From 9adf6fbe4045daa0325c4ef0cad1629212885b8a Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Sat, 22 Jul 2023 19:29:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#67=20start=20Destination=EC=9D=84=20?= =?UTF-8?q?=EC=A0=95=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EA=B2=B0=EC=A0=95?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/droidknights/app2023/feature/main/MainNavigator.kt | 4 ++-- .../java/com/droidknights/app2023/feature/main/MainScreen.kt | 2 +- 2 files changed, 3 insertions(+), 3 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 index 1735ae43..70340dab 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 @@ -21,8 +21,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) { 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( From 5ac37dcf4573cc74702985cafc7a3c5cb40ba9d3 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Sat, 22 Jul 2023 19:35:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?#67=20=EC=BB=A8=ED=8A=B8=EB=A6=AC=EB=B7=B0?= =?UTF-8?q?=ED=84=B0=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/droidknights/app2023/feature/main/MainNavigator.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 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 index 70340dab..d2e2fb0e 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,7 +22,7 @@ internal class MainNavigator( private val currentDestination: NavDestination? @Composable get() = navController .currentBackStackEntryAsState().value?.destination - + val startDestination = HomeRoute.route val currentTab: MainTab? @@ -50,7 +51,7 @@ internal class MainNavigator( } fun navigateContributor() { - navController.navigate(ContributorRoute.route) + navController.navigateContributor() } fun popBackStack() { From f62fc3ac2bcb8cac28bad074456717fa491dba68 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Sat, 22 Jul 2023 19:51:53 +0900 Subject: [PATCH 3/3] =?UTF-8?q?#67=20Temp=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= =?UTF-8?q?=ED=95=A0=20=EB=95=8C=20navOptions=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/droidknights/app2023/feature/main/MainNavigator.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d2e2fb0e..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 @@ -46,7 +46,7 @@ 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: ??? } }