Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-07-31 16:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: implement guarded back navigation for settings screens

Browse source
This commit is contained in:
tapframe 2026-04-07 01:24:39 +05:30
parent 53e1fa74fe
commit f4e6b7fef1
1 changed files with 64 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
View file

@ -58,8 +58,11 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavBackStackEntry
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import androidx.navigation.toRoute
import coil3.ImageLoader
@ -1096,40 +1099,68 @@ private fun MainAppContent(
)
}
composable<HomescreenSettingsRoute> {
val onBack = rememberGuardedPopBackStack(
navController = navController,
backStackEntry = it,
)
HomescreenSettingsScreen(
onBack = { navController.popBackStack() },
onBack = onBack,
)
}
composable<MetaScreenSettingsRoute> {
composable<MetaScreenSettingsRoute> { backStackEntry ->
val onBack = rememberGuardedPopBackStack(
navController = navController,
backStackEntry = backStackEntry,
)
MetaScreenSettingsScreen(
onBack = { navController.popBackStack() },
onBack = onBack,
)
}
composable<ContinueWatchingSettingsRoute> {
composable<ContinueWatchingSettingsRoute> { backStackEntry ->
val onBack = rememberGuardedPopBackStack(
navController = navController,
backStackEntry = backStackEntry,
)
ContinueWatchingSettingsScreen(
onBack = { navController.popBackStack() },
onBack = onBack,
)
}
composable<AddonsSettingsRoute> {
composable<AddonsSettingsRoute> { backStackEntry ->
val onBack = rememberGuardedPopBackStack(
navController = navController,
backStackEntry = backStackEntry,
)
AddonsSettingsScreen(
onBack = { navController.popBackStack() },
onBack = onBack,
)
}
if (AppFeaturePolicy.pluginsEnabled) {
composable<PluginsSettingsRoute> {
composable<PluginsSettingsRoute> { backStackEntry ->
val onBack = rememberGuardedPopBackStack(
navController = navController,
backStackEntry = backStackEntry,
)
PluginsSettingsScreen(
onBack = { navController.popBackStack() },
onBack = onBack,
)
}
}
composable<AccountSettingsRoute> {
composable<AccountSettingsRoute> { backStackEntry ->
val onBack = rememberGuardedPopBackStack(
navController = navController,
backStackEntry = backStackEntry,
)
AccountSettingsScreen(
onBack = { navController.popBackStack() },
onBack = onBack,
)
}
composable<CollectionsRoute> {
composable<CollectionsRoute> { backStackEntry ->
val onBack = rememberGuardedPopBackStack(
navController = navController,
backStackEntry = backStackEntry,
)
CollectionManagementScreen(
onBack = { navController.popBackStack() },
onBack = onBack,
onNavigateToEditor = { collectionId ->
navController.navigate(CollectionEditorRoute(collectionId = collectionId))
},
@ -1273,6 +1304,26 @@ private fun MainAppContent(
}
}
@Composable
private fun rememberGuardedPopBackStack(
navController: NavHostController,
backStackEntry: NavBackStackEntry,
beforePop: () -> Unit = {},
): () -> Unit {
val currentBackStackEntry by navController.currentBackStackEntryAsState()
var popHandled by remember(backStackEntry) { mutableStateOf(false) }
return remember(navController, backStackEntry, currentBackStackEntry, popHandled, beforePop) {
{
if (!popHandled && currentBackStackEntry == backStackEntry) {
popHandled = true
beforePop()
navController.popBackStack()
}
}
}
}
@Composable
private fun AppTabHost(
selectedTab: AppScreenTab,