Merge pull request #89 from SELab1/small_changes

Small changes

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

@@ -11,26 +11,21 @@ import be.ugent.sel.studeez.R
 import be.ugent.sel.studeez.common.composable.BasicButton
 import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate
 import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
-import be.ugent.sel.studeez.common.composable.drawer.DrawerViewModel
-import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions
 import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
-import be.ugent.sel.studeez.common.composable.navbar.NavigationBarViewModel
-import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions
 import be.ugent.sel.studeez.common.ext.basicButton
 import be.ugent.sel.studeez.resources
 
 @Composable
 fun HomeRoute(
     open: (String) -> Unit,
-    openAndPopUp: (String, String) -> Unit,
     viewModel: HomeViewModel,
-    drawerViewModel: DrawerViewModel,
-    navBarViewModel: NavigationBarViewModel,
+    drawerActions: DrawerActions,
+    navigationBarActions: NavigationBarActions,
 ) {
     HomeScreen(
         onStartSessionClick = { viewModel.onStartSessionClick(open) },
-        drawerActions = getDrawerActions(drawerViewModel, open, openAndPopUp),
-        navigationBarActions = getNavigationBarActions(navBarViewModel, open),
+        drawerActions = drawerActions,
+        navigationBarActions = navigationBarActions,
     )
 }
 
@@ -40,12 +35,11 @@ fun HomeScreen(
     drawerActions: DrawerActions,
     navigationBarActions: NavigationBarActions,
 ) {
-
     PrimaryScreenTemplate(
         title = resources().getString(R.string.home),
         drawerActions = drawerActions,
         navigationBarActions = navigationBarActions,
-        action = { FriendsAction() }
+        barAction = { FriendsAction() }
     ) {
         BasicButton(R.string.start_session, Modifier.basicButton()) {
             onStartSessionClick()
@@ -69,6 +63,6 @@ fun HomeScreenPreview() {
     HomeScreen(
         onStartSessionClick = {},
         drawerActions = DrawerActions({}, {}, {}, {}, {}),
-        navigationBarActions = NavigationBarActions({}, {}, {}, {})
+        navigationBarActions = NavigationBarActions({ false }, {}, {}, {}, {})
     )
 }

app/src/main/java/be/ugent/sel/studeez/screens/profile/ProfileScreen.kt

@@ -11,15 +11,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
 import be.ugent.sel.studeez.R
 import be.ugent.sel.studeez.common.composable.Headline
 import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate
-import be.ugent.sel.studeez.resources
 import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
-import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions
 import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
-import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions
+import be.ugent.sel.studeez.resources
 import kotlinx.coroutines.CoroutineScope
 import be.ugent.sel.studeez.R.string as AppText
 
@@ -41,13 +38,14 @@ fun getProfileActions(
 @Composable
 fun ProfileRoute(
     open: (String) -> Unit,
-    openAndPopUp: (String, String) -> Unit,
     viewModel: ProfileViewModel,
+    drawerActions: DrawerActions,
+    navigationBarActions: NavigationBarActions,
 ) {
     ProfileScreen(
         profileActions = getProfileActions(viewModel, open),
-        drawerActions = getDrawerActions(hiltViewModel(), open, openAndPopUp),
-        navigationBarActions = getNavigationBarActions(hiltViewModel(), open),
+        drawerActions = drawerActions,
+        navigationBarActions = navigationBarActions,
     )
 }
 
@@ -65,7 +63,7 @@ fun ProfileScreen(
         title = resources().getString(AppText.profile),
         drawerActions = drawerActions,
         navigationBarActions = navigationBarActions,
-        action = { EditAction(onClick = profileActions.onEditProfileClick) }
+        barAction = { EditAction(onClick = profileActions.onEditProfileClick) }
     ) {
         Headline(text = (username ?: resources().getString(R.string.no_username)))
     }
@@ -90,6 +88,6 @@ fun ProfileScreenPreview() {
     ProfileScreen(
         profileActions = ProfileActions({ null }, {}),
         drawerActions = DrawerActions({}, {}, {}, {}, {}),
-        navigationBarActions = NavigationBarActions({}, {}, {}, {})
+        navigationBarActions = NavigationBarActions({ false }, {}, {}, {}, {})
     )
 }

app/src/main/java/be/ugent/sel/studeez/screens/splash/SplashScreen.kt

@@ -1,6 +1,5 @@
 package be.ugent.sel.studeez.screens.splash
 
-import android.window.SplashScreen
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

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

@@ -1,6 +1,5 @@
 package be.ugent.sel.studeez.screens.timer_overview
 
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -8,18 +7,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import be.ugent.sel.studeez.R
 import be.ugent.sel.studeez.common.composable.BasicButton
-import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate
+import be.ugent.sel.studeez.common.composable.DrawerScreenTemplate
 import be.ugent.sel.studeez.common.composable.StealthButton
 import be.ugent.sel.studeez.common.composable.TimerEntry
 import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
-import be.ugent.sel.studeez.common.composable.drawer.DrawerViewModel
-import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions
-import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
-import be.ugent.sel.studeez.common.composable.navbar.NavigationBarViewModel
-import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions
 import be.ugent.sel.studeez.common.ext.basicButton
 import be.ugent.sel.studeez.data.local.models.timer_info.CustomTimerInfo
 import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
@@ -45,38 +38,29 @@ fun getTimerOverviewActions(
 
 @Composable
 fun TimerOverviewRoute(
-    open: (String) -> Unit,
-    openAndPopUp: (String, String) -> Unit,
     viewModel: TimerOverviewViewModel,
-    drawerViewModel: DrawerViewModel,
-    navBarViewModel: NavigationBarViewModel,
+    drawerActions: DrawerActions,
 ) {
     TimerOverviewScreen(
         timerOverviewActions = getTimerOverviewActions(viewModel),
-        drawerActions = getDrawerActions(drawerViewModel, open, openAndPopUp),
-        navigationBarActions = getNavigationBarActions(navBarViewModel, open),
+        drawerActions = drawerActions,
     )
 }
 
 @Composable
 fun TimerOverviewScreen(
     timerOverviewActions: TimerOverviewActions,
-    drawerActions: DrawerActions,
-    navigationBarActions: NavigationBarActions,
+    drawerActions: DrawerActions
 ) {
 
     val timers = timerOverviewActions.getUserTimers().collectAsState(initial = emptyList())
 
-    // TODO moet geen primary screen zijn: geen navbar nodig
-    PrimaryScreenTemplate(
+    DrawerScreenTemplate(
         title = resources().getString(R.string.timers),
-        drawerActions = drawerActions,
-        navigationBarActions = navigationBarActions,
+        drawerActions = drawerActions
     ) {
         Column {
-            LazyColumn(
-                verticalArrangement = Arrangement.spacedBy(7.dp)
-            ) {
+            LazyColumn {
                 // Default Timers, cannot be edited
                 items(timerOverviewActions.getDefaultTimers()) {
                     TimerEntry(timerInfo = it) {}
@@ -112,7 +96,6 @@ fun TimerOverviewPreview() {
             { flowOf() },
             { listOf(customTimer, customTimer) },
             {}),
-        drawerActions = DrawerActions({}, {}, {}, {}, {}),
-        navigationBarActions = NavigationBarActions({}, {}, {}, {})
+        drawerActions = DrawerActions({}, {}, {}, {}, {})
     )
 }

app/src/main/java/be/ugent/sel/studeez/screens/timer_selection/TimerSelectionScreen.kt

@@ -1,22 +1,14 @@
 package be.ugent.sel.studeez.screens.timer_selection
 
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import be.ugent.sel.studeez.R
-import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate
+import be.ugent.sel.studeez.common.composable.SecondaryScreenTemplate
 import be.ugent.sel.studeez.common.composable.StealthButton
 import be.ugent.sel.studeez.common.composable.TimerEntry
-import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
-import be.ugent.sel.studeez.common.composable.drawer.DrawerViewModel
-import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions
-import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
-import be.ugent.sel.studeez.common.composable.navbar.NavigationBarViewModel
-import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions
 import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
 import be.ugent.sel.studeez.resources
 import kotlinx.coroutines.flow.Flow
@@ -40,41 +32,37 @@ fun getTimerSelectionActions(
 @Composable
 fun TimerSelectionRoute(
     open: (String) -> Unit,
-    openAndPopUp: (String, String) -> Unit,
+    popUp: () -> Unit,
     viewModel: TimerSelectionViewModel,
-    drawerViewModel: DrawerViewModel,
-    navBarViewModel: NavigationBarViewModel,
 ) {
     TimerSelectionScreen(
         timerSelectionActions = getTimerSelectionActions(viewModel, open),
-        drawerActions = getDrawerActions(drawerViewModel, open, openAndPopUp),
-        navigationBarActions = getNavigationBarActions(navBarViewModel, open),
+        popUp = popUp
     )
 }
 
 @Composable
 fun TimerSelectionScreen(
     timerSelectionActions: TimerSelectionActions,
-    drawerActions: DrawerActions,
-    navigationBarActions: NavigationBarActions,
+    popUp: () -> Unit
 ) {
     val timers = timerSelectionActions.getAllTimers().collectAsState(initial = emptyList())
-    PrimaryScreenTemplate(
+    SecondaryScreenTemplate(
         title = resources().getString(R.string.timers),
-        drawerActions = drawerActions,
-        navigationBarActions = navigationBarActions,
+        popUp = popUp
     ) {
-        LazyColumn(verticalArrangement = Arrangement.spacedBy(7.dp)) {
+        LazyColumn {
             // All timers
             items(timers.value) { timerInfo ->
                 TimerEntry(
                     timerInfo = timerInfo,
-                ) {
-                    StealthButton(
-                        text = R.string.start,
-                        onClick = { timerSelectionActions.startSession(timerInfo) }
-                    )
-                }
+                    leftButton = {
+                        StealthButton(
+                            text = R.string.start,
+                            onClick = { timerSelectionActions.startSession(timerInfo) }
+                        )
+                    }
+                )
             }
         }
     }
@@ -85,7 +73,6 @@ fun TimerSelectionScreen(
 fun TimerSelectionPreview() {
     TimerSelectionScreen(
         timerSelectionActions = TimerSelectionActions({ flowOf() }, {}),
-        drawerActions = DrawerActions({}, {}, {}, {}, {}),
-        navigationBarActions = NavigationBarActions({}, {}, {}, {}),
+        popUp = {}
     )
 }