StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
perf: remove provider flow collection from app shell
David Nashashbddc6ef704a6
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavHost.ktindex 9312eaf3..37088321 100644--- a/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt@@ -11,7 +11,7 @@ import com.streamvault.feature.settings.presentation.BackupImportPreviewDialogimport com.streamvault.core.navigation.AppDestinationimport com.streamvault.core.navigation.NavigationActionsimport com.streamvault.core.navigation.NavigationOptions-import com.streamvault.app.ui.components.shell.rememberAppDestinationItems+import com.streamvault.core.ui.components.shell.UiDestinationimport com.streamvault.feature.settings.navigation.registerSettingsGraphimport com.streamvault.feature.settings.parental.ParentalControlGroupScreenimport com.streamvault.feature.settings.api.SettingsPlatformHost@@ -43,13 +43,12 @@ internal fun AppNavHost(catalogPlatformHost: CatalogPlatformHost?,playbackPlatformHost: PlaybackPlatformHost?,settingsPlatformHost: SettingsPlatformHost,+ navigationDestinations: List<UiDestination>,startupReady: Boolean,onStartupNavigationRequested: (popUpTo: AppDestination) -> Unit,onTopLevelDestinationRequested: (AppDestination) -> Unit,onCloseApp: () -> Unit) {- val navigationDestinations = rememberAppDestinationItems()-NavHost(navController = navController,startDestination = SystemRoutePatterns.WELCOMEdiff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.ktindex 2fef9447..92e28b93 100644--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt@@ -1,6 +1,7 @@package com.streamvault.app.navigationimport androidx.compose.runtime.Composable+import androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -12,7 +13,10 @@ import androidx.navigation.NavHostControllerimport androidx.navigation.compose.currentBackStackEntryAsStateimport androidx.navigation.compose.rememberNavControllerimport com.streamvault.app.playback.rememberPlaybackPlatformHost+import com.streamvault.app.ui.components.shell.LocalAppDestinationItems+import com.streamvault.app.ui.components.shell.rememberAppDestinationItemsimport com.streamvault.core.navigation.AppDestination+import com.streamvault.domain.model.CatalogLayoutimport com.streamvault.feature.catalog.api.CatalogPlatformHostimport com.streamvault.feature.settings.api.SettingsPlatformHost@@ -43,19 +47,27 @@ fun AppNavigation(onTopLevelDestinationRequested = coordinator::requestTopLevelNavigation)- AppNavHost(- navController = navController,- actions = navigator,- catalogDetailActions = navigator,- payloads = navigator,- playbackPlatformHost = playbackPlatformHost,- settingsPlatformHost = settingsPlatformHost,- catalogPlatformHost = catalogPlatformHost,- startupReady = state.startupTarget != null,- onStartupNavigationRequested = coordinator::requestStartupNavigation,- onTopLevelDestinationRequested = coordinator::requestTopLevelNavigation,- onCloseApp = onCloseApp+ val navigationDestinations = rememberAppDestinationItems(+ configuredDestinations = state.topLevelDestinations,+ catalogLayout = state.catalogLayout ?: CatalogLayout.SPLIT)++ CompositionLocalProvider(LocalAppDestinationItems provides navigationDestinations) {+ AppNavHost(+ navController = navController,+ actions = navigator,+ catalogDetailActions = navigator,+ payloads = navigator,+ playbackPlatformHost = playbackPlatformHost,+ settingsPlatformHost = settingsPlatformHost,+ catalogPlatformHost = catalogPlatformHost,+ navigationDestinations = navigationDestinations,+ startupReady = state.startupTarget != null,+ onStartupNavigationRequested = coordinator::requestStartupNavigation,+ onTopLevelDestinationRequested = coordinator::requestTopLevelNavigation,+ onCloseApp = onCloseApp+ )+ }}@Composablediff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.ktindex 68d2f59f..5bdc82ab 100644--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.kt@@ -1,7 +1,5 @@package com.streamvault.app.ui.components.shell-import android.content.Context-import android.content.ContextWrapperimport androidx.annotation.StringResimport androidx.compose.foundation.layout.ColumnScopeimport androidx.compose.foundation.layout.PaddingValues@@ -17,16 +15,14 @@ import androidx.compose.material.icons.filled.Starimport androidx.compose.material.icons.filled.Downloadimport androidx.compose.runtime.Composableimport androidx.compose.runtime.remember+import androidx.compose.runtime.staticCompositionLocalOfimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.SolidColorimport androidx.compose.ui.graphics.vector.ImageVectorimport androidx.compose.ui.graphics.vector.path-import androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.unit.dp-import androidx.lifecycle.compose.collectAsStateWithLifecycle-import com.streamvault.app.MainActivityimport com.streamvault.app.Rimport com.streamvault.app.navigation.Routesimport com.streamvault.core.ui.components.shell.CoreAppScreenScaffold@@ -40,6 +36,8 @@ enum class AppNavigationChrome {TopBar}+internal val LocalAppDestinationItems = staticCompositionLocalOf<List<UiDestination>?> { null }+@Composablefun AppScreenScaffold(currentRoute: String,@@ -56,9 +54,15 @@ fun AppScreenScaffold(contentPadding: PaddingValues = PaddingValues(),content: @Composable ColumnScope.() -> Unit) {+ val navigationDestinations = LocalAppDestinationItems.current+ ?: rememberAppDestinationItems(+ configuredDestinations = AppTopLevelDestination.defaultOrder,+ catalogLayout = CatalogLayout.SPLIT+ )+CoreAppScreenScaffold(currentDestinationId = currentRoute,- destinations = rememberAppDestinationItems(),+ destinations = navigationDestinations,onDestinationSelected = onNavigate,title = title,subtitle = subtitle,@@ -105,19 +109,10 @@ internal fun buildDestinationItems(}@Composable-internal fun rememberAppDestinationItems(): List<UiDestination> {- val context = LocalContext.current- val mainActivity = remember(context) { context.findMainActivity() }- val configuredDestinations = mainActivity?.preferencesRepository?.appTopLevelDestinations- ?.collectAsStateWithLifecycle(initialValue = AppTopLevelDestination.defaultOrder)- ?.value- ?: AppTopLevelDestination.defaultOrder- val catalogLayout = mainActivity?.providerRepository?.getActiveProvider()- ?.collectAsStateWithLifecycle(initialValue = null)- ?.value- ?.catalogLayout- ?: CatalogLayout.SPLIT-+internal fun rememberAppDestinationItems(+ configuredDestinations: List<AppTopLevelDestination>,+ catalogLayout: CatalogLayout+): List<UiDestination> {val destinationItems = remember(configuredDestinations, catalogLayout) {buildDestinationItems(configuredDestinations, catalogLayout)}@@ -142,15 +137,6 @@ private fun AppTopLevelDestination.toDestinationItem(): AppDestinationItem = wheAppTopLevelDestination.SETTINGS -> AppDestinationItem(Routes.SETTINGS, R.string.nav_settings, Icons.Default.Settings)}-private fun Context.findMainActivity(): MainActivity? {- var current: Context? = this- while (current is ContextWrapper) {- if (current is MainActivity) return current- current = current.baseContext- }- return null-}-private val PluginBlocksIcon: ImageVectorget() {if (_pluginBlocksIcon != null) return _pluginBlocksIcon!!diff --git a/app/src/test/java/com/streamvault/app/ui/components/shell/AppShellNavigationTest.kt b/app/src/test/java/com/streamvault/app/ui/components/shell/AppShellNavigationTest.ktindex 1270dbd8..c81d7644 100644--- a/app/src/test/java/com/streamvault/app/ui/components/shell/AppShellNavigationTest.kt+++ b/app/src/test/java/com/streamvault/app/ui/components/shell/AppShellNavigationTest.kt@@ -8,6 +8,28 @@ import org.junit.Testclass AppShellNavigationTest {+ @Test+ fun `destination construction is independent of Activity and repository state`() {+ val result = buildDestinationItems(+ configured = AppTopLevelDestination.defaultOrder,+ layout = CatalogLayout.SPLIT+ )++ assertThat(result.map { it.route })+ .containsExactly(+ Routes.HOME,+ Routes.LIVE_TV,+ Routes.MOVIES,+ Routes.SERIES,+ Routes.DOWNLOADS,+ Routes.EPG,+ Routes.SEARCH,+ Routes.PLUGINS,+ Routes.SETTINGS+ )+ .inOrder()+ }+@Testfun splitCatalogPreservesConfiguredMovieAndSeriesDestinations() {val result = buildDestinationItems(