From b76f5c48fbf94155ff6ba3fea50c6b813afad8c8 Mon Sep 17 00:00:00 2001 From: bavitha01 Date: Sun, 23 Feb 2025 02:27:46 +0530 Subject: [PATCH 1/3] feat: Improve import dialog UI with better padding and spacing --- lib/widgets/dialog_import.dart | 5 ++++- lib/widgets/menu_sidebar_top.dart | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/widgets/dialog_import.dart b/lib/widgets/dialog_import.dart index 7bb2b82e..0553bee3 100644 --- a/lib/widgets/dialog_import.dart +++ b/lib/widgets/dialog_import.dart @@ -24,7 +24,8 @@ showImportDialog({ Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - const Text("Import "), + const Text("Import ",style: const TextStyle(fontWeight: FontWeight.bold)), + const SizedBox(width:8), DropdownButtonImportFormat( importFormat: fmt, onChanged: (format) { @@ -38,9 +39,11 @@ showImportDialog({ ), ], ), + const SizedBox(height:10), DragAndDropArea( onFileDropped: onFileDropped, ), + const SizedBox(height:12), ], ), ); diff --git a/lib/widgets/menu_sidebar_top.dart b/lib/widgets/menu_sidebar_top.dart index 0f1ced58..130c71e8 100644 --- a/lib/widgets/menu_sidebar_top.dart +++ b/lib/widgets/menu_sidebar_top.dart @@ -29,7 +29,8 @@ class SidebarTopMenu extends StatelessWidget { iconSize: 14, offset: offset, onSelected: onSelected, - shape: shape, + shape: RoundedRectangleBorder (borderRadius: BorderRadius. circular (12)), + menuPadding: const EdgeInsets.symmetric(vertical: 3, horizontal: 8), itemBuilder: (BuildContext context) => SidebarMenuOption.values .map>( (e) => PopupMenuItem( From bbb3fa6364917791bc78ec870686e6fe68c34afd Mon Sep 17 00:00:00 2001 From: Ashita Prasad Date: Sun, 23 Feb 2025 05:51:11 +0530 Subject: [PATCH 2/3] Update import dialog --- lib/consts.dart | 1 + lib/widgets/dialog_import.dart | 12 ++++++------ .../lib/tokens/measurements.dart | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/consts.dart b/lib/consts.dart index 5937636e..7eb1ae95 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -432,6 +432,7 @@ const kLabelSelect = "Select"; const kLabelContinue = "Continue"; const kLabelCancel = "Cancel"; const kLabelOk = "Ok"; +const kLabelImport = "Import"; const kUntitled = "untitled"; // Request Pane const kLabelRequest = "Request"; diff --git a/lib/widgets/dialog_import.dart b/lib/widgets/dialog_import.dart index 0553bee3..bfc50eda 100644 --- a/lib/widgets/dialog_import.dart +++ b/lib/widgets/dialog_import.dart @@ -1,8 +1,9 @@ -import 'package:apidash/consts.dart'; +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:file_selector/file_selector.dart'; import 'drag_and_drop_area.dart'; import 'dropdown_import_format.dart'; +import '../consts.dart'; showImportDialog({ required BuildContext context, @@ -17,15 +18,15 @@ showImportDialog({ return StatefulBuilder( builder: (context, StateSetter setState) { return AlertDialog( - contentPadding: const EdgeInsets.all(12), + contentPadding: kP12, content: Column( mainAxisSize: MainAxisSize.min, children: [ Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - const Text("Import ",style: const TextStyle(fontWeight: FontWeight.bold)), - const SizedBox(width:8), + const Text(kLabelImport), + kHSpacer8, DropdownButtonImportFormat( importFormat: fmt, onChanged: (format) { @@ -39,11 +40,10 @@ showImportDialog({ ), ], ), - const SizedBox(height:10), + kVSpacer6, DragAndDropArea( onFileDropped: onFileDropped, ), - const SizedBox(height:12), ], ), ); diff --git a/packages/apidash_design_system/lib/tokens/measurements.dart b/packages/apidash_design_system/lib/tokens/measurements.dart index 638e5413..f760f8f9 100644 --- a/packages/apidash_design_system/lib/tokens/measurements.dart +++ b/packages/apidash_design_system/lib/tokens/measurements.dart @@ -26,13 +26,14 @@ const kP4 = EdgeInsets.all(4); const kP5 = EdgeInsets.all(5); const kP6 = EdgeInsets.all(6); const kP8 = EdgeInsets.all(8); +const kP10 = EdgeInsets.all(10); +const kP12 = EdgeInsets.all(12); const kPs8 = EdgeInsets.only(left: 8); const kPs2 = EdgeInsets.only(left: 2); const kPe4 = EdgeInsets.only(right: 4); const kPe8 = EdgeInsets.only(right: 8); const kPh20v5 = EdgeInsets.symmetric(horizontal: 20, vertical: 5); const kPh20v10 = EdgeInsets.symmetric(horizontal: 20, vertical: 10); -const kP10 = EdgeInsets.all(10); const kPv2 = EdgeInsets.symmetric(vertical: 2); const kPv6 = EdgeInsets.symmetric(vertical: 6); const kPv8 = EdgeInsets.symmetric(vertical: 8); @@ -92,6 +93,7 @@ const kHSpacer20 = SizedBox(width: 20); const kHSpacer40 = SizedBox(width: 40); const kVSpacer3 = SizedBox(height: 3); const kVSpacer5 = SizedBox(height: 5); +const kVSpacer6 = SizedBox(height: 6); const kVSpacer8 = SizedBox(height: 8); const kVSpacer10 = SizedBox(height: 10); const kVSpacer16 = SizedBox(height: 16); From d6dcf50a1ff6aefc07b13882c97c205c77fdfd16 Mon Sep 17 00:00:00 2001 From: Ashita Prasad Date: Sun, 23 Feb 2025 10:53:04 +0530 Subject: [PATCH 3/3] Update menu_sidebar_top.dart --- lib/widgets/menu_sidebar_top.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/widgets/menu_sidebar_top.dart b/lib/widgets/menu_sidebar_top.dart index 130c71e8..4bf95ace 100644 --- a/lib/widgets/menu_sidebar_top.dart +++ b/lib/widgets/menu_sidebar_top.dart @@ -10,13 +10,14 @@ class SidebarTopMenu extends StatelessWidget { this.splashRadius = 14, this.tooltip, this.shape, + this.menuPadding, }); final Widget? child; final Offset offset; final double splashRadius; final String? tooltip; final ShapeBorder? shape; - + final EdgeInsets? menuPadding; final Function(SidebarMenuOption)? onSelected; @override @@ -29,8 +30,8 @@ class SidebarTopMenu extends StatelessWidget { iconSize: 14, offset: offset, onSelected: onSelected, - shape: RoundedRectangleBorder (borderRadius: BorderRadius. circular (12)), - menuPadding: const EdgeInsets.symmetric(vertical: 3, horizontal: 8), + shape: shape, + menuPadding: menuPadding, itemBuilder: (BuildContext context) => SidebarMenuOption.values .map>( (e) => PopupMenuItem(