Bottom navbar and new top navbar

uni/lib/main.dart

@@ -29,7 +29,7 @@ import 'package:uni/model/providers/plausible/plausible_provider.dart';
 import 'package:uni/model/providers/startup/profile_provider.dart';
 import 'package:uni/model/providers/startup/session_provider.dart';
 import 'package:uni/model/providers/state_providers.dart';
-import 'package:uni/utils/drawer_items.dart';
+import 'package:uni/utils/navigation_items.dart';
 import 'package:uni/view/academic_path/academic_path.dart';
 import 'package:uni/view/bus_stop_next_arrivals/bus_stop_next_arrivals.dart';
 import 'package:uni/view/calendar/calendar.dart';
@@ -42,8 +42,10 @@ import 'package:uni/view/library/library.dart';
 import 'package:uni/view/locale_notifier.dart';
 import 'package:uni/view/locations/locations.dart';
 import 'package:uni/view/login/login.dart';
+import 'package:uni/view/profile/profile.dart';
 import 'package:uni/view/restaurant/restaurant_page_view.dart';
 import 'package:uni/view/schedule/schedule.dart';
+import 'package:uni/view/settings/settings.dart';
 import 'package:uni/view/theme.dart';
 import 'package:uni/view/theme_notifier.dart';
 import 'package:uni/view/transports/transports.dart';
@@ -226,68 +228,79 @@ class ApplicationState extends State<Application> {
           GlobalCupertinoLocalizations.delegate,
         ],
         supportedLocales: S.delegate.supportedLocales,
+        initialRoute: '/${NavigationItem.navPersonalArea.route}',
         home: widget.initialWidget,
         navigatorObservers: navigatorObservers,
         onGenerateRoute: (RouteSettings settings) {
           final transitions = {
-            '/${DrawerItem.navPersonalArea.title}':
+            '/${NavigationItem.navPersonalArea.route}':
                 PageTransition.makePageTransition(
               page: const HomePageView(),
               settings: settings,
             ),
-            '/${DrawerItem.navSchedule.title}':
+            '/${NavigationItem.navSchedule.route}':
                 PageTransition.makePageTransition(
               page: const SchedulePage(),
               settings: settings,
             ),
-            '/${DrawerItem.navExams.title}': PageTransition.makePageTransition(
+            '/${NavigationItem.navExams.route}':
+                PageTransition.makePageTransition(
               page: const ExamsPageView(),
               settings: settings,
             ),
-            '/${DrawerItem.navStops.title}': PageTransition.makePageTransition(
+            '/${NavigationItem.navStops.route}':
+                PageTransition.makePageTransition(
               page: const BusStopNextArrivalsPage(),
               settings: settings,
             ),
-            '/${DrawerItem.navCourseUnits.title}':
+            '/${NavigationItem.navCourseUnits.route}':
                 PageTransition.makePageTransition(
               page: const CourseUnitsPageView(),
               settings: settings,
             ),
-            '/${DrawerItem.navLocations.title}':
+            '/${NavigationItem.navLocations.route}':
                 PageTransition.makePageTransition(
               page: const LocationsPage(),
               settings: settings,
             ),
-            '/${DrawerItem.navRestaurants.title}':
+            '/${NavigationItem.navRestaurants.route}':
                 PageTransition.makePageTransition(
               page: const RestaurantPageView(),
               settings: settings,
             ),
-            '/${DrawerItem.navCalendar.title}':
+            '/${NavigationItem.navCalendar.route}':
                 PageTransition.makePageTransition(
               page: const CalendarPageView(),
               settings: settings,
             ),
-            '/${DrawerItem.navLibrary.title}':
+            '/${NavigationItem.navLibrary.route}':
                 PageTransition.makePageTransition(
               page: const LibraryPage(),
               settings: settings,
             ),
-            '/${DrawerItem.navFaculty.title}':
+            '/${NavigationItem.navFaculty.route}':
                 PageTransition.makePageTransition(
               page: const FacultyPageView(),
               settings: settings,
             ),
-            '/${DrawerItem.navAcademicPath.title}':
+            '/${NavigationItem.navAcademicPath.route}':
                 PageTransition.makePageTransition(
               page: const AcademicPathPageView(),
               settings: settings,
             ),
-            '/${DrawerItem.navTransports.title}':
+            '/${NavigationItem.navTransports.route}':
                 PageTransition.makePageTransition(
               page: const TransportsPageView(),
               settings: settings,
             ),
+            '/${NavigationItem.navProfile.route}':
+                MaterialPageRoute<ProfilePageView>(
+              builder: (__) => const ProfilePageView(),
+            ),
+            '/${NavigationItem.navSettings.route}':
+                MaterialPageRoute<SettingsPage>(
+              builder: (_) => const SettingsPage(),
+            ),
           };
           return transitions[settings.name];
         },

uni/lib/utils/navbar_items.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:uni/utils/navigation_items.dart';
+
+enum NavbarItem {
+  navPersonalArea(
+    Icons.home_outlined,
+    Icons.home,
+    NavigationItem.navPersonalArea,
+  ),
+  navAcademicPath(
+    Icons.school_outlined,
+    Icons.school,
+    NavigationItem.navAcademicPath,
+  ),
+  navRestaurants(
+    Icons.local_cafe_outlined,
+    Icons.local_cafe,
+    NavigationItem.navRestaurants,
+  ),
+  navFaculty(Icons.domain_outlined, Icons.domain, NavigationItem.navFaculty),
+  navTransports(Icons.map_outlined, Icons.map, NavigationItem.navTransports);
+
+  const NavbarItem(this.unselectedIcon, this.selectedIcon, this.item);
+
+  final IconData unselectedIcon;
+  final IconData selectedIcon;
+  final NavigationItem item;
+
+  BottomNavigationBarItem toUnselectedBottomNavigationBarItem() {
+    return BottomNavigationBarItem(
+      icon: Icon(unselectedIcon),
+      label: '',
+    );
+  }
+
+  BottomNavigationBarItem toSelectedBottomNavigationBarItem() {
+    return BottomNavigationBarItem(
+      icon: Icon(selectedIcon),
+      label: '',
+    );
+  }
+
+  String get route {
+    return item.route;
+  }
+}

uni/lib/utils/drawer_items.dart → uni/lib/utils/navigation_items.dart

@@ -1,4 +1,4 @@
-enum DrawerItem {
+enum NavigationItem {
   navPersonalArea('area'),
   navSchedule('horario'),
   navExams('exames'),
@@ -10,11 +10,13 @@ enum DrawerItem {
   navLibrary('biblioteca', faculties: {'feup'}),
   navFaculty('faculdade'),
   navAcademicPath('percurso_academico'),
+  navProfile('perfil'),
+  navSettings('definicoes'),
   navTransports('transportes');
 
-  const DrawerItem(this.title, {this.faculties});
+  const NavigationItem(this.route, {this.faculties});
 
-  final String title;
+  final String route;
   final Set<String>? faculties;
 
   bool isVisible(List<String> userFaculties) {

uni/lib/view/about/about.dart

@@ -37,4 +37,9 @@ class AboutPageViewState extends SecondaryPageViewState<AboutPageView> {
 
   @override
   Future<void> onRefresh(BuildContext context) async {}
+
+  @override
+  String? getTitle() {
+    return null;
+  }
 }

uni/lib/view/academic_path/academic_path.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:uni/generated/l10n.dart';
-import 'package:uni/utils/drawer_items.dart';
 import 'package:uni/view/academic_path/widgets/course_units_card.dart';
 import 'package:uni/view/common_widgets/generic_card.dart';
-import 'package:uni/view/common_widgets/page_title.dart';
 import 'package:uni/view/common_widgets/pages_layouts/general/general.dart';
 import 'package:uni/view/home/widgets/exam_card.dart';
 import 'package:uni/view/home/widgets/schedule_card.dart';
@@ -26,14 +23,7 @@ class AcademicPathPageViewState extends GeneralPageViewState {
   @override
   Widget getBody(BuildContext context) {
     return ListView(
-      children: [
-        PageTitle(
-          name: S.of(context).nav_title(DrawerItem.navAcademicPath.title),
-        ),
-        Column(
-          children: academicPathCards,
-        ),
-      ],
+      children: academicPathCards,
     );
   }
 

uni/lib/view/academic_path/widgets/course_units_card.dart

@@ -4,7 +4,7 @@ import 'package:uni/generated/l10n.dart';
 import 'package:uni/model/entities/course_units/course_unit.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/providers/startup/profile_provider.dart';
-import 'package:uni/utils/drawer_items.dart';
+import 'package:uni/utils/navigation_items.dart';
 import 'package:uni/view/common_widgets/generic_card.dart';
 import 'package:uni/view/course_units/widgets/course_unit_card.dart';
 import 'package:uni/view/lazy_consumer.dart';
@@ -73,9 +73,9 @@ class CourseUnitsCard extends GenericCard {
 
   @override
   String getTitle(BuildContext context) =>
-      S.of(context).nav_title(DrawerItem.navCourseUnits.title);
+      S.of(context).nav_title(NavigationItem.navCourseUnits.route);
 
   @override
   Future<Object?> onClick(BuildContext context) =>
-      Navigator.pushNamed(context, '/${DrawerItem.navCourseUnits.title}');
+      Navigator.pushNamed(context, '/${NavigationItem.navCourseUnits.route}');
 }

uni/lib/view/bug_report/bug_report.dart

@@ -22,4 +22,9 @@ class BugReportPageViewState extends SecondaryPageViewState<BugReportPageView> {
 
   @override
   Future<void> onRefresh(BuildContext context) async {}
+
+  @override
+  String? getTitle() {
+    return null;
+  }
 }

uni/lib/view/bus_stop_next_arrivals/bus_stop_next_arrivals.dart

@@ -5,13 +5,12 @@ import 'package:provider/provider.dart';
 import 'package:uni/generated/l10n.dart';
 import 'package:uni/model/entities/bus_stop.dart';
 import 'package:uni/model/providers/lazy/bus_stop_provider.dart';
-import 'package:uni/utils/drawer_items.dart';
+import 'package:uni/utils/navigation_items.dart';
 import 'package:uni/view/bus_stop_next_arrivals/widgets/bus_stop_row.dart';
 import 'package:uni/view/bus_stop_selection/bus_stop_selection.dart';
 import 'package:uni/view/common_widgets/expanded_image_label.dart';
 import 'package:uni/view/common_widgets/last_update_timestamp.dart';
-import 'package:uni/view/common_widgets/page_title.dart';
-import 'package:uni/view/common_widgets/pages_layouts/general/general.dart';
+import 'package:uni/view/common_widgets/pages_layouts/secondary/secondary.dart';
 import 'package:uni/view/lazy_consumer.dart';
 
 class BusStopNextArrivalsPage extends StatefulWidget {
@@ -23,18 +22,12 @@ class BusStopNextArrivalsPage extends StatefulWidget {
 
 /// Manages the 'Bus arrivals' section inside the user's personal area
 class BusStopNextArrivalsPageState
-    extends GeneralPageViewState<BusStopNextArrivalsPage> {
+    extends SecondaryPageViewState<BusStopNextArrivalsPage> {
   @override
   Widget getBody(BuildContext context) {
     return SingleChildScrollView(
       child: Column(
         children: [
-          Container(
-            padding: const EdgeInsets.only(bottom: 12),
-            child: PageTitle(
-              name: S.of(context).nav_title(DrawerItem.navStops.title),
-            ),
-          ),
           Container(
             padding: const EdgeInsets.all(8),
             child: Row(
@@ -104,6 +97,9 @@ class BusStopNextArrivalsPageState
     return Provider.of<BusStopProvider>(context, listen: false)
         .forceRefresh(context);
   }
+
+  @override
+  String? getTitle() => S.of(context).nav_title(NavigationItem.navStops.route);
 }
 
 class NextArrivals extends StatefulWidget {

uni/lib/view/bus_stop_selection/bus_stop_selection.dart

@@ -6,7 +6,6 @@ import 'package:uni/model/entities/bus_stop.dart';
 import 'package:uni/model/providers/lazy/bus_stop_provider.dart';
 import 'package:uni/view/bus_stop_selection/widgets/bus_stop_search.dart';
 import 'package:uni/view/bus_stop_selection/widgets/bus_stop_selection_row.dart';
-import 'package:uni/view/common_widgets/page_title.dart';
 import 'package:uni/view/common_widgets/pages_layouts/secondary/secondary.dart';
 
 class BusStopSelectionPage extends StatefulWidget {
@@ -49,7 +48,6 @@ class BusStopSelectionPageState
             bottom: 20,
           ),
           children: <Widget>[
-            PageTitle(name: S.of(context).configured_buses),
             Container(
               padding: const EdgeInsets.all(20),
               child: Text(
@@ -85,4 +83,7 @@ class BusStopSelectionPageState
 
   @override
   Future<void> onRefresh(BuildContext context) async {}
+
+  @override
+  String? getTitle() => S.of(context).configured_buses;
 }