diff --git a/lib/presentation/pages/scaffold_with_nav_bar.dart b/lib/presentation/pages/scaffold_with_nav_bar.dart index 9b1194e5..4c763c82 100644 --- a/lib/presentation/pages/scaffold_with_nav_bar.dart +++ b/lib/presentation/pages/scaffold_with_nav_bar.dart @@ -7,7 +7,6 @@ import 'package:rtu_mirea_app/presentation/app_notifier.dart'; import 'package:rtu_mirea_app/presentation/theme.dart'; import 'package:rtu_mirea_app/presentation/typography.dart'; import 'package:unicons/unicons.dart'; -import 'package:dot_navigation_bar/dot_navigation_bar.dart'; import 'package:salomon_bottom_bar/salomon_bottom_bar.dart'; import '../constants.dart'; @@ -43,45 +42,13 @@ class ScaffoldWithNavBar extends StatelessWidget { body: Consumer( builder: (_, value, child) => navigationShell, ), - extendBody: true, - bottomNavigationBar: DotNavigationBar( - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.1), - blurRadius: 8, - ), - ], - marginR: const EdgeInsets.symmetric(horizontal: 16), - paddingR: - const EdgeInsets.only(bottom: 5, top: 7, right: 8, left: 8), - backgroundColor: AppTheme.colors.background03, - splashBorderRadius: 30, - currentIndex: navigationShell.currentIndex, - onTap: (index) => _setActiveIndex(index), - items: [ - DotNavigationBarItem( - icon: const Icon(Icons.library_books_rounded), - selectedColor: AppTheme.colors.colorful02, - ), - DotNavigationBarItem( - icon: const Icon(Icons.calendar_today_rounded), - selectedColor: AppTheme.colors.colorful03, - ), - DotNavigationBarItem( - icon: const Icon(Icons.widgets_rounded), - selectedColor: AppTheme.colors.colorful04, - ), - isDesktop - ? DotNavigationBarItem( - icon: const Icon(UniconsLine.info_circle), - selectedColor: AppTheme.colors.colorful06, - ) - : DotNavigationBarItem( - icon: const Icon(Icons.person), - selectedColor: AppTheme.colors.colorful06, + bottomNavigationBar: + navigationShell.route.toString().contains('home') + ? null + : AppBottomNavigationBar( + index: navigationShell.currentIndex, + onClick: (index) => _setActiveIndex(index), ), - ], - ), ); } }, diff --git a/pubspec.lock b/pubspec.lock index f9249be2..8e0d73ca 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -375,14 +375,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" - dot_navigation_bar: - dependency: "direct main" - description: - name: dot_navigation_bar - sha256: "753e1d91644e39beddd0a4ed7e366f37a95e38cafb601c3b7496120ae0532f63" - url: "https://pub.dev" - source: hosted - version: "1.0.2" equatable: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index a6194f42..f213e9f5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ publish_to: 'none' # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.4.2+54 +version: 1.4.2+55 environment: sdk: ">=3.1.1" @@ -46,7 +46,6 @@ dependencies: hydrated_bloc: ^9.1.2 bloc_concurrency: ^0.2.2 - dot_navigation_bar: ^1.0.2 # A wrapper around InheritedWidget to make them easier to use and more reusable. # See https://pub.dev/packages/provider