diff --git a/packages/smooth_app/lib/pages/page_manager.dart b/packages/smooth_app/lib/pages/page_manager.dart index 5ef62fcfec1..00e876a8a52 100644 --- a/packages/smooth_app/lib/pages/page_manager.dart +++ b/packages/smooth_app/lib/pages/page_manager.dart @@ -79,30 +79,42 @@ class PageManagerState extends State { final bool isProd = userPreferences .getFlag(UserPreferencesDevMode.userPreferencesFlagProd) ?? true; - final BottomNavigationBar bar = BottomNavigationBar( - onTap: (int index) { - if (_currentPage == BottomNavigationTab.Scan && - _pageKeys[index] == BottomNavigationTab.Scan) { - carouselManager.showSearchCard(); - } + final Widget bar = DecoratedBox( + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Theme.of(context).shadowColor.withOpacity(0.3), + offset: Offset.zero, + blurRadius: 10.0, + spreadRadius: 1.0, + ), + ], + ), + child: BottomNavigationBar( + onTap: (int index) { + if (_currentPage == BottomNavigationTab.Scan && + _pageKeys[index] == BottomNavigationTab.Scan) { + carouselManager.showSearchCard(); + } - _selectTab(_pageKeys[index], index); - }, - currentIndex: _currentPage.index, - items: [ - BottomNavigationBarItem( - icon: const Icon(Icons.account_circle), - label: appLocalizations.profile_navbar_label, - ), - BottomNavigationBarItem( - icon: const Icon(Icons.search), - label: appLocalizations.scan_navbar_label, - ), - BottomNavigationBarItem( - icon: const Icon(Icons.list), - label: appLocalizations.list_navbar_label, - ), - ], + _selectTab(_pageKeys[index], index); + }, + currentIndex: _currentPage.index, + items: [ + BottomNavigationBarItem( + icon: const Icon(Icons.account_circle), + label: appLocalizations.profile_navbar_label, + ), + BottomNavigationBarItem( + icon: const Icon(Icons.search), + label: appLocalizations.scan_navbar_label, + ), + BottomNavigationBarItem( + icon: const Icon(Icons.list), + label: appLocalizations.list_navbar_label, + ), + ], + ), ); return WillPopScope2( onWillPop: () async { diff --git a/packages/smooth_app/lib/pages/scan/scan_header.dart b/packages/smooth_app/lib/pages/scan/scan_header.dart index 53cbe5bbb6e..519315cb851 100644 --- a/packages/smooth_app/lib/pages/scan/scan_header.dart +++ b/packages/smooth_app/lib/pages/scan/scan_header.dart @@ -29,6 +29,12 @@ class _ScanHeaderState extends State { borderRadius: BorderRadius.all(Radius.circular(18.0)), ), ), + foregroundColor: WidgetStateProperty.all( + Theme.of(context).colorScheme.onPrimary, + ), + textStyle: WidgetStateProperty.all( + const TextStyle(fontWeight: FontWeight.w600), + ), ); final bool compareFeatureAvailable = model.compareFeatureAvailable; diff --git a/packages/smooth_app/lib/themes/smooth_theme.dart b/packages/smooth_app/lib/themes/smooth_theme.dart index 771cb1fe161..1316298bb90 100644 --- a/packages/smooth_app/lib/themes/smooth_theme.dart +++ b/packages/smooth_app/lib/themes/smooth_theme.dart @@ -61,6 +61,8 @@ class SmoothTheme { selectedLabelStyle: const TextStyle(fontWeight: FontWeight.bold), showUnselectedLabels: true, unselectedIconTheme: const IconThemeData(size: 20.0), + elevation: 0.0, + enableFeedback: true, ), elevatedButtonTheme: ElevatedButtonThemeData( style: ButtonStyle(