A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix nested navigation graphs
Simona Stojanovic1475e3e8f906
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.ktindex 75a243ee4..0967ec363 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt@@ -54,13 +54,11 @@ fun NiaNavHost()interestsGraph(navigateToTopic = { navController.navigate("${TopicDestination.route}/$it") },- navigateToAuthor = { navController.navigate("${AuthorDestination.route}/$it") }- )- topicGraph(- onBackClick = { navController.popBackStack() }- )- authorGraph(- onBackClick = { navController.popBackStack() }+ navigateToAuthor = { navController.navigate("${AuthorDestination.route}/$it") },+ nestedGraphs = {+ topicGraph(onBackClick = { navController.popBackStack() })+ authorGraph(onBackClick = { navController.popBackStack() })+ })}}diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.ktindex 69ed7bba9..87612beeb 100644--- a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt+++ b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt@@ -18,6 +18,7 @@ package com.google.samples.apps.nowinandroid.feature.interests.navigationimport androidx.navigation.NavGraphBuilderimport androidx.navigation.compose.composable+import androidx.navigation.navigationimport com.google.samples.apps.nowinandroid.core.navigation.NiaNavigationDestinationimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute@@ -28,12 +29,20 @@ object InterestsDestination : NiaNavigationDestination {fun NavGraphBuilder.interestsGraph(navigateToTopic: (String) -> Unit,- navigateToAuthor: (String) -> Unit+ navigateToAuthor: (String) -> Unit,+ nestedGraphs: NavGraphBuilder.() -> Unit+) {- composable(route = InterestsDestination.route) {- InterestsRoute(- navigateToTopic = navigateToTopic,- navigateToAuthor = navigateToAuthor,- )+ navigation(+ route = InterestsDestination.route,+ startDestination = InterestsDestination.destination+ ) {+ composable(route = InterestsDestination.destination) {+ InterestsRoute(+ navigateToTopic = navigateToTopic,+ navigateToAuthor = navigateToAuthor,+ )+ }+ nestedGraphs()}}