Skip to content

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

refactor(live): inject Home navigation callbacks

David Nashash597f97063af8
diff --git a/app/src/main/java/com/streamvault/app/navigation/graph/LiveGraph.kt b/app/src/main/java/com/streamvault/app/navigation/graph/LiveGraph.kt
index 29ff3b2e..1248afe7 100644
--- a/app/src/main/java/com/streamvault/app/navigation/graph/LiveGraph.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/graph/LiveGraph.kt
@@ -34,6 +34,7 @@ internal fun NavGraphBuilder.registerLiveGraph(
)
)
},
+ onOpenMultiView = { onNavigate(AppRoutePatterns.MULTI_VIEW) },
onNavigate = onNavigate,
currentRoute = AppRoutePatterns.LIVE_TV,
initialCategoryId = initialCategoryId,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
index d21c5174..1d30ca64 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
@@ -74,7 +74,7 @@ import com.streamvault.app.R
import com.streamvault.domain.model.LiveTvChannelMode
import com.streamvault.feature.playback.multiview.MultiViewViewModel
import com.streamvault.feature.playback.multiview.MultiViewPlannerDialog
-import com.streamvault.app.navigation.Routes
+import com.streamvault.feature.live.navigation.LiveRoutePatterns
import com.streamvault.domain.model.VirtualCategoryIds
import com.streamvault.domain.playback.archivePlaybackCapability
import com.streamvault.domain.repository.ChannelRepository
@@ -104,6 +104,7 @@ private sealed interface FocusedRemoteShortcutTarget {
fun HomeScreen(
onChannelClick: (Channel, Category?, Provider?, Long?, Long?) -> Unit,
onNavigate: (String) -> Unit,
+ onOpenMultiView: () -> Unit,
currentRoute: String,
initialCategoryId: Long? = null,
viewModel: HomeViewModel = hiltViewModel(),
@@ -218,8 +219,8 @@ fun HomeScreen(
onShowSplitManagerDialogChange = { showSplitManagerDialog = it },
onPendingSplitPlannerChannelChange = { pendingSplitPlannerChannel = it },
onChannelClick = onChannelClick,
+ onOpenMultiView = onOpenMultiView,
resolveProviderForChannel = resolveProviderForChannel,
- onNavigate = onNavigate,
scope = scope
)
@@ -603,7 +604,7 @@ fun HomeScreen(
)
},
onAddToSplitScreen = { pendingSplitPlannerChannel = target.channel },
- onOpenGuide = { onNavigate(Routes.EPG) }
+ onOpenGuide = { onNavigate(LiveRoutePatterns.EPG) }
)
is FocusedRemoteShortcutTarget.CategoryTarget -> {
val category = target.category
@@ -622,7 +623,7 @@ fun HomeScreen(
showPinDialog = true
},
onHideCategory = { viewModel.hideCategory(category) },
- onOpenGuide = { onNavigate(Routes.EPG) }
+ onOpenGuide = { onNavigate(LiveRoutePatterns.EPG) }
)
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt
index 5c9bb2e6..8b035aa0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt
@@ -11,7 +11,6 @@ import androidx.compose.ui.res.stringResource
import com.streamvault.app.R
import com.streamvault.feature.live.presentation.home.HomeUiState
import com.streamvault.feature.live.home.HomeViewModel
-import com.streamvault.app.navigation.Routes
import com.streamvault.app.ui.components.dialogs.AddToGroupDialog
import com.streamvault.core.ui.components.dialogs.PinDialog
import com.streamvault.feature.playback.multiview.MultiViewPlannerDialog
@@ -65,8 +64,8 @@ internal fun HomeDialogsHost(
onShowSplitManagerDialogChange: (Boolean) -> Unit,
onPendingSplitPlannerChannelChange: (Channel?) -> Unit,
onChannelClick: (Channel, Category?, Provider?, Long?, Long?) -> Unit,
+ onOpenMultiView: () -> Unit,
resolveProviderForChannel: (Channel) -> Provider?,
- onNavigate: (String) -> Unit,
scope: CoroutineScope
) {
val context = LocalContext.current
@@ -243,7 +242,7 @@ internal fun HomeDialogsHost(
onPendingSplitPlannerChannelChange(null)
viewModel.onDismissDialog()
viewModel.clearPreview()
- onNavigate(Routes.MULTI_VIEW)
+ onOpenMultiView()
},
viewModel = multiViewViewModel
)
@@ -391,7 +390,7 @@ internal fun HomeDialogsHost(
onLaunch = {
onShowSplitManagerDialogChange(false)
viewModel.clearPreview()
- onNavigate(Routes.MULTI_VIEW)
+ onOpenMultiView()
},
viewModel = multiViewViewModel
)
diff --git a/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md b/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md
index fcc53928..7e607126 100644
--- a/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md
+++ b/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md
@@ -168,3 +168,8 @@ category/channel lock policies, category-selection fallback policy, schedule
metrics, options overlay, and EPG-match dialog are independent of app code;
screen/resource moves, golden/runtime/performance gates, and legacy app cleanup
remain open, so no live slice acceptance gate is claimed yet.
+
+Home route composition is also app-independent at the screen boundary: Guide
+uses `LiveRoutePatterns.EPG`, and MultiView is exposed through an injected
+callback. The app graph remains the sole owner of the concrete MultiView
+destination string.
diff --git a/docs/superpowers/plans/2026-08-28-live-feature-extraction.md b/docs/superpowers/plans/2026-08-28-live-feature-extraction.md
index 23ae4877..ac653329 100644
--- a/docs/superpowers/plans/2026-08-28-live-feature-extraction.md
+++ b/docs/superpowers/plans/2026-08-28-live-feature-extraction.md
@@ -42,6 +42,11 @@ The Live-browse portion of remote shortcut dispatch is now feature-owned in
player-wide shortcut dispatch and imports the Live handler API at the Home
composition boundary. Focused feature and app dispatch tests are green.
+Home no longer imports the app `Routes` object: Guide navigation uses the
+feature-owned `LiveRoutePatterns.EPG`, while MultiView navigation is supplied
+as an app composition callback. Dialog composition therefore carries no
+MultiView route constant and remains behaviorally unchanged.
+
Route patterns were subsequently moved behind `LiveRoutePatterns`; the app
codec still owns encode/decode compatibility and no route behavior changed.
The feature-owned `registerLiveGraph` now owns Live destination argument