Fix bottom navbar route handling

NIAEFEUP · Jan 18, 2024 · b1a71c7 · b1a71c7
1 parent 95bb8bf
commit b1a71c7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/uni/lib/view/common_widgets/pages_layouts/general/widgets/bottom_navigation_bar.dart b/uni/lib/view/common_widgets/pages_layouts/general/widgets/bottom_navigation_bar.dart
@@ -20,13 +20,14 @@ class AppBottomNavbarState extends State<AppBottomNavbar> {
       .map((item) => item.toBottomNavigationBarItem())
       .toList();
 
-  String _getCurrentRoute() =>
-      ModalRoute.of(widget.parentContext)!.settings.name == null
-          ? DrawerItem.navPersonalArea.title
-          : ModalRoute.of(widget.parentContext)!.settings.name!.substring(1);
+  String? _getCurrentRoute() =>
+      ModalRoute.of(widget.parentContext)!.settings.name?.substring(1);
 
   int _getCurrentIndex() {
     final currentRoute = _getCurrentRoute();
+    if (_getCurrentRoute() == null) {
+      return -1;
+    }
 
     for (final item in NavbarItem.values) {
       if (item.routes.contains(currentRoute)) {