Merge branch 'development' into timers

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

@@ -21,6 +21,7 @@ import be.ugent.sel.studeez.navigation.StudeezDestinations
 import be.ugent.sel.studeez.screens.home.HomeScreen
 import be.ugent.sel.studeez.screens.log_in.LoginScreen
 import be.ugent.sel.studeez.screens.session.SessionScreen
+import be.ugent.sel.studeez.screens.profile.ProfileScreen
 import be.ugent.sel.studeez.screens.sign_up.SignUpScreen
 import be.ugent.sel.studeez.screens.splash.SplashScreen
 import be.ugent.sel.studeez.screens.timer_overview.TimerOverviewScreen
@@ -82,6 +83,10 @@ fun NavGraphBuilder.studeezGraph(appState: StudeezAppstate) {
             route, popUp -> appState.navigateAndPopUp(route, popUp)
     }
 
+    val open: (String) -> Unit = {
+        route -> appState.navigate(route)
+    }
+
     composable(StudeezDestinations.SPLASH_SCREEN) {
         SplashScreen(openAndPopUp)
     }
@@ -95,7 +100,14 @@ fun NavGraphBuilder.studeezGraph(appState: StudeezAppstate) {
     }
 
     composable(StudeezDestinations.HOME_SCREEN) {
-        HomeScreen(openAndPopUp)
+        HomeScreen(open, openAndPopUp)
+    }
+
+    // TODO Tasks screen
+    // TODO Sessions screen
+
+    composable(StudeezDestinations.PROFILE_SCREEN) {
+        ProfileScreen(open, openAndPopUp)
     }
 
     composable(StudeezDestinations.TIMER_OVERVIEW_SCREEN) {
@@ -105,4 +117,7 @@ fun NavGraphBuilder.studeezGraph(appState: StudeezAppstate) {
     composable(StudeezDestinations.SESSION_SCREEN) {
         SessionScreen(openAndPopUp)
     }
+    
+    // TODO Timers screen
+    // TODO Settings screen
 }

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

@@ -6,16 +6,19 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.tooling.preview.Preview
 import be.ugent.sel.studeez.R
 import be.ugent.sel.studeez.resources
 import be.ugent.sel.studeez.screens.drawer.Drawer
 import be.ugent.sel.studeez.screens.navbar.NavigationBar
+import be.ugent.sel.studeez.ui.theme.StudeezTheme
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 @Composable
 fun PrimaryScreenTemplate(
     title: String,
+    open: (String) -> Unit,
     openAndPopUp: (String, String) -> Unit,
     content: @Composable (PaddingValues) -> Unit
 ) {
@@ -40,10 +43,10 @@ fun PrimaryScreenTemplate(
         ) },
 
         drawerContent = {
-            Drawer(openAndPopUp)
+            Drawer(open, openAndPopUp)
         },
 
-        bottomBar = { NavigationBar(openAndPopUp) },
+        bottomBar = { NavigationBar(open) },
         floatingActionButtonPosition = FabPosition.Center,
         isFloatingActionButtonDocked = true,
         floatingActionButton = { CollapsedAddButton() }
@@ -52,13 +55,14 @@ fun PrimaryScreenTemplate(
     }
 }
 
-//@Preview
+@Preview
-//@Composable
+@Composable
-//fun PrimaryScreenPreview() {
+fun PrimaryScreenPreview() {
-//    StudeezTheme {
+    StudeezTheme {
-//        PrimaryScreenTemplate(
+        PrimaryScreenTemplate(
-//            "Preview screen",
+            "Preview screen",
-//            {}
+            { _ -> {}},
-//        ) {}
+            { _, _ -> {}}
-//    }
+        ) {}
-//}
+    }
+}

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

@@ -0,0 +1,16 @@
+package be.ugent.sel.studeez.common.composable
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
+import androidx.compose.runtime.Composable
+
+@Composable
+fun SimpleScreenTemplate(
+    title: String,
+    content: @Composable (PaddingValues) -> Unit
+) {
+    Scaffold( topBar = { TopAppBar ( title = { Text(text = title) } ) }
+    ) { paddingValues -> content(paddingValues) }
+}

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

@@ -0,0 +1,26 @@
+package be.ugent.sel.studeez.common.composable
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun Headline(
+    text: String
+) {
+    Row (
+        modifier = Modifier.fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center
+    ) {
+        Text(
+            text = text,
+            fontSize = 34.sp
+        )
+    }
+}

app/src/main/java/be/ugent/sel/studeez/domain/UserDAO.kt

@@ -1,10 +1,7 @@
 package be.ugent.sel.studeez.domain
 
-import kotlinx.coroutines.flow.Flow
-
 interface UserDAO {
 
-    suspend fun getUserName(): String?
+    suspend fun getUsername(): String?
-
     suspend fun save(newUsername: String)
 }

app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseUserDAO.kt

@@ -1,18 +1,26 @@
 package be.ugent.sel.studeez.domain.implementation
 
+import androidx.compose.runtime.rememberCoroutineScope
 import be.ugent.sel.studeez.domain.AccountDAO
 import be.ugent.sel.studeez.domain.UserDAO
 import com.google.firebase.firestore.DocumentReference
 import com.google.firebase.firestore.FirebaseFirestore
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.tasks.await
 import javax.inject.Inject
+import kotlin.coroutines.coroutineContext
 
 class FirebaseUserDAO @Inject constructor(
     private val firestore: FirebaseFirestore,
     private val auth: AccountDAO
     ) : UserDAO {
 
-    override suspend fun getUserName(): String? {
+    override suspend fun getUsername(): String? {
         return currentUserDocument().get().await().getString("username")
     }
 

app/src/main/java/be/ugent/sel/studeez/navigation/StudeezDestinations.kt

@@ -4,8 +4,13 @@ object StudeezDestinations {
     const val SPLASH_SCREEN = "splash"
     const val SIGN_UP_SCREEN = "signup"
     const val LOGIN_SCREEN = "login"
+
     const val HOME_SCREEN = "home"
     const val TIMER_OVERVIEW_SCREEN = "timer_overview"
     const val SESSION_SCREEN = "session"
+//    const val TASKS_SCREEN = "tasks"
+    const val PROFILE_SCREEN = "profile"
 
+//    const val TIMERS_SCREEN = "timers"
+//    const val SETTINGS_SCREEN = "settings"
 }

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

@@ -23,6 +23,7 @@ import be.ugent.sel.studeez.ui.theme.StudeezTheme
 
 @Composable
 fun Drawer(
+    open: (String) -> Unit,
     openAndPopUp: (String, String) -> Unit,
     viewModel: DrawerViewModel = hiltViewModel()
 ) {
@@ -36,19 +37,19 @@ fun Drawer(
                 icon = Icons.Default.Home,
                 text = resources().getString(R.string.home)
             ) {
-                // TODO Go to home
+                viewModel.onHomeButtonClick(open)
             }
             DrawerEntry(
                 icon = ImageVector.vectorResource(id = R.drawable.ic_timer),
                 text = resources().getString(R.string.timers)
             ) {
-                viewModel.onTimersClick(openAndPopUp)
+                viewModel.onTimersClick(open)
             }
             DrawerEntry(
                 icon = Icons.Default.Settings,
                 text = resources().getString(R.string.settings)
             ) {
-                viewModel.onSettingsClick(openAndPopUp)
+                viewModel.onSettingsClick(open)
             }
             DrawerEntry(
                 icon = ImageVector.vectorResource(id = R.drawable.ic_logout),
@@ -62,7 +63,7 @@ fun Drawer(
             icon = Icons.Outlined.Info,
             text = resources().getString(R.string.about)
         ) {
-            viewModel.onAboutClick(openAndPopUp)
+            viewModel.onAboutClick(open)
         }
     }
 }
@@ -101,7 +102,9 @@ fun DrawerEntry(
 fun DrawerPreview() {
     StudeezTheme {
         Drawer(
-            {a, b -> {}}, hiltViewModel()
+            { _, -> {} },
+            { _, _ -> {} },
+            hiltViewModel()
         )
     }
 }

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

@@ -2,7 +2,8 @@ package be.ugent.sel.studeez.screens.drawer
 
 import be.ugent.sel.studeez.domain.AccountDAO
 import be.ugent.sel.studeez.domain.LogService
-import be.ugent.sel.studeez.navigation.StudeezDestinations
+import be.ugent.sel.studeez.navigation.StudeezDestinations.HOME_SCREEN
+import be.ugent.sel.studeez.navigation.StudeezDestinations.LOGIN_SCREEN
 import be.ugent.sel.studeez.screens.StudeezViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -13,27 +14,30 @@ class DrawerViewModel @Inject constructor(
     logService: LogService
 ) : StudeezViewModel(logService) {
 
-    fun onLogoutClick(openAndPopup: (String, String) -> Unit) {
+    fun onHomeButtonClick(open: (String) -> Unit) {
-        launchCatching {
+        open(HOME_SCREEN)
-            accountDAO.signOut()
-            openAndPopup(StudeezDestinations.LOGIN_SCREEN, StudeezDestinations.HOME_SCREEN)
-        }
     }
 
-    fun onHomeButtonClick(openAndPopup: (String, String) -> Unit) {
+    fun onTimersClick(open: (String) -> Unit) {
         // TODO
     }
 
     fun onTimersClick(openAndPopup: (String, String) -> Unit) {
         // TODO is niet altijd het homescreen
         openAndPopup(StudeezDestinations.TIMER_OVERVIEW_SCREEN, StudeezDestinations.HOME_SCREEN)
-    }
 
-    fun onSettingsClick(openAndPopup: (String, String) -> Unit) {
+    fun onSettingsClick(open: (String) -> Unit) {
         // TODO
     }
 
-    fun onAboutClick(openAndPopup: (String, String) -> Unit) {
+    fun onLogoutClick(openAndPopUp: (String, String) -> Unit) {
+        launchCatching {
+            accountDAO.signOut()
+            openAndPopUp(LOGIN_SCREEN, HOME_SCREEN)
+        }
+    }
+
+    fun onAboutClick(open: (String) -> Unit) {
         // TODO
     }
 }

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

@@ -11,15 +11,17 @@ import be.ugent.sel.studeez.resources
 
 @Composable
 fun HomeScreen(
+    open: (String) -> Unit,
     openAndPopUp: (String, String) -> Unit,
     viewModel: HomeViewModel = hiltViewModel()
 ) {
     PrimaryScreenTemplate(
         title = resources().getString(R.string.home),
+        open = open,
         openAndPopUp = openAndPopUp
     ) {
         BasicButton(R.string.start_session, Modifier.basicButton()) {
-            viewModel.onStartSessionClick(openAndPopUp)
+            viewModel.onStartSessionClick(open)
         }
     }
 }

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

@@ -1,8 +1,5 @@
 package be.ugent.sel.studeez.screens.home
 
-import androidx.compose.material.ScaffoldState
-import androidx.compose.material.rememberScaffoldState
-import be.ugent.sel.studeez.data.local.models.User
 import be.ugent.sel.studeez.domain.AccountDAO
 import be.ugent.sel.studeez.domain.LogService
 import be.ugent.sel.studeez.navigation.StudeezDestinations
@@ -10,7 +7,6 @@ import be.ugent.sel.studeez.navigation.StudeezDestinations.HOME_SCREEN
 import be.ugent.sel.studeez.navigation.StudeezDestinations.LOGIN_SCREEN
 import be.ugent.sel.studeez.screens.StudeezViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 @HiltViewModel

app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt

@@ -26,8 +26,7 @@ fun LoginScreen(
 ) {
     val uiState by viewModel.uiState
 
-    // TODO Make this a separate kind of screen?
+    SimpleScreenTemplate(title = resources().getString(AppText.sign_in)) {
-    SecondaryScreenTemplate(title = resources().getString(AppText.sign_in), {}) {
         Column(
             modifier = modifier
                 .fillMaxWidth()

app/src/main/java/be/ugent/sel/studeez/screens/navbar/NavigationBarComposable.kt

@@ -13,11 +13,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import be.ugent.sel.studeez.resources
 import be.ugent.sel.studeez.ui.theme.StudeezTheme
+import be.ugent.sel.studeez.R.string as AppText
+
 
 @Composable
 fun NavigationBar(
-    popUpAndOpen: (String, String) -> Unit,
+    open: (String) -> Unit,
     viewModel: NavigationBarViewModel = hiltViewModel()
 ) {
     // TODO Pass functions and new screens.
@@ -27,41 +30,46 @@ fun NavigationBar(
         elevation = 10.dp
     ) {
         BottomNavigationItem(
-            icon = { Icon(imageVector = Icons.Default.List, "Home") },
+            icon = { Icon(imageVector = Icons.Default.List, resources().getString(AppText.home)) },
-            label = { Text(text = "Home") },
+            label = { Text(text = resources().getString(AppText.home)) },
             selected = false, // TODO
-            onClick = { viewModel.onHomeClick(popUpAndOpen) }
+            onClick = { viewModel.onHomeClick(open) }
         )
 
         BottomNavigationItem(
-            icon = { Icon(imageVector = Icons.Default.Check, "Tasks") },
+            icon = { Icon(imageVector = Icons.Default.Check, resources().getString(AppText.tasks)) },
-            label = { Text(text = "Tasks") },
+            label = { Text(text = resources().getString(AppText.tasks)) },
             selected = false, // TODO
-            onClick = { viewModel.onTasksClick(popUpAndOpen) }
+            onClick = { viewModel.onTasksClick(open) }
         )
 
         // Hack to space the entries in the navigation bar, make space for fab
         BottomNavigationItem(icon = {}, onClick = {}, selected = false)
 
         BottomNavigationItem(
-            icon = { Icon(imageVector = Icons.Outlined.DateRange, "Sessions") },
+            icon = { Icon(imageVector = Icons.Outlined.DateRange, resources().getString(AppText.sessions)) },
-            label = { Text(text = "Sessions") },
+            label = { Text(text = resources().getString(AppText.sessions)) },
             selected = false, // TODO
-            onClick = { viewModel.onSessionsClick(popUpAndOpen) }
+            onClick = { viewModel.onSessionsClick(open) }
         )
 
         BottomNavigationItem(
-            icon = { Icon(imageVector = Icons.Default.Person, "Profile") },
+            icon = { Icon(imageVector = Icons.Default.Person, resources().getString(AppText.profile)) },
-            label = { Text(text = "Profile") },
+            label = { Text(text = resources().getString(AppText.profile)) },
             selected = false, // TODO
-            onClick = { viewModel.onProfileClick(popUpAndOpen) }
+            onClick = { viewModel.onProfileClick(open) }
         )
 
     }
 }
 
-//@Preview(showBackground = true)
+@Preview(showBackground = true)
-//@Composable
+@Composable
-//fun NavigationBarPreview() {
+fun NavigationBarPreview() {
-//    StudeezTheme { NavigationBar() }
+    StudeezTheme {
-//}
+        NavigationBar(
+            { _ -> {} },
+            hiltViewModel()
+        )
+    }
+}

app/src/main/java/be/ugent/sel/studeez/screens/navbar/NavigationBarViewModel.kt

@@ -3,6 +3,8 @@ package be.ugent.sel.studeez.screens.navbar
 import be.ugent.sel.studeez.domain.AccountDAO
 import be.ugent.sel.studeez.domain.LogService
 import be.ugent.sel.studeez.navigation.StudeezDestinations
+import be.ugent.sel.studeez.navigation.StudeezDestinations.HOME_SCREEN
+import be.ugent.sel.studeez.navigation.StudeezDestinations.PROFILE_SCREEN
 import be.ugent.sel.studeez.screens.StudeezViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -13,19 +15,19 @@ class NavigationBarViewModel @Inject constructor(
     logService: LogService
 ) : StudeezViewModel(logService) {
 
-    fun onHomeClick(openAndPopup: (String, String) -> Unit) {
+    fun onHomeClick(open: (String) -> Unit) {
+        open(HOME_SCREEN)
+    }
+
+    fun onTasksClick(open: (String) -> Unit) {
         // TODO
     }
 
-    fun onTasksClick(openAndPopup: (String, String) -> Unit) {
+    fun onSessionsClick(open: (String) -> Unit) {
         // TODO
     }
 
-    fun onSessionsClick(openAndPopup: (String, String) -> Unit) {
+    fun onProfileClick(open: (String) -> Unit) {
-        // TODO
+        open(PROFILE_SCREEN)
-    }
-
-    fun onProfileClick(openAndPopup: (String, String) -> Unit) {
-        // TODO
     }
 }

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

@@ -0,0 +1,29 @@
+package be.ugent.sel.studeez.screens.profile
+
+import androidx.compose.runtime.*
+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.R.string as AppText
+
+@Composable
+fun ProfileScreen(
+    open: (String) -> Unit,
+    openAndPopUp: (String, String) -> Unit,
+    viewModel: ProfileViewModel = hiltViewModel()
+) {
+    var username: String? by remember { mutableStateOf("") }
+    LaunchedEffect(key1 = Unit) {
+        username = viewModel.getUsername()
+    }
+
+    PrimaryScreenTemplate(
+        title = resources().getString(AppText.profile),
+        open = open,
+        openAndPopUp = openAndPopUp
+    ) {
+        Headline(text = (username ?: resources().getString(R.string.no_username)))
+    }
+}

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

@@ -0,0 +1,30 @@
+package be.ugent.sel.studeez.screens.profile
+
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.lifecycle.viewModelScope
+import be.ugent.sel.studeez.R
+import be.ugent.sel.studeez.domain.LogService
+import be.ugent.sel.studeez.domain.UserDAO
+import be.ugent.sel.studeez.resources
+import be.ugent.sel.studeez.screens.StudeezViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+
+import javax.inject.Inject
+
+@HiltViewModel
+class ProfileViewModel @Inject constructor(
+    private val userDAO: UserDAO,
+    logService: LogService
+) : StudeezViewModel(logService) {
+
+    suspend fun getUsername(): String? {
+        return userDAO.getUsername()
+    }
+
+}

app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt

@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Person
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -29,7 +27,7 @@ fun SignUpScreen(
     val uiState by viewModel.uiState
     val fieldModifier = Modifier.fieldModifier()
 
-    SecondaryScreenTemplate(title = resources().getString(AppText.create_account), {}) {
+    SimpleScreenTemplate(title = resources().getString(AppText.create_account)) {
         Column(
             modifier = modifier
                 .fillMaxWidth()

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

@@ -21,7 +21,7 @@ import be.ugent.sel.studeez.common.ext.basicButton
 import kotlinx.coroutines.delay
 import be.ugent.sel.studeez.R.string as AppText
 
-private const val SPLASH_TIMEOUT = 1000L
+private const val SPLASH_TIMEOUT = 500L
 
 @Composable
 fun SplashScreen(

app/src/main/java/be/ugent/sel/studeez/screens/timers/TimerScreen.kt

@@ -0,0 +1,4 @@
+package be.ugent.sel.studeez.screens.timers
+
+class TimerScreen {
+}

app/src/main/res/values/strings.xml

@@ -18,7 +18,6 @@
     <string name="password_match_error">Passwords do not match.</string>
     <string name="already_user">Already have an account? Log in.</string>
 
-
     <!-- LoginScreen -->
     <string name="not_already_user">Don\'t have an account yet? Sign up.</string>
     <string name="sign_in">Sign in</string>
@@ -31,6 +30,16 @@
     <string name="home">Home</string>
     <string name="start_session">Start session</string>
 
+    <!-- Tasks -->
+    <string name="tasks">Tasks</string>
+
+    <!-- Sessions -->
+    <string name="sessions">Sessions</string>
+
+    <!-- Profile -->
+    <string name="profile">Profile</string>
+    <string name="no_username">Unknown username</string>
+
     <!-- Drawer / SideMenu -->
     <string name="log_out">Log out</string>
     <string name="profile_picture_description">Profile Picture</string>