TW-1437: Update bottom navigator bar

linagora · Feb 1, 2024 · ebd4d7d · ebd4d7d
1 parent 5b3edc3
commit ebd4d7d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/lib/utils/responsive/responsive_utils.dart b/lib/utils/responsive/responsive_utils.dart
@@ -17,7 +17,8 @@ class ResponsiveUtils {
   static const double bodyRadioWidth = 472;
 
   static const double defaultSizeBodyLayoutDesktop = 280;
-  static const double heightBottomNavigation = 90;
+  static const double heightBottomNavigation = 72;
+  static const double heightBottomNavigationBar = 56;
 
   static const double bodyWithRightColumnRatio = 0.7;
 

diff --git a/lib/widgets/layouts/adaptive_layout/app_adaptive_scaffold_body_view.dart b/lib/widgets/layouts/adaptive_layout/app_adaptive_scaffold_body_view.dart
@@ -8,6 +8,7 @@ import 'package:fluffychat/utils/responsive/responsive_utils.dart';
 import 'package:fluffychat/widgets/layouts/adaptive_layout/adaptive_scaffold_primary_navigation.dart';
 import 'package:fluffychat/widgets/layouts/adaptive_layout/adaptive_scaffold_view_style.dart';
 import 'package:fluffychat/widgets/layouts/adaptive_layout/app_adaptive_scaffold_body.dart';
+import 'package:fluffychat/widgets/layouts/adaptive_layout/app_adaptive_scaffold_body_view_style.dart';
 import 'package:fluffychat/widgets/layouts/enum/adaptive_destinations_enum.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
@@ -231,12 +232,16 @@ class _ColumnPageView extends StatelessWidget {
           builder: (_) {
             return Container(
               height: ResponsiveUtils.heightBottomNavigation,
-              color: Theme.of(context).colorScheme.surface,
+              color: LinagoraSysColors.material().surface,
+              padding: AppAdaptiveScaffoldBodyViewStyle.paddingBottomNavigation,
               child: ListView(
+                padding: EdgeInsets.zero,
                 physics: const NeverScrollableScrollPhysics(),
                 children: [
                   NavigationBar(
-                    height: ResponsiveUtils.heightBottomNavigation,
+                    backgroundColor: LinagoraSysColors.material().surface,
+                    elevation: AppAdaptiveScaffoldBodyViewStyle.elevation,
+                    height: ResponsiveUtils.heightBottomNavigationBar,
                     selectedIndex: _getActiveBottomNavigationBarIndex(),
                     destinations: getNavigationDestinations(context),
                     onDestinationSelected: onDestinationSelected,

diff --git a/lib/widgets/layouts/adaptive_layout/app_adaptive_scaffold_body_view_style.dart b/lib/widgets/layouts/adaptive_layout/app_adaptive_scaffold_body_view_style.dart
@@ -0,0 +1,9 @@
+import 'package:flutter/cupertino.dart';
+
+class AppAdaptiveScaffoldBodyViewStyle {
+  static const double elevation = 0.0;
+
+  static const EdgeInsets paddingBottomNavigation = EdgeInsets.only(
+    top: 4,
+  );
+}