Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

refactor: register settings routes from feature

David Nashash579a00cc5b5f
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt
index 74646f0b..d3f3e760 100644
--- a/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt
@@ -1,6 +1,7 @@
package com.streamvault.app.navigation
import androidx.compose.runtime.Composable
+import androidx.lifecycle.compose.dropUnlessResumed
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import com.streamvault.app.navigation.graph.registerCatalogGraph
@@ -11,6 +12,10 @@ import com.streamvault.app.navigation.graph.registerWelcomeGraph
import com.streamvault.feature.settings.presentation.BackupImportPreviewDialog
import com.streamvault.core.navigation.AppDestination
import com.streamvault.core.navigation.NavigationActions
+import com.streamvault.core.navigation.NavigationOptions
+import com.streamvault.app.ui.screens.settings.SettingsScreen
+import com.streamvault.feature.settings.navigation.registerSettingsGraph
+import com.streamvault.feature.settings.parental.ParentalControlGroupScreen
import com.streamvault.feature.playback.api.PlaybackPlatformHost
import com.streamvault.feature.playback.navigation.registerPlaybackGraph
import com.streamvault.feature.provider.api.ProviderBackupPreviewRequest
@@ -62,6 +67,42 @@ internal fun AppNavHost(
onTopLevelDestinationRequested
)
registerPlaybackGraph(actions, playbackPlatformHost, payloads::consumePlayerRequest)
+ registerSettingsGraph(
+ actions = actions,
+ settingsContent = { backupUri ->
+ SettingsScreen(
+ onNavigate = { route ->
+ AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)
+ },
+ onAddProvider = dropUnlessResumed {
+ actions.navigate(AppDestination.ProviderSetup())
+ },
+ onEditProvider = { provider ->
+ actions.navigate(
+ AppDestination.ProviderSetup(providerId = provider.id),
+ NavigationOptions(launchSingleTop = true)
+ )
+ },
+ onNavigateToParentalControl = { providerId ->
+ actions.navigate(
+ AppDestination.ParentalControlGroups(providerId),
+ NavigationOptions(launchSingleTop = true)
+ )
+ },
+ currentRoute = AppRoutePatterns.SETTINGS,
+ initialBackupImportUri = backupUri
+ )
+ },
+ parentalControlContent = { onBack ->
+ ParentalControlGroupScreen(
+ currentRoute = AppRoutePatterns.SETTINGS,
+ onNavigate = { route ->
+ AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)
+ },
+ onBack = onBack
+ )
+ }
+ )
registerSystemGraph(actions, onTopLevelDestinationRequested)
}
}
diff --git a/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt b/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt
index 2e735bd4..b7e363b7 100644
--- a/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt
@@ -1,19 +1,13 @@
package com.streamvault.app.navigation.graph
-import androidx.lifecycle.compose.dropUnlessResumed
import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavType
import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
import com.streamvault.app.navigation.AppRouteCodec
import com.streamvault.app.navigation.AppRoutePatterns
import com.streamvault.app.ui.screens.downloads.DownloadsScreen
import com.streamvault.app.ui.screens.plugins.PluginsScreen
-import com.streamvault.app.ui.screens.settings.SettingsScreen
-import com.streamvault.feature.settings.parental.ParentalControlGroupScreen
import com.streamvault.core.navigation.AppDestination
import com.streamvault.core.navigation.NavigationActions
-import com.streamvault.core.navigation.NavigationOptions
internal fun NavGraphBuilder.registerSystemGraph(
actions: NavigationActions,
@@ -28,37 +22,6 @@ internal fun NavGraphBuilder.registerSystemGraph(
)
}
- composable(
- route = AppRoutePatterns.SETTINGS_DESTINATION,
- arguments = listOf(
- navArgument("backupUri") { type = NavType.StringType; defaultValue = "" }
- )
- ) { backStackEntry ->
- val backupUri = backStackEntry.arguments?.getString("backupUri")?.takeIf { it.isNotBlank() }
- SettingsScreen(
- onNavigate = { route ->
- AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)
- },
- onAddProvider = dropUnlessResumed {
- actions.navigate(AppDestination.ProviderSetup())
- },
- onEditProvider = { provider ->
- actions.navigate(
- AppDestination.ProviderSetup(providerId = provider.id),
- NavigationOptions(launchSingleTop = true)
- )
- },
- onNavigateToParentalControl = { providerId ->
- actions.navigate(
- AppDestination.ParentalControlGroups(providerId),
- NavigationOptions(launchSingleTop = true)
- )
- },
- currentRoute = AppRoutePatterns.SETTINGS,
- initialBackupImportUri = backupUri
- )
- }
-
composable(AppRoutePatterns.PLUGINS) {
PluginsScreen(
currentRoute = AppRoutePatterns.PLUGINS,
@@ -68,18 +31,4 @@ internal fun NavGraphBuilder.registerSystemGraph(
)
}
- composable(
- route = AppRoutePatterns.PARENTAL_CONTROL_GROUPS,
- arguments = listOf(
- navArgument("providerId") { type = NavType.LongType }
- )
- ) {
- ParentalControlGroupScreen(
- currentRoute = AppRoutePatterns.SETTINGS,
- onNavigate = { route ->
- AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)
- },
- onBack = { actions.back() }
- )
- }
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/navigation/SettingsGraph.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/navigation/SettingsGraph.kt
new file mode 100644
index 00000000..4fdf5b99
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/navigation/SettingsGraph.kt
@@ -0,0 +1,44 @@
+package com.streamvault.feature.settings.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavType
+import androidx.navigation.compose.composable
+import androidx.navigation.navArgument
+import com.streamvault.core.navigation.NavigationActions
+
+/** Stable route patterns owned by the settings feature. */
+object SettingsRoutePatterns {
+ const val SETTINGS = "settings"
+ const val SETTINGS_DESTINATION = "settings?backupUri={backupUri}"
+ const val PARENTAL_CONTROL_GROUPS = "parental_control_groups/{providerId}"
+}
+
+/**
+ * Registers settings-owned destinations without depending on the app navigation
+ * controller or route codec. The app supplies the platform/composition content.
+ */
+fun NavGraphBuilder.registerSettingsGraph(
+ actions: NavigationActions,
+ settingsContent: @Composable (backupUri: String?) -> Unit,
+ parentalControlContent: @Composable (onBack: () -> Unit) -> Unit,
+) {
+ composable(
+ route = SettingsRoutePatterns.SETTINGS_DESTINATION,
+ arguments = listOf(
+ navArgument("backupUri") { type = NavType.StringType; defaultValue = "" }
+ )
+ ) { backStackEntry ->
+ val backupUri = backStackEntry.arguments?.getString("backupUri")?.takeIf { it.isNotBlank() }
+ settingsContent(backupUri)
+ }
+
+ composable(
+ route = SettingsRoutePatterns.PARENTAL_CONTROL_GROUPS,
+ arguments = listOf(
+ navArgument("providerId") { type = NavType.LongType }
+ )
+ ) {
+ parentalControlContent(actions::back)
+ }
+}