fix mergeconflict when merging tasksoverview

app/src/main/java/be/ugent/sel/studeez/StudeezApp.kt

@@ -38,6 +38,8 @@ import be.ugent.sel.studeez.screens.profile.EditProfileRoute
 import be.ugent.sel.studeez.screens.profile.ProfileRoute
 import be.ugent.sel.studeez.screens.session.SessionRoute
 import be.ugent.sel.studeez.screens.session_recap.SessionRecapRoute
+import be.ugent.sel.studeez.screens.sessions.SessionsRoute
+import be.ugent.sel.studeez.screens.settings.SettingsRoute
 import be.ugent.sel.studeez.screens.sign_up.SignUpRoute
 import be.ugent.sel.studeez.screens.splash.SplashRoute
 import be.ugent.sel.studeez.screens.tasks.SubjectRoute
@@ -46,7 +48,9 @@ import be.ugent.sel.studeez.screens.tasks.forms.SubjectAddRoute
 import be.ugent.sel.studeez.screens.tasks.forms.SubjectEditRoute
 import be.ugent.sel.studeez.screens.tasks.forms.TaskAddRoute
 import be.ugent.sel.studeez.screens.tasks.forms.TaskEditRoute
+import be.ugent.sel.studeez.screens.timer_edit.TimerEditRoute
 import be.ugent.sel.studeez.screens.timer_overview.TimerOverviewRoute
+import be.ugent.sel.studeez.screens.timer_overview.add_timer.AddTimerRoute
 import be.ugent.sel.studeez.screens.timer_selection.TimerSelectionRoute
 import be.ugent.sel.studeez.ui.theme.StudeezTheme
 import kotlinx.coroutines.CoroutineScope
@@ -97,7 +101,7 @@ fun resources(): Resources {
 @Composable
 fun StudeezNavGraph(
     appState: StudeezAppstate,
-    modifier: Modifier,
+    modifier: Modifier = Modifier,
 ) {
     val drawerViewModel: DrawerViewModel = hiltViewModel()
     val navBarViewModel: NavigationBarViewModel = hiltViewModel()
@@ -119,35 +123,13 @@ fun StudeezNavGraph(
         startDestination = StudeezDestinations.SPLASH_SCREEN,
         modifier = modifier,
     ) {
-
-
-        composable(StudeezDestinations.SPLASH_SCREEN) {
-            SplashRoute(
-                openAndPopUp,
-                viewModel = hiltViewModel(),
-            )
-        }
-
-        composable(StudeezDestinations.LOGIN_SCREEN) {
-            LoginRoute(
-                openAndPopUp,
-                viewModel = hiltViewModel(),
-            )
-        }
-
-        composable(StudeezDestinations.SIGN_UP_SCREEN) {
-            SignUpRoute(
-                openAndPopUp,
-                viewModel = hiltViewModel(),
-            )
-        }
-
+        // NavBar
         composable(StudeezDestinations.HOME_SCREEN) {
             HomeRoute(
                 open,
                 viewModel = hiltViewModel(),
                 drawerActions = drawerActions,
-                navigationBarActions = navigationBarActions,
+                navigationBarActions = navigationBarActions
             )
         }
 
@@ -176,6 +158,14 @@ fun StudeezNavGraph(
             )
         }
 
+        composable(StudeezDestinations.TASKS_SCREEN) {
+            TaskRoute(
+                goBack = goBack,
+                open = open,
+                viewModel = hiltViewModel(),
+            )
+        }
+
         composable(StudeezDestinations.ADD_TASK_FORM) {
             TaskAddRoute(
                 goBack = goBack,
@@ -192,16 +182,14 @@ fun StudeezNavGraph(
             )
         }
 
-        composable(StudeezDestinations.TASKS_SCREEN) {
-            TaskRoute(
-                goBack = goBack,
-                open = open,
-                viewModel = hiltViewModel(),
+
+        composable(StudeezDestinations.SESSIONS_SCREEN) {
+            SessionsRoute(
+                drawerActions = drawerActions,
+                navigationBarActions = navigationBarActions
             )
         }
 
-        // TODO Sessions screen
-
         composable(StudeezDestinations.PROFILE_SCREEN) {
             ProfileRoute(
                 open,
@@ -211,10 +199,49 @@ fun StudeezNavGraph(
             )
         }
 
-        composable(StudeezDestinations.TIMER_OVERVIEW_SCREEN) {
+        // Drawer
+        composable(StudeezDestinations.TIMER_SCREEN) {
             TimerOverviewRoute(
                 viewModel = hiltViewModel(),
                 drawerActions = drawerActions,
+                open = open
+            )
+        }
+
+        composable(StudeezDestinations.SETTINGS_SCREEN) {
+            SettingsRoute(
+                drawerActions = drawerActions
+            )
+        }
+
+        // Login flow
+        composable(StudeezDestinations.SPLASH_SCREEN) {
+            SplashRoute(
+                openAndPopUp,
+                viewModel = hiltViewModel(),
+            )
+        }
+
+        composable(StudeezDestinations.LOGIN_SCREEN) {
+            LoginRoute(
+                openAndPopUp,
+                viewModel = hiltViewModel(),
+            )
+        }
+
+        composable(StudeezDestinations.SIGN_UP_SCREEN) {
+            SignUpRoute(
+                openAndPopUp,
+                viewModel = hiltViewModel(),
+            )
+        }
+
+        // Studying flow
+        composable(StudeezDestinations.TIMER_SELECTION_SCREEN) {
+            TimerSelectionRoute(
+                open,
+                goBack,
+                viewModel = hiltViewModel(),
             )
         }
 
@@ -226,10 +253,43 @@ fun StudeezNavGraph(
             )
         }
 
-        // TODO Timers screen
-        // TODO Settings screen
+        composable(StudeezDestinations.SESSION_RECAP) {
+            SessionRecapRoute(
+                openAndPopUp = openAndPopUp,
+                viewModel = hiltViewModel()
+            )
+        }
+
+        composable(StudeezDestinations.ADD_TIMER_SCREEN) {
+            AddTimerRoute(
+                open = open,
+                goBack = goBack,
+                viewModel = hiltViewModel()
+            )
+        }
+
+        composable(StudeezDestinations.TIMER_EDIT_SCREEN) {
+            TimerEditRoute(
+                open = open,
+                popUp = goBack,
+                viewModel = hiltViewModel()
+            )
+        }
+
+        // Friends flow
+        composable(StudeezDestinations.SEARCH_FRIENDS_SCREEN) {
+            // TODO
+        }
+
+        // Create & edit screens
+        composable(StudeezDestinations.CREATE_TASK_SCREEN) {
+            // TODO
+        }
+
+        composable(StudeezDestinations.CREATE_SESSION_SCREEN) {
+            // TODO
+        }
 
-        // Edit screens
         composable(StudeezDestinations.EDIT_PROFILE_SCREEN) {
             EditProfileRoute(
                 goBack,
@@ -237,20 +297,5 @@ fun StudeezNavGraph(
                 viewModel = hiltViewModel(),
             )
         }
-
-        composable(StudeezDestinations.TIMER_SELECTION_SCREEN) {
-            TimerSelectionRoute(
-                open,
-                goBack,
-                viewModel = hiltViewModel(),
-            )
-        }
-
-        composable(StudeezDestinations.SESSION_RECAP) {
-            SessionRecapRoute(
-                openAndPopUp = openAndPopUp,
-                viewModel = hiltViewModel()
-            )
-        }
     }
 }