From 59325c2f69ed487381c8a5833c93b4eb9dfb5527 Mon Sep 17 00:00:00 2001
From: Jossi Wolf <jossi@snappmobile.io>
Date: Wed, 29 Sep 2021 17:54:20 +0200
Subject: [PATCH] Update Docs and Sample to use new API for adding custom
 Navigators

Fixes #744
---
 docs/navigation-material.md                              | 9 +++------
 gradle/libs.versions.toml                                | 4 ++--
 .../navigation.material/BottomSheetNavigatorTest.kt      | 4 ++--
 .../sample/navigation/material/BottomSheetNavSample.kt   | 3 +--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/docs/navigation-material.md b/docs/navigation-material.md
index 1d76b8425..55323accf 100644
--- a/docs/navigation-material.md
+++ b/docs/navigation-material.md
@@ -18,9 +18,8 @@ This features composable bottom sheet destinations.
     ```kotlin
     @Composable
     fun MyApp() {
-        val navController = rememberNavController()
         val bottomSheetNavigator = rememberBottomSheetNavigator()
-        navController.navigatorProvider += bottomSheetNavigator
+        val navController = rememberNavController(bottomSheetNavigator)
     }
     ```
 
@@ -29,9 +28,8 @@ This features composable bottom sheet destinations.
     ```kotlin
     @Composable
     fun MyApp() {
-        val navController = rememberNavController()
         val bottomSheetNavigator = rememberBottomSheetNavigator()
-        navController.navigatorProvider += bottomSheetNavigator
+        val navController = rememberNavController(bottomSheetNavigator)
         ModalBottomSheetLayout(bottomSheetNavigator) {
             NavHost(navController, Destinations.Home) {
                // We'll define our graph here in a bit!
@@ -45,9 +43,8 @@ This features composable bottom sheet destinations.
     ```kotlin
     @Composable
     fun MyApp() {
-        val navController = rememberNavController()
         val bottomSheetNavigator = rememberBottomSheetNavigator()
-        navController.navigatorProvider += bottomSheetNavigator
+        val navController = rememberNavController(bottomSheetNavigator)
         ModalBottomSheetLayout(bottomSheetNavigator) {
             NavHost(navController, Destinations.Home) {
                composable(route = "home") {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 301d378a9..e97ee9f4b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 compose = "1.0.2"
-composesnapshot = "-" # a single character = no snapshot
+composesnapshot = "7778007" # a single character = no snapshot
 
 # gradlePlugin and lint need to be updated together
 gradlePlugin = "7.0.2"
@@ -13,7 +13,7 @@ okhttp = "3.12.13"
 coil = "1.3.0"
 
 androidxtest = "1.4.0"
-androidxnavigation = "2.4.0-alpha09"
+androidxnavigation = "2.4.0-SNAPSHOT"
 
 [libraries]
 compose-ui-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
diff --git a/navigation-material/src/androidTest/java/com/google/accompanist/navigation.material/BottomSheetNavigatorTest.kt b/navigation-material/src/androidTest/java/com/google/accompanist/navigation.material/BottomSheetNavigatorTest.kt
index b7b64f471..e3c1ef176 100644
--- a/navigation-material/src/androidTest/java/com/google/accompanist/navigation.material/BottomSheetNavigatorTest.kt
+++ b/navigation-material/src/androidTest/java/com/google/accompanist/navigation.material/BottomSheetNavigatorTest.kt
@@ -198,9 +198,9 @@ internal class BottomSheetNavigatorTest {
         val sheetState = ModalBottomSheetState(ModalBottomSheetValue.Hidden)
 
         composeTestRule.setContent {
-            navController = rememberNavController()
+            navigator = remember { BottomSheetNavigator(sheetState) }
+            navController = rememberNavController(navigator)
             if (savedState != null) navController.restoreState(savedState)
-            navigator = remember(navController) { BottomSheetNavigator(sheetState) }
             navController.navigatorProvider += navigator
             if (compositionState == 0) {
                 ModalBottomSheetLayout(
diff --git a/sample/src/main/java/com/google/accompanist/sample/navigation/material/BottomSheetNavSample.kt b/sample/src/main/java/com/google/accompanist/sample/navigation/material/BottomSheetNavSample.kt
index ee75a2a10..5393f51f4 100644
--- a/sample/src/main/java/com/google/accompanist/sample/navigation/material/BottomSheetNavSample.kt
+++ b/sample/src/main/java/com/google/accompanist/sample/navigation/material/BottomSheetNavSample.kt
@@ -58,9 +58,8 @@ private object Destinations {
 @OptIn(ExperimentalMaterialNavigationApi::class)
 @Composable
 fun BottomSheetNavDemo() {
-    val navController = rememberNavController()
     val bottomSheetNavigator = rememberBottomSheetNavigator()
-    navController.navigatorProvider += bottomSheetNavigator
+    val navController = rememberNavController(bottomSheetNavigator)
 
     ModalBottomSheetLayout(bottomSheetNavigator) {
         NavHost(navController, Destinations.Home) {