Reset settings navigation when dismiss

SRGSSR · Aug 16, 2023 · 70f158a · 70f158a
1 parent 1911c9e
commit 70f158a
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/DemoPlayer.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/DemoPlayer.kt
@@ -47,24 +47,29 @@ fun DemoPlayer(
 ) {
     val bottomSheetNavigator = rememberBottomSheetNavigator()
     val navController = rememberNavController(bottomSheetNavigator)
+    LaunchedEffect(bottomSheetNavigator.navigatorSheetState.isVisible) {
+        if (!bottomSheetNavigator.navigatorSheetState.isVisible) {
+            navController.popBackStack(route = RoutePlayer, false)
+        }
+    }
     ModalBottomSheetLayout(
         modifier = modifier,
         bottomSheetNavigator = bottomSheetNavigator
     ) {
-        NavHost(navController, startDestination = "player") {
+        NavHost(navController, startDestination = RoutePlayer) {
             composable(route = "player") {
                 PlayerContent(
                     player = player,
                     pictureInPicture = pictureInPicture,
                     pictureInPictureClick = pictureInPictureClick,
                     displayPlaylist = displayPlaylist,
                 ) {
-                    navController.navigate(route = "settings") {
+                    navController.navigate(route = RouteSettings) {
                         launchSingleTop = true
                     }
                 }
             }
-            bottomSheet(route = "settings") {
+            bottomSheet(route = RouteSettings) {
                 LaunchedEffect(pictureInPicture) {
                     if (pictureInPicture) {
                         navController.popBackStack()
@@ -125,3 +130,6 @@ private fun FullScreenMode(fullScreen: Boolean) {
         systemUiController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
     }
 }
+
+private const val RoutePlayer = "player"
+private const val RouteSettings = "settings"