Merge pull request 'Add Database | Add FolderPairDao | Add UI for FolderPairs' (#1) from ui into develop

Reviewed-on: #1

app/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.jetbrains.kotlin.serialization)
     alias(libs.plugins.ksp)
 }
 
@@ -61,7 +61,9 @@ dependencies {
     implementation(libs.androidx.navigation3.runtime)
     implementation(libs.androidx.lifecycle.viewmodel.navigation3)
     implementation(libs.androidx.material3.adaptive.navigation3)
-    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.kotlinx.serialization.core)
+
+    implementation(libs.bundles.voyager)
 
     // Room
     implementation(libs.androidx.room.runtime)

app/src/main/java/com/fabisahne/cloudsync/MainActivity.kt

@@ -5,6 +5,8 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.material3.ExperimentalMaterial3Api
+import cafe.adriel.voyager.navigator.Navigator
+import com.fabisahne.cloudsync.ui.screens.HomeScreen
 import com.fabisahne.cloudsync.ui.theme.CloudSyncTheme
 
 class MainActivity : ComponentActivity() {
@@ -15,7 +17,7 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             CloudSyncTheme {
-//                Navigator(HomeScreen)
+                Navigator(HomeScreen)
             }
         }
     }

app/src/main/java/com/fabisahne/cloudsync/navigation/Route.kt

@@ -1,27 +0,0 @@
-package com.fabisahne.cloudsync.navigation
-
-import androidx.navigation3.runtime.NavKey
-import kotlinx.serialization.Serializable
-
-@Serializable
-sealed interface Route : NavKey {
-    // Screens
-    @Serializable
-    data object HomeScreen : Route, NavKey
-
-    @Serializable
-    data class FolderPairScreen(val id: Long) : Route, NavKey
-
-    // Tabs
-    @Serializable
-    data object AccountTab : Route, NavKey
-
-    @Serializable
-    data object FolderPairTab : Route, NavKey
-
-    @Serializable
-    data object HistoryTab : Route, NavKey
-
-    @Serializable
-    data object SettingsTab : Route, NavKey
-}

app/src/main/java/com/fabisahne/cloudsync/ui/navigation/navigation.kt

@@ -0,0 +1,22 @@
+package com.fabisahne.cloudsync.ui.navigation
+
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import cafe.adriel.voyager.navigator.tab.LocalTabNavigator
+import cafe.adriel.voyager.navigator.tab.Tab
+
+
+@Composable
+fun RowScope.TabNavigationItem(tab: Tab) {
+    val tabNavigator = LocalTabNavigator.current
+
+    NavigationBarItem(
+        selected = tabNavigator.current.key == tab.key,
+        onClick = { tabNavigator.current = tab },
+        label = { Text(tab.options.title) },
+        icon = { Icon(painter = tab.options.icon!!, contentDescription = tab.options.title) }
+    )
+}

app/src/main/java/com/fabisahne/cloudsync/ui/screens/FolderPairScreen.kt

@@ -8,16 +8,14 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.screen.Screen
-import com.fabisahne.cloudsync.viewmodels.FolderPairScreenViewModel
 
+data class FolderPairScreen(
+    val id: Long
+) : Screen {
     @OptIn(ExperimentalMaterial3Api::class)
     @Composable
-fun FolderPairScreen(
+    override fun Content() {
-    modifier: Modifier = Modifier,
-    viewModel: FolderPairScreenViewModel = viewModel(),
-    id: Long
-) {
         Scaffold(
             topBar = {
                 TopAppBar(
@@ -25,9 +23,10 @@ fun FolderPairScreen(
                 )
             },
             content = { contentPadding ->
-            Surface(modifier = modifier.padding(contentPadding)) {
+                Surface(modifier = Modifier.padding(contentPadding)) {
                     Text("ASDF: $id")
                 }
             }
         )
     }
+}

app/src/main/java/com/fabisahne/cloudsync/ui/screens/HomeScreen.kt

@@ -1,12 +1,7 @@
 package com.fabisahne.cloudsync.ui.screens
 
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Route
-import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarDefaults
 import androidx.compose.material3.Scaffold
@@ -15,46 +10,55 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
+import cafe.adriel.voyager.navigator.tab.CurrentTab
+import cafe.adriel.voyager.navigator.tab.TabNavigator
+import com.fabisahne.cloudsync.ui.navigation.TabNavigationItem
 import com.fabisahne.cloudsync.ui.tabs.AccountTab
 import com.fabisahne.cloudsync.ui.tabs.FolderPairTab
 import com.fabisahne.cloudsync.ui.tabs.HistoryTab
 import com.fabisahne.cloudsync.ui.tabs.SettingsTab
 
 
-@OptIn(ExperimentalMaterial3Api::class)
+object HomeScreen : Screen {
-@Composable
+    private fun readResolve(): Any = HomeScreen
-fun HomeScreen(
+
-    modifier: Modifier = Modifier
+    private val TABS = listOf(
-) {
-    val tabs = listOf(
         HistoryTab,
         FolderPairTab,
         AccountTab,
         SettingsTab,
     )
 
+    @OptIn(ExperimentalMaterial3Api::class)
+    @Composable
+    override fun Content() {
+        val navigator = LocalNavigator.currentOrThrow
+
+        TabNavigator(
+            HistoryTab
+        ) { tabNavigator ->
             Scaffold(
                 topBar = {
                     TopAppBar(
-                title = { Text("Home Screen") }
+                        title = { Text(text = tabNavigator.current.options.title) }
                     )
                 },
                 content = { padding ->
-            Surface(modifier = modifier.padding(padding)) {
+                    Surface(modifier = Modifier.padding(padding)) {
-                Text("Home Screen Content")
+                        CurrentTab()
                     }
                 },
                 bottomBar = {
                     NavigationBar(windowInsets = NavigationBarDefaults.windowInsets) {
-                tabs.forEach { _ ->
+                        TABS.forEach {
-                    Button({}) {
+                            TabNavigationItem(it)
-                        Icon(
-                            Icons.Default.Route,
-                            null
-                        )
-                    }
                         }
                     }
                 }
             )
         }
+    }
+}

app/src/main/java/com/fabisahne/cloudsync/ui/tabs/SettingsTab.kt

@@ -1,6 +1,7 @@
 package com.fabisahne.cloudsync.ui.tabs
 
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AccountBox
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -20,7 +21,7 @@ object SettingsTab : Tab {
 
             return remember {
                 TabOptions(
-                    index = 3u,
+                    index = 2u,
                     title = title,
                     icon = icon
                 )

app/src/main/java/com/fabisahne/cloudsync/viewmodels/FolderPairScreenViewModel.kt

@@ -1,20 +0,0 @@
-package com.fabisahne.cloudsync.viewmodels
-
-import androidx.lifecycle.ViewModel
-import com.fabisahne.cloudsync.data.FolderPair
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-
-class FolderPairScreenViewModel(
-    private val id: Long
-) : ViewModel() {
-    private val _state = MutableStateFlow(
-        FolderPair(
-            id = id,
-            name = "ASDF",
-            localDir = "asdf/asdf",
-            cloudPath = "cloud/folder"
-        )
-    )
-    val state = _state.asStateFlow()
-}

build.gradle.kts

@@ -2,5 +2,4 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.compose) apply false
-    alias(libs.plugins.kotlin.serialization) apply false
 }

gradle/libs.versions.toml

@@ -5,18 +5,18 @@ junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 lifecycleRuntimeKtx = "2.10.0"
-activityCompose = "1.12.4"
+activityCompose = "1.12.2"
-kotlin = "2.3.10"
+kotlin = "2.2.10"
-composeBom = "2026.02.00"
+composeBom = "2024.09.00"
 voyager = "1.1.0-beta03"
-room = "2.8.4"
+room = "2.7.1"
 ksp = "2.3.6"
 
-nav3Core = "1.0.1"
+nav3Core = "1.0.0"
 lifeCycleViewmodelNav3 = "2.10.0"
-kotlinSerialization = "2.3.10"
+kotlinSerialization = "2.2.21"
-kotlinxSerializationCore = "1.10.0"
+kotlinxSerializationCore = "1.9.0"
-material3AdaptiveNav3 = "1.3.0-alpha08"
+material3AdaptiveNav3 = "1.3.0-alpha06"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -40,9 +40,14 @@ androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", vers
 
 androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifeCycleViewmodelNav3" }
 kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationCore" }
 androidx-material3-adaptive-navigation3 = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation3", version.ref = "material3AdaptiveNav3" }
 
+# Voyager
+voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
+voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager" }
+voyager-tab-navigator = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager" }
+voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" }
+
 # Room
 androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
 androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
@@ -51,5 +56,8 @@ androidx-room-compiler = { group = "androidx.room", name = "room-compiler", vers
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization" }
+jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+
+[bundles]
+voyager = ["voyager-navigator", "voyager-screenmodel", "voyager-tab-navigator", "voyager-transitions"]