refactor: Move base bottom sheet to mxc ui

MXCzkEVM · Dec 12, 2024 · fb120b5 · fb120b5
1 parent b81c0f3
commit fb120b5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/ui/lib/mxc_ui.dart b/ui/lib/mxc_ui.dart
@@ -13,5 +13,6 @@ export 'src/drop_down.dart';
 export 'src/app_bar.dart';
 export 'src/app_bar_evenly.dart';
 export 'src/mxc_icons.dart';
+export 'src/bottom_sheets/bottom_sheets.dart';
 
 const mxcUiPackageName = 'mxc_ui';
diff --git a/ui/lib/src/bottom_sheets/base_bottom_sheet.dart b/ui/lib/src/bottom_sheets/base_bottom_sheet.dart
@@ -11,7 +11,8 @@ Future<T?> showBaseBottomSheet<T>({
   List<Widget>? widgets,
   Widget? content,
   bool isDismissible = true,
-  bool enableDrag = true
+  bool enableDrag = true,
+  Color? bottomSheetBackgroundColor,
 }) {
   assert(
       ((widgets != null && bottomSheetTitle != null) || content != null) &&
@@ -29,7 +30,7 @@ Future<T?> showBaseBottomSheet<T>({
     useSafeArea: true,
     builder: (BuildContext context) => ConstrainedBox(
       constraints: BoxConstraints(
-        maxHeight: MediaQuery.of(context).size.height * 0.95,
+        maxHeight: MediaQuery.of(context).size.height * 0.9,
       ),
       child: Container(
         padding: const EdgeInsets.only(
@@ -38,39 +39,40 @@ Future<T?> showBaseBottomSheet<T>({
             right: Sizes.spaceNormal,
             left: Sizes.spaceNormal),
         decoration: BoxDecoration(
-          color: ColorsTheme.of(context).layerSheetBackground,
+          color: bottomSheetBackgroundColor ??
+              ColorsTheme.of(context).layerSheetBackground,
           borderRadius: const BorderRadius.only(
             topLeft: Radius.circular(20),
             topRight: Radius.circular(20),
           ),
         ),
-        child: content ??
-            Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsetsDirectional.only(
-                      start: Sizes.spaceNormal,
-                      end: Sizes.spaceNormal,
-                      bottom: Sizes.space2XLarge),
-                  child: MxcAppBarEvenly.title(
+        child: Container(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceSmall,
+              end: Sizes.spaceSmall,
+              bottom: Sizes.space2XLarge),
+          child: content ??
+              Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  MxcAppBarEvenly.title(
                     titleText: translate(bottomSheetTitle!),
                     action: hasCloseButton
                         ? Container(
                             alignment: Alignment.centerRight,
                             child: InkWell(
-                              child: const Icon(Icons.close, size: 30),
+                              child: const Icon(Icons.close, size: 24),
                               onTap: () => Navigator.of(context)
                                   .pop(closeButtonReturnValue),
                             ),
                           )
                         : null,
                   ),
-                ),
-                ...widgets!
-              ],
-            ),
+                  ...widgets!
+                ],
+              ),
+        ),
       ),
     ),
   );

diff --git a/ui/lib/src/bottom_sheets/bottom_sheets.dart b/ui/lib/src/bottom_sheets/bottom_sheets.dart
@@ -1 +1,2 @@
-export 'info_bottom_sheet.dart';
+export 'info_bottom_sheet.dart';
+export 'base_bottom_sheet.dart';