From 0341fcf137c66987f713c4bde5298f0fdadea866 Mon Sep 17 00:00:00 2001
From: brreynie <bram.reyniers@ugent.be>
Date: Sat, 13 May 2023 16:31:03 +0200
Subject: [PATCH] clear navStack when ending session

---
 .../be/ugent/sel/studeez/navigation/StudeezNavGraph.kt |  5 +++--
 .../screens/session_recap/SessionRecapScreen.kt        | 10 +++++-----
 .../screens/session_recap/SessionRecapViewModel.kt     |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/be/ugent/sel/studeez/navigation/StudeezNavGraph.kt b/app/src/main/java/be/ugent/sel/studeez/navigation/StudeezNavGraph.kt
index 37085f1..0a0e8b4 100644
--- a/app/src/main/java/be/ugent/sel/studeez/navigation/StudeezNavGraph.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/navigation/StudeezNavGraph.kt
@@ -25,9 +25,9 @@ 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.subjects.SubjectRoute
-import be.ugent.sel.studeez.screens.tasks.TaskRoute
 import be.ugent.sel.studeez.screens.subjects.form.SubjectCreateRoute
 import be.ugent.sel.studeez.screens.subjects.form.SubjectEditRoute
+import be.ugent.sel.studeez.screens.tasks.TaskRoute
 import be.ugent.sel.studeez.screens.tasks.form.TaskCreateRoute
 import be.ugent.sel.studeez.screens.tasks.form.TaskEditRoute
 import be.ugent.sel.studeez.screens.timer_form.TimerAddRoute
@@ -51,6 +51,7 @@ fun StudeezNavGraph(
     val open: (String) -> Unit = { appState.navigate(it) }
     val openAndPopUp: (String, String) -> Unit =
         { route, popUp -> appState.navigateAndPopUp(route, popUp) }
+    val clearAndNavigate: (route: String) -> Unit = { route -> appState.clearAndNavigate(route) }
 
     val drawerActions: DrawerActions = getDrawerActions(drawerViewModel, open, openAndPopUp)
     val navigationBarActions: NavigationBarActions =
@@ -200,7 +201,7 @@ fun StudeezNavGraph(
 
         composable(StudeezDestinations.SESSION_RECAP) {
             SessionRecapRoute(
-                openAndPopUp = openAndPopUp,
+                clearAndNavigate = clearAndNavigate,
                 viewModel = hiltViewModel()
             )
         }
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session_recap/SessionRecapScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session_recap/SessionRecapScreen.kt
index 2d06e0b..e49c8d6 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session_recap/SessionRecapScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session_recap/SessionRecapScreen.kt
@@ -21,24 +21,24 @@ data class SessionRecapActions(
 
 fun getSessionRecapActions(
     viewModel: SessionRecapViewModel,
-    openAndPopUp: (String, String) -> Unit,
+    clearAndNavigate: (String) -> Unit,
 ): SessionRecapActions {
     return SessionRecapActions(
         viewModel::getSessionReport,
-        {viewModel.saveSession(openAndPopUp)},
-        {viewModel.discardSession(openAndPopUp)}
+        { viewModel.saveSession(clearAndNavigate) },
+        { viewModel.discardSession(clearAndNavigate) }
     )
 }
 
 @Composable
 fun SessionRecapRoute(
-    openAndPopUp: (String, String) -> Unit,
+    clearAndNavigate: (String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: SessionRecapViewModel,
 ) {
     SessionRecapScreen(
         modifier = modifier,
-        getSessionRecapActions(viewModel, openAndPopUp)
+        getSessionRecapActions(viewModel, clearAndNavigate)
     )
 }
 
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session_recap/SessionRecapViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session_recap/SessionRecapViewModel.kt
index c11e28f..bf11b93 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session_recap/SessionRecapViewModel.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session_recap/SessionRecapViewModel.kt
@@ -24,15 +24,15 @@ class SessionRecapViewModel @Inject constructor(
         return selectedSessionReport()
     }
 
-    fun saveSession(open: (String, String) -> Unit) {
+    fun saveSession(open: (String) -> Unit) {
         sessionDAO.saveSession(getSessionReport())
         val newTask =
             selectedTask().copy(time = selectedTask().time + selectedSessionReport().studyTime)
         taskDAO.updateTask(newTask)
-        open(StudeezDestinations.HOME_SCREEN, StudeezDestinations.SESSION_RECAP)
+        open(StudeezDestinations.HOME_SCREEN)
     }
 
-    fun discardSession(open: (String, String) -> Unit) {
-        open(StudeezDestinations.HOME_SCREEN, StudeezDestinations.SESSION_RECAP)
+    fun discardSession(open: (String) -> Unit) {
+        open(StudeezDestinations.HOME_SCREEN)
     }
 }
\ No newline at end of file