Merge "Fix nested navigation graphs" into main

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") }
+            navigateToAuthor = { navController.navigate("${AuthorDestination.route}/$it") },
-        )
+            nestedGraphs = {
-        topicGraph(
+                topicGraph(onBackClick = { navController.popBackStack() })
-            onBackClick = { navController.popBackStack() }
+                authorGraph(onBackClick = { navController.popBackStack() })
-        )
+            }
-        authorGraph(
-            onBackClick = { navController.popBackStack() }
         )
     }
 }

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.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
+import androidx.navigation.navigation
 import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigationDestination
 import 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) {
+    navigation(
-        InterestsRoute(
+        route = InterestsDestination.route,
-            navigateToTopic = navigateToTopic,
+        startDestination = InterestsDestination.destination
-            navigateToAuthor = navigateToAuthor,
+    ) {
-        )
+        composable(route = InterestsDestination.destination) {
+            InterestsRoute(
+                navigateToTopic = navigateToTopic,
+                navigateToAuthor = navigateToAuthor,
+            )
+        }
+        nestedGraphs()
     }
 }