Skip to content

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

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.kt
index 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.BackupImportPreviewDialog
import com.streamvault.core.navigation.AppDestination
import com.streamvault.core.navigation.NavigationActions
import com.streamvault.core.navigation.NavigationOptions
-import com.streamvault.app.ui.components.shell.rememberAppDestinationItems
+import com.streamvault.core.ui.components.shell.UiDestination
import com.streamvault.feature.settings.navigation.registerSettingsGraph
import com.streamvault.feature.settings.parental.ParentalControlGroupScreen
import 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.WELCOME
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
index 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.navigation
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -12,7 +13,10 @@ import androidx.navigation.NavHostController
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.streamvault.app.playback.rememberPlaybackPlatformHost
+import com.streamvault.app.ui.components.shell.LocalAppDestinationItems
+import com.streamvault.app.ui.components.shell.rememberAppDestinationItems
import com.streamvault.core.navigation.AppDestination
+import com.streamvault.domain.model.CatalogLayout
import com.streamvault.feature.catalog.api.CatalogPlatformHost
import 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
+ )
+ }
}
@Composable
diff --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.kt
index 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.ContextWrapper
import androidx.annotation.StringRes
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.PaddingValues
@@ -17,16 +15,14 @@ import androidx.compose.material.icons.filled.Star
import androidx.compose.material.icons.filled.Download
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
+import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.path
-import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.streamvault.app.MainActivity
import com.streamvault.app.R
import com.streamvault.app.navigation.Routes
import com.streamvault.core.ui.components.shell.CoreAppScreenScaffold
@@ -40,6 +36,8 @@ enum class AppNavigationChrome {
TopBar
}
+internal val LocalAppDestinationItems = staticCompositionLocalOf<List<UiDestination>?> { null }
+
@Composable
fun 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 = whe
AppTopLevelDestination.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: ImageVector
get() {
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.kt
index 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.Test
class 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()
+ }
+
@Test
fun splitCatalogPreservesConfiguredMovieAndSeriesDestinations() {
val result = buildDestinationItems(