StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor: extract core shell visuals and app navigation adapter
David Nashash517b272fe0d6
diff --git a/app/src/androidTest/java/com/streamvault/app/ui/PremiumRouteGoldenTest.kt b/app/src/androidTest/java/com/streamvault/app/ui/PremiumRouteGoldenTest.ktindex 8c84fd58..c5248591 100644--- a/app/src/androidTest/java/com/streamvault/app/ui/PremiumRouteGoldenTest.kt+++ b/app/src/androidTest/java/com/streamvault/app/ui/PremiumRouteGoldenTest.kt@@ -11,21 +11,21 @@ import androidx.compose.ui.unit.dpimport androidx.test.ext.junit.runners.AndroidJUnit4import com.streamvault.app.navigation.Routesimport com.streamvault.app.ui.components.SearchInput-import com.streamvault.app.ui.components.shell.AppHeroHeader-import com.streamvault.app.ui.components.shell.AppMessageState+import com.streamvault.core.ui.components.shell.AppHeroHeader+import com.streamvault.core.ui.components.shell.AppMessageStateimport com.streamvault.app.ui.components.shell.AppScreenScaffold-import com.streamvault.app.ui.components.shell.AppSectionHeader+import com.streamvault.core.ui.components.shell.AppSectionHeaderimport com.streamvault.app.ui.components.shell.BrowseHeroPanelimport com.streamvault.app.ui.components.shell.BrowseSearchLaunchCardimport com.streamvault.app.ui.components.shell.CategoryRailPanel-import com.streamvault.app.ui.components.shell.ContentMetadataStrip+import com.streamvault.core.ui.components.shell.ContentMetadataStripimport com.streamvault.app.ui.components.shell.EpisodeRowCardimport com.streamvault.app.ui.components.shell.LibraryBrowseScaffoldimport com.streamvault.app.ui.components.shell.LiveChannelRowSurface-import com.streamvault.app.ui.components.shell.LoadMoreCard+import com.streamvault.core.ui.components.shell.LoadMoreCardimport com.streamvault.app.ui.components.shell.MoviePosterCardimport com.streamvault.app.ui.components.shell.SeriesPosterCard-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.app.ui.test.TestFixturesimport com.streamvault.app.ui.test.assertAgainstGolden@@ -309,7 +309,7 @@ class PremiumRouteGoldenTest {}AppMessageState(title = TestFixtures.currentProgram.title,- subtitle = "21:00 - 22:00 · Focused details stay visible while the timeline scrolls."+ subtitle = "21:00 - 22:00 ֲ· Focused details stay visible while the timeline scrolls.")}}@@ -324,7 +324,7 @@ class PremiumRouteGoldenTest {Column(verticalArrangement = Arrangement.spacedBy(14.dp)) {AppHeroHeader(title = "Pulse IPTV",- subtitle = "1 active provider · Locked groups enabled · System language"+ subtitle = "1 active provider ֲ· Locked groups enabled ֲ· System language")AppMessageState(title = "Provider Sync Healthy",diff --git a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt b/app/src/main/java/com/streamvault/app/ui/components/Cards.ktindex 62148cff..414bc518 100644--- a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt@@ -53,7 +53,7 @@ import com.streamvault.app.Rimport com.streamvault.app.ui.components.rememberCrossfadeImageModelimport com.streamvault.app.ui.components.shell.MoviePosterCardimport com.streamvault.app.ui.components.shell.SeriesPosterCard-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.app.ui.model.formatVodRatingLabelimport com.streamvault.app.ui.model.archivePlaybackCapabilityimport com.streamvault.core.ui.theme.AccentAmberdiff --git a/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt b/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.ktindex e56ffb4f..656634c5 100644--- a/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt@@ -31,7 +31,7 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Textimport com.streamvault.app.R-import com.streamvault.app.ui.components.shell.AppSectionHeader+import com.streamvault.core.ui.components.shell.AppSectionHeaderimport com.streamvault.core.ui.theme.FocusBorderimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.Primary@@ -39,7 +39,7 @@ import com.streamvault.core.ui.theme.SurfaceElevatedimport com.streamvault.core.ui.theme.SurfaceHighlightimport com.streamvault.core.ui.interaction.mouseClickable-// ג”€ג”€ Netflix-style horizontal category row ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€+// ׳’ג€ג‚¬׳’ג€ג‚¬ Netflix-style horizontal category row ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬@OptIn(ExperimentalComposeUiApi::class)@Composablediff --git a/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt b/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.ktindex 8031c2ba..a535113e 100644--- a/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt@@ -19,7 +19,7 @@ import androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.unit.dpimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.app.ui.components.shell.AppMessageState+import com.streamvault.core.ui.components.shell.AppMessageStateimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDimdiff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.ktindex d8467d81..937037c9 100644--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt@@ -60,6 +60,8 @@ import com.streamvault.core.ui.design.AppMotionimport com.streamvault.core.ui.design.FocusSpecimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.interaction.rememberTvInteractionSounds+import com.streamvault.core.ui.components.shell.ContentMetadataStrip+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.app.ui.model.archivePlaybackCapabilityimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Episodediff --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.ktnew file mode 100644index 00000000..5f0d0734--- /dev/null+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.kt@@ -0,0 +1,183 @@+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+import androidx.compose.foundation.layout.RowScope+import androidx.compose.material.icons.Icons+import androidx.compose.material.icons.filled.Home+import androidx.compose.material.icons.filled.Info+import androidx.compose.material.icons.filled.Menu+import androidx.compose.material.icons.filled.PlayArrow+import androidx.compose.material.icons.filled.Search+import androidx.compose.material.icons.filled.Settings+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.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.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+import com.streamvault.core.ui.components.shell.NavigationChrome+import com.streamvault.core.ui.components.shell.UiDestination+import com.streamvault.domain.model.AppTopLevelDestination+import com.streamvault.domain.model.CatalogLayout++enum class AppNavigationChrome {+ Rail,+ TopBar+}++@Composable+fun AppScreenScaffold(+ currentRoute: String,+ onNavigate: (String) -> Unit,+ title: String,+ subtitle: String? = null,+ modifier: Modifier = Modifier,+ navigationChrome: AppNavigationChrome = AppNavigationChrome.Rail,+ topBarVisible: Boolean = true,+ compactHeader: Boolean = false,+ showScreenHeader: Boolean = true,+ header: (@Composable ColumnScope.() -> Unit)? = null,+ topBarActions: (@Composable RowScope.() -> Unit)? = null,+ contentPadding: PaddingValues = PaddingValues(),+ content: @Composable ColumnScope.() -> Unit+) {+ CoreAppScreenScaffold(+ currentDestinationId = currentRoute,+ destinations = rememberAppDestinationItems(),+ onDestinationSelected = onNavigate,+ title = title,+ subtitle = subtitle,+ modifier = modifier,+ navigationChrome = when (navigationChrome) {+ AppNavigationChrome.Rail -> NavigationChrome.Rail+ AppNavigationChrome.TopBar -> NavigationChrome.TopBar+ },+ topBarVisible = topBarVisible,+ compactHeader = compactHeader,+ showScreenHeader = showScreenHeader,+ header = header,+ topBarActions = topBarActions,+ contentPadding = contentPadding,+ content = content+ )+}++internal data class AppDestinationItem(+ val route: String,+ @param:StringRes val labelRes: Int,+ val icon: ImageVector+)++internal fun buildDestinationItems(+ configured: List<AppTopLevelDestination>,+ layout: CatalogLayout+): List<AppDestinationItem> {+ if (layout == CatalogLayout.SPLIT) return configured.map { it.toDestinationItem() }++ var insertedVod = false+ return buildList {+ configured.forEach { destination ->+ when (destination) {+ AppTopLevelDestination.MOVIES,+ AppTopLevelDestination.SERIES -> if (!insertedVod) {+ add(AppDestinationItem(Routes.VOD, R.string.nav_vod, Icons.Default.Star))+ insertedVod = true+ }+ else -> add(destination.toDestinationItem())+ }+ }+ }+}++@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++ return remember(configuredDestinations, catalogLayout) {+ buildDestinationItems(configuredDestinations, catalogLayout).map { item ->+ UiDestination(+ id = item.route,+ label = context.getString(item.labelRes),+ icon = item.icon+ )+ }+ }+}++private fun AppTopLevelDestination.toDestinationItem(): AppDestinationItem = when (this) {+ AppTopLevelDestination.HOME -> AppDestinationItem(Routes.HOME, R.string.nav_home, Icons.Default.Home)+ AppTopLevelDestination.LIVE_TV -> AppDestinationItem(Routes.LIVE_TV, R.string.nav_live_tv, Icons.Default.PlayArrow)+ AppTopLevelDestination.MOVIES -> AppDestinationItem(Routes.MOVIES, R.string.nav_movies, Icons.Default.Star)+ AppTopLevelDestination.SERIES -> AppDestinationItem(Routes.SERIES, R.string.nav_series, Icons.Default.Menu)+ AppTopLevelDestination.DOWNLOADS -> AppDestinationItem(Routes.DOWNLOADS, R.string.nav_downloads, Icons.Default.Download)+ AppTopLevelDestination.GUIDE -> AppDestinationItem(Routes.EPG, R.string.nav_epg, Icons.Default.Info)+ AppTopLevelDestination.SEARCH -> AppDestinationItem(Routes.SEARCH, R.string.search_title, Icons.Default.Search)+ AppTopLevelDestination.PLUGINS -> AppDestinationItem(Routes.PLUGINS, R.string.nav_plugins, PluginBlocksIcon)+ 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!!+ _pluginBlocksIcon = ImageVector.Builder(+ name = "PluginBlocks",+ defaultWidth = 24.dp,+ defaultHeight = 24.dp,+ viewportWidth = 24f,+ viewportHeight = 24f+ ).apply {+ path(fill = SolidColor(Color.Black)) {+ moveTo(3f, 4f)+ horizontalLineTo(10f)+ verticalLineTo(11f)+ horizontalLineTo(3f)+ close()+ moveTo(14f, 4f)+ horizontalLineTo(21f)+ verticalLineTo(11f)+ horizontalLineTo(14f)+ close()+ moveTo(8.5f, 13f)+ horizontalLineTo(15.5f)+ verticalLineTo(20f)+ horizontalLineTo(8.5f)+ close()+ }+ }.build()+ return _pluginBlocksIcon!!+ }++private var _pluginBlocksIcon: ImageVector? = nulldiff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.ktindex 2807c2ae..f277536d 100644--- a/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt@@ -45,6 +45,7 @@ import com.streamvault.core.ui.design.LocalAppSpacingimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvIconButton+import com.streamvault.core.ui.components.shell.ContentMetadataStrip@Composablefun LibraryBrowseScaffold(diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.ktindex f9d98836..83437aa0 100644--- a/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt@@ -56,6 +56,7 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvIconButton+import com.streamvault.core.ui.components.shell.AppSectionHeader@Composablefun VodSectionHeader(diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.ktindex 2a972185..b45fecb9 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt@@ -62,9 +62,9 @@ import com.streamvault.app.ui.components.MovieCardimport com.streamvault.app.ui.components.rememberCrossfadeImageModelimport com.streamvault.app.ui.components.SeriesCardimport com.streamvault.app.ui.components.shell.AppNavigationChrome-import com.streamvault.app.ui.components.shell.AppHeroHeader+import com.streamvault.core.ui.components.shell.AppHeroHeaderimport com.streamvault.app.ui.components.shell.AppScreenScaffold-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.app.ui.time.LocalAppTimeFormatimport com.streamvault.app.ui.time.createDateTimeFormatdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.ktindex 1b481d6a..e293f87a 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt@@ -61,10 +61,10 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialogimport com.streamvault.app.ui.components.dialogs.PremiumDialogActionButtonimport com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.app.ui.components.shell.AppNavigationChrome-import com.streamvault.app.ui.components.shell.AppHeroHeader+import com.streamvault.core.ui.components.shell.AppHeroHeaderimport com.streamvault.app.ui.components.shell.AppScreenScaffold-import com.streamvault.app.ui.components.shell.AppSectionHeader-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.AppSectionHeader+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.theme.OnBackgroundimport com.streamvault.core.ui.theme.OnPrimaryimport com.streamvault.core.ui.theme.OnSurfacediff --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.ktindex 9e63371d..54bef35a 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@@ -51,9 +51,9 @@ import com.streamvault.app.ui.components.CategoryRowimport com.streamvault.app.ui.components.ChannelCardimport com.streamvault.app.ui.components.ChannelProgressTickerimport com.streamvault.app.ui.components.LiveSourceSwitcher-import com.streamvault.app.ui.components.shell.ContentMetadataStrip+import com.streamvault.core.ui.components.shell.ContentMetadataStripimport com.streamvault.app.ui.components.shell.LiveChannelRowSurface-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.app.ui.components.TvEmptyStateimport com.streamvault.app.ui.components.dialogs.CategoryOptionsDialogimport com.streamvault.app.ui.components.dialogs.HiddenCategoriesDialog@@ -168,12 +168,12 @@ private fun HomePreviewHost(}-// ג”€ג”€ Screen ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€+// ׳’ג€ג‚¬׳’ג€ג‚¬ Screen ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬-// ג”€ג”€ Screen ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€+// ׳’ג€ג‚¬׳’ג€ג‚¬ Screen ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬@Composablefun HomeScreen(diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.ktindex 954047f9..d21ea12e 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt@@ -60,9 +60,9 @@ import com.streamvault.app.cast.CastUiEventimport com.streamvault.app.device.rememberIsTelevisionDeviceimport com.streamvault.app.ui.components.rememberCrossfadeImageModelimport com.streamvault.app.util.formatPositionMs-import com.streamvault.app.ui.components.shell.ContentMetadataStrip+import com.streamvault.core.ui.components.shell.ContentMetadataStripimport com.streamvault.app.ui.components.shell.ExternalRatingsStrip-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.core.ui.design.requestFocusSafelyimport com.streamvault.app.ui.model.formatVodRatingLabeldiff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.ktindex a40c7398..f1c088ce 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt@@ -66,10 +66,10 @@ import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.SnackbarHostimport androidx.compose.material3.SnackbarHostStateimport com.streamvault.app.ui.components.shell.BrowseSearchLaunchCard-import com.streamvault.app.ui.components.shell.LoadMoreCard+import com.streamvault.core.ui.components.shell.LoadMoreCardimport com.streamvault.app.ui.components.shell.InfiniteScrollEffectimport com.streamvault.app.ui.components.shell.AppNavigationChrome-import com.streamvault.app.ui.components.shell.AppMessageState+import com.streamvault.core.ui.components.shell.AppMessageStateimport com.streamvault.app.ui.components.shell.AppScreenScaffoldimport androidx.tv.material3.Borderimport com.streamvault.app.ui.components.dialogs.RenameGroupDialogdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.ktindex 42d49271..e63cc930 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt@@ -40,8 +40,8 @@ import androidx.tv.material3.Textimport com.streamvault.app.Rimport com.streamvault.app.ui.components.dialogs.PremiumDialogimport com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton-import com.streamvault.app.ui.components.shell.AppMessageState-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.AppMessageState+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.core.ui.design.FocusSpecimport com.streamvault.domain.model.Channeldiff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.ktindex 57682638..f51673e6 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt@@ -60,7 +60,7 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.app.Rimport com.streamvault.app.device.rememberIsTelevisionDevice-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.app.ui.model.archivePlaybackCapabilityimport com.streamvault.app.ui.screens.player.playerCategoryOverlayItemKey@@ -1146,7 +1146,7 @@ fun CategoryListOverlay(}if (isSelected) {Text(- text = "ג—",+ text = "׳’ג€”ֲ",style = MaterialTheme.typography.labelSmall,color = Color.White.copy(alpha = 0.8f),modifier = Modifier.padding(start = 8.dp)diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.ktindex 030bf1af..cd6c5774 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt@@ -48,7 +48,7 @@ import androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.app.Rimport com.streamvault.app.ui.components.ChannelLogoBadge-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.app.ui.model.archivePlaybackCapabilitydiff --git a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.ktindex 574a996d..32b7c2f3 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt@@ -61,7 +61,7 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialogimport com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.app.ui.components.shell.AppNavigationChromeimport com.streamvault.app.ui.components.shell.AppScreenScaffold-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.core.ui.design.FocusSpecimport com.streamvault.core.ui.interaction.TvButton@@ -411,7 +411,7 @@ private fun PluginCard()val version = plugin.manifest.versionName.ifBlank { "unknown" }Text(- text = "${plugin.packageName} ֲ· v$version",+ text = "${plugin.packageName} ײ²ֲ· v$version",style = MaterialTheme.typography.bodySmall,color = AppColors.TextTertiary,maxLines = 1,@@ -421,7 +421,7 @@ private fun PluginCard(Text(text = listOf(plugin.statusLabel, plugin.lastMessage).filter { it.isNotBlank() }- .joinToString(" ֲ· "),+ .joinToString(" ײ²ֲ· "),style = MaterialTheme.typography.bodySmall,color = AppColors.TextTertiary,maxLines = 2,@@ -726,7 +726,7 @@ private fun PluginConfigurationSelectField(onClick = { onValueChange(option.value) }) {Text(- text = if (option.value == value) "${option.label} ג“" else option.label,+ text = if (option.value == value) "${option.label} ׳’ֲג€" else option.label,maxLines = 1,overflow = TextOverflow.Ellipsis)diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPairingCard.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPairingCard.ktindex 965d0964..7fabe4fc 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPairingCard.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPairingCard.kt@@ -20,7 +20,7 @@ import androidx.tv.material3.Textimport com.streamvault.app.Rimport com.streamvault.app.pairing.ProviderQrPairingStateimport com.streamvault.app.pairing.ProviderQrPairingStatus-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.theme.*@Composablediff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.ktindex 9286d361..aac94fc3 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt@@ -80,7 +80,7 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.app.ui.components.extractProgressFractionimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.app.ui.screens.settings.BackupImportPreviewDialogimport com.streamvault.core.ui.theme.*import com.streamvault.data.remote.stalker.StalkerAdvancedOptions@@ -715,15 +715,15 @@ uiState.stalkerTransportChallenge?.let { challenge ->-// ??? Source type selector ׳³ֲײ²ֲ¿ײ²ֲ½ wide layout (left sidebar) ????????????????????????+// ??? Source type selector ׳³ֲ³ײ²ֲ׳²ֲ²ײ²ֲ¿׳²ֲ²ײ²ֲ½ wide layout (left sidebar) ????????????????????????-// ??? Source type row ׳³ֲײ²ֲ¿ײ²ֲ½ narrow layout (top tabs) ???????????????????????????????+// ??? Source type row ׳³ֲ³ײ²ֲ׳²ֲ²ײ²ֲ¿׳²ֲ²ײ²ֲ½ narrow layout (top tabs) ???????????????????????????????// ??? ProviderTextField ????????????????????????????????????????????????????????//// Key fix: uses BasicTextField with decorationBox and tracks focus via-// onFocusEvent { it.hasFocus } ׳³ֲײ²ֲ¿ײ²ֲ½ hasFocus is true when this node OR any+// onFocusEvent { it.hasFocus } ׳³ֲ³ײ²ֲ׳²ֲ²ײ²ֲ¿׳²ֲ²ײ²ֲ½ hasFocus is true when this node OR any// descendant (the actual cursor/text composable) has focus. The old approach// used onFocusChanged { isFocused } on an outer Box, which became false the// moment the inner BasicTextField took focus, breaking keyboard scroll.@@ -733,9 +733,9 @@ uiState.stalkerTransportChallenge?.let { challenge ->// ??? TabButton (used by SourceTypeTabRow) ?????????????????????????????????????-// ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬ Revealing password visual transformation ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬+// ׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬ Revealing password visual transformation ׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬-// ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬ File cleanup helpers ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬+// ׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬ File cleanup helpers ׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬// ??? Jellyfin form ?????????????????????????????????????????????????????????????diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.ktindex da542992..a7cb23dd 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt@@ -16,7 +16,7 @@ import androidx.tv.material3.Surface as TvSurfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.app.R-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.theme.*diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.ktindex 4fb12b03..03436d25 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt@@ -20,7 +20,7 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Textimport com.streamvault.app.R-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.theme.AccentAmberimport com.streamvault.core.ui.theme.FocusBorderdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSyncDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSyncDialog.ktindex 951bb29b..a43dc1df 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSyncDialog.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSyncDialog.kt@@ -30,7 +30,7 @@ import androidx.tv.material3.Textimport com.streamvault.app.Rimport com.streamvault.app.ui.components.dialogs.PremiumDialogimport com.streamvault.app.ui.components.extractProgressFraction-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.theme.*@Composablediff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.ktindex 2801cc87..b770492d 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt@@ -63,10 +63,10 @@ import com.streamvault.app.cast.CastUiEventimport com.streamvault.app.device.rememberIsTelevisionDeviceimport com.streamvault.app.ui.components.rememberCrossfadeImageModelimport com.streamvault.app.util.formatPositionMs-import com.streamvault.app.ui.components.shell.ContentMetadataStrip+import com.streamvault.core.ui.components.shell.ContentMetadataStripimport com.streamvault.app.ui.components.shell.EpisodeRowCardimport com.streamvault.app.ui.components.shell.ExternalRatingsStrip-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.app.ui.model.formatVodRatingLabelimport com.streamvault.domain.model.Episodediff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.ktindex b71556f4..b10e4af6 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt@@ -68,10 +68,10 @@ import com.streamvault.app.ui.components.dialogs.DeleteGroupDialogimport com.streamvault.app.ui.components.dialogs.RenameGroupDialogimport com.streamvault.app.ui.components.shell.BrowseHeroPanelimport com.streamvault.app.ui.components.shell.BrowseSearchLaunchCard-import com.streamvault.app.ui.components.shell.LoadMoreCard+import com.streamvault.core.ui.components.shell.LoadMoreCardimport com.streamvault.app.ui.components.shell.InfiniteScrollEffectimport com.streamvault.app.ui.components.shell.AppNavigationChrome-import com.streamvault.app.ui.components.shell.AppMessageState+import com.streamvault.core.ui.components.shell.AppMessageStateimport com.streamvault.app.ui.components.shell.AppScreenScaffoldimport com.streamvault.app.ui.components.shell.VodActionChipimport com.streamvault.app.ui.components.shell.VodActionChipRowdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.ktindex 73937a46..3b23ddb4 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt@@ -28,7 +28,7 @@ import com.streamvault.app.device.removableAppStorageDirsimport java.io.Fileimport com.streamvault.app.diagnostics.CrashReportStoreimport com.streamvault.app.util.OfficialBuildVerifier-import com.streamvault.app.ui.components.shell.AppTopBarCloseAction+import com.streamvault.core.ui.components.shell.AppTopBarCloseActionimport com.streamvault.app.ui.components.shell.AppNavigationChromeimport com.streamvault.app.ui.components.shell.AppScreenScaffoldimport com.streamvault.core.ui.theme.*@@ -362,7 +362,8 @@ fun SettingsScreen(showScreenHeader = false,topBarActions = {AppTopBarCloseAction(- onClick = { mainActivity?.finishAffinity() }+ onClick = { mainActivity?.finishAffinity() },+ contentDescription = stringResource(R.string.settings_close_app))}) {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreen.ktindex c476011e..6a6319fd 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreen.kt@@ -35,11 +35,11 @@ import com.streamvault.app.ui.components.MovieCardimport com.streamvault.app.ui.components.SearchInputimport com.streamvault.app.ui.components.SelectionChipimport com.streamvault.app.ui.components.SeriesCard-import com.streamvault.app.ui.components.shell.AppMessageState+import com.streamvault.core.ui.components.shell.AppMessageStateimport com.streamvault.app.ui.components.shell.AppNavigationChromeimport com.streamvault.app.ui.components.shell.AppScreenScaffoldimport com.streamvault.app.ui.components.shell.InfiniteScrollEffect-import com.streamvault.app.ui.components.shell.LoadMoreCard+import com.streamvault.core.ui.components.shell.LoadMoreCardimport com.streamvault.app.ui.components.shell.VodActionChipimport com.streamvault.app.ui.components.shell.VodActionChipRowimport com.streamvault.app.ui.components.shell.VodBrowseOptionsDialogdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.ktindex 2f02e06f..fc8ea1e6 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt@@ -36,7 +36,7 @@ import androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.app.BuildConfigimport com.streamvault.app.R-import com.streamvault.app.ui.components.shell.StatusPill+import com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.data.sync.SyncProgressBusdiff --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.ktnew file mode 100644index 00000000..1270dbd8--- /dev/null+++ b/app/src/test/java/com/streamvault/app/ui/components/shell/AppShellNavigationTest.kt@@ -0,0 +1,38 @@+package com.streamvault.app.ui.components.shell++import com.google.common.truth.Truth.assertThat+import com.streamvault.app.navigation.Routes+import com.streamvault.domain.model.AppTopLevelDestination+import com.streamvault.domain.model.CatalogLayout+import org.junit.Test++class AppShellNavigationTest {++ @Test+ fun splitCatalogPreservesConfiguredMovieAndSeriesDestinations() {+ val result = buildDestinationItems(+ configured = listOf(AppTopLevelDestination.MOVIES, AppTopLevelDestination.SERIES),+ layout = CatalogLayout.SPLIT+ )++ assertThat(result.map { it.route })+ .containsExactly(Routes.MOVIES, Routes.SERIES)+ .inOrder()+ }++ @Test+ fun unifiedCatalogReplacesMovieAndSeriesWithOneVodDestination() {+ val result = buildDestinationItems(+ configured = listOf(+ AppTopLevelDestination.HOME,+ AppTopLevelDestination.MOVIES,+ AppTopLevelDestination.SERIES+ ),+ layout = CatalogLayout.UNIFIED_VOD+ )++ assertThat(result.map { it.route })+ .containsExactly(Routes.HOME, Routes.VOD)+ .inOrder()+ }+}diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.ktsindex c8bc81c7..3280d64f 100644--- a/core/ui/build.gradle.kts+++ b/core/ui/build.gradle.kts@@ -98,4 +98,11 @@ dependencies {testImplementation(libs.junit)testImplementation(libs.robolectric)testImplementation(libs.truth)++ androidTestImplementation(platform(libs.compose.bom))+ androidTestImplementation("androidx.compose.ui:ui-test-junit4")+ androidTestImplementation(libs.androidx.test.ext.junit)+ androidTestImplementation(libs.androidx.test.runner)+ androidTestImplementation(libs.truth)+ debugImplementation("androidx.compose.ui:ui-test-manifest")}diff --git a/core/ui/src/androidTest/java/com/streamvault/core/ui/components/shell/CoreAppScreenScaffoldTest.kt b/core/ui/src/androidTest/java/com/streamvault/core/ui/components/shell/CoreAppScreenScaffoldTest.ktnew file mode 100644index 00000000..a0f42c1b--- /dev/null+++ b/core/ui/src/androidTest/java/com/streamvault/core/ui/components/shell/CoreAppScreenScaffoldTest.kt@@ -0,0 +1,47 @@+package com.streamvault.core.ui.components.shell++import androidx.compose.material.icons.Icons+import androidx.compose.material.icons.filled.Home+import androidx.compose.ui.test.onNodeWithContentDescription+import androidx.compose.ui.test.performSemanticsAction+import androidx.compose.ui.semantics.SemanticsActions+import androidx.compose.ui.test.hasClickAction+import androidx.compose.ui.test.hasText+import androidx.compose.ui.test.junit4.createComposeRule+import androidx.tv.material3.MaterialTheme+import org.junit.Rule+import org.junit.Test+import com.google.common.truth.Truth.assertThat++class CoreAppScreenScaffoldTest {++ @get:Rule+ val composeRule = createComposeRule()++ @Test+ fun exposesDestinationSemanticsAndForwardsSelection() {+ var selectedDestination: String? = null+ composeRule.setContent {+ MaterialTheme {+ CoreAppScreenScaffold(+ currentDestinationId = "home",+ destinations = listOf(+ UiDestination(id = "home", label = "Home", icon = Icons.Default.Home),+ UiDestination(id = "settings", label = "Settings", icon = Icons.Default.Home)+ ),+ onDestinationSelected = { selectedDestination = it },+ title = "Home"+ ) {}+ }+ }++ composeRule.onNodeWithContentDescription("streamvault.destination:home").assertExists()+ composeRule+ .onNode(hasText("Settings") and hasClickAction())+ .performSemanticsAction(SemanticsActions.OnClick)++ composeRule.runOnIdle {+ assertThat(selectedDestination).isEqualTo("settings")+ }+ }+}diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt b/core/ui/src/main/java/com/streamvault/core/ui/components/shell/AppShellVisuals.ktsimilarity index 66%rename from app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.ktrename to core/ui/src/main/java/com/streamvault/core/ui/components/shell/AppShellVisuals.ktindex 8ffc5e97..b9ea5385 100644--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt+++ b/core/ui/src/main/java/com/streamvault/core/ui/components/shell/AppShellVisuals.kt@@ -1,17 +1,16 @@-package com.streamvault.app.ui.components.shell+package com.streamvault.core.ui.components.shell-import android.content.Context-import android.content.ContextWrapper-import androidx.annotation.StringResimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.background+import androidx.compose.foundation.horizontalScrollimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.ColumnScopeimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.RowScopeimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxHeightimport androidx.compose.foundation.layout.fillMaxSize@@ -21,26 +20,16 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.layout.wrapContentWidth-import androidx.compose.foundation.layout.RowScopeimport androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.foundation.horizontalScrollimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ExitToApp-import androidx.compose.material.icons.filled.Homeimport androidx.compose.material.icons.filled.Info-import androidx.compose.material.icons.filled.Menu-import androidx.compose.material.icons.filled.Search-import androidx.compose.material.icons.filled.Settings-import androidx.compose.material.icons.filled.PlayArrow-import androidx.compose.material.icons.filled.Star-import androidx.compose.material.icons.filled.Downloadimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValue-import androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clip@@ -48,25 +37,21 @@ import androidx.compose.ui.focus.FocusRequesterimport androidx.compose.ui.focus.focusPropertiesimport androidx.compose.ui.focus.focusRequesterimport androidx.compose.ui.focus.onFocusChanged-import androidx.compose.ui.zIndeximport androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.graphics.SolidColorimport androidx.compose.ui.graphics.graphicsLayerimport androidx.compose.ui.graphics.vector.ImageVector-import androidx.compose.ui.graphics.vector.path-import androidx.compose.ui.res.stringResourceimport androidx.compose.ui.semantics.LiveRegionModeimport androidx.compose.ui.semantics.contentDescriptionimport androidx.compose.ui.semantics.headingimport androidx.compose.ui.semantics.liveRegion+import androidx.compose.ui.semantics.onClickimport androidx.compose.ui.semantics.semanticsimport androidx.compose.ui.text.TextStyleimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.dp-import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.tv.material3.Borderimport androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.Icon@@ -74,34 +59,35 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Text-import com.streamvault.app.R-import com.streamvault.app.MainActivity-import com.streamvault.app.navigation.toAppRoute-import com.streamvault.app.navigation.Routesimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.core.ui.design.AppMotionimport com.streamvault.core.ui.design.FocusSpec-import com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.interaction.rememberTvInteractionSounds-import com.streamvault.core.ui.interaction.TvIconButtonimport com.streamvault.core.ui.design.LocalAppShapesimport com.streamvault.core.ui.design.LocalAppSpacing-import com.streamvault.domain.model.AppTopLevelDestination-import com.streamvault.domain.model.CatalogLayout+import com.streamvault.core.ui.interaction.TvIconButton+import com.streamvault.core.ui.interaction.mouseClickable+import com.streamvault.core.ui.interaction.rememberTvInteractionSounds-enum class AppNavigationChrome {+enum class NavigationChrome {Rail,TopBar}+data class UiDestination(+ val id: String,+ val label: String,+ val icon: ImageVector+)+@Composable-fun AppScreenScaffold(- currentRoute: String,- onNavigate: (String) -> Unit,+fun CoreAppScreenScaffold(+ currentDestinationId: String,+ destinations: List<UiDestination>,+ onDestinationSelected: (String) -> Unit,title: String,subtitle: String? = null,modifier: Modifier = Modifier,- navigationChrome: AppNavigationChrome = AppNavigationChrome.Rail,+ navigationChrome: NavigationChrome = NavigationChrome.Rail,topBarVisible: Boolean = true,compactHeader: Boolean = false,showScreenHeader: Boolean = true,@@ -116,7 +102,7 @@ fun AppScreenScaffold(modifier = modifier.fillMaxSize().semantics {- contentDescription = "streamvault.destination:$currentRoute"+ contentDescription = "streamvault.destination:$currentDestinationId"}.background(Brush.linearGradient(@@ -128,11 +114,12 @@ fun AppScreenScaffold())) {- if (navigationChrome == AppNavigationChrome.Rail) {+ if (navigationChrome == NavigationChrome.Rail) {Row(modifier = Modifier.fillMaxSize()) {DestinationRail(- currentRoute = currentRoute,- onNavigate = onNavigate,+ currentDestinationId = currentDestinationId,+ destinations = destinations,+ onDestinationSelected = onDestinationSelected,modifier = Modifier.fillMaxHeight().width(spacing.railWidth)@@ -176,15 +163,13 @@ fun AppScreenScaffold(Column(modifier = Modifier.fillMaxSize()- .padding(- horizontal = 14.dp,- vertical = 10.dp- )+ .padding(horizontal = 14.dp, vertical = 10.dp)) {if (topBarVisible) {TopNavigationBar(- currentRoute = currentRoute,- onNavigate = onNavigate,+ currentDestinationId = currentDestinationId,+ destinations = destinations,+ onDestinationSelected = onDestinationSelected,actions = topBarActions,modifier = Modifier.fillMaxWidth())@@ -258,21 +243,20 @@ fun AppScreenHeader(@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class)@Composableprivate fun TopNavigationBar(- currentRoute: String,- onNavigate: (String) -> Unit,+ currentDestinationId: String,+ destinations: List<UiDestination>,+ onDestinationSelected: (String) -> Unit,actions: (@Composable RowScope.() -> Unit)? = null,modifier: Modifier = Modifier) {- val items = rememberDestinationItems()val scrollState = rememberScrollState()-val focusRequesters = remember { mutableMapOf<String, FocusRequester>() }-+Surface(modifier = modifier.focusProperties {onEnter = {- val activeItem = findActiveDestinationItem(items, currentRoute)- focusRequesters[activeItem?.route] ?: FocusRequester.Default+ val activeItem = findActiveDestination(destinations, currentDestinationId)+ focusRequesters[activeItem?.id] ?: FocusRequester.Default}},shape = RoundedCornerShape(18.dp),@@ -287,12 +271,12 @@ private fun TopNavigationBar(horizontalArrangement = Arrangement.spacedBy(8.dp)) {Text(- text = stringResource(R.string.app_name),+ text = "StreamVault",style = MaterialTheme.typography.titleSmall,color = AppColors.TextPrimary,modifier = Modifier.wrapContentWidth(Alignment.Start))- Spacer(modifier = Modifier.width(32.dp)) // Increased spacing to prevent overlap+ Spacer(modifier = Modifier.width(32.dp))Row(modifier = Modifier.weight(1f)@@ -300,16 +284,15 @@ private fun TopNavigationBar(.padding(horizontal = 12.dp),horizontalArrangement = Arrangement.spacedBy(6.dp)) {- items.forEach { item ->- val requester = focusRequesters.getOrPut(item.route) { FocusRequester() }+ destinations.forEach { destination ->+ val requester = focusRequesters.getOrPut(destination.id) { FocusRequester() }TopNavigationButton(- label = stringResource(item.labelRes),- icon = item.icon,- selected = currentRoute.startsWith(item.route),+ destination = destination,+ selected = currentDestinationId.startsWith(destination.id),focusRequester = requester,onClick = {- if (!currentRoute.startsWith(item.route)) {- onNavigate(item.route)+ if (!currentDestinationId.startsWith(destination.id)) {+ onDestinationSelected(destination.id)}})@@ -329,8 +312,8 @@ private fun TopNavigationBar(@Composablefun AppTopBarCloseAction(onClick: () -> Unit,- modifier: Modifier = Modifier,- contentDescription: String = stringResource(R.string.settings_close_app)+ contentDescription: String,+ modifier: Modifier = Modifier) {TvIconButton(onClick = onClick,@@ -358,8 +341,7 @@ fun AppTopBarCloseAction(@Composableprivate fun TopNavigationButton(- label: String,- icon: ImageVector,+ destination: UiDestination,selected: Boolean,focusRequester: FocusRequester,modifier: Modifier = Modifier,@@ -387,15 +369,12 @@ private fun TopNavigationButton(onClick()})- .zIndex(if (isFocused) 1f else 0f) // Keep focused button on top.graphicsLayer {scaleX = scalescaleY = scale}.onFocusChanged {- if (it.isFocused && !isFocused) {- sounds.playNavigate()- }+ if (it.isFocused && !isFocused) sounds.playNavigate()isFocused = it.isFocused},shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),@@ -416,13 +395,13 @@ private fun TopNavigationButton(verticalAlignment = Alignment.CenterVertically) {Icon(- imageVector = icon,- contentDescription = label,+ imageVector = destination.icon,+ contentDescription = destination.label,tint = if (selected) AppColors.Brand else AppColors.TextSecondary,modifier = Modifier.size(14.dp))Text(- text = label,+ text = destination.label,style = MaterialTheme.typography.labelSmall,color = if (selected) AppColors.TextPrimary else AppColors.TextSecondary)@@ -450,21 +429,13 @@ fun AppHeroHeader(.clip(RoundedCornerShape(28.dp)).background(Brush.horizontalGradient(- colors = listOf(- AppColors.Canvas,- AppColors.SurfaceAccent,- AppColors.SurfaceEmphasis- )+ colors = listOf(AppColors.Canvas, AppColors.SurfaceAccent, AppColors.SurfaceEmphasis))).padding(32.dp)) {Column(verticalArrangement = Arrangement.spacedBy(18.dp)) {- AppScreenHeader(- title = title,- subtitle = subtitle,- eyebrow = eyebrow- )+ AppScreenHeader(title = title, subtitle = subtitle, eyebrow = eyebrow)if (actions != null) {Row(horizontalArrangement = Arrangement.spacedBy(12.dp),@@ -472,9 +443,7 @@ fun AppHeroHeader(content = actions)}- if (footer != null) {- footer()- }+ if (footer != null) footer()}}}@@ -506,24 +475,16 @@ fun AppSectionHeader(modifier = Modifier.semantics { heading() })if (!subtitle.isNullOrBlank()) {- Text(- text = subtitle,- style = MaterialTheme.typography.bodySmall,- color = AppColors.TextTertiary- )+ Text(text = subtitle, style = MaterialTheme.typography.bodySmall, color = AppColors.TextTertiary)}}-if (onActionClick != null && !actionLabel.isNullOrBlank()) {val actionFocusRequester = remember { FocusRequester() }Surface(onClick = onActionClick,modifier = Modifier.focusRequester(actionFocusRequester)- .mouseClickable(- focusRequester = actionFocusRequester,- onClick = onActionClick- ),+ .mouseClickable(focusRequester = actionFocusRequester, onClick = onActionClick),shape = ClickableSurfaceDefaults.shape(shapes.pill),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.Brand.copy(alpha = 0.12f),@@ -531,11 +492,7 @@ fun AppSectionHeader(contentColor = actionContentColor)) {- Text(- text = actionLabel,- style = MaterialTheme.typography.labelSmall,- modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp)- )+ Text(text = actionLabel, style = MaterialTheme.typography.labelSmall, modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp))}}}@@ -557,11 +514,7 @@ fun StatusPill(.background(containerColor).padding(horizontal = horizontalPadding, vertical = verticalPadding)) {- Text(- text = label,- style = MaterialTheme.typography.labelSmall,- color = contentColor- )+ Text(text = label, style = MaterialTheme.typography.labelSmall, color = contentColor)}}@@ -586,10 +539,7 @@ fun AppMessageState(modifier = modifier.semantics { liveRegion = LiveRegionMode.Polite },shape = resolvedShape,border = Border(- border = BorderStroke(- width = if (borderColor != null) 1.dp else 0.dp,- color = borderColor ?: Color.Transparent- ),+ border = BorderStroke(if (borderColor != null) 1.dp else 0.dp, borderColor ?: Color.Transparent),shape = resolvedShape),colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated)@@ -600,20 +550,8 @@ fun AppMessageState(.padding(horizontal = 18.dp, vertical = 16.dp),verticalArrangement = Arrangement.spacedBy(8.dp)) {- Text(- text = title,- style = titleStyle,- color = titleColor,- textAlign = titleTextAlign,- modifier = Modifier.fillMaxWidth()- )- Text(- text = subtitle,- style = subtitleStyle,- color = subtitleColor,- textAlign = subtitleTextAlign,- modifier = Modifier.fillMaxWidth()- )+ Text(text = title, style = titleStyle, color = titleColor, textAlign = titleTextAlign, modifier = Modifier.fillMaxWidth())+ Text(text = subtitle, style = subtitleStyle, color = subtitleColor, textAlign = subtitleTextAlign, modifier = Modifier.fillMaxWidth())if (action != null) {Spacer(modifier = Modifier.height(8.dp))action()@@ -634,10 +572,7 @@ fun LoadMoreCard(onClick = onClick,modifier = modifier.focusRequester(focusRequester)- .mouseClickable(- focusRequester = focusRequester,- onClick = onClick- ),+ .mouseClickable(focusRequester = focusRequester, onClick = onClick),shape = ClickableSurfaceDefaults.shape(shapes.medium),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated,@@ -655,17 +590,8 @@ fun LoadMoreCard(horizontalArrangement = Arrangement.spacedBy(8.dp),verticalAlignment = Alignment.CenterVertically) {- Icon(- imageVector = Icons.Default.Info,- contentDescription = label,- tint = AppColors.Brand,- modifier = Modifier.size(18.dp)- )- Text(- text = label,- style = MaterialTheme.typography.titleMedium,- color = AppColors.TextPrimary- )+ Icon(imageVector = Icons.Default.Info, contentDescription = label, tint = AppColors.Brand, modifier = Modifier.size(18.dp))+ Text(text = label, style = MaterialTheme.typography.titleMedium, color = AppColors.TextPrimary)}}}@@ -682,11 +608,7 @@ fun ContentMetadataStrip(verticalAlignment = Alignment.CenterVertically) {filteredValues.forEachIndexed { index, value ->- Text(- text = value,- style = MaterialTheme.typography.labelMedium,- color = AppColors.TextSecondary- )+ Text(text = value, style = MaterialTheme.typography.labelMedium, color = AppColors.TextSecondary)if (index < filteredValues.lastIndex) {Box(modifier = Modifier@@ -702,30 +624,23 @@ fun ContentMetadataStrip(@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class)@Composableprivate fun DestinationRail(- currentRoute: String,- onNavigate: (String) -> Unit,+ currentDestinationId: String,+ destinations: List<UiDestination>,+ onDestinationSelected: (String) -> Unit,modifier: Modifier = Modifier) {val spacing = LocalAppSpacing.current- val items = rememberDestinationItems()val focusRequesters = remember { mutableMapOf<String, FocusRequester>() }Box(modifier = modifier.padding(start = spacing.lg, top = spacing.safeTop, bottom = spacing.safeBottom).clip(RoundedCornerShape(28.dp))- .background(- Brush.verticalGradient(- colors = listOf(- AppColors.SurfaceElevated,- AppColors.Surface- )- )- )+ .background(Brush.verticalGradient(colors = listOf(AppColors.SurfaceElevated, AppColors.Surface))).focusProperties {onEnter = {- val activeItem = findActiveDestinationItem(items, currentRoute)- focusRequesters[activeItem?.route] ?: FocusRequester.Default+ val activeItem = findActiveDestination(destinations, currentDestinationId)+ focusRequesters[activeItem?.id] ?: FocusRequester.Default}}) {@@ -735,27 +650,18 @@ private fun DestinationRail(.padding(horizontal = 12.dp, vertical = 20.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {- Text(- text = stringResource(R.string.app_name),- style = MaterialTheme.typography.titleMedium,- color = AppColors.TextPrimary- )- Text(- text = stringResource(R.string.label_tv),- style = MaterialTheme.typography.labelSmall,- color = AppColors.TextTertiary- )+ Text(text = "StreamVault", style = MaterialTheme.typography.titleMedium, color = AppColors.TextPrimary)+ Text(text = "TV", style = MaterialTheme.typography.labelSmall, color = AppColors.TextTertiary)Spacer(modifier = Modifier.height(10.dp))- items.forEach { item ->- val requester = focusRequesters.getOrPut(item.route) { FocusRequester() }+ destinations.forEach { destination ->+ val requester = focusRequesters.getOrPut(destination.id) { FocusRequester() }RailButton(- label = stringResource(item.labelRes),- icon = item.icon,- selected = currentRoute.startsWith(item.route),+ destination = destination,+ selected = currentDestinationId.startsWith(destination.id),modifier = Modifier.focusRequester(requester),onClick = {- if (!currentRoute.startsWith(item.route)) {- onNavigate(item.route)+ if (!currentDestinationId.startsWith(destination.id)) {+ onDestinationSelected(destination.id)}})@@ -766,8 +672,7 @@ private fun DestinationRail(@Composableprivate fun RailButton(- label: String,- icon: ImageVector,+ destination: UiDestination,selected: Boolean,onClick: () -> Unit,modifier: Modifier = Modifier@@ -783,11 +688,15 @@ private fun RailButton(Surface(onClick = onClick,modifier = modifier+ .semantics {+ contentDescription = destination.label+ onClick(label = destination.label) {+ onClick()+ true+ }+ }.focusRequester(focusRequester)- .mouseClickable(- focusRequester = focusRequester,- onClick = onClick- )+ .mouseClickable(focusRequester = focusRequester, onClick = onClick).fillMaxWidth().graphicsLayer {scaleX = scale@@ -814,13 +723,13 @@ private fun RailButton(verticalAlignment = Alignment.CenterVertically) {Icon(- imageVector = icon,- contentDescription = label,+ imageVector = destination.icon,+ contentDescription = destination.label,tint = if (selected) AppColors.Brand else AppColors.TextSecondary,modifier = Modifier.size(20.dp))Text(- text = label,+ text = destination.label,style = MaterialTheme.typography.titleSmall,color = if (selected) AppColors.TextPrimary else AppColors.TextSecondary,maxLines = 1,@@ -830,112 +739,10 @@ private fun RailButton(}}-private data class DestinationItem(- val route: String,- @param:StringRes val labelRes: Int,- val icon: ImageVector-)--private fun findActiveDestinationItem(- items: List<DestinationItem>,- currentRoute: String-): DestinationItem? =- items- .filter { currentRoute.startsWith(it.route) }- .maxByOrNull { it.route.length }- ?: items.firstOrNull { it.route == currentRoute }--private fun buildDestinationItems(): List<DestinationItem> =- AppTopLevelDestination.defaultOrder.map { it.toDestinationItem() }--private fun buildDestinationItems(- configured: List<AppTopLevelDestination>,- layout: CatalogLayout-): List<DestinationItem> {- if (layout == CatalogLayout.SPLIT) return configured.map { it.toDestinationItem() }- var insertedVod = false- return buildList {- configured.forEach { destination ->- when (destination) {- AppTopLevelDestination.MOVIES,- AppTopLevelDestination.SERIES -> if (!insertedVod) {- add(DestinationItem(Routes.VOD, R.string.nav_vod, Icons.Default.Star))- insertedVod = true- }- else -> add(destination.toDestinationItem())- }- }- }-}--@Composable-private fun rememberDestinationItems(): List<DestinationItem> {- 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- return remember(configuredDestinations, catalogLayout) {- buildDestinationItems(configuredDestinations, catalogLayout)- }-}--private fun AppTopLevelDestination.toDestinationItem(): DestinationItem = when (this) {- AppTopLevelDestination.HOME -> DestinationItem(Routes.HOME, R.string.nav_home, Icons.Default.Home)- AppTopLevelDestination.LIVE_TV -> DestinationItem(Routes.LIVE_TV, R.string.nav_live_tv, Icons.Default.PlayArrow)- AppTopLevelDestination.MOVIES -> DestinationItem(Routes.MOVIES, R.string.nav_movies, Icons.Default.Star)- AppTopLevelDestination.SERIES -> DestinationItem(Routes.SERIES, R.string.nav_series, Icons.Default.Menu)- AppTopLevelDestination.DOWNLOADS -> DestinationItem(Routes.DOWNLOADS, R.string.nav_downloads, Icons.Default.Download)- AppTopLevelDestination.GUIDE -> DestinationItem(Routes.EPG, R.string.nav_epg, Icons.Default.Info)- AppTopLevelDestination.SEARCH -> DestinationItem(Routes.SEARCH, R.string.search_title, Icons.Default.Search)- AppTopLevelDestination.PLUGINS -> DestinationItem(Routes.PLUGINS, R.string.nav_plugins, PluginBlocksIcon)- AppTopLevelDestination.SETTINGS -> DestinationItem(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!!- _pluginBlocksIcon = ImageVector.Builder(- name = "PluginBlocks",- defaultWidth = 24.dp,- defaultHeight = 24.dp,- viewportWidth = 24f,- viewportHeight = 24f- ).apply {- path(fill = SolidColor(Color.Black)) {- moveTo(3f, 4f)- horizontalLineTo(10f)- verticalLineTo(11f)- horizontalLineTo(3f)- close()- moveTo(14f, 4f)- horizontalLineTo(21f)- verticalLineTo(11f)- horizontalLineTo(14f)- close()- moveTo(8.5f, 13f)- horizontalLineTo(15.5f)- verticalLineTo(20f)- horizontalLineTo(8.5f)- close()- }- }.build()- return _pluginBlocksIcon!!- }--private var _pluginBlocksIcon: ImageVector? = null+private fun findActiveDestination(+ destinations: List<UiDestination>,+ currentDestinationId: String+): UiDestination? = destinations+ .filter { currentDestinationId.startsWith(it.id) }+ .maxByOrNull { it.id.length }+ ?: destinations.firstOrNull { it.id == currentDestinationId }