Merge branch 'main' of https://github.com/siddu015/apidash

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,14 +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 "),
+                    const Text(kLabelImport),
+                    kHSpacer8,
                     DropdownButtonImportFormat(
                       importFormat: fmt,
                       onChanged: (format) {
@@ -38,6 +40,7 @@ showImportDialog({
                     ),
                   ],
                 ),
+                kVSpacer6,
                 DragAndDropArea(
                   onFileDropped: onFileDropped,
                 ),

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
@@ -30,6 +31,7 @@ class SidebarTopMenu extends StatelessWidget {
       offset: offset,
       onSelected: onSelected,
       shape: shape,
+      menuPadding: menuPadding,
       itemBuilder: (BuildContext context) => SidebarMenuOption.values
           .map<PopupMenuEntry<SidebarMenuOption>>(
             (e) => PopupMenuItem<SidebarMenuOption>(

lib/widgets/popup_menu_env.dart

@@ -1,7 +1,6 @@
 import 'package:apidash_core/apidash_core.dart';
 import 'package:apidash_design_system/apidash_design_system.dart';
 import 'package:flutter/material.dart';
-import 'package:apidash/models/models.dart';
 import 'package:apidash/utils/utils.dart';
 import '../consts.dart';