Merge pull request #68 from SELab1/timers

fix issues

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

@@ -116,11 +116,11 @@ fun NavGraphBuilder.studeezGraph(appState: StudeezAppstate) {
     }
 
     composable(StudeezDestinations.TIMER_OVERVIEW_SCREEN) {
-        TimerOverviewScreen(openAndPopUp)
+        TimerOverviewScreen(open, openAndPopUp)
     }
 
     composable(StudeezDestinations.SESSION_SCREEN) {
-        SessionScreen(openAndPopUp)
+        SessionScreen(open, openAndPopUp)
     }
     
     // TODO Timers screen

app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt

@@ -22,7 +22,7 @@ fun PrimaryScreenTemplate(
     title: String,
     open: (String) -> Unit,
     openAndPopUp: (String, String) -> Unit,
-    action: @Composable RowScope.() -> Unit,
+    action: @Composable RowScope.() -> Unit = {},
     content: @Composable (PaddingValues) -> Unit
 ) {
     val scaffoldState: ScaffoldState = rememberScaffoldState()

app/src/main/java/be/ugent/sel/studeez/screens/drawer/DrawerViewModel.kt

@@ -19,13 +19,8 @@ class DrawerViewModel @Inject constructor(
         open(HOME_SCREEN)
     }
 
-    fun onTimersClick(open: (String) -> Unit) {
+    fun onTimersClick(openAndPopup: (String) -> Unit) {
-        // TODO
+        openAndPopup(StudeezDestinations.TIMER_OVERVIEW_SCREEN)
-    }
-
-    fun onTimersClick(openAndPopup: (String, String) -> Unit) {
-        // TODO is niet altijd het homescreen
-        openAndPopup(StudeezDestinations.TIMER_OVERVIEW_SCREEN, StudeezDestinations.HOME_SCREEN)
     }
 
     fun onSettingsClick(open: (String) -> Unit) {

app/src/main/java/be/ugent/sel/studeez/screens/home/HomeViewModel.kt

@@ -15,8 +15,8 @@ class HomeViewModel @Inject constructor(
     logService: LogService
 ) : StudeezViewModel(logService) {
 
-    fun onStartSessionClick(openAndPopUp: (String, String) -> Unit) {
+    fun onStartSessionClick(openAndPopUp: (String) -> Unit) {
-        openAndPopUp(StudeezDestinations.SESSION_SCREEN, StudeezDestinations.HOME_SCREEN)
+        openAndPopUp(StudeezDestinations.SESSION_SCREEN)
     }
 
     fun onLogoutClick(openAndPopup: (String, String) -> Unit) {

app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt

@@ -18,11 +18,13 @@ import kotlinx.coroutines.delay
 
 @Composable
 fun SessionScreen(
+    open: (String) -> Unit,
     openAndPopUp: (String, String) -> Unit,
     viewModel: SessionViewModel = hiltViewModel()
 ) {
     PrimaryScreenTemplate(
         title = resources().getString(R.string.start_session),
+        open = open,
         openAndPopUp = openAndPopUp
     ) {
         Timer(viewModel)

app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/TimerOverviewScreen.kt

@@ -27,6 +27,7 @@ import be.ugent.sel.studeez.resources
 
 @Composable
 fun TimerOverviewScreen(
+    open: (String) -> Unit,
     openAndPopUp: (String, String) -> Unit,
     viewModel: TimerOverviewViewModel = hiltViewModel()
 ) {
@@ -35,6 +36,7 @@ fun TimerOverviewScreen(
 
     PrimaryScreenTemplate(
         title = resources().getString(R.string.timers),
+        open = open,
         openAndPopUp = openAndPopUp
     ) {