Creepso/NuvioTV
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't forget to popBackStack

Browse source
This commit is contained in:
skoruppa 2026-03-10 07:56:05 +01:00
parent d90fa90908
commit c784e2a87d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/nuvio/tv/ui/navigation/NuvioNavHost.kt
View file

@ -366,11 +366,14 @@ fun NuvioNavHost(
val season = streamArgs?.getString("season")?.toIntOrNull()
val episode = streamArgs?.getString("episode")?.toIntOrNull()
if (streamContentType.equals("series", ignoreCase = true) && streamContentId.isNotBlank()) {
val detailOnStack = navController.popBackStack(
Screen.Detail.route,
inclusive = false
)
if (!detailOnStack) {
val detailOnStack = navController.backQueue.any {
it.destination.route == Screen.Detail.route
}
if (detailOnStack) {
navController.getBackStackEntry(Screen.Detail.route).savedStateHandle.set("returnFocusSeason", season)
navController.getBackStackEntry(Screen.Detail.route).savedStateHandle.set("returnFocusEpisode", episode)
navController.popBackStack(Screen.Detail.route, inclusive = false)
} else {
navController.navigate(
Screen.Detail.createRoute(
itemId = streamContentId,
@ -383,9 +386,6 @@ fun NuvioNavHost(
popUpTo(Screen.Stream.route) { inclusive = true }
launchSingleTop = true
}
} else {
navController.currentBackStackEntry?.savedStateHandle?.set("returnFocusSeason", season)
navController.currentBackStackEntry?.savedStateHandle?.set("returnFocusEpisode", episode)
}
} else {
navController.popBackStack()