Merge pull request #69 from laco-dev/feature/#67

[Contributor] 컨트리뷰터 화면이 뒤로가기로 앱이 종료되지 않도록 한다
droidknights · Jul 22, 2023 · d33166c · d33166c
2 parents 9a39f46 + f62fc3a
commit d33166c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainNavigator.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainNavigator.kt
@@ -10,6 +10,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
 import com.droidknights.app2023.feature.contributor.navigation.ContributorRoute
+import com.droidknights.app2023.feature.contributor.navigation.navigateContributor
 import com.droidknights.app2023.feature.home.navigation.HomeRoute
 import com.droidknights.app2023.feature.home.navigation.navigateHome
 import com.droidknights.app2023.feature.setting.navigation.SettingRoute
@@ -21,8 +22,8 @@ internal class MainNavigator(
     private val currentDestination: NavDestination?
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination
-    val startDestination: String
-        @Composable get() = currentDestination?.route ?: HomeRoute.route
+
+    val startDestination = HomeRoute.route
 
     val currentTab: MainTab?
         @Composable get() = when (currentDestination?.route) {
@@ -45,12 +46,12 @@ internal class MainNavigator(
         when (tab) {
             MainTab.SETTING -> navController.navigateSetting(navOptions)
             MainTab.HOME -> navController.navigateHome(navOptions)
-            MainTab.TEMP -> navController.navigate("temp") // TODO: ???
+            MainTab.TEMP -> navController.navigate("temp", navOptions) // TODO: ???
         }
     }
 
     fun navigateContributor() {
-        navController.navigate(ContributorRoute.route)
+        navController.navigateContributor()
     }
 
     fun popBackStack() {

diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt
@@ -43,7 +43,7 @@ internal fun MainScreen(navigator: MainNavigator = rememberMainNavigator()) {
             ) {
                 NavHost(
                     navController = navigator.navController,
-                    startDestination = navigator.startDestination
+                    startDestination = navigator.startDestination,
                 ) {
                     settingNavGraph()
                     homeNavGraph(