Use type-safe compose navigation (#43)

* chore: 🤖 upgrade navigation-compose to 2.8.0 beta * refactor: 💡 use type-safe navigation * refactor: 💡 remove old navigation folder * refactor: 💡 move navigation code to MainNavHost
ricky9667 · Jul 28, 2024 · 2472714 · 2472714
1 parent c9b3cb8
commit 2472714
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 56 deletions.
diff --git a/app/src/main/java/com/rickyhu/hushkeyboard/main/MainApp.kt b/app/src/main/java/com/rickyhu/hushkeyboard/main/MainApp.kt
@@ -10,7 +10,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.rickyhu.hushkeyboard.data.ThemeOption
-import com.rickyhu.hushkeyboard.navigation.AppNavHost
 import com.rickyhu.hushkeyboard.theme.HushKeyboardTheme
 
 @Composable
@@ -30,7 +29,7 @@ fun MainApp(
             modifier = Modifier.fillMaxSize(),
             color = MaterialTheme.colorScheme.background
         ) {
-            AppNavHost()
+            MainNavHost()
         }
     }
 }
diff --git a/app/src/main/java/com/rickyhu/hushkeyboard/main/MainNavHost.kt b/app/src/main/java/com/rickyhu/hushkeyboard/main/MainNavHost.kt
@@ -0,0 +1,34 @@
+package com.rickyhu.hushkeyboard.main
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import com.rickyhu.hushkeyboard.home.HomeScreen
+import com.rickyhu.hushkeyboard.settings.SettingsScreen
+import kotlinx.serialization.Serializable
+
+@Serializable
+object HomeRoute
+
+@Serializable
+object SettingsRoute
+
+@Composable
+fun MainNavHost() {
+    val navController = rememberNavController()
+
+    NavHost(
+        navController = navController,
+        startDestination = HomeRoute
+    ) {
+        composable<HomeRoute> {
+            HomeScreen(
+                onSettingsClick = { navController.navigate(route = SettingsRoute) }
+            )
+        }
+        composable<SettingsRoute> {
+            SettingsScreen()
+        }
+    }
+}
diff --git a/app/src/main/java/com/rickyhu/hushkeyboard/navigation/AppNavHost.kt b/app/src/main/java/com/rickyhu/hushkeyboard/navigation/AppNavHost.kt
diff --git a/app/src/main/java/com/rickyhu/hushkeyboard/navigation/HomeRoute.kt b/app/src/main/java/com/rickyhu/hushkeyboard/navigation/HomeRoute.kt
diff --git a/app/src/main/java/com/rickyhu/hushkeyboard/navigation/SettingsRoute.kt b/app/src/main/java/com/rickyhu/hushkeyboard/navigation/SettingsRoute.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ kotlin-serialization = "1.8.10"
 kotlinx-serialization-json = "1.3.2"
 kover = "0.7.6"
 ktlint = "11.4.1"
-navigation-compose = "2.7.7"
+navigation-compose = "2.8.0-beta06"
 robolectric = "4.12"
 splitties-systemservices = "3.0.0"