Fix playback position saving when navigating back. (#477)

ychescale9 · web-flow · commit 03a6537ac677 · 2026-01-07T02:16:22.000+11:00
diff --git a/android/feature/content-viewer/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/contentviewer/impl/ContentViewerEntryProvider.kt b/android/feature/content-viewer/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/contentviewer/impl/ContentViewerEntryProvider.kt
@@ -16,6 +16,7 @@ public fun EntryProviderScope<NavKey>.contentViewerEntry(
     entry<ContentViewerRoute> {
         ContentViewerScreen(
             animatedVisibilityScope = LocalNavAnimatedContentScope.current,
+            backStack = backStack,
             boundsKey = ContentViewerSharedTransitionKeys.bounds(
                 origin = it.origin,
                 id = it.id,
@@ -26,9 +27,6 @@ public fun EntryProviderScope<NavKey>.contentViewerEntry(
                 id = it.id,
             ),
             id = it.id,
-            onNavigateUp = {
-                backStack.removeLastOrNull()
-            },
         )
     }
 }
diff --git a/android/feature/content-viewer/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/contentviewer/impl/ContentViewerScreen.kt b/android/feature/content-viewer/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/contentviewer/impl/ContentViewerScreen.kt
@@ -39,6 +39,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
 import androidx.tracing.trace
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.FilledIconButton
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.LargeIconButton
@@ -55,11 +57,11 @@ import kotlinx.coroutines.delay
 @Composable
 internal fun SharedTransitionScope.ContentViewerScreen(
     animatedVisibilityScope: AnimatedVisibilityScope,
+    backStack: NavBackStack<NavKey>,
     boundsKey: String,
     topBarBoundsKey: String,
     saveButtonElementKey: String,
     id: String,
-    onNavigateUp: () -> Unit,
     modifier: Modifier = Modifier,
 ) = trace("Screen:ContentViewer") {
     val viewModel = hiltViewModel<ContentViewerViewModel, ContentViewerViewModel.Factory>(
@@ -88,7 +90,7 @@ internal fun SharedTransitionScope.ContentViewerScreen(
                 LargeIconButton(
                     KSIcons.Close,
                     contentDescription = null,
-                    onClick = onNavigateUp,
+                    onClick = backStack::removeLastOrNull,
                 )
             },
             actions = {
diff --git a/android/feature/kotlin-weekly-issue/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/impl/KotlinWeeklyIssueEntryProvider.kt b/android/feature/kotlin-weekly-issue/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/impl/KotlinWeeklyIssueEntryProvider.kt
@@ -16,6 +16,7 @@ public fun EntryProviderScope<NavKey>.kotlinWeeklyIssueEntry(
     entry<KotlinWeeklyIssueRoute> {
         KotlinWeeklyIssueScreen(
             animatedVisibilityScope = LocalNavAnimatedContentScope.current,
+            backStack = backStack,
             boundsKey = KotlinWeeklyIssueSharedTransitionKeys.bounds(
                 origin = it.origin,
                 id = it.id,
@@ -24,9 +25,6 @@ public fun EntryProviderScope<NavKey>.kotlinWeeklyIssueEntry(
             titleElementKey = TopNavBarSharedTransitionKeys.titleElement(it.origin),
             id = it.id,
             issueNumber = it.issueNumber,
-            onNavigateUp = {
-                backStack.removeLastOrNull()
-            },
         )
     }
 }
diff --git a/android/feature/kotlin-weekly-issue/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/impl/KotlinWeeklyIssueScreen.kt b/android/feature/kotlin-weekly-issue/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/impl/KotlinWeeklyIssueScreen.kt
@@ -39,6 +39,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
 import androidx.tracing.trace
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.FilledIconButton
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.LargeIconButton
@@ -58,12 +60,12 @@ import io.github.reactivecircus.kstreamlined.kmp.presentation.kotlinweeklyissue.
 @Composable
 internal fun SharedTransitionScope.KotlinWeeklyIssueScreen(
     animatedVisibilityScope: AnimatedVisibilityScope,
+    backStack: NavBackStack<NavKey>,
     boundsKey: String,
     topBarBoundsKey: String,
     titleElementKey: String,
     id: String,
     issueNumber: Int,
-    onNavigateUp: () -> Unit,
     modifier: Modifier = Modifier,
 ) = trace("Screen:KotlinWeeklyIssue") {
     val viewModel = hiltViewModel<KotlinWeeklyIssueViewModel, KotlinWeeklyIssueViewModel.Factory>(
@@ -79,7 +81,7 @@ internal fun SharedTransitionScope.KotlinWeeklyIssueScreen(
         topBarBoundsKey = topBarBoundsKey,
         titleElementKey = titleElementKey,
         title = title,
-        onNavigateUp = onNavigateUp,
+        onNavigateUp = backStack::removeLastOrNull,
         onShareButtonClick = { url ->
             context.openShareSheet(title, url)
         },
diff --git a/android/feature/licenses/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/licenses/impl/LicensesEntryProvider.kt b/android/feature/licenses/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/licenses/impl/LicensesEntryProvider.kt
@@ -14,9 +14,7 @@ public fun EntryProviderScope<NavKey>.licensesEntry(
     entry<LicensesRoute> {
         LicensesScreen(
             animatedVisibilityScope = LocalNavAnimatedContentScope.current,
-            onNavigateUp = {
-                backStack.removeLastOrNull()
-            },
+            backStack = backStack,
         )
     }
 }
diff --git a/android/feature/licenses/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/licenses/impl/LicensesScreen.kt b/android/feature/licenses/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/licenses/impl/LicensesScreen.kt
@@ -23,6 +23,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.zIndex
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
 import androidx.tracing.trace
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.LargeIconButton
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.TopNavBar
@@ -34,14 +36,14 @@ import io.github.reactivecircus.kstreamlined.android.feature.licenses.impl.compo
 @Composable
 internal fun SharedTransitionScope.LicensesScreen(
     animatedVisibilityScope: AnimatedVisibilityScope,
-    onNavigateUp: () -> Unit,
+    backStack: NavBackStack<NavKey>,
     modifier: Modifier = Modifier,
 ) = trace("Screen:Licenses") {
     val viewModel = hiltViewModel<LicensesViewModel>()
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
     LicensesScreen(
-        onNavigateUp = onNavigateUp,
+        onNavigateUp = backStack::removeLastOrNull,
         uiState = uiState,
         modifier = modifier.sharedBounds(
             sharedContentState = rememberSharedContentState(key = LicensesSharedTransitionKeys.Bounds),
diff --git a/android/feature/settings/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/settings/impl/SettingsEntryProvider.kt b/android/feature/settings/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/settings/impl/SettingsEntryProvider.kt
@@ -6,7 +6,6 @@ import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.TopNavBarSharedTransitionKeys
-import io.github.reactivecircus.kstreamlined.android.feature.licenses.api.LicensesRoute
 import io.github.reactivecircus.kstreamlined.android.feature.settings.api.SettingsRoute
 
 public fun EntryProviderScope<NavKey>.settingsEntry(
@@ -16,14 +15,9 @@ public fun EntryProviderScope<NavKey>.settingsEntry(
     entry<SettingsRoute> {
         SettingsScreen(
             animatedVisibilityScope = LocalNavAnimatedContentScope.current,
+            backStack = backStack,
             topBarBoundsKey = TopNavBarSharedTransitionKeys.bounds(it.origin),
             titleElementKey = TopNavBarSharedTransitionKeys.titleElement(it.origin),
-            onOpenLicenses = {
-                backStack.add(LicensesRoute)
-            },
-            onNavigateUp = {
-                backStack.removeLastOrNull()
-            },
         )
     }
 }
diff --git a/android/feature/settings/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/settings/impl/SettingsScreen.kt b/android/feature/settings/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/settings/impl/SettingsScreen.kt
@@ -35,6 +35,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
 import androidx.tracing.trace
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.LargeIconButton
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.ModalBottomSheet
@@ -43,6 +45,7 @@ import io.github.reactivecircus.kstreamlined.android.core.designsystem.component
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.rememberModalBottomSheetState
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.foundation.KSTheme
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.foundation.icon.KSIcons
+import io.github.reactivecircus.kstreamlined.android.feature.licenses.api.LicensesRoute
 import io.github.reactivecircus.kstreamlined.android.feature.licenses.api.LicensesSharedTransitionKeys
 import io.github.reactivecircus.kstreamlined.android.feature.settings.impl.component.about.OpenSourceLicensesTile
 import io.github.reactivecircus.kstreamlined.android.feature.settings.impl.component.about.SourceCodeTile
@@ -58,10 +61,9 @@ import kotlinx.coroutines.launch
 @Composable
 internal fun SharedTransitionScope.SettingsScreen(
     animatedVisibilityScope: AnimatedVisibilityScope,
+    backStack: NavBackStack<NavKey>,
     topBarBoundsKey: String,
     titleElementKey: String,
-    onOpenLicenses: () -> Unit,
-    onNavigateUp: () -> Unit,
     modifier: Modifier = Modifier,
 ) = trace("Screen:Settings") {
     val viewModel = hiltViewModel<SettingsViewModel>()
@@ -72,8 +74,8 @@ internal fun SharedTransitionScope.SettingsScreen(
         animatedVisibilityScope = animatedVisibilityScope,
         topBarBoundsKey = topBarBoundsKey,
         titleElementKey = titleElementKey,
-        onOpenLicenses = onOpenLicenses,
-        onNavigateUp = onNavigateUp,
+        onOpenLicenses = { backStack.add(LicensesRoute) },
+        onNavigateUp = backStack::removeLastOrNull,
         uiState = uiState,
         eventSink = eventSink,
         modifier = modifier,
diff --git a/android/feature/talking-kotlin-episode/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/talkingkotlinepisode/impl/TalkingKotlinEpisodeEntryProvider.kt b/android/feature/talking-kotlin-episode/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/talkingkotlinepisode/impl/TalkingKotlinEpisodeEntryProvider.kt
@@ -16,6 +16,7 @@ public fun EntryProviderScope<NavKey>.talkingKotlinEpisodeEntry(
     entry<TalkingKotlinEpisodeRoute> {
         TalkingKotlinEpisodeScreen(
             animatedVisibilityScope = LocalNavAnimatedContentScope.current,
+            backStack = backStack,
             boundsKey = TalkingKotlinEpisodeSharedTransitionKeys.bounds(
                 origin = it.origin,
                 id = it.id,
@@ -26,9 +27,6 @@ public fun EntryProviderScope<NavKey>.talkingKotlinEpisodeEntry(
                 id = it.id,
             ),
             id = it.id,
-            onNavigateUp = {
-                backStack.removeLastOrNull()
-            },
         )
     }
 }
diff --git a/android/feature/talking-kotlin-episode/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/talkingkotlinepisode/impl/TalkingKotlinEpisodeScreen.kt b/android/feature/talking-kotlin-episode/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/talkingkotlinepisode/impl/TalkingKotlinEpisodeScreen.kt
@@ -24,8 +24,11 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -41,6 +44,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
 import androidx.tracing.trace
 import coil3.compose.AsyncImage
 import io.github.reactivecircus.kstreamlined.android.core.designsystem.component.FilledIconButton
@@ -56,6 +61,7 @@ import io.github.reactivecircus.kstreamlined.android.core.launcher.openCustomTab
 import io.github.reactivecircus.kstreamlined.android.core.launcher.openShareSheet
 import io.github.reactivecircus.kstreamlined.android.core.ui.pattern.ItemNotFoundUi
 import io.github.reactivecircus.kstreamlined.android.core.ui.util.linkify
+import io.github.reactivecircus.kstreamlined.android.feature.talkingkotlinepisode.api.TalkingKotlinEpisodeRoute
 import io.github.reactivecircus.kstreamlined.android.feature.talkingkotlinepisode.impl.component.PlayPauseButton
 import io.github.reactivecircus.kstreamlined.android.feature.talkingkotlinepisode.impl.component.PodcastPlayer
 import io.github.reactivecircus.kstreamlined.kmp.presentation.talkingkotlinepisode.TalkingKotlinEpisode
@@ -65,11 +71,11 @@ import io.github.reactivecircus.kstreamlined.kmp.presentation.talkingkotlinepiso
 @Composable
 internal fun SharedTransitionScope.TalkingKotlinEpisodeScreen(
     animatedVisibilityScope: AnimatedVisibilityScope,
+    backStack: NavBackStack<NavKey>,
     topBarBoundsKey: String,
     boundsKey: String,
     playerElementKey: String,
     id: String,
-    onNavigateUp: () -> Unit,
     modifier: Modifier = Modifier,
 ) = trace("Screen:TalkingKotlinEpisode") {
     val viewModel = hiltViewModel<TalkingKotlinEpisodeViewModel, TalkingKotlinEpisodeViewModel.Factory>(
@@ -79,22 +85,33 @@ internal fun SharedTransitionScope.TalkingKotlinEpisodeScreen(
     val eventSink = viewModel.eventSink
 
     val context = LocalContext.current
+    var playerPosition by remember { mutableLongStateOf(0L) }
+
     TalkingKotlinEpisodeScreen(
         animatedVisibilityScope = animatedVisibilityScope,
         topBarBoundsKey = topBarBoundsKey,
         playerElementKey = playerElementKey,
-        onNavigateUp = onNavigateUp,
+        onNavigateUp = backStack::removeLastOrNull,
         onShareButtonClick = { title, url ->
             context.openShareSheet(title, url)
         },
         onOpenLink = context::openCustomTab,
+        onPlayerPositionChange = { playerPosition = it },
         uiState = uiState,
         eventSink = eventSink,
         modifier = modifier.sharedBounds(
             sharedContentState = rememberSharedContentState(key = boundsKey),
             animatedVisibilityScope = animatedVisibilityScope,
         ),
     )
+
+    // save playback position when navigating away
+    val topEntry = backStack.lastOrNull()
+    LaunchedEffect(topEntry) {
+        if (topEntry !is TalkingKotlinEpisodeRoute) {
+            eventSink(TalkingKotlinEpisodeUiEvent.SaveStartPosition(playerPosition))
+        }
+    }
 }
 
 @Composable
@@ -104,6 +121,7 @@ internal fun SharedTransitionScope.TalkingKotlinEpisodeScreen(
     onNavigateUp: () -> Unit,
     onShareButtonClick: (title: String, url: String) -> Unit,
     onOpenLink: (url: String) -> Unit,
+    onPlayerPositionChange: (Long) -> Unit,
     uiState: TalkingKotlinEpisodeUiState,
     eventSink: (TalkingKotlinEpisodeUiEvent) -> Unit,
     modifier: Modifier = Modifier,
@@ -171,6 +189,7 @@ internal fun SharedTransitionScope.TalkingKotlinEpisodeScreen(
                         eventSink = eventSink,
                         isPlaying = uiState.isPlaying,
                         onOpenLink = onOpenLink,
+                        onPlayerPositionChange = onPlayerPositionChange,
                     )
                 }
             }
@@ -186,6 +205,7 @@ private fun SharedTransitionScope.ContentUi(
     eventSink: (TalkingKotlinEpisodeUiEvent) -> Unit,
     isPlaying: Boolean,
     onOpenLink: (url: String) -> Unit,
+    onPlayerPositionChange: (Long) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -292,9 +312,7 @@ private fun SharedTransitionScope.ContentUi(
             episode = episode,
             isPlaying = isPlaying,
             onPlayPauseButtonClick = { eventSink(TalkingKotlinEpisodeUiEvent.TogglePlayPause) },
-            onSaveStartPosition = { startPositionMillis ->
-                eventSink(TalkingKotlinEpisodeUiEvent.SaveStartPosition(startPositionMillis))
-            },
+            onPlayerPositionChange = onPlayerPositionChange,
             contentPadding = WindowInsets.navigationBars.asPaddingValues(),
             modifier = if (animatedVisibilityScope != null) {
                 Modifier.sharedElement(
diff --git a/android/feature/talking-kotlin-episode/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/talkingkotlinepisode/impl/component/PodcastPlayer.kt b/android/feature/talking-kotlin-episode/impl/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/talkingkotlinepisode/impl/component/PodcastPlayer.kt
@@ -16,12 +16,13 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.retain.RetainedEffect
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -48,7 +49,7 @@ internal fun PodcastPlayer(
     episode: TalkingKotlinEpisode,
     isPlaying: Boolean,
     onPlayPauseButtonClick: () -> Unit,
-    onSaveStartPosition: (Long) -> Unit,
+    onPlayerPositionChange: (Long) -> Unit,
     modifier: Modifier = Modifier,
     contentPadding: PaddingValues = PaddingValues(0.dp),
 ) {
@@ -67,14 +68,14 @@ internal fun PodcastPlayer(
         },
     )
 
-    DisposableEffect(Unit) {
+    RetainedEffect(player) {
         player.seekTo(episode.startPositionMillis)
-        onDispose {
-            onSaveStartPosition(playerPositionMillis.toLong())
+        onRetire {
             player.release()
         }
     }
 
+    // sync player state with UI
     LaunchedEffect(isPlaying) {
         if (isPlaying) {
             player.play()
@@ -92,6 +93,14 @@ internal fun PodcastPlayer(
         }
     }
 
+    // report latest player position
+    LaunchedEffect(Unit) {
+        snapshotFlow { playerPositionMillis }
+            .collect {
+                onPlayerPositionChange(it.toLong())
+            }
+    }
+
     PodcastPlayerUi(
         playerPositionMillis = playerPositionMillis,
         playerDurationMillis = playerDurationMillis,
diff --git a/android/feature/talking-kotlin-episode/impl/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/feature/talkingkotlinepisode/impl/TalkingKotlinEpisodeScreenTest.kt b/android/feature/talking-kotlin-episode/impl/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/feature/talkingkotlinepisode/impl/TalkingKotlinEpisodeScreenTest.kt
@@ -58,6 +58,7 @@ class TalkingKotlinEpisodeScreenTest {
                 onNavigateUp = {},
                 onShareButtonClick = { _, _ -> },
                 onOpenLink = {},
+                onPlayerPositionChange = {},
                 uiState = uiState,
                 eventSink = {},
             )

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public fun EntryProviderScope<NavKey>.contentViewerEntry(`
`16`	`16`	`entry<ContentViewerRoute> {`
`17`	`17`	`ContentViewerScreen(`
`18`	`18`	`animatedVisibilityScope = LocalNavAnimatedContentScope.current,`
	`19`	`+ backStack = backStack,`
`19`	`20`	`boundsKey = ContentViewerSharedTransitionKeys.bounds(`
`20`	`21`	`origin = it.origin,`
`21`	`22`	`id = it.id,`
`@@ -26,9 +27,6 @@ public fun EntryProviderScope<NavKey>.contentViewerEntry(`
`26`	`27`	`id = it.id,`
`27`	`28`	`),`
`28`	`29`	`id = it.id,`
`29`		`- onNavigateUp = {`
`30`		`- backStack.removeLastOrNull()`
`31`		`- },`
`32`	`30`	`)`
`33`	`31`	`}`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,7 @@ public fun EntryProviderScope<NavKey>.licensesEntry(`
`14`	`14`	`entry<LicensesRoute> {`
`15`	`15`	`LicensesScreen(`
`16`	`16`	`animatedVisibilityScope = LocalNavAnimatedContentScope.current,`
`17`		`- onNavigateUp = {`
`18`		`- backStack.removeLastOrNull()`
`19`		`- },`
	`17`	`+ backStack = backStack,`
`20`	`18`	`)`
`21`	`19`	`}`
`22`	`20`	`}`