Update deep link back behavior

bsagmoe · bsagmoe · commit b77e984e32f5 · 2026-03-25T16:01:58.000-04:00
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsApp.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsApp.kt
@@ -37,7 +37,7 @@ import com.example.jetnews.ui.theme.JetnewsTheme
 import kotlinx.coroutines.launch
 
 @Composable
-fun JetnewsApp(appContainer: AppContainer, isOpenedByDeepLink: Boolean, initialBackStack: List<NavKey>) {
+fun JetnewsApp(appContainer: AppContainer, isBackEnabled: Boolean, initialBackStack: List<NavKey>) {
 
     val navigationState = rememberNavigationState(
         mainTopLevelRoute = HomeKey,
@@ -85,7 +85,7 @@ fun JetnewsApp(appContainer: AppContainer, isOpenedByDeepLink: Boolean, initialB
                     appContainer = appContainer,
                     onBack = navigator::goBack,
                     isExpandedScreen = isExpandedScreen,
-                    isOpenedByDeepLink = isOpenedByDeepLink,
+                    isBackEnabled = isBackEnabled,
                     openDrawer = { coroutineScope.launch { sizeAwareDrawerState.open() } },
                 )
             }
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsNavDisplay.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsNavDisplay.kt
@@ -52,7 +52,7 @@ fun JetnewsNavDisplay(
     appContainer: AppContainer,
     onBack: () -> Unit,
     isExpandedScreen: Boolean,
-    isOpenedByDeepLink: Boolean,
+    isBackEnabled: Boolean,
     openDrawer: () -> Unit,
 ) {
     // Because the entryProvider is used within a `remember` block during NavEntry decoration,
@@ -103,7 +103,7 @@ fun JetnewsNavDisplay(
 
             NavigationBackHandler(
                 state = navigationEventState,
-                isBackEnabled = !isOpenedByDeepLink && scene.previousEntries.isNotEmpty(),
+                isBackEnabled = isBackEnabled && scene.previousEntries.isNotEmpty(),
                 onBackCompleted = {
                     repeat(navEntries.size - scene.previousEntries.size) { onBack() }
                 },
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/MainActivity.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/MainActivity.kt
@@ -52,7 +52,7 @@ class MainActivity : ComponentActivity() {
 
             JetnewsApp(
                 appContainer,
-                isOpenedByDeepLink,
+                isBackEnabled = !isOpenedByDeepLink || isTaskRoot,
                 initialBackStack,
             )
         }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class MainActivity : ComponentActivity() {`
`52`	`52`
`53`	`53`	`JetnewsApp(`
`54`	`54`	`appContainer,`
`55`		`- isOpenedByDeepLink,`
	`55`	`+ isBackEnabled = !isOpenedByDeepLink \|\| isTaskRoot,`
`56`	`56`	`initialBackStack,`
`57`	`57`	`)`
`58`	`58`	`}`