From 7e09fe7fffee6f15a8420699186fc4596bf0cb88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Kiss?=
 <70794496+kimaah@users.noreply.github.com>
Date: Mon, 4 Mar 2024 12:04:52 +0100
Subject: [PATCH] navbar updates

---
 .../screens/navigation/navigation_route.dart  |  6 +-
 .../navigation/navigation_route_handler.dart  |  8 ++-
 .../screens/navigation/navigation_screen.dart | 70 ++++++++++++++++---
 3 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/refilc_mobile_ui/lib/screens/navigation/navigation_route.dart b/refilc_mobile_ui/lib/screens/navigation/navigation_route.dart
index 79778aa..44037f2 100644
--- a/refilc_mobile_ui/lib/screens/navigation/navigation_route.dart
+++ b/refilc_mobile_ui/lib/screens/navigation/navigation_route.dart
@@ -6,8 +6,10 @@ class NavigationRoute {
     "home",
     "grades",
     "timetable",
-    "messages",
-    "absences",
+    "notes",
+    "inbox",
+    // "messages",
+    // "absences",
   ];
 
   String get name => _name;
diff --git a/refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart b/refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart
index c3d8a99..de9579e 100644
--- a/refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart
+++ b/refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart
@@ -14,10 +14,14 @@ Route navigationRouteHandler(RouteSettings settings) {
       return navigationPageRoute((context) => const GradesPage());
     case "timetable":
       return navigationPageRoute((context) => const TimetablePage());
-    case "messages":
+    case "notes":
       return navigationPageRoute((context) => const MessagesPage());
-    case "absences":
+    case "inbox":
       return navigationPageRoute((context) => const AbsencesPage());
+    // case "messages":
+    //   return navigationPageRoute((context) => const MessagesPage());
+    // case "absences":
+    //   return navigationPageRoute((context) => const AbsencesPage());
     default:
       return navigationPageRoute((context) => const HomePage());
   }
diff --git a/refilc_mobile_ui/lib/screens/navigation/navigation_screen.dart b/refilc_mobile_ui/lib/screens/navigation/navigation_screen.dart
index e57cd77..9d56e7e 100644
--- a/refilc_mobile_ui/lib/screens/navigation/navigation_screen.dart
+++ b/refilc_mobile_ui/lib/screens/navigation/navigation_screen.dart
@@ -367,24 +367,74 @@ class NavigationScreenState extends State<NavigationScreen>
                           ),
                           NavItem(
                             title: "grades".i18n,
-                            icon: const Icon(FeatherIcons.bookmark),
-                            activeIcon: const Icon(FilcIcons.gradesfill),
+                            icon: SvgPicture.asset(
+                                  'assets/svg/menu_icons/grades.svg',
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  height: 24,
+                                ),
+                            activeIcon: SvgPicture.asset(
+                                  'assets/svg/menu_icons/grades_selected.svg',
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  height: 24,
+                                ),
                           ),
                           NavItem(
                             title: "timetable".i18n,
-                            icon: const Icon(FeatherIcons.calendar),
-                            activeIcon: const Icon(FilcIcons.timetablefill),
+                            icon: SvgPicture.asset(
+                                  'assets/svg/menu_icons/timetable.svg',
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  height: 24,
+                                ),
+                            activeIcon: SvgPicture.asset(
+                                  'assets/svg/menu_icons/timetable_selected.svg',
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  height: 24,
+                                ),
                           ),
                           NavItem(
-                            title: "messages".i18n,
-                            icon: const Icon(FeatherIcons.messageSquare),
-                            activeIcon: const Icon(FilcIcons.messagesfill),
+                            title: "notes".i18n,
+                            icon: SvgPicture.asset(
+                                  'assets/svg/menu_icons/notes.svg',
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  height: 24,
+                                ),
+                            activeIcon: SvgPicture.asset(
+                                  'assets/svg/menu_icons/notes_selected.svg',
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  height: 24,
+                                ),
                           ),
                           NavItem(
-                            title: "absences".i18n,
-                            icon: const Icon(FeatherIcons.clock),
-                            activeIcon: const Icon(FilcIcons.absencesfill),
+                            title: "inbox".i18n,
+                            icon: SvgPicture.asset(
+                                  'assets/svg/menu_icons/inbox.svg',
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  height: 24,
+                                ),
+                            activeIcon: SvgPicture.asset(
+                                  'assets/svg/menu_icons/inbox_selected.svg',
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  height: 24,
+                                ),
                           ),
+                          // NavItem(
+                          //   title: "messages".i18n,
+                          //   icon: const Icon(FeatherIcons.messageSquare),
+                          //   activeIcon: const Icon(FilcIcons.messagesfill),
+                          // ),
+                          // NavItem(
+                          //   title: "absences".i18n,
+                          //   icon: const Icon(FeatherIcons.clock),
+                          //   activeIcon: const Icon(FilcIcons.absencesfill),
+                          // ),
                         ],
                       ),
                     ),