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 index 1735ae43..935fdb65 100644 --- 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 index af9eec61..e7e7ed77 100644 --- 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(