StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Modernize browsing visuals while preserving settings and VOD controls
David Nashash6db40bb8c275
diff --git a/app/src/androidTest/java/com/streamvault/app/ui/BrowseVisualJourneyTest.kt b/app/src/androidTest/java/com/streamvault/app/ui/BrowseVisualJourneyTest.ktnew file mode 100644index 00000000..7fba1e3d--- /dev/null+++ b/app/src/androidTest/java/com/streamvault/app/ui/BrowseVisualJourneyTest.kt@@ -0,0 +1,127 @@+package com.streamvault.app.ui++import android.app.Application+import android.content.Intent+import android.os.SystemClock+import androidx.test.core.app.ActivityScenario+import androidx.test.core.app.ApplicationProvider+import androidx.test.ext.junit.runners.AndroidJUnit4+import androidx.test.platform.app.InstrumentationRegistry+import androidx.test.uiautomator.By+import androidx.test.uiautomator.UiDevice+import androidx.test.uiautomator.UiObject2+import androidx.test.uiautomator.Until+import com.streamvault.app.MainActivity+import com.streamvault.app.benchmark.XtreamSyncBenchmarkEntryPoint+import com.streamvault.domain.model.AppLandingDestination+import com.streamvault.domain.model.AppTheme+import com.streamvault.domain.usecase.ValidateAndAddProviderResult+import com.streamvault.domain.usecase.XtreamProviderSetupCommand+import dagger.hilt.android.EntryPointAccessors+import java.io.File+import kotlinx.coroutines.flow.first+import kotlinx.coroutines.runBlocking+import org.junit.Assume.assumeTrue+import org.junit.Test+import org.junit.runner.RunWith++/** Opt-in production-screen visual review against tools/catalog_xtream_fixture.py.+ * Requires an empty debug install; removes only the provider created by this journey.+ * These captures review UI, and do not claim to validate media playback.+ */+@RunWith(AndroidJUnit4::class)+class BrowseVisualJourneyTest {+ @Test+ fun captureProductionScreensAcrossThemes() = runBlocking<Unit> {+ assumeTrue(InstrumentationRegistry.getArguments().getString("visualRefresh") == "true")+ val app = ApplicationProvider.getApplicationContext<Application>()+ check(app.packageName.endsWith(".debug"))+ val graph = EntryPointAccessors.fromApplication(app, XtreamSyncBenchmarkEntryPoint::class.java)+ check(graph.providers().getProviders().first().isEmpty()) { "Use an empty debug install" }+ val prefs = graph.preferences()+ val originalTheme = prefs.appTheme.first()+ val originalLanding = prefs.appLandingDestination.first()+ val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())+ val directory = File(app.getExternalFilesDir(null), "visual-refresh").apply { mkdirs() }+ var ownedProviderId: Long? = null+ try {+ val result = graph.setup().loginXtream(XtreamProviderSetupCommand(+ serverUrl = "http://10.0.2.2:8765", username = "visual", password = "fixture",+ name = "Visual Review", xtreamFastSyncEnabled = false,+ ))+ ownedProviderId = when (result) {+ is ValidateAndAddProviderResult.Success -> result.provider.id+ is ValidateAndAddProviderResult.SavedWithWarning -> result.provider.id+ else -> error("Local fixture setup failed: ${result.javaClass.simpleName}")+ }+ prefs.setAppLandingDestination(AppLandingDestination.HOME)+ for (theme in AppTheme.entries) {+ prefs.setAppTheme(theme)+ ActivityScenario.launch<MainActivity>(Intent(app, MainActivity::class.java)).use {+ check(device.wait(Until.hasObject(By.text("Home")), 30_000))+ SystemClock.sleep(2_000)+ capture(device, directory, "${theme.storageValue}_home")+ for ((label, route) in listOf(+ "Movies" to "movies", "Series" to "series", "Live TV" to "live_tv",+ "Guide" to "epg", "Search" to "search", "Downloads" to "downloads",+ "Plugins" to "plugins",+ )) {+ val tab = device.findObject(By.desc(label)) ?: device.findObject(By.text(label))+ clickPointer(device, checkNotNull(tab) { "Navigation item missing: $label" })+ check(device.wait(Until.hasObject(By.descStartsWith("streamvault.destination:$route")), 15_000)) {+ "Navigation did not reach $route"+ }+ SystemClock.sleep(2_000)+ capture(device, directory, "${theme.storageValue}_$route")+ if (label == "Live TV") {+ repeat(2) {+ if (!device.hasObject(By.descContains("Fixture News"))) {+ val category = device.findObjects(By.text("All Channels")).first {+ generateSequence(it) { node -> node.parent }.any { node -> node.isClickable }+ }+ clickPointer(device, category)+ device.wait(Until.hasObject(By.descContains("Fixture News")), 5_000)+ }+ }+ check(device.hasObject(By.descContains("Fixture News"))) { "Live channel row did not appear" }+ capture(device, directory, "${theme.storageValue}_live_tv_channels")+ }+ if (label == "Movies" || label == "Series") {+ val fixtureName = if (label == "Movies") "Fixture Movie One" else "Fixture Series One"+ check(device.wait(Until.hasObject(By.descStartsWith(fixtureName)), 15_000))+ clickPointer(device, device.findObject(By.descStartsWith(fixtureName)))+ check(device.wait(Until.hasObject(By.text("Back to library")), 15_000))+ SystemClock.sleep(2_000)+ capture(device, directory, "${theme.storageValue}_${route}_detail")+ clickPointer(device, device.findObject(By.text("Back to library")))+ check(device.wait(Until.hasObject(By.descStartsWith("streamvault.destination:$route")), 15_000))+ }+ }+ // TV pointer activation uses a mouse source, matching the app's TV contract.+ clickPointer(device, device.findObject(By.desc("Home")))+ check(device.wait(Until.hasObject(By.desc("streamvault.destination:home")), 15_000))+ clickPointer(device, device.findObject(By.desc("Home")))+ device.pressDPadRight()+ device.pressDPadCenter()+ check(device.wait(Until.hasObject(By.descStartsWith("streamvault.destination:live_tv")), 15_000))+ SystemClock.sleep(1_000)+ capture(device, directory, "${theme.storageValue}_remote_focus")+ }+ }+ } finally {+ ownedProviderId?.let { graph.providers().deleteProvider(it) }+ prefs.setAppTheme(originalTheme)+ prefs.setAppLandingDestination(originalLanding)+ }+ }++ private fun clickPointer(device: UiDevice, target: UiObject2) {+ val center = target.visibleCenter+ device.executeShellCommand("input mouse tap ${center.x} ${center.y}")+ }++ private fun capture(device: UiDevice, directory: File, name: String) {+ check(device.takeScreenshot(File(directory, "$name.png")))+ device.dumpWindowHierarchy(File(directory, "$name.xml"))+ }+}diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.ktindex 54721c88..1a7e5357 100644--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt@@ -1,5 +1,6 @@package com.streamvault.app.navigation+import com.streamvault.core.ui.design.BrowseVisualStyleimport androidx.compose.runtime.Composableimport androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.runtime.LaunchedEffect@@ -57,20 +58,24 @@ fun AppNavigation(LocalAppDestinationItems provides navigationDestinations,LocalAppCloseAction provides onCloseApp) {- 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- )+ val route = currentBackStackEntry?.destination?.route.orEmpty()+ BrowseVisualStyle(enabled = !route.startsWith(AppRoutePatterns.SETTINGS) &&+ !route.startsWith("parental_control_groups") && route != AppRoutePatterns.PLAYER) {+ 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+ )+ }}}diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.ktindex 78e3077a..c4af9fc4 100644--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt@@ -1,5 +1,6 @@package com.streamvault.app.ui.components.dialogs+import com.streamvault.core.ui.design.contentOnColorimport androidx.compose.foundation.layout.*import androidx.compose.foundation.borderimport androidx.compose.foundation.background@@ -24,7 +25,7 @@ import com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Categoryimport androidx.compose.ui.res.stringResourceimport com.streamvault.app.R-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport androidx.compose.ui.input.key.*import androidx.compose.ui.focus.onFocusChangedimport androidx.compose.foundation.shape.CircleShape@@ -147,6 +148,13 @@ fun AddToGroupDialog(// ג”€ג”€ Favorites ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€item {var isFocused by remember { mutableStateOf(false) }+ val favoriteInk = contentOnColor(+ when {+ isFocused -> AppColors.Focus+ isFavorite -> AppColors.Warning+ else -> AppColors.Brand+ }+ )Button(onClick = safeToggleFavorite,modifier = Modifier@@ -169,20 +177,20 @@ fun AddToGroupDialog(isFavorite -> AppColors.Warningelse -> AppColors.Brand},- contentColor = Color.Black+ contentColor = favoriteInk)) {Icon(imageVector = Icons.Default.Star,contentDescription = if (isFavorite) stringResource(R.string.add_group_remove_favorites)else stringResource(R.string.add_group_add_favorites),- tint = Color.Black+ tint = favoriteInk)Spacer(modifier = Modifier.width(8.dp))Text(text = if (isFavorite) stringResource(R.string.add_group_remove_favorites)else stringResource(R.string.add_group_add_favorites),- color = Color.Black+ color = favoriteInk)}}@@ -194,7 +202,7 @@ fun AddToGroupDialog(modifier = Modifier.fillMaxWidth().mouseClickable(onClick = safeMoveToMovies),colors = ButtonDefaults.colors(containerColor = AppColors.Brand,- contentColor = Color.Black+ contentColor = contentOnColor(AppColors.Brand))) { Text(stringResource(R.string.m3u_move_to_movies)) }}@@ -207,7 +215,7 @@ fun AddToGroupDialog(modifier = Modifier.fillMaxWidth().mouseClickable(onClick = safeMoveToSeries),colors = ButtonDefaults.colors(containerColor = AppColors.Success,- contentColor = Color.Black+ contentColor = contentOnColor(AppColors.Success))) { Text(stringResource(R.string.m3u_move_to_series)) }}@@ -256,13 +264,13 @@ fun AddToGroupDialog(Icon(imageVector = Icons.Default.Add,contentDescription = stringResource(R.string.multiview_add_to_split),- tint = if (isFocused) Color.Black else Color.White+ tint = if (isFocused) contentOnColor(AppColors.Focus) else Color.White)Spacer(modifier = Modifier.width(8.dp))Text(text = if (isQueuedForSplitScreen) stringResource(R.string.multiview_queued)else stringResource(R.string.multiview_add_to_split),- color = if (isFocused) Color.Black else Color.White+ color = if (isFocused) contentOnColor(AppColors.Focus) else Color.White)}}@@ -289,18 +297,18 @@ fun AddToGroupDialog(.mouseClickable(onClick = safeHideChannel),colors = ButtonDefaults.colors(containerColor = if (isFocused) AppColors.Focus else AppColors.SurfaceAccent,- contentColor = if (isFocused) Color.Black else AppColors.TextPrimary+ contentColor = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)) {Icon(imageVector = Icons.Default.Lock,contentDescription = stringResource(R.string.channel_action_hide),- tint = if (isFocused) Color.Black else AppColors.TextPrimary+ tint = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)Spacer(modifier = Modifier.width(8.dp))Text(text = stringResource(R.string.channel_action_hide),- color = if (isFocused) Color.Black else AppColors.TextPrimary+ color = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)}}@@ -330,18 +338,18 @@ fun AddToGroupDialog(isFocused -> AppColors.Focuselse -> MaterialTheme.colorScheme.errorContainer},- contentColor = if (isFocused) Color.Black else MaterialTheme.colorScheme.onErrorContainer+ contentColor = if (isFocused) contentOnColor(AppColors.Focus) else MaterialTheme.colorScheme.onErrorContainer)) {Icon(imageVector = Icons.Default.Close,contentDescription = stringResource(R.string.channel_options_remove_from_recent),- tint = if (isFocused) Color.Black else MaterialTheme.colorScheme.onErrorContainer+ tint = if (isFocused) contentOnColor(AppColors.Focus) else MaterialTheme.colorScheme.onErrorContainer)Spacer(modifier = Modifier.width(8.dp))Text(text = stringResource(R.string.channel_options_remove_from_recent),- color = if (isFocused) Color.Black else MaterialTheme.colorScheme.onErrorContainer+ color = if (isFocused) contentOnColor(AppColors.Focus) else MaterialTheme.colorScheme.onErrorContainer)}}@@ -404,7 +412,7 @@ fun AddToGroupDialog(isMember -> AppColors.Live.copy(alpha = 0.2f)else -> AppColors.BrandMuted.copy(alpha = 0.4f)},- contentColor = if (isFocused) Color.Black else AppColors.TextPrimary+ contentColor = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)) {Text(@@ -435,7 +443,7 @@ fun AddToGroupDialog(.mouseClickable(onClick = safeCreateGroup),colors = ButtonDefaults.colors(containerColor = if (isFocused) AppColors.Focus else Color.Transparent,- contentColor = if (isFocused) Color.Black else AppColors.TextPrimary+ contentColor = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)) {Icon(Icons.Default.Add, contentDescription = stringResource(R.string.add_group_create_new_btn))diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.ktsindex 1d13a7c6..b074616c 100644--- a/core/ui/build.gradle.kts+++ b/core/ui/build.gradle.kts@@ -12,6 +12,7 @@ android {defaultConfig {minSdk = 25+ testOptions.targetSdk = 36testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"}diff --git a/core/ui/src/androidTest/java/com/streamvault/core/ui/components/shell/BrowseVisualStyleTest.kt b/core/ui/src/androidTest/java/com/streamvault/core/ui/components/shell/BrowseVisualStyleTest.ktnew file mode 100644index 00000000..1c126848--- /dev/null+++ b/core/ui/src/androidTest/java/com/streamvault/core/ui/components/shell/BrowseVisualStyleTest.kt@@ -0,0 +1,54 @@+package com.streamvault.core.ui.components.shell++import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.remember+import androidx.compose.ui.test.junit4.createComposeRule+import androidx.tv.material3.MaterialTheme+import com.google.common.truth.Truth.assertThat+import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.AppPalette+import com.streamvault.core.ui.design.AppShapes+import com.streamvault.core.ui.design.BrowseColors+import com.streamvault.core.ui.design.BrowseVisualStyle+import com.streamvault.core.ui.design.LocalAppShapes+import com.streamvault.core.ui.design.LocalBrowseVisuals+import com.streamvault.core.ui.theme.StreamVaultTheme+import org.junit.Rule+import org.junit.Test++class BrowseVisualStyleTest {+ @get:Rule val composeRule = createComposeRule()++ @Test+ fun leavingBrowseRestoresProtectedThemeWithoutRecreatingContent() {+ val enabled = mutableStateOf(true)+ var remembered: Any? = null+ var observed: Any? = null+ var modern = false+ var shapes = AppShapes()+ var surface = AppPalette.classicBlue().surface+ composeRule.setContent {+ StreamVaultTheme {+ BrowseVisualStyle(enabled = enabled.value) {+ observed = remember { Any() }+ modern = LocalBrowseVisuals.current+ shapes = LocalAppShapes.current+ surface = MaterialTheme.colorScheme.surface+ }+ }+ }+ composeRule.runOnIdle {+ remembered = observed+ assertThat(modern).isTrue()+ assertThat(surface).isEqualTo(BrowseColors.Surface)+ enabled.value = false+ }+ composeRule.runOnIdle {+ assertThat(observed).isSameInstanceAs(remembered)+ assertThat(modern).isFalse()+ assertThat(shapes).isEqualTo(AppShapes())+ assertThat(surface).isEqualTo(AppColors.Surface)+ assertThat(AppColors.current).isEqualTo(AppPalette.classicBlue())+ }+ }+}diff --git a/core/ui/src/main/java/com/streamvault/core/ui/components/SearchInput.kt b/core/ui/src/main/java/com/streamvault/core/ui/components/SearchInput.ktindex b8182740..d0ab0ab0 100644--- a/core/ui/src/main/java/com/streamvault/core/ui/components/SearchInput.kt+++ b/core/ui/src/main/java/com/streamvault/core/ui/components/SearchInput.kt@@ -50,6 +50,10 @@ import androidx.tv.material3.Iconimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.device.rememberIsTelevisionDevice+import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors+import com.streamvault.core.ui.design.BrowseShapes+import com.streamvault.core.ui.design.LocalBrowseVisualsimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.theme.FocusBorderimport com.streamvault.core.ui.theme.OnSurface@@ -156,8 +160,11 @@ fun SearchInput(focusRequester.requestFocus()}- val borderColor = if (isFocused) FocusBorder else OnSurfaceDim.copy(alpha = 0.5f)- val backgroundColor = if (isFocused) SurfaceHighlight else SurfaceElevated+ val modern = LocalBrowseVisuals.current+ val palette = if (modern) BrowseColors.current else AppColors.current+ val searchShape = if (modern) BrowseShapes.Control else RoundedCornerShape(12.dp)+ val borderColor = if (isFocused) palette.focus else if (modern) palette.outline else OnSurfaceDim.copy(alpha = 0.5f)+ val backgroundColor = if (isFocused) palette.surfaceEmphasis else palette.surfaceElevatedval borderWidth = if (isFocused) 2.dp else 1.dpBox(@@ -166,8 +173,8 @@ fun SearchInput(.heightIn(min = 56.dp).focusRequester(focusRequester).bringIntoViewRequester(bringIntoViewRequester)- .background(backgroundColor, RoundedCornerShape(12.dp))- .border(borderWidth, borderColor, RoundedCornerShape(12.dp))+ .background(backgroundColor, searchShape)+ .border(borderWidth, borderColor, searchShape).semantics(mergeDescendants = true) {contentDescription = placeholderstateDescription = value.ifBlank { placeholder }diff --git a/core/ui/src/main/java/com/streamvault/core/ui/components/TvEmptyState.kt b/core/ui/src/main/java/com/streamvault/core/ui/components/TvEmptyState.ktindex 8c8f77db..5bcb0741 100644--- a/core/ui/src/main/java/com/streamvault/core/ui/components/TvEmptyState.kt+++ b/core/ui/src/main/java/com/streamvault/core/ui/components/TvEmptyState.kt@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -20,6 +19,8 @@ import androidx.compose.ui.unit.dpimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.components.shell.AppMessageState+import com.streamvault.core.ui.design.BrowseColors+import com.streamvault.core.ui.design.LocalBrowseVisualsimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDim@@ -33,6 +34,7 @@ fun TvEmptyState(modifier = modifier.fillMaxSize(),contentAlignment = Alignment.Center) {+ val modern = LocalBrowseVisuals.currentval contentWidthFraction = if (maxWidth < 700.dp) 0.9f else 0.62fAppMessageState(title = title,@@ -40,11 +42,11 @@ fun TvEmptyState(modifier = Modifier.fillMaxWidth(contentWidthFraction),containerBrush = Brush.horizontalGradient(listOf(- Color.White.copy(alpha = 0.05f),- Color.White.copy(alpha = 0.02f)+ if (modern) BrowseColors.SurfaceElevated else Color.White.copy(alpha = 0.05f),+ if (modern) BrowseColors.Surface else Color.White.copy(alpha = 0.02f))),- borderColor = Color.White.copy(alpha = 0.08f),+ borderColor = if (modern) BrowseColors.Outline else Color.White.copy(alpha = 0.08f),titleStyle = androidx.tv.material3.MaterialTheme.typography.headlineMedium,subtitleStyle = androidx.tv.material3.MaterialTheme.typography.bodyMedium,titleColor = OnSurface,diff --git a/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PremiumDialog.kt b/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PremiumDialog.ktindex c8b96412..d15d65e5 100644--- a/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PremiumDialog.kt+++ b/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PremiumDialog.kt@@ -49,6 +49,12 @@ import com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.design.requestFocusSafelyimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.contentOnColor+import com.streamvault.core.ui.design.AppPalette+import com.streamvault.core.ui.design.BrowseColors+import com.streamvault.core.ui.design.BrowseShapes+import com.streamvault.core.ui.design.BrowseFocusSpec+import com.streamvault.core.ui.design.LocalBrowseVisualsimport com.streamvault.core.ui.design.FocusSpecinternal val LocalDialogCanInteract = compositionLocalOf { true }@@ -68,6 +74,9 @@ fun rememberDialogOpenGestureBlocker(canInteract: Boolean): (KeyEvent) -> Boolea}}+private val dialogPalette: AppPalette+ @Composable get() = if (LocalBrowseVisuals.current) BrowseColors.current else AppColors.current+@Composablefun PremiumDialog(title: String,@@ -111,17 +120,17 @@ fun PremiumDialog(.onPreviewKeyEvent(blockOpenGesture)Surface(modifier = dialogModifier,- shape = RoundedCornerShape(28.dp),- colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated)+ shape = if (LocalBrowseVisuals.current) BrowseShapes.Hero else RoundedCornerShape(28.dp),+ colors = SurfaceDefaults.colors(containerColor = dialogPalette.surfaceElevated)) {Column(modifier = Modifier.background(Brush.verticalGradient(colors = listOf(- AppColors.BrandMuted.copy(alpha = 0.18f),- AppColors.SurfaceElevated,- AppColors.Surface+ dialogPalette.brandMuted.copy(alpha = 0.18f),+ dialogPalette.surfaceElevated,+ dialogPalette.surface)))@@ -132,13 +141,13 @@ fun PremiumDialog(Text(text = title,style = MaterialTheme.typography.headlineMedium,- color = AppColors.TextPrimary+ color = dialogPalette.textPrimary)if (!subtitle.isNullOrBlank()) {Text(text = subtitle,style = MaterialTheme.typography.bodyMedium,- color = AppColors.TextSecondary+ color = dialogPalette.textSecondary)}}@@ -178,17 +187,17 @@ fun PremiumDialog(Surface(modifier = dialogModifier,- shape = RoundedCornerShape(28.dp),- colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated)+ shape = if (LocalBrowseVisuals.current) BrowseShapes.Hero else RoundedCornerShape(28.dp),+ colors = SurfaceDefaults.colors(containerColor = dialogPalette.surfaceElevated)) {Column(modifier = Modifier.background(Brush.verticalGradient(colors = listOf(- AppColors.BrandMuted.copy(alpha = 0.18f),- AppColors.SurfaceElevated,- AppColors.Surface+ dialogPalette.brandMuted.copy(alpha = 0.18f),+ dialogPalette.surfaceElevated,+ dialogPalette.surface)))@@ -199,13 +208,13 @@ fun PremiumDialog(Text(text = title,style = MaterialTheme.typography.headlineMedium,- color = AppColors.TextPrimary+ color = dialogPalette.textPrimary)if (!subtitle.isNullOrBlank()) {Text(text = subtitle,style = MaterialTheme.typography.bodyMedium,- color = AppColors.TextSecondary+ color = dialogPalette.textSecondary)}}@@ -294,10 +303,10 @@ private fun ColumnScope.PremiumDialogScrollableBody(text = "$arrow $scrollHint",modifier = Modifier.align(Alignment.BottomCenter)- .background(AppColors.Surface.copy(alpha = 0.94f), RoundedCornerShape(10.dp))+ .background(dialogPalette.surface.copy(alpha = 0.94f), RoundedCornerShape(10.dp)).padding(horizontal = 12.dp, vertical = 7.dp),style = MaterialTheme.typography.labelSmall,- color = AppColors.TextSecondary,+ color = dialogPalette.textSecondary,)}}@@ -314,34 +323,37 @@ fun PremiumDialogActionButton() {val canInteract = LocalDialogCanInteract.currentval containerColor = when {- destructive -> AppColors.Live.copy(alpha = 0.22f)- emphasized -> AppColors.Brand+ destructive -> dialogPalette.live.copy(alpha = 0.22f)+ emphasized -> dialogPalette.brandelse -> Color.White.copy(alpha = 0.08f)}val contentColor = when {- destructive -> AppColors.TextPrimary- emphasized -> Color.Black- else -> AppColors.TextPrimary+ destructive -> dialogPalette.textPrimary+ emphasized -> if (LocalBrowseVisuals.current) dialogPalette.onPrimary else Color.Black+ else -> dialogPalette.textPrimary}Button(onClick = { if (canInteract) onClick() },enabled = enabled,modifier = modifier.fillMaxWidth().mouseClickable(enabled = enabled, onClick = { if (canInteract) onClick() }),+ shape = if (LocalBrowseVisuals.current) ButtonDefaults.shape(BrowseShapes.Control) else ButtonDefaults.shape(),colors = ButtonDefaults.colors(containerColor = containerColor,contentColor = contentColor,- focusedContainerColor = if (destructive) AppColors.Live else AppColors.SurfaceEmphasis,- focusedContentColor = AppColors.Focus,- disabledContainerColor = AppColors.Surface.copy(alpha = 0.85f),- disabledContentColor = AppColors.TextDisabled+ focusedContainerColor = if (destructive) dialogPalette.live else dialogPalette.surfaceEmphasis,+ focusedContentColor = if (LocalBrowseVisuals.current) {+ if (destructive) contentOnColor(dialogPalette.live) else dialogPalette.textPrimary+ } else dialogPalette.focus,+ disabledContainerColor = dialogPalette.surface.copy(alpha = 0.85f),+ disabledContentColor = dialogPalette.textDisabled),border = ButtonDefaults.border(focusedBorder = androidx.tv.material3.Border(- border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus)+ border = BorderStroke(if (LocalBrowseVisuals.current) BrowseFocusSpec.BorderWidth else FocusSpec.BorderWidth, dialogPalette.focus))),- scale = ButtonDefaults.scale(focusedScale = FocusSpec.FocusedScale)+ scale = ButtonDefaults.scale(focusedScale = if (LocalBrowseVisuals.current) BrowseFocusSpec.FocusedScale else FocusSpec.FocusedScale)) {Text(text = label,@@ -361,30 +373,33 @@ fun PremiumDialogFooterButton() {val canInteract = LocalDialogCanInteract.currentval containerColor = when {- destructive -> AppColors.Live.copy(alpha = 0.18f)- emphasized -> AppColors.Brand+ destructive -> dialogPalette.live.copy(alpha = 0.18f)+ emphasized -> dialogPalette.brandelse -> Color.White.copy(alpha = 0.08f)}- val contentColor = if (emphasized) Color.Black else AppColors.TextPrimary+ val contentColor = if (emphasized) { if (LocalBrowseVisuals.current) dialogPalette.onPrimary else Color.Black } else dialogPalette.textPrimaryButton(onClick = { if (canInteract) onClick() },enabled = enabled,modifier = modifier.mouseClickable(enabled = enabled, onClick = { if (canInteract) onClick() }),+ shape = if (LocalBrowseVisuals.current) ButtonDefaults.shape(BrowseShapes.Control) else ButtonDefaults.shape(),colors = ButtonDefaults.colors(containerColor = containerColor,contentColor = contentColor,- focusedContainerColor = if (destructive) AppColors.Live else AppColors.SurfaceEmphasis,- focusedContentColor = AppColors.Focus,- disabledContainerColor = AppColors.Surface.copy(alpha = 0.85f),- disabledContentColor = AppColors.TextDisabled+ focusedContainerColor = if (destructive) dialogPalette.live else dialogPalette.surfaceEmphasis,+ focusedContentColor = if (LocalBrowseVisuals.current) {+ if (destructive) contentOnColor(dialogPalette.live) else dialogPalette.textPrimary+ } else dialogPalette.focus,+ disabledContainerColor = dialogPalette.surface.copy(alpha = 0.85f),+ disabledContentColor = dialogPalette.textDisabled),border = ButtonDefaults.border(focusedBorder = androidx.tv.material3.Border(- border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus)+ border = BorderStroke(if (LocalBrowseVisuals.current) BrowseFocusSpec.BorderWidth else FocusSpec.BorderWidth, dialogPalette.focus))),- scale = ButtonDefaults.scale(focusedScale = FocusSpec.FocusedScale)+ scale = ButtonDefaults.scale(focusedScale = if (LocalBrowseVisuals.current) BrowseFocusSpec.FocusedScale else FocusSpec.FocusedScale)) {Text(text = label, style = MaterialTheme.typography.labelLarge)}diff --git a/core/ui/src/main/java/com/streamvault/core/ui/components/shell/AppShellVisuals.kt b/core/ui/src/main/java/com/streamvault/core/ui/components/shell/AppShellVisuals.ktindex 260121cb..3f094fbf 100644--- a/core/ui/src/main/java/com/streamvault/core/ui/components/shell/AppShellVisuals.kt+++ b/core/ui/src/main/java/com/streamvault/core/ui/components/shell/AppShellVisuals.kt@@ -3,6 +3,7 @@ package com.streamvault.core.ui.components.shellimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.background+import androidx.compose.foundation.borderimport androidx.compose.foundation.horizontalScrollimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -52,6 +53,7 @@ import androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.dp+import androidx.compose.ui.unit.spimport androidx.compose.ui.zIndeximport androidx.tv.material3.Borderimport androidx.tv.material3.ClickableSurfaceDefaults@@ -61,8 +63,13 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors+import com.streamvault.core.ui.design.BrowseShapes+import com.streamvault.core.ui.design.LocalBrowseVisuals+import com.streamvault.core.ui.design.browseBackdrop+import com.streamvault.core.ui.design.browsePanelimport com.streamvault.core.ui.design.AppMotion-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.design.LocalAppShapesimport com.streamvault.core.ui.design.LocalAppSpacingimport com.streamvault.core.ui.interaction.TvIconButton@@ -105,15 +112,7 @@ fun CoreAppScreenScaffold(.semantics {contentDescription = "streamvault.destination:$currentDestinationId"}- .background(- Brush.linearGradient(- colors = listOf(- AppColors.Canvas,- AppColors.CanvasElevated,- AppColors.Surface- )- )- )+ .browseBackdrop()) {if (navigationChrome == NavigationChrome.Rail) {Row(modifier = Modifier.fillMaxSize()) {@@ -219,13 +218,13 @@ fun AppScreenHeader(Text(text = eyebrow,style = MaterialTheme.typography.labelMedium,- color = AppColors.Brand+ color = BrowseColors.Brand)}Text(text = title,style = if (compact) MaterialTheme.typography.titleMedium else MaterialTheme.typography.displaySmall,- color = AppColors.TextPrimary,+ color = BrowseColors.TextPrimary,maxLines = 2,overflow = TextOverflow.Ellipsis)@@ -233,7 +232,7 @@ fun AppScreenHeader(Text(text = subtitle,style = if (compact) MaterialTheme.typography.bodySmall else MaterialTheme.typography.bodyLarge,- color = AppColors.TextSecondary,+ color = BrowseColors.TextSecondary,maxLines = 2,overflow = TextOverflow.Ellipsis)@@ -260,8 +259,9 @@ private fun TopNavigationBar(focusRequesters[activeItem?.id] ?: FocusRequester.Default}},- shape = RoundedCornerShape(18.dp),- colors = SurfaceDefaults.colors(containerColor = AppColors.Surface.copy(alpha = 0.9f))+ shape = BrowseShapes.Panel,+ colors = SurfaceDefaults.colors(containerColor = BrowseColors.Surface.copy(alpha = 0.94f)),+ border = Border(BorderStroke(1.dp, BrowseColors.Outline), shape = BrowseShapes.Panel)) {Row(modifier = Modifier@@ -273,11 +273,11 @@ private fun TopNavigationBar() {Text(text = "StreamVault",- style = MaterialTheme.typography.titleSmall,- color = AppColors.TextPrimary,+ style = MaterialTheme.typography.titleSmall.copy(letterSpacing = (-0.4).sp),+ color = BrowseColors.TextPrimary,modifier = Modifier.wrapContentWidth(Alignment.Start))- Spacer(modifier = Modifier.width(32.dp))+ Spacer(modifier = Modifier.width(24.dp))Row(modifier = Modifier.weight(1f)@@ -321,14 +321,14 @@ fun AppTopBarCloseAction(modifier = modifier,colors = androidx.tv.material3.IconButtonDefaults.colors(containerColor = Color.Transparent,- focusedContainerColor = AppColors.SurfaceEmphasis,- contentColor = AppColors.TextSecondary,- focusedContentColor = AppColors.TextPrimary+ focusedContainerColor = BrowseColors.Brand.copy(alpha = 0.18f),+ contentColor = BrowseColors.TextSecondary,+ focusedContentColor = BrowseColors.TextPrimary),border = androidx.tv.material3.IconButtonDefaults.border(focusedBorder = Border(- border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),- shape = RoundedCornerShape(14.dp)+ border = BorderStroke(FocusSpec.BorderWidth, BrowseColors.Focus),+ shape = BrowseShapes.Control))) {@@ -379,33 +379,36 @@ private fun TopNavigationButton(if (it.isFocused && !isFocused) sounds.playNavigate()isFocused = it.isFocused},- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),colors = ClickableSurfaceDefaults.colors(- containerColor = if (selected) AppColors.BrandMuted else Color.Transparent,- focusedContainerColor = AppColors.SurfaceEmphasis+ containerColor = if (selected) BrowseColors.Brand.copy(alpha = 0.12f) else Color.Transparent,+ focusedContainerColor = BrowseColors.Brand.copy(alpha = 0.18f)),border = ClickableSurfaceDefaults.border(focusedBorder = Border(- border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),- shape = RoundedCornerShape(14.dp)+ border = BorderStroke(FocusSpec.BorderWidth, BrowseColors.Focus),+ shape = BrowseShapes.Control))) {Row(- modifier = Modifier.padding(horizontal = 10.dp, vertical = 6.dp),+ modifier = Modifier+ .then(if (selected) Modifier.border(1.dp, BrowseColors.Brand.copy(alpha = 0.28f), BrowseShapes.Control) else Modifier)+ .padding(horizontal = 8.dp, vertical = 6.dp),horizontalArrangement = Arrangement.spacedBy(6.dp),verticalAlignment = Alignment.CenterVertically) {Icon(imageVector = destination.icon,contentDescription = destination.label,- tint = if (selected) AppColors.Brand else AppColors.TextSecondary,+ tint = if (selected) BrowseColors.Brand else BrowseColors.TextSecondary,modifier = Modifier.size(14.dp))Text(text = destination.label,style = MaterialTheme.typography.labelSmall,- color = if (selected) AppColors.TextPrimary else AppColors.TextSecondary+ color = if (selected) BrowseColors.TextPrimary else BrowseColors.TextSecondary)}}@@ -422,16 +425,17 @@ fun AppHeroHeader() {Surface(modifier = modifier,- shape = RoundedCornerShape(28.dp),- colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated)+ shape = BrowseShapes.Hero,+ colors = SurfaceDefaults.colors(containerColor = BrowseColors.SurfaceElevated),+ border = Border(BorderStroke(1.dp, BrowseColors.Outline), shape = BrowseShapes.Hero)) {Box(modifier = Modifier.fillMaxWidth()- .clip(RoundedCornerShape(28.dp))+ .clip(BrowseShapes.Hero).background(Brush.horizontalGradient(- colors = listOf(AppColors.Canvas, AppColors.SurfaceAccent, AppColors.SurfaceEmphasis)+ colors = listOf(BrowseColors.Surface, BrowseColors.SurfaceEmphasis, BrowseColors.Brand.copy(alpha = 0.16f)))).padding(32.dp)@@ -458,7 +462,7 @@ fun AppSectionHeader(modifier: Modifier = Modifier,actionLabel: String? = null,onActionClick: (() -> Unit)? = null,- actionContentColor: Color = AppColors.TextTertiary+ actionContentColor: Color = BrowseColors.TextTertiary) {val shapes = LocalAppShapes.currentRow(@@ -473,11 +477,11 @@ fun AppSectionHeader(Text(text = title,style = MaterialTheme.typography.titleMedium,- color = AppColors.TextPrimary,+ color = BrowseColors.TextPrimary,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 = BrowseColors.TextTertiary)}}if (onActionClick != null && !actionLabel.isNullOrBlank()) {@@ -489,8 +493,8 @@ fun AppSectionHeader(.mouseClickable(focusRequester = actionFocusRequester, onClick = onActionClick),shape = ClickableSurfaceDefaults.shape(shapes.pill),colors = ClickableSurfaceDefaults.colors(- containerColor = AppColors.Brand.copy(alpha = 0.12f),- focusedContainerColor = AppColors.Brand.copy(alpha = 0.22f),+ containerColor = BrowseColors.Brand.copy(alpha = 0.12f),+ focusedContainerColor = BrowseColors.Brand.copy(alpha = 0.22f),contentColor = actionContentColor)) {@@ -510,13 +514,23 @@ fun StatusPill(horizontalPadding: Dp = 10.dp,verticalPadding: Dp = 4.dp) {+ val modern = LocalBrowseVisuals.current+ val isStatusColor = containerColor in listOf(AppColors.Live, AppColors.Brand, AppColors.Warning, AppColors.Success, AppColors.Info)+ val tinted = modern && isStatusColor+ val shape = RoundedCornerShape(if (modern && cornerRadius == 999.dp) 6.dp else cornerRadius)+ val resolvedContentColor = when {+ tinted -> containerColor+ modern && containerColor.copy(alpha = 1f) == Color.Black -> Color.White+ else -> contentColor+ }Box(modifier = modifier- .clip(RoundedCornerShape(cornerRadius))- .background(containerColor)+ .clip(shape)+ .background(if (tinted) containerColor.copy(alpha = 0.16f) else containerColor)+ .then(if (modern) Modifier.border(1.dp, (if (tinted) containerColor else AppColors.TextPrimary).copy(alpha = 0.14f), shape) else Modifier).padding(horizontal = horizontalPadding, vertical = verticalPadding)) {- Text(text = label, style = MaterialTheme.typography.labelSmall, color = contentColor)+ Text(text = label, style = MaterialTheme.typography.labelSmall, color = resolvedContentColor)}}@@ -577,12 +591,12 @@ fun LoadMoreCard(.mouseClickable(focusRequester = focusRequester, onClick = onClick),shape = ClickableSurfaceDefaults.shape(shapes.medium),colors = ClickableSurfaceDefaults.colors(- containerColor = AppColors.SurfaceElevated,- focusedContainerColor = AppColors.SurfaceEmphasis+ containerColor = BrowseColors.SurfaceElevated,+ focusedContainerColor = BrowseColors.Brand.copy(alpha = 0.18f)),border = ClickableSurfaceDefaults.border(focusedBorder = Border(- border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),+ border = BorderStroke(FocusSpec.BorderWidth, BrowseColors.Focus),shape = shapes.medium))@@ -592,8 +606,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 = BrowseColors.Brand, modifier = Modifier.size(18.dp))+ Text(text = label, style = MaterialTheme.typography.titleMedium, color = BrowseColors.TextPrimary)}}}@@ -610,13 +624,13 @@ 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 = BrowseColors.TextSecondary)if (index < filteredValues.lastIndex) {Box(modifier = Modifier.size(4.dp).clip(RoundedCornerShape(999.dp))- .background(AppColors.TextTertiary)+ .background(BrowseColors.TextTertiary))}}@@ -637,8 +651,7 @@ private fun DestinationRail(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)))+ .browsePanel(BrowseShapes.Panel).focusProperties {onEnter = {val activeItem = findActiveDestination(destinations, currentDestinationId)@@ -652,8 +665,8 @@ private fun DestinationRail(.padding(horizontal = 12.dp, vertical = 20.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {- Text(text = "StreamVault", style = MaterialTheme.typography.titleMedium, color = AppColors.TextPrimary)- Text(text = "TV", style = MaterialTheme.typography.labelSmall, color = AppColors.TextTertiary)+ Text(text = "StreamVault", style = MaterialTheme.typography.titleMedium, color = BrowseColors.TextPrimary)+ Text(text = "TV", style = MaterialTheme.typography.labelSmall, color = BrowseColors.TextTertiary)Spacer(modifier = Modifier.height(10.dp))destinations.forEach { destination ->val requester = focusRequesters.getOrPut(destination.id) { FocusRequester() }@@ -705,15 +718,16 @@ private fun RailButton(scaleY = scale}.onFocusChanged { isFocused = it.isFocused },- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(18.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Panel),+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),colors = ClickableSurfaceDefaults.colors(- containerColor = if (selected) AppColors.BrandMuted else Color.Transparent,- focusedContainerColor = AppColors.SurfaceEmphasis+ containerColor = if (selected) BrowseColors.Brand.copy(alpha = 0.12f) else Color.Transparent,+ focusedContainerColor = BrowseColors.Brand.copy(alpha = 0.18f)),border = ClickableSurfaceDefaults.border(focusedBorder = Border(- border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),- shape = RoundedCornerShape(18.dp)+ border = BorderStroke(FocusSpec.BorderWidth, BrowseColors.Focus),+ shape = BrowseShapes.Panel))) {@@ -727,13 +741,13 @@ private fun RailButton(Icon(imageVector = destination.icon,contentDescription = destination.label,- tint = if (selected) AppColors.Brand else AppColors.TextSecondary,+ tint = if (selected) BrowseColors.Brand else BrowseColors.TextSecondary,modifier = Modifier.size(20.dp))Text(text = destination.label,style = MaterialTheme.typography.titleSmall,- color = if (selected) AppColors.TextPrimary else AppColors.TextSecondary,+ color = if (selected) BrowseColors.TextPrimary else BrowseColors.TextSecondary,maxLines = 1,overflow = TextOverflow.Ellipsis)diff --git a/core/ui/src/main/java/com/streamvault/core/ui/design/BrowseVisuals.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/BrowseVisuals.ktnew file mode 100644index 00000000..574c717d--- /dev/null+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/BrowseVisuals.kt@@ -0,0 +1,171 @@+package com.streamvault.core.ui.design++import androidx.compose.foundation.background+import androidx.compose.foundation.border+import androidx.compose.foundation.shape.RoundedCornerShape+import androidx.compose.runtime.Composable+import androidx.compose.runtime.CompositionLocalProvider+import androidx.compose.runtime.staticCompositionLocalOf+import androidx.compose.ui.Modifier+import androidx.compose.ui.draw.clip+import androidx.compose.ui.draw.drawWithCache+import androidx.compose.ui.geometry.Offset+import androidx.compose.ui.graphics.Brush+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.graphics.lerp+import androidx.compose.ui.graphics.luminance+import androidx.compose.ui.unit.sp+import androidx.compose.ui.unit.dp+import androidx.tv.material3.MaterialTheme+import androidx.tv.material3.ButtonDefaults+import androidx.tv.material3.LocalContentColor as TvContentColor+import androidx.compose.material3.LocalContentColor as TouchContentColor+import androidx.compose.material3.MaterialTheme as TouchMaterialTheme++/** Browsing surfaces deliberately do not change the settings or VOD player palette. */+internal fun AppPalette.forBrowsing(): AppPalette = copy(+ canvas = if (isLight) canvas else lerp(canvas, Color.Black, 0.32f),+ canvasElevated = if (isLight) canvas else lerp(canvasElevated, Color.Black, 0.22f),+ surface = if (isLight) surface else lerp(surface, Color.Black, 0.16f),+ surfaceElevated = lerp(surface, surfaceElevated, 0.48f),+ surfaceEmphasis = lerp(surfaceEmphasis, brand, if (isLight) 0.04f else 0.08f),+ textTertiary = if (isLight) lerp(textSecondary, textTertiary, 0.15f)+ else lerp(textTertiary, textSecondary, 0.35f),+ onPrimary = contentOnColor(brand),+ focus = brandStrong,+ outline = textPrimary.copy(alpha = if (isLight) 0.12f else 0.09f),+ heroBottom = if (isLight) heroBottom else lerp(heroBottom, Color.Black, 0.24f),+)++/** Picks readable ink for a solid accent, including future custom palettes. */+fun contentOnColor(color: Color): Color = if (color.luminance() > 0.179f) Color.Black else Color.White++@Composable+fun browsePrimaryButtonColors() = ButtonDefaults.colors(+ containerColor = BrowseColors.Brand,+ contentColor = BrowseColors.OnPrimary,+ focusedContainerColor = BrowseColors.BrandStrong,+ focusedContentColor = contentOnColor(BrowseColors.BrandStrong),+)++/** Theme-derived colors, also available to non-composable drawing helpers. */+object BrowseColors {+ private var source = AppPalette.classicBlue()+ private var resolved = source.forBrowsing()+ val current: AppPalette+ get() {+ val palette = AppColors.current+ if (palette != source) {+ source = palette+ resolved = palette.forBrowsing()+ }+ return resolved+ }+ val Canvas get() = current.canvas+ val CanvasElevated get() = current.canvasElevated+ val Surface get() = current.surface+ val SurfaceElevated get() = current.surfaceElevated+ val SurfaceEmphasis get() = current.surfaceEmphasis+ val SurfaceAccent get() = current.surfaceAccent+ val Brand get() = current.brand+ val BrandMuted get() = current.brandMuted+ val BrandStrong get() = current.brandStrong+ val OnPrimary get() = current.onPrimary+ val Focus get() = current.focus+ val TextPrimary get() = current.textPrimary+ val TextSecondary get() = current.textSecondary+ val TextTertiary get() = current.textTertiary+ val TextDisabled get() = current.textDisabled+ val Live get() = current.live+ val Success get() = current.success+ val Warning get() = current.warning+ // Badges over artwork keep bright ink regardless of the surrounding screen theme.+ val MediaWarning = Color(0xFFFFC766)+ val Info get() = current.info+ val Divider get() = current.divider+ val Outline get() = current.outline+ val HeroTop get() = current.heroTop+ val HeroBottom get() = current.heroBottom+}++object BrowseShapes {+ val Artwork = RoundedCornerShape(10.dp)+ val Control = RoundedCornerShape(10.dp)+ val Panel = RoundedCornerShape(16.dp)+ val Hero = RoundedCornerShape(20.dp)+}++object BrowseFocusSpec {+ const val FocusedScale = 1.035f+ const val PressedScale = 0.98f+ val BorderWidth = 2.dp+ val CardBorderWidth = 2.dp+}++val LocalBrowseVisuals = staticCompositionLocalOf { false }++@Composable+fun BrowseVisualStyle(enabled: Boolean = true, content: @Composable () -> Unit) {+ val palette = BrowseColors.current+ val originalShapes = LocalAppShapes.current+ val typography = MaterialTheme.typography+ val touchTypography = TouchMaterialTheme.typography+ CompositionLocalProvider(+ LocalBrowseVisuals provides enabled,+ TvContentColor provides if (enabled) palette.textPrimary else TvContentColor.current,+ TouchContentColor provides if (enabled) palette.textPrimary else TouchContentColor.current,+ LocalAppShapes provides if (enabled) AppShapes(+ xSmall = RoundedCornerShape(6.dp),+ small = BrowseShapes.Artwork,+ medium = BrowseShapes.Panel,+ large = BrowseShapes.Hero,+ xLarge = BrowseShapes.Hero,+ ) else originalShapes,+ ) {+ MaterialTheme(typography = if (enabled) typography.copy(+ displaySmall = typography.displaySmall.copy(letterSpacing = (-0.6).sp),+ titleLarge = typography.titleLarge.copy(letterSpacing = (-0.3).sp),+ titleMedium = typography.titleMedium.copy(letterSpacing = (-0.2).sp),+ ) else typography, colorScheme = if (enabled) MaterialTheme.colorScheme.copy(+ onPrimary = palette.onPrimary,+ background = palette.canvas,+ surface = palette.surface,+ surfaceVariant = palette.surfaceElevated,+ ) else MaterialTheme.colorScheme) {+ TouchMaterialTheme(typography = if (enabled) touchTypography.copy(+ titleLarge = typography.titleLarge,+ titleMedium = typography.titleMedium,+ titleSmall = typography.titleSmall,+ bodyLarge = typography.bodyLarge,+ bodyMedium = typography.bodyMedium,+ bodySmall = typography.bodySmall,+ labelLarge = typography.labelLarge,+ labelMedium = typography.labelMedium,+ labelSmall = typography.labelSmall,+ ) else touchTypography, colorScheme = if (enabled) TouchMaterialTheme.colorScheme.copy(+ onPrimary = palette.onPrimary,+ background = palette.canvas,+ surface = palette.surface,+ surfaceVariant = palette.surfaceElevated,+ outline = palette.outline,+ ) else TouchMaterialTheme.colorScheme, content = content)+ }+ }+}++/** Static ambient light: no blur layers, animation, or extra focus targets on TV. */+fun Modifier.browseBackdrop(): Modifier = drawWithCache {+ val palette = BrowseColors.current+ val base = Brush.verticalGradient(listOf(palette.canvasElevated, palette.canvas))+ val ambient = Brush.radialGradient(+ colors = listOf(palette.brand.copy(alpha = if (palette.isLight) 0.07f else 0.10f), Color.Transparent),+ center = Offset(size.width * 0.8f, -size.height * 0.2f),+ radius = size.width * 0.85f,+ )+ onDrawBehind { drawRect(base); drawRect(ambient) }+}++fun Modifier.browsePanel(shape: RoundedCornerShape = BrowseShapes.Panel): Modifier =+ clip(shape)+ .background(Brush.verticalGradient(listOf(BrowseColors.SurfaceElevated, BrowseColors.Surface)))+ .border(1.dp, BrowseColors.Outline, shape)diff --git a/core/ui/src/main/java/com/streamvault/core/ui/design/browse/Color.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/browse/Color.ktnew file mode 100644index 00000000..24ea75eb--- /dev/null+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/browse/Color.kt@@ -0,0 +1,31 @@+package com.streamvault.core.ui.design.browse++import com.streamvault.core.ui.design.BrowseColors++// Compatibility names for browse-only screens; original player/settings colors stay intact.+val Primary get() = BrowseColors.Brand+val PrimaryLight get() = BrowseColors.BrandStrong+val PrimaryGlow get() = BrowseColors.BrandMuted+val BackgroundDeep get() = BrowseColors.Canvas+val Background get() = BrowseColors.CanvasElevated+val Surface get() = BrowseColors.Surface+val SurfaceElevated get() = BrowseColors.SurfaceElevated+val SurfaceHighlight get() = BrowseColors.SurfaceEmphasis+val TextPrimary get() = BrowseColors.TextPrimary+val TextSecondary get() = BrowseColors.TextSecondary+val TextTertiary get() = BrowseColors.TextTertiary+val TextDisabled get() = BrowseColors.TextDisabled+val OnBackground get() = TextPrimary+val OnSurface get() = TextPrimary+val OnSurfaceDim get() = TextTertiary+val AccentRed get() = BrowseColors.Live+val AccentGreen get() = BrowseColors.Success+val AccentAmber get() = BrowseColors.Warning+val AccentCyan get() = BrowseColors.Info+val OnPrimary get() = BrowseColors.OnPrimary+val Secondary get() = BrowseColors.Success+val ErrorColor get() = AccentRed+val GradientOverlayTop get() = BrowseColors.HeroTop+val GradientOverlayBottom get() = BrowseColors.HeroBottom+val FocusBorder get() = BrowseColors.Focus+val ProgressBarBackground get() = BrowseColors.SurfaceAccentdiff --git a/core/ui/src/main/java/com/streamvault/core/ui/interaction/TvComponents.kt b/core/ui/src/main/java/com/streamvault/core/ui/interaction/TvComponents.ktindex e52cad67..20e92642 100644--- a/core/ui/src/main/java/com/streamvault/core/ui/interaction/TvComponents.kt+++ b/core/ui/src/main/java/com/streamvault/core/ui/interaction/TvComponents.kt@@ -1,6 +1,7 @@package com.streamvault.core.ui.interactionimport android.view.KeyEvent+import androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.interaction.MutableInteractionSourceimport androidx.compose.foundation.layout.BoxScopeimport androidx.compose.foundation.layout.PaddingValues@@ -28,6 +29,11 @@ import androidx.tv.material3.IconButtonimport androidx.tv.material3.IconButtonDefaultsimport androidx.tv.material3.Surfaceimport com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.contentOnColor+import com.streamvault.core.ui.design.BrowseColors+import com.streamvault.core.ui.design.BrowseShapes+import com.streamvault.core.ui.design.LocalBrowseVisuals+import androidx.compose.ui.unit.dp/*** Drop-in replacement for TV Material3 Surface(onClick) that automatically adds@@ -39,10 +45,18 @@ fun TvClickableSurface(onClick: () -> Unit,modifier: Modifier = Modifier,enabled: Boolean = true,- shape: ClickableSurfaceShape = ClickableSurfaceDefaults.shape(),- colors: ClickableSurfaceColors = ClickableSurfaceDefaults.colors(),- border: ClickableSurfaceBorder = ClickableSurfaceDefaults.border(),- scale: ClickableSurfaceScale = ClickableSurfaceDefaults.scale(),+ shape: ClickableSurfaceShape = if (LocalBrowseVisuals.current) ClickableSurfaceDefaults.shape(BrowseShapes.Control) else ClickableSurfaceDefaults.shape(),+ colors: ClickableSurfaceColors = if (LocalBrowseVisuals.current) ClickableSurfaceDefaults.colors(+ containerColor = BrowseColors.SurfaceElevated,+ focusedContainerColor = BrowseColors.SurfaceEmphasis,+ contentColor = BrowseColors.TextPrimary,+ focusedContentColor = BrowseColors.TextPrimary,+ ) else ClickableSurfaceDefaults.colors(),+ border: ClickableSurfaceBorder = if (LocalBrowseVisuals.current) ClickableSurfaceDefaults.border(+ border = Border(BorderStroke(1.dp, BrowseColors.Outline), shape = BrowseShapes.Control),+ focusedBorder = Border(BorderStroke(2.dp, BrowseColors.Focus), shape = BrowseShapes.Control),+ ) else ClickableSurfaceDefaults.border(),+ scale: ClickableSurfaceScale = if (LocalBrowseVisuals.current) ClickableSurfaceDefaults.scale(focusedScale = 1.035f) else ClickableSurfaceDefaults.scale(),glow: ClickableSurfaceGlow = ClickableSurfaceDefaults.glow(),interactionSource: MutableInteractionSource? = null,onLongClick: (() -> Unit)? = null,@@ -88,12 +102,20 @@ fun TvButton(onClick: () -> Unit,modifier: Modifier = Modifier,enabled: Boolean = true,- scale: ButtonScale = ButtonDefaults.scale(),+ scale: ButtonScale = if (LocalBrowseVisuals.current) ButtonDefaults.scale(focusedScale = 1.035f) else ButtonDefaults.scale(),glow: ButtonGlow = ButtonDefaults.glow(),interactionSource: MutableInteractionSource? = null,- shape: ButtonShape = ButtonDefaults.shape(),- colors: ButtonColors = ButtonDefaults.colors(),- border: ButtonBorder = ButtonDefaults.border(),+ shape: ButtonShape = if (LocalBrowseVisuals.current) ButtonDefaults.shape(BrowseShapes.Control) else ButtonDefaults.shape(),+ colors: ButtonColors = if (LocalBrowseVisuals.current) ButtonDefaults.colors(+ containerColor = BrowseColors.Brand.copy(alpha = 0.14f),+ contentColor = BrowseColors.TextPrimary,+ focusedContainerColor = BrowseColors.BrandStrong,+ focusedContentColor = contentOnColor(BrowseColors.BrandStrong),+ ) else ButtonDefaults.colors(),+ border: ButtonBorder = if (LocalBrowseVisuals.current) ButtonDefaults.border(+ border = Border(BorderStroke(1.dp, BrowseColors.Outline), shape = BrowseShapes.Control),+ focusedBorder = Border(BorderStroke(2.dp, BrowseColors.Focus), shape = BrowseShapes.Control),+ ) else ButtonDefaults.border(),contentPadding: PaddingValues = ButtonDefaults.ContentPadding,content: @Composable RowScope.() -> Unit,) {diff --git a/core/ui/src/test/java/com/streamvault/core/ui/design/BrowsePaletteContrastTest.kt b/core/ui/src/test/java/com/streamvault/core/ui/design/BrowsePaletteContrastTest.ktnew file mode 100644index 00000000..6c590ffb--- /dev/null+++ b/core/ui/src/test/java/com/streamvault/core/ui/design/BrowsePaletteContrastTest.kt@@ -0,0 +1,39 @@+package com.streamvault.core.ui.design++import androidx.compose.ui.graphics.Color+import androidx.compose.ui.graphics.luminance+import org.junit.Assert.assertEquals+import org.junit.Assert.assertTrue+import org.junit.Test++class BrowsePaletteContrastTest {+ @Test+ fun metadataRemainsReadableOnFocusedSurfaces() {+ listOf(AppPalette.classicBlue(), AppPalette.m3Purple(), AppPalette.light()).forEach {+ val browse = it.forBrowsing()+ val background = browse.surfaceEmphasis.luminance()+ val foreground = browse.textTertiary.luminance()+ val contrast = (maxOf(background, foreground) + 0.05f) /+ (minOf(background, foreground) + 0.05f)+ assertTrue("Metadata contrast was $contrast", contrast >= 4.5f)+ }+ }++ @Test+ fun primaryActionsPreserveAccentAndReadableInkAcrossPalettes() {+ val palettes = listOf(+ AppPalette.classicBlue(), AppPalette.m3Purple(), AppPalette.light(),+ AppPalette.classicBlue().copy(brand = Color(0xFF8EDADC)),+ AppPalette.classicBlue().copy(brand = Color(0xFF103858)),+ )+ palettes.forEach { original ->+ val browse = original.forBrowsing()+ assertEquals(original.brand, browse.brand)+ val background = browse.brand.luminance()+ val foreground = browse.onPrimary.luminance()+ val contrast = (maxOf(background, foreground) + 0.05f) /+ (minOf(background, foreground) + 0.05f)+ assertTrue("Primary action contrast was $contrast", contrast >= 4.5f)+ }+ }+}diff --git a/docs/UI_VISUAL_SYSTEM.md b/docs/UI_VISUAL_SYSTEM.mdnew file mode 100644index 00000000..1f32148a--- /dev/null+++ b/docs/UI_VISUAL_SYSTEM.md@@ -0,0 +1,22 @@+# Browse visual system++Browse UI uses `BrowseVisualStyle`, `BrowseColors`, and `BrowseShapes` from `core:ui`. The original `AppPalette` remains the source of theme identity. Classic Blue, M3 Purple, and Light keep their existing accents and theme IDs; browsing derives canvas depth, surface tones, focus color, and readable foregrounds from each palette.++The application navigation root enables this style for browsing. Settings, parental settings, and the player root retain the original theme. Live-only player chrome opts into the browse style separately. Keep the composition tree stable when switching styles so remembered navigation and focus state survive.++| Element | Treatment |+| --- | --- |+| Controls and artwork | 10 dp corners |+| Panels and navigation bar | 16 dp corners, subtle outline |+| Hero surfaces | 20 dp corners, restrained theme tint |+| Remote focus | 2 dp accent ring, 1.035 scale where scaling is appropriate |+| Media artwork | Crop to fill; themed monogram fallback |+| Solid accent actions | `browsePrimaryButtonColors()` or `contentOnColor()` |+| Metadata | Theme-derived ink tested against emphasized surfaces at 4.5:1 contrast |+| Video preview placeholders | White ink on the black video canvas in every theme |++Keep navigation order, category ordering, screen structure, card dimensions, and callbacks with their existing owners. Style changes should not move features or change focus routing.++Use `browseBackdrop()` for ambient screen backgrounds and `browsePanel()` for layered panels. Browse text and surfaces should read from `BrowseColors`; compatibility imports under `design.browse` expose the older color names. Shared widgets use `LocalBrowseVisuals` to retain their original rendering in settings and VOD controls. Avoid changing the global `AppColors` palette to restyle a single screen.++Add future theme presets through `AppTheme` and `AppPalette`. The browse system derives its styling without a separate widget implementation for each preset. Primary ink adapts to the accent luminance; translucent selection surfaces use the theme's normal text colors instead.diff --git a/feature/catalog/build.gradle.kts b/feature/catalog/build.gradle.ktsindex ffa893d5..de40f0e9 100644--- a/feature/catalog/build.gradle.kts+++ b/feature/catalog/build.gradle.kts@@ -15,6 +15,7 @@ android {defaultConfig {minSdk = 25+ testOptions.targetSdk = 36testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"}diff --git a/feature/catalog/src/androidTest/assets/ui-goldens/route_dashboard_default.png b/feature/catalog/src/androidTest/assets/ui-goldens/route_dashboard_default.pngindex afd3eab6..46787841 100644Binary files a/feature/catalog/src/androidTest/assets/ui-goldens/route_dashboard_default.png and b/feature/catalog/src/androidTest/assets/ui-goldens/route_dashboard_default.png differdiff --git a/feature/catalog/src/androidTest/assets/ui-goldens/route_movies_landing.png b/feature/catalog/src/androidTest/assets/ui-goldens/route_movies_landing.pngindex 73f78add..b29ba1c9 100644Binary files a/feature/catalog/src/androidTest/assets/ui-goldens/route_movies_landing.png and b/feature/catalog/src/androidTest/assets/ui-goldens/route_movies_landing.png differdiff --git a/feature/catalog/src/androidTest/assets/ui-goldens/route_search_results.png b/feature/catalog/src/androidTest/assets/ui-goldens/route_search_results.pngindex 11cb30c9..a0559586 100644Binary files a/feature/catalog/src/androidTest/assets/ui-goldens/route_search_results.png and b/feature/catalog/src/androidTest/assets/ui-goldens/route_search_results.png differdiff --git a/feature/catalog/src/androidTest/assets/ui-goldens/route_series_detail.png b/feature/catalog/src/androidTest/assets/ui-goldens/route_series_detail.pngindex b371d8e2..f555a751 100644Binary files a/feature/catalog/src/androidTest/assets/ui-goldens/route_series_detail.png and b/feature/catalog/src/androidTest/assets/ui-goldens/route_series_detail.png differdiff --git a/feature/catalog/src/androidTest/java/com/streamvault/feature/catalog/CatalogPresentationGoldenTest.kt b/feature/catalog/src/androidTest/java/com/streamvault/feature/catalog/CatalogPresentationGoldenTest.ktindex 3cdf1c20..2030ea62 100644--- a/feature/catalog/src/androidTest/java/com/streamvault/feature/catalog/CatalogPresentationGoldenTest.kt+++ b/feature/catalog/src/androidTest/java/com/streamvault/feature/catalog/CatalogPresentationGoldenTest.kt@@ -13,7 +13,8 @@ import androidx.compose.ui.test.onNodeWithTagimport androidx.compose.ui.unit.dpimport androidx.test.ext.junit.runners.AndroidJUnit4import androidx.tv.material3.MaterialTheme-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors+import com.streamvault.core.ui.design.BrowseVisualStyleimport com.streamvault.core.ui.components.SearchInputimport com.streamvault.core.ui.components.shell.AppHeroHeaderimport com.streamvault.core.ui.components.shell.AppSectionHeader@@ -91,11 +92,11 @@ class CatalogPresentationGoldenTest {private fun captureGolden(name: String, content: @androidx.compose.runtime.Composable () -> Unit) {composeRule.setContent {StreamVaultTheme {- MaterialTheme {+ BrowseVisualStyle {Box(Modifier.fillMaxSize()- .background(AppColors.Canvas)+ .background(BrowseColors.Canvas).testTag("golden")) {content()diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogBrowseScaffold.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogBrowseScaffold.ktindex fc73a9a8..f56d70df 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogBrowseScaffold.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogBrowseScaffold.kt@@ -1,5 +1,7 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.browsePrimaryButtonColors+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -18,7 +20,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.LazyListScope-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -39,8 +40,8 @@ import androidx.tv.material3.Textimport coil3.compose.AsyncImageimport com.streamvault.core.ui.components.SearchInputimport com.streamvault.core.ui.image.rememberCrossfadeImageModel-import com.streamvault.core.ui.design.AppColors-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseColors as AppColors+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.design.LocalAppSpacingimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvButton@@ -120,8 +121,9 @@ fun CategoryRailPanel(val spacing = LocalAppSpacing.currentSurface(modifier = modifier.fillMaxSize(),- shape = RoundedCornerShape(28.dp),- colors = androidx.tv.material3.SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated)+ shape = BrowseShapes.Panel,+ colors = androidx.tv.material3.SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated),+ border = Border(BorderStroke(1.dp, AppColors.Outline), shape = BrowseShapes.Panel)) {Column(modifier = Modifier@@ -173,7 +175,7 @@ fun BrowseSearchLaunchCard(TvClickableSurface(onClick = onClick,modifier = modifier.fillMaxWidth(),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(22.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Panel),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated,focusedContainerColor = AppColors.SurfaceEmphasis@@ -181,7 +183,7 @@ fun BrowseSearchLaunchCard(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),- shape = RoundedCornerShape(22.dp)+ shape = BrowseShapes.Panel))) {@@ -219,7 +221,7 @@ fun BrowseHeroPanel(modifier = modifier.fillMaxWidth().height(240.dp),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(28.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Hero),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated,focusedContainerColor = AppColors.SurfaceEmphasis@@ -227,7 +229,7 @@ fun BrowseHeroPanel(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),- shape = RoundedCornerShape(28.dp)+ shape = BrowseShapes.Hero))) {@@ -301,10 +303,7 @@ fun BrowseHeroPanel(}TvButton(onClick = onClick,- colors = ButtonDefaults.colors(- containerColor = AppColors.Brand,- contentColor = Color.Black- )+ colors = browsePrimaryButtonColors()) {Text(actionLabel)}diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogCards.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogCards.ktindex fa72eda8..0b1fad98 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogCards.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogCards.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.animation.core.snapimport androidx.compose.animation.core.tween@@ -62,22 +63,22 @@ import com.streamvault.feature.catalog.presentation.components.SeriesPosterCardimport com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.feature.catalog.presentation.components.formatVodRatingLabelimport com.streamvault.domain.playback.archivePlaybackCapability-import com.streamvault.core.ui.theme.AccentAmber-import com.streamvault.core.ui.theme.AccentCyan-import com.streamvault.core.ui.theme.AccentRed-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.GradientOverlayBottom-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.Surface-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight-import com.streamvault.core.ui.theme.TextPrimary-import com.streamvault.core.ui.theme.TextSecondary-import com.streamvault.core.ui.theme.TextTertiary+import com.streamvault.core.ui.design.browse.AccentAmber+import com.streamvault.core.ui.design.browse.AccentCyan+import com.streamvault.core.ui.design.browse.AccentRed+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.GradientOverlayBottom+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.Surface+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlight+import com.streamvault.core.ui.design.browse.TextPrimary+import com.streamvault.core.ui.design.browse.TextSecondary+import com.streamvault.core.ui.design.browse.TextTertiaryimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Movieimport com.streamvault.domain.model.Series-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.interaction.rememberTvInteractionSounds@@ -141,7 +142,7 @@ fun FocusableCard(}isFocused = it.isFocused},- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f,pressedScale = FocusSpec.PressedScale@@ -152,15 +153,15 @@ fun FocusableCard(),border = ClickableSurfaceDefaults.border(border = Border(- border = BorderStroke(0.dp, Color.Transparent),- shape = RoundedCornerShape(12.dp)+ border = BorderStroke(1.dp, com.streamvault.core.ui.design.BrowseColors.Outline),+ shape = BrowseShapes.Artwork),focusedBorder = Border(border = BorderStroke(width = if (isDragging) 4.dp else FocusSpec.CardBorderWidth,color = if (isDragging) AccentAmber else FocusBorder),- shape = RoundedCornerShape(12.dp)+ shape = BrowseShapes.Artwork))) {@@ -296,7 +297,7 @@ fun ChannelCard(Icon(imageVector = Icons.Filled.Star,contentDescription = null,- tint = AccentAmber,+ tint = com.streamvault.core.ui.design.BrowseColors.MediaWarning,modifier = Modifier.size(14.dp))}@@ -456,7 +457,7 @@ fun MovieCard(Text(text = formatVodRatingLabel(movie.rating),style = MaterialTheme.typography.labelSmall,- color = AccentAmber+ color = com.streamvault.core.ui.design.BrowseColors.MediaWarning)}}@@ -472,7 +473,7 @@ fun MovieCard(Icon(imageVector = Icons.Filled.Star,contentDescription = null,- tint = AccentAmber,+ tint = com.streamvault.core.ui.design.BrowseColors.MediaWarning,modifier = Modifier.size(12.dp))}@@ -576,7 +577,7 @@ fun SeriesCard(Text(text = formatVodRatingLabel(series.rating),style = MaterialTheme.typography.labelSmall,- color = AccentAmber+ color = com.streamvault.core.ui.design.BrowseColors.MediaWarning)}}@@ -592,7 +593,7 @@ fun SeriesCard(Icon(imageVector = Icons.Filled.Star,contentDescription = null,- tint = AccentAmber,+ tint = com.streamvault.core.ui.design.BrowseColors.MediaWarning,modifier = Modifier.size(12.dp))}diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogCategoryRow.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogCategoryRow.ktindex f23dfbbc..76e1c55a 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogCategoryRow.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogCategoryRow.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.PaddingValues@@ -7,7 +8,6 @@ import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.BorderStroke-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.itemsimport androidx.compose.material.icons.Icons@@ -32,11 +32,11 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.Textimport com.streamvault.feature.catalog.Rimport com.streamvault.core.ui.components.shell.AppSectionHeader-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.core.ui.interaction.mouseClickable// ׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬ Netflix-style horizontal category row ׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬׳³ג€™׳’ג‚¬ֲ׳’ג€ֲ¬@@ -90,11 +90,11 @@ fun <T : Any> CategoryRow(contentColor = Primary,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control))) {@@ -119,11 +119,11 @@ fun <T : Any> CategoryRow(contentColor = if (isPinned) Primary else OnSurface,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control))) {diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogContinueWatchingRow.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogContinueWatchingRow.ktindex 5a1d2061..fa2122af 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogContinueWatchingRow.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogContinueWatchingRow.kt@@ -32,12 +32,12 @@ import androidx.tv.material3.Textimport coil3.compose.AsyncImageimport com.streamvault.feature.catalog.Rimport com.streamvault.core.ui.image.rememberCrossfadeImageModel-import com.streamvault.core.ui.theme.AccentCyan-import com.streamvault.core.ui.theme.GradientOverlayBottom-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.TextPrimary-import com.streamvault.core.ui.theme.TextSecondary-import com.streamvault.core.ui.theme.TextTertiary+import com.streamvault.core.ui.design.browse.AccentCyan+import com.streamvault.core.ui.design.browse.GradientOverlayBottom+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.TextPrimary+import com.streamvault.core.ui.design.browse.TextSecondary+import com.streamvault.core.ui.design.browse.TextTertiaryimport com.streamvault.domain.model.ContentTypeimport com.streamvault.domain.model.PlaybackHistorydiff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogEpisodeRowCard.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogEpisodeRowCard.ktindex de98fda8..cb34264d 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogEpisodeRowCard.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogEpisodeRowCard.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.animation.core.snapimport androidx.compose.foundation.BorderStroke@@ -57,9 +58,9 @@ import com.streamvault.core.ui.image.ChannelLogoBadgeimport com.streamvault.core.ui.accessibility.rememberReducedMotionEnabledimport com.streamvault.feature.catalog.presentation.components.channelProgressFractionimport com.streamvault.core.ui.image.rememberCrossfadeImageModel-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.core.ui.design.AppMotion-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.interaction.rememberTvInteractionSoundsimport com.streamvault.core.ui.components.shell.ContentMetadataStrip@@ -72,6 +73,7 @@ import com.streamvault.domain.model.Series@Composablefun LiveChannelRowCard(+ highlighted: Boolean = false,channel: Channel,nowMs: Long,sourceBadgeLabel: String? = null,@@ -90,8 +92,8 @@ fun LiveChannelRowCard(Box(modifier = modifier- .clip(RoundedCornerShape(18.dp))- .background(AppColors.SurfaceElevated)+ .clip(BrowseShapes.Panel)+ .background(if (highlighted) AppColors.SurfaceEmphasis else AppColors.SurfaceElevated).fillMaxWidth().height(rowHeight)) {@@ -106,7 +108,7 @@ fun LiveChannelRowCard(modifier = Modifier.width(logoWidth).fillMaxHeight()- .clip(RoundedCornerShape(12.dp))+ .clip(BrowseShapes.Artwork)) {ChannelLogoBadge(channelName = channel.name,@@ -180,7 +182,7 @@ fun LiveChannelRowCard(modifier = Modifier.fillMaxWidth().height(2.dp)- .clip(RoundedCornerShape(999.dp)),+ .clip(BrowseShapes.Control),color = AppColors.Info,trackColor = AppColors.SurfaceEmphasis)@@ -277,23 +279,25 @@ fun LiveChannelRowSurface(isFocused = it.isFocused},scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(16.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated,focusedContainerColor = AppColors.SurfaceEmphasis),border = ClickableSurfaceDefaults.border(+ border = Border(BorderStroke(1.dp, AppColors.Outline), shape = BrowseShapes.Control),focusedBorder = Border(border = BorderStroke(width = if (isDragging) 4.dp else FocusSpec.BorderWidth,color = if (isDragging) AppColors.Warning else AppColors.Focus),- shape = RoundedCornerShape(16.dp)+ shape = BrowseShapes.Control))) {Box {LiveChannelRowCard(+ highlighted = isFocused,channel = channel,nowMs = nowMs,sourceBadgeLabel = sourceBadgeLabel,@@ -338,7 +342,7 @@ fun LiveChannelRowSurface(Icon(imageVector = Icons.Filled.Star,contentDescription = null,- tint = AppColors.Warning,+ tint = AppColors.MediaWarning,modifier = Modifier.size(11.dp))}@@ -382,7 +386,7 @@ fun EpisodeRowCard(Box(modifier = modifier.fillMaxWidth()- .clip(RoundedCornerShape(18.dp))+ .clip(BrowseShapes.Panel).background(AppColors.SurfaceElevated).padding(16.dp)) {@@ -392,7 +396,7 @@ fun EpisodeRowCard(modifier = Modifier.width(previewWidth).aspectRatio(16f / 9f)- .clip(RoundedCornerShape(12.dp))+ .clip(BrowseShapes.Artwork).background(AppColors.SurfaceEmphasis),contentAlignment = Alignment.Center) {@@ -454,7 +458,7 @@ private fun PosterCard(subtitle: String?,modifier: Modifier = Modifier) {- val posterShape = RoundedCornerShape(12.dp)+ val posterShape = BrowseShapes.Artworkvar imageLoaded by remember(imageUrl) { mutableStateOf(false) }var imageFailed by remember(imageUrl) { mutableStateOf(false) }val showFallback = imageUrl.isNullOrBlank() || imageFailed || !imageLoaded@@ -462,7 +466,7 @@ private fun PosterCard(Box(modifier = modifier.clip(posterShape)- .background(AppColors.SurfaceEmphasis)+ .background(Brush.linearGradient(listOf(AppColors.SurfaceEmphasis, AppColors.Surface, AppColors.Brand.copy(alpha = 0.18f))))) {// Fallback letter: only shown while no URL, still loading, or load failedif (showFallback) {@@ -472,7 +476,7 @@ private fun PosterCard() {Text(text = title.take(1).uppercase(),- style = MaterialTheme.typography.titleLarge,+ style = MaterialTheme.typography.displayLarge,color = AppColors.TextSecondary)}@@ -484,7 +488,7 @@ private fun PosterCard(modifier = Modifier.fillMaxSize().clip(posterShape),- contentScale = ContentScale.Fit,+ contentScale = ContentScale.Crop,onSuccess = { imageLoaded = true },onError = { imageFailed = true })diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogExternalRatingsStrip.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogExternalRatingsStrip.ktindex 13d16091..c4fe9554 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogExternalRatingsStrip.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogExternalRatingsStrip.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.borderimport androidx.compose.foundation.layout.Arrangement@@ -21,7 +22,7 @@ import androidx.compose.ui.unit.dpimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.feature.catalog.R-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.domain.model.ExternalRatingValueimport com.streamvault.domain.model.ExternalRatings@@ -108,8 +109,8 @@ private fun RatingBadgeCard(Column(modifier = Modifier.widthIn(min = 92.dp)- .background(containerColor, RoundedCornerShape(18.dp))- .border(1.dp, AppColors.Outline, RoundedCornerShape(18.dp))+ .background(containerColor, BrowseShapes.Panel)+ .border(1.dp, AppColors.Outline, BrowseShapes.Panel).padding(horizontal = 12.dp, vertical = 10.dp),verticalArrangement = Arrangement.spacedBy(8.dp)) {diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogReorderTopBar.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogReorderTopBar.ktindex ea41a7fb..c94a5b22 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogReorderTopBar.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogReorderTopBar.kt@@ -1,5 +1,7 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.browsePrimaryButtonColors+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.animation.AnimatedVisibilityimport androidx.compose.animation.EnterTransition@@ -8,7 +10,6 @@ import androidx.compose.animation.slideInVerticallyimport androidx.compose.animation.slideOutVerticallyimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.*-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -18,13 +19,13 @@ import androidx.compose.ui.unit.dpimport androidx.compose.ui.res.stringResourceimport androidx.tv.material3.*import com.streamvault.feature.catalog.R-import com.streamvault.core.ui.design.FocusSpec-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.TextPrimary-import com.streamvault.core.ui.theme.TextSecondary+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpec+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.TextPrimary+import com.streamvault.core.ui.design.browse.TextSecondaryimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvIconButton@@ -49,7 +50,7 @@ fun ReorderTopBar(.padding(bottom = 20.dp)) {Surface(- shape = RoundedCornerShape(24.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Row(@@ -105,12 +106,7 @@ fun ReorderTopBar(TvButton(onClick = onSave,- colors = ButtonDefaults.colors(- containerColor = Primary,- contentColor = Color.White,- focusedContainerColor = Primary.copy(alpha = 0.88f),- focusedContentColor = Color.White- ),+ colors = browsePrimaryButtonColors(),border = ButtonDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, FocusBorder)diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSavedCategoryContextCard.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSavedCategoryContextCard.ktindex 0b45b708..0bfbfe01 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSavedCategoryContextCard.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSavedCategoryContextCard.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -9,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.height-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -25,12 +25,12 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.feature.catalog.R-import com.streamvault.core.ui.design.FocusSpec-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpec+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport com.streamvault.core.ui.interaction.mouseClickable@Composable@@ -43,7 +43,7 @@ fun SavedCategoryContextCard() {Surface(modifier = modifier.fillMaxWidth(),- shape = RoundedCornerShape(18.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSavedCategoryShortcutsRow.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSavedCategoryShortcutsRow.ktindex de390663..2667af2c 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSavedCategoryShortcutsRow.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSavedCategoryShortcutsRow.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -10,7 +11,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.ExperimentalComposeUiApiimport androidx.compose.ui.Alignment@@ -27,12 +27,12 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.feature.catalog.R-import com.streamvault.core.ui.design.FocusSpec-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpec+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport com.streamvault.core.ui.interaction.mouseClickabledata class SavedCategoryShortcut(@@ -93,7 +93,7 @@ fun SavedCategoryShortcutsRow(modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp),- shape = RoundedCornerShape(14.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Text(@@ -118,7 +118,7 @@ fun SavedCategoryShortcutsRow(Surface(onClick = onPrimaryShortcutClick,modifier = Modifier.width(shortcutWidth).mouseClickable(onClick = onPrimaryShortcutClick),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = if (isPrimaryShortcutSelected) {Primary.copy(alpha = 0.18f)@@ -132,7 +132,7 @@ fun SavedCategoryShortcutsRow(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, FocusBorder),- shape = RoundedCornerShape(14.dp)+ shape = BrowseShapes.Control)),scale = ClickableSurfaceDefaults.scale(focusedScale = FocusSpec.FocusedScale)@@ -169,7 +169,7 @@ fun SavedCategoryShortcutsRow(onClick = { onShortcutClick(shortcut.name) },onLongClick = onShortcutLongClick?.let { handler -> { handler(shortcut.name) } }),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = if (isSelected) Primary.copy(alpha = 0.18f) else SurfaceElevated,focusedContainerColor = Primary.copy(alpha = 0.22f),@@ -179,7 +179,7 @@ fun SavedCategoryShortcutsRow(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, FocusBorder),- shape = RoundedCornerShape(14.dp)+ shape = BrowseShapes.Control)),scale = ClickableSurfaceDefaults.scale(focusedScale = FocusSpec.FocusedScale)diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSelectionChipRow.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSelectionChipRow.ktindex 1ae4e803..cc539305 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSelectionChipRow.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogSelectionChipRow.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -8,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -28,12 +28,12 @@ import androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.interaction.rememberTvInteractionSounds@@ -128,11 +128,11 @@ fun ChipRowSection(contentColor = if (isSelected) Primary else OnSurface,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control)),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogVodChrome.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogVodChrome.ktindex ad7027bf..9fe9cb72 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogVodChrome.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogVodChrome.kt@@ -1,5 +1,7 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.contentOnColor+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.BoxWithConstraints@@ -14,7 +16,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -37,15 +38,15 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Text-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.feature.catalog.presentation.components.ChipRowItemimport com.streamvault.feature.catalog.presentation.components.ChipRowSection-import com.streamvault.core.ui.design.AppColors.Brand as Primary-import com.streamvault.core.ui.design.AppColors.Focus as FocusBorder-import com.streamvault.core.ui.design.AppColors.SurfaceElevated as SurfaceElevated-import com.streamvault.core.ui.design.AppColors.SurfaceEmphasis as SurfaceHighlight-import com.streamvault.core.ui.design.AppColors.TextPrimary as TextPrimary-import com.streamvault.core.ui.design.AppColors.TextTertiary as OnSurfaceDim+import com.streamvault.core.ui.design.BrowseColors.Brand as Primary+import com.streamvault.core.ui.design.BrowseColors.Focus as FocusBorder+import com.streamvault.core.ui.design.BrowseColors.SurfaceElevated as SurfaceElevated+import com.streamvault.core.ui.design.BrowseColors.SurfaceEmphasis as SurfaceHighlight+import com.streamvault.core.ui.design.BrowseColors.TextPrimary as TextPrimary+import com.streamvault.core.ui.design.BrowseColors.TextTertiary as OnSurfaceDimimport androidx.compose.foundation.BorderStrokeimport com.streamvault.feature.catalog.Rimport com.streamvault.core.ui.components.SearchInput@@ -115,7 +116,7 @@ fun VodHeroStrip(.fillMaxWidth().padding(horizontal = 20.dp).height(132.dp),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(22.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Panel),colors = ClickableSurfaceDefaults.colors(containerColor = SurfaceHighlight,focusedContainerColor = Primary.copy(alpha = 0.22f)@@ -123,7 +124,7 @@ fun VodHeroStrip(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(22.dp)+ shape = BrowseShapes.Panel)),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)@@ -155,13 +156,13 @@ fun VodHeroStrip()}Surface(- shape = RoundedCornerShape(999.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = Primary)) {Text(text = actionLabel,style = MaterialTheme.typography.labelLarge,- color = Color.Black,+ color = contentOnColor(Primary),modifier = Modifier.padding(horizontal = 16.dp, vertical = 10.dp))}@@ -251,7 +252,7 @@ fun VodCategoryPickerDialog(onDismiss()}},- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = SurfaceElevated,focusedContainerColor = SurfaceHighlight@@ -259,7 +260,7 @@ fun VodCategoryPickerDialog(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(14.dp)+ shape = BrowseShapes.Control)),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)@@ -401,11 +402,11 @@ private fun VodBrowseOptionChip(contentColor = if (selected) Primary else TextPrimary,focusedContentColor = TextPrimary),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control)),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogVodClassicBrowser.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogVodClassicBrowser.ktindex 2061ffce..adf80d1b 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogVodClassicBrowser.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/CatalogVodClassicBrowser.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -16,7 +17,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -35,8 +35,8 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.Textimport com.streamvault.feature.catalog.Rimport com.streamvault.feature.catalog.presentation.components.FocusedMarqueeText-import com.streamvault.core.ui.design.AppColors-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseColors as AppColors+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvIconButton@@ -83,7 +83,7 @@ fun VodClassicSplitLayout(modifier = Modifier.fillMaxWidth().onFocusChanged { isFocused = it.isFocused },- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = if (category.isSelected) AppColors.Brand.copy(alpha = 0.22f) else AppColors.SurfaceElevated,focusedContainerColor = AppColors.SurfaceEmphasis,@@ -93,7 +93,7 @@ fun VodClassicSplitLayout(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),- shape = RoundedCornerShape(14.dp)+ shape = BrowseShapes.Control)),scale = ClickableSurfaceDefaults.scale(focusedScale = FocusSpec.FocusedScale)@@ -138,7 +138,7 @@ fun VodClassicSplitLayout(modifier = Modifier.weight(1f).fillMaxHeight()- .background(AppColors.Canvas, RoundedCornerShape(28.dp))+ .background(AppColors.Canvas, BrowseShapes.Hero).padding(horizontal = 16.dp, vertical = 14.dp)) {content()@@ -204,7 +204,7 @@ private fun VodClassicHeaderActionButton(TvClickableSurface(onClick = action.onClick,modifier = modifier,- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(18.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Panel),colors = ClickableSurfaceDefaults.colors(containerColor = if (isSelected) AppColors.Brand.copy(alpha = 0.18f) else AppColors.SurfaceElevated,focusedContainerColor = AppColors.SurfaceEmphasis,@@ -214,7 +214,7 @@ private fun VodClassicHeaderActionButton(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),- shape = RoundedCornerShape(18.dp)+ shape = BrowseShapes.Panel)),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/AddToGroupDialog.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/AddToGroupDialog.ktindex 29ded271..f03e4773 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/AddToGroupDialog.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/AddToGroupDialog.kt@@ -1,11 +1,12 @@package com.streamvault.feature.catalog.presentation.components.dialogs+import com.streamvault.core.ui.design.contentOnColor+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.layout.*import androidx.compose.foundation.borderimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Addimport androidx.compose.material.icons.filled.Close@@ -24,7 +25,7 @@ import com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Categoryimport androidx.compose.ui.res.stringResourceimport com.streamvault.feature.catalog.R-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport androidx.compose.ui.input.key.*import androidx.compose.ui.focus.onFocusChangedimport androidx.compose.foundation.shape.CircleShape@@ -113,7 +114,7 @@ fun AddToGroupDialog(val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->Surface(- shape = RoundedCornerShape(16.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated),modifier = resolvedModifier.padding(16.dp)@@ -147,6 +148,13 @@ fun AddToGroupDialog(// ׳’ג€ג‚¬׳’ג€ג‚¬ Favorites ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬item {var isFocused by remember { mutableStateOf(false) }+ val favoriteInk = contentOnColor(+ when {+ isFocused -> AppColors.Focus+ isFavorite -> AppColors.Warning+ else -> AppColors.Brand+ }+ )Button(onClick = safeToggleFavorite,modifier = Modifier@@ -169,20 +177,20 @@ fun AddToGroupDialog(isFavorite -> AppColors.Warningelse -> AppColors.Brand},- contentColor = Color.Black+ contentColor = favoriteInk)) {Icon(imageVector = Icons.Default.Star,contentDescription = if (isFavorite) stringResource(R.string.add_group_remove_favorites)else stringResource(R.string.add_group_add_favorites),- tint = Color.Black+ tint = favoriteInk)Spacer(modifier = Modifier.width(8.dp))Text(text = if (isFavorite) stringResource(R.string.add_group_remove_favorites)else stringResource(R.string.add_group_add_favorites),- color = Color.Black+ color = favoriteInk)}}@@ -194,7 +202,7 @@ fun AddToGroupDialog(modifier = Modifier.fillMaxWidth().mouseClickable(onClick = safeMoveToMovies),colors = ButtonDefaults.colors(containerColor = AppColors.Brand,- contentColor = Color.Black+ contentColor = contentOnColor(AppColors.Brand))) { Text(stringResource(R.string.m3u_move_to_movies)) }}@@ -207,7 +215,7 @@ fun AddToGroupDialog(modifier = Modifier.fillMaxWidth().mouseClickable(onClick = safeMoveToSeries),colors = ButtonDefaults.colors(containerColor = AppColors.Success,- contentColor = Color.Black+ contentColor = contentOnColor(AppColors.Success))) { Text(stringResource(R.string.m3u_move_to_series)) }}@@ -256,13 +264,13 @@ fun AddToGroupDialog(Icon(imageVector = Icons.Default.Add,contentDescription = stringResource(R.string.multiview_add_to_split),- tint = if (isFocused) Color.Black else Color.White+ tint = if (isFocused) contentOnColor(AppColors.Focus) else Color.White)Spacer(modifier = Modifier.width(8.dp))Text(text = if (isQueuedForSplitScreen) stringResource(R.string.multiview_queued)else stringResource(R.string.multiview_add_to_split),- color = if (isFocused) Color.Black else Color.White+ color = if (isFocused) contentOnColor(AppColors.Focus) else Color.White)}}@@ -289,18 +297,18 @@ fun AddToGroupDialog(.mouseClickable(onClick = safeHideChannel),colors = ButtonDefaults.colors(containerColor = if (isFocused) AppColors.Focus else AppColors.SurfaceAccent,- contentColor = if (isFocused) Color.Black else AppColors.TextPrimary+ contentColor = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)) {Icon(imageVector = Icons.Default.Lock,contentDescription = stringResource(R.string.channel_action_hide),- tint = if (isFocused) Color.Black else AppColors.TextPrimary+ tint = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)Spacer(modifier = Modifier.width(8.dp))Text(text = stringResource(R.string.channel_action_hide),- color = if (isFocused) Color.Black else AppColors.TextPrimary+ color = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)}}@@ -330,18 +338,18 @@ fun AddToGroupDialog(isFocused -> AppColors.Focuselse -> MaterialTheme.colorScheme.errorContainer},- contentColor = if (isFocused) Color.Black else MaterialTheme.colorScheme.onErrorContainer+ contentColor = if (isFocused) contentOnColor(AppColors.Focus) else MaterialTheme.colorScheme.onErrorContainer)) {Icon(imageVector = Icons.Default.Close,contentDescription = stringResource(R.string.channel_options_remove_from_recent),- tint = if (isFocused) Color.Black else MaterialTheme.colorScheme.onErrorContainer+ tint = if (isFocused) contentOnColor(AppColors.Focus) else MaterialTheme.colorScheme.onErrorContainer)Spacer(modifier = Modifier.width(8.dp))Text(text = stringResource(R.string.channel_options_remove_from_recent),- color = if (isFocused) Color.Black else MaterialTheme.colorScheme.onErrorContainer+ color = if (isFocused) contentOnColor(AppColors.Focus) else MaterialTheme.colorScheme.onErrorContainer)}}@@ -404,7 +412,7 @@ fun AddToGroupDialog(isMember -> AppColors.Live.copy(alpha = 0.2f)else -> AppColors.BrandMuted.copy(alpha = 0.4f)},- contentColor = if (isFocused) Color.Black else AppColors.TextPrimary+ contentColor = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)) {Text(@@ -435,7 +443,7 @@ fun AddToGroupDialog(.mouseClickable(onClick = safeCreateGroup),colors = ButtonDefaults.colors(containerColor = if (isFocused) AppColors.Focus else Color.Transparent,- contentColor = if (isFocused) Color.Black else AppColors.TextPrimary+ contentColor = if (isFocused) contentOnColor(AppColors.Focus) else AppColors.TextPrimary)) {Icon(Icons.Default.Add, contentDescription = stringResource(R.string.add_group_create_new_btn))diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/CategoryOptionsDialog.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/CategoryOptionsDialog.ktindex 9d3f5e72..6b71495c 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/CategoryOptionsDialog.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/CategoryOptionsDialog.kt@@ -1,11 +1,11 @@package com.streamvault.feature.catalog.presentation.components.dialogs+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValue@@ -27,10 +27,10 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.feature.catalog.R-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.components.dialogs.rememberDialogOpenGestureBlockerimport androidx.compose.foundation.layout.BoxWithConstraints@@ -84,7 +84,7 @@ fun CategoryOptionsDialog(modifier = Modifier.fillMaxWidth(dialogWidth).onPreviewKeyEvent(blockOpenGesture),- shape = RoundedCornerShape(24.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/CreateGroupDialog.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/CreateGroupDialog.ktindex 3b62f64c..c1d498dc 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/CreateGroupDialog.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/CreateGroupDialog.kt@@ -1,5 +1,7 @@package com.streamvault.feature.catalog.presentation.components.dialogs+import com.streamvault.core.ui.design.browsePrimaryButtonColors+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.BoxWithConstraints@@ -7,7 +9,6 @@ import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.text.KeyboardActionsimport androidx.compose.foundation.text.KeyboardOptionsimport androidx.compose.material3.OutlinedTextField@@ -40,10 +41,10 @@ import androidx.tv.material3.Textimport com.streamvault.feature.catalog.Rimport com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated@Composablefun CreateGroupDialog(@@ -73,7 +74,7 @@ fun CreateGroupDialog(val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->Surface(modifier = resolvedModifier,- shape = RoundedCornerShape(24.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(@@ -163,10 +164,7 @@ fun CreateGroupDialog(enabled = canInteract && value.trim().isNotEmpty(),onClick = createHandler),- colors = ButtonDefaults.colors(- containerColor = Primary,- contentColor = Color.White- )+ colors = browsePrimaryButtonColors()) {Text(stringResource(R.string.add_group_create))}diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/DeleteGroupDialog.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/DeleteGroupDialog.ktindex 8cc1fc9e..b1bed1cb 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/DeleteGroupDialog.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/DeleteGroupDialog.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.components.dialogs+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.BoxWithConstraints@@ -7,7 +8,6 @@ import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValue@@ -31,10 +31,10 @@ import androidx.tv.material3.Textimport com.streamvault.feature.catalog.Rimport com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.ErrorColor-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.ErrorColor+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport kotlinx.coroutines.delay@Composable@@ -59,7 +59,7 @@ fun DeleteGroupDialog(val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->Surface(modifier = resolvedModifier,- shape = RoundedCornerShape(24.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/RenameGroupDialog.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/RenameGroupDialog.ktindex 1193cfc5..ea199cd1 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/RenameGroupDialog.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/components/dialogs/RenameGroupDialog.kt@@ -1,5 +1,7 @@package com.streamvault.feature.catalog.presentation.components.dialogs+import com.streamvault.core.ui.design.browsePrimaryButtonColors+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.text.KeyboardActionsimport androidx.compose.foundation.text.KeyboardOptions@@ -9,7 +11,6 @@ import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.OutlinedTextFieldDefaultsimport androidx.compose.material3.OutlinedTextFieldimport androidx.compose.runtime.Composable@@ -41,15 +42,15 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.design.requestFocusSafely-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.feature.catalog.Rimport com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated@Composablefun RenameGroupDialog(@@ -83,7 +84,7 @@ fun RenameGroupDialog(val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->Surface(modifier = resolvedModifier,- shape = RoundedCornerShape(24.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(@@ -184,12 +185,7 @@ fun RenameGroupDialog(enabled = canInteract && value.trim().isNotEmpty(),onClick = renameHandler),- colors = ButtonDefaults.colors(- containerColor = Primary,- contentColor = Color.White,- focusedContainerColor = Primary.copy(alpha = 0.84f),- focusedContentColor = Color.White- ),+ colors = browsePrimaryButtonColors(),border = ButtonDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, FocusBorder)diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/dashboard/DashboardScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/dashboard/DashboardScreen.ktindex a0b620ee..7ede33d1 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/dashboard/DashboardScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/dashboard/DashboardScreen.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.dashboard+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -17,7 +18,6 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.SnackbarHostimport androidx.compose.material3.SnackbarHostStateimport androidx.lifecycle.compose.collectAsStateWithLifecycle@@ -62,21 +62,21 @@ import com.streamvault.core.ui.image.rememberCrossfadeImageModelimport com.streamvault.feature.catalog.presentation.components.SeriesCardimport com.streamvault.core.ui.components.shell.AppHeroHeaderimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.feature.catalog.presentation.time.LocalCatalogTimeFormatimport com.streamvault.feature.catalog.presentation.time.createCatalogDateTimeFormatimport com.streamvault.feature.catalog.api.CatalogDashboardShelfCustomizationContentimport com.streamvault.feature.catalog.api.CatalogNavigationChromeimport com.streamvault.feature.catalog.api.CatalogScaffoldContentimport com.streamvault.core.navigation.AppDestination-import com.streamvault.core.ui.design.AppColors.Brand as Primary-import com.streamvault.core.ui.design.AppColors.Focus as FocusBorder-import com.streamvault.core.ui.design.AppColors.SurfaceElevated as SurfaceElevated-import com.streamvault.core.ui.design.AppColors.SurfaceEmphasis as SurfaceHighlight-import com.streamvault.core.ui.design.AppColors.TextPrimary as OnBackground-import com.streamvault.core.ui.design.AppColors.TextPrimary as TextPrimary-import com.streamvault.core.ui.design.AppColors.TextTertiary as OnSurfaceDim-import com.streamvault.core.ui.design.AppColors.TextTertiary as TextTertiary+import com.streamvault.core.ui.design.BrowseColors.Brand as Primary+import com.streamvault.core.ui.design.BrowseColors.Focus as FocusBorder+import com.streamvault.core.ui.design.BrowseColors.SurfaceElevated as SurfaceElevated+import com.streamvault.core.ui.design.BrowseColors.SurfaceEmphasis as SurfaceHighlight+import com.streamvault.core.ui.design.BrowseColors.TextPrimary as OnBackground+import com.streamvault.core.ui.design.BrowseColors.TextPrimary as TextPrimary+import com.streamvault.core.ui.design.BrowseColors.TextTertiary as OnSurfaceDim+import com.streamvault.core.ui.design.BrowseColors.TextTertiary as TextTertiaryimport com.streamvault.domain.model.AppHomeDashboardShelfimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.Channel@@ -375,13 +375,13 @@ private fun DashboardHero(modifier = Modifier.fillMaxWidth().height(heroHeight)- .clip(RoundedCornerShape(28.dp))+ .clip(BrowseShapes.Hero))Box(modifier = Modifier.fillMaxWidth().height(heroHeight)- .clip(RoundedCornerShape(28.dp))+ .clip(BrowseShapes.Hero).background(Brush.horizontalGradient(colors = listOf(@@ -446,7 +446,7 @@ private fun DashboardStatRow(LazyRow(horizontalArrangement = Arrangement.spacedBy(10.dp)) {items(statItems, key = { it }) { statLabel ->Surface(- shape = RoundedCornerShape(999.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = AppColors.Surface.copy(alpha = 0.64f))@@ -528,7 +528,7 @@ private fun DashboardShortcutCard(modifier = Modifier.width(cardWidth).height(76.dp),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(16.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = SurfaceElevated,focusedContainerColor = SurfaceHighlight@@ -536,11 +536,11 @@ private fun DashboardShortcutCard(border = ClickableSurfaceDefaults.border(border = Border(border = BorderStroke(1.dp, accentColor.copy(alpha = 0.28f)),- shape = RoundedCornerShape(16.dp)+ shape = BrowseShapes.Control),focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(16.dp)+ shape = BrowseShapes.Control))) {@@ -557,7 +557,7 @@ private fun DashboardShortcutCard(Box(modifier = Modifier.size(12.dp)- .clip(RoundedCornerShape(999.dp))+ .clip(BrowseShapes.Control).background(accentColor))Text(@@ -635,7 +635,7 @@ private fun DashboardProviderHealthCard(modifier = Modifier.fillMaxWidth().padding(horizontal = 48.dp, vertical = 4.dp),- shape = RoundedCornerShape(22.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceHighlight)) {Row(@@ -707,7 +707,7 @@ private fun DashboardHealthPill(value: String) {Surface(- shape = RoundedCornerShape(18.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = Color.White.copy(alpha = 0.08f))) {Column(@@ -737,7 +737,7 @@ private fun DashboardProviderWarningCard(modifier = Modifier.fillMaxWidth().padding(horizontal = 48.dp, vertical = 6.dp),- shape = RoundedCornerShape(20.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(@@ -774,7 +774,7 @@ private fun DashboardUpdateCard(modifier = Modifier.fillMaxWidth().padding(horizontal = 48.dp, vertical = 6.dp),- shape = RoundedCornerShape(20.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = Primary.copy(alpha = 0.16f)),border = Border(BorderStroke(1.dp, Primary.copy(alpha = 0.45f)))) {@@ -843,7 +843,7 @@ private fun EmptyDashboard(}Surface(- shape = RoundedCornerShape(28.dp),+ shape = BrowseShapes.Hero,colors = SurfaceDefaults.colors(containerColor = SurfaceHighlight)@@ -974,7 +974,7 @@ private fun FavoriteChannelsRow()TvClickableSurface(onClick = onSeeAll,- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = Primary.copy(alpha = 0.12f),focusedContainerColor = Primary.copy(alpha = 0.22f),@@ -1011,7 +1011,7 @@ private fun FavoriteChannelLogoCard(TvClickableSurface(onClick = onClick,modifier = Modifier.width(86.dp),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(18.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Panel),colors = ClickableSurfaceDefaults.colors(containerColor = SurfaceElevated,focusedContainerColor = SurfaceHighlight@@ -1019,7 +1019,7 @@ private fun FavoriteChannelLogoCard(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(18.dp)+ shape = BrowseShapes.Panel))) {@@ -1033,12 +1033,12 @@ private fun FavoriteChannelLogoCard(Box(modifier = Modifier.size(54.dp)- .clip(RoundedCornerShape(999.dp))+ .clip(BrowseShapes.Control)) {ChannelLogoBadge(channelName = channel.name,logoUrl = channel.logoUrl,- shape = RoundedCornerShape(999.dp),+ shape = BrowseShapes.Control,backgroundColor = AppColors.SurfaceEmphasis,contentPadding = PaddingValues(8.dp),textStyle = MaterialTheme.typography.labelLarge,diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/favorites/FavoritesScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/favorites/FavoritesScreen.ktindex 006257c4..db259631 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/favorites/FavoritesScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/favorites/FavoritesScreen.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.favorites+import com.streamvault.core.ui.design.BrowseShapesimport androidx.activity.compose.BackHandlerimport androidx.compose.animation.AnimatedVisibilityimport androidx.compose.animation.EnterTransition@@ -69,14 +70,14 @@ import com.streamvault.core.ui.components.shell.AppHeroHeaderimport com.streamvault.core.navigation.AppDestinationimport com.streamvault.core.ui.components.shell.AppSectionHeaderimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.theme.OnBackground-import com.streamvault.core.ui.theme.OnPrimary-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.Surface-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.OnBackground+import com.streamvault.core.ui.design.browse.OnPrimary+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.Surface+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.ContentTypeimport kotlinx.coroutines.launchimport com.streamvault.core.ui.interaction.TvClickableSurface@@ -701,7 +702,7 @@ private fun SavedLibrarySummaryCard(currentFilter: SavedLibraryFilter) {Surface(- shape = RoundedCornerShape(18.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(@@ -750,7 +751,7 @@ private fun SavedLibraryStatPill(highlighted: Boolean) {Surface(- shape = RoundedCornerShape(999.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = if (highlighted) Primary.copy(alpha = 0.18f) else SurfaceHighlight)@@ -810,7 +811,7 @@ private fun SavedHistoryRow(items(items, key = { "${it.history.contentType}:${it.history.contentId}" }) { item ->TvClickableSurface(onClick = { onItemClick(item) },- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = Surface,focusedContainerColor = SurfaceHighlight,@@ -875,7 +876,7 @@ private fun SavedGroupManagementRow(TvClickableSurface(onClick = { onGroupClick(group) },onLongClick = { onGroupLongClick(group) },- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = Surface,focusedContainerColor = SurfaceHighlightdiff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MovieDetailScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MovieDetailScreen.ktindex 6cd8b95a..0198b38a 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MovieDetailScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MovieDetailScreen.kt@@ -1,5 +1,7 @@package com.streamvault.feature.catalog.presentation.movies+import com.streamvault.core.ui.design.browsePrimaryButtonColors+import com.streamvault.core.ui.design.BrowseShapesimport android.content.Intentimport android.content.ClipDataimport android.content.ClipboardManager@@ -23,7 +25,6 @@ import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Favoriteimport androidx.compose.material.icons.outlined.FavoriteBorder@@ -64,7 +65,7 @@ import com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.image.rememberCrossfadeImageModelimport com.streamvault.core.ui.components.shell.ContentMetadataStripimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.core.ui.design.requestFocusSafelyimport com.streamvault.domain.model.ExternalRatingsimport com.streamvault.domain.model.Movie@@ -336,7 +337,7 @@ private fun MovieDetailContent(modifier = Modifier.fillMaxWidth().aspectRatio(2f / 3f)- .clip(RoundedCornerShape(12.dp))+ .clip(BrowseShapes.Artwork).background(AppColors.SurfaceElevated)) {AsyncImage(@@ -372,7 +373,7 @@ private fun MoviePoster(modifier = Modifier.width(posterWidth).aspectRatio(2f / 3f)- .clip(RoundedCornerShape(24.dp))+ .clip(BrowseShapes.Panel).background(AppColors.SurfaceElevated)) {AsyncImage(@@ -454,10 +455,7 @@ private fun MovieDetailHeroText(TvButton(onClick = onPlay,modifier = Modifier.focusRequester(playButtonFocusRequester),- colors = ButtonDefaults.colors(- containerColor = AppColors.Brand,- contentColor = Color.White- )+ colors = browsePrimaryButtonColors()) {Text(text = if (hasResume) {@@ -514,7 +512,7 @@ private fun MovieDetailHeroText(onClick = onToggleFavorite,colors = ButtonDefaults.colors(containerColor = if (movie.isFavorite) AppColors.Brand else AppColors.SurfaceEmphasis,- contentColor = if (movie.isFavorite) Color.White else AppColors.TextSecondary+ contentColor = if (movie.isFavorite) AppColors.OnPrimary else AppColors.TextSecondary)) {Icon(@@ -557,7 +555,7 @@ private fun MovieVersionSelector(onClick = { onSelectVariant(variant.rawMovieId) },colors = ButtonDefaults.colors(containerColor = if (selected) AppColors.Brand else AppColors.SurfaceEmphasis,- contentColor = if (selected) Color.White else AppColors.TextPrimary+ contentColor = if (selected) AppColors.OnPrimary else AppColors.TextPrimary)) {Text(diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesScreen.ktindex bb3f1fc4..3923ffef 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesScreen.kt@@ -21,7 +21,6 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.tv.material3.*import androidx.compose.ui.layout.ContentScaleimport coil3.compose.AsyncImage-import androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.foundation.BorderStroke@@ -48,7 +47,7 @@ import com.streamvault.feature.catalog.presentation.components.SelectionChipRowimport com.streamvault.feature.catalog.presentation.components.SavedCategoryContextCardimport com.streamvault.feature.catalog.presentation.components.SavedCategoryShortcutimport com.streamvault.feature.catalog.presentation.components.SavedCategoryShortcutsRow-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.LibraryFilterTypeimport com.streamvault.domain.model.LibrarySortBy@@ -61,7 +60,6 @@ import androidx.compose.ui.text.input.TextFieldValueimport androidx.compose.foundation.borderimport com.streamvault.feature.catalog.presentation.components.ReorderTopBarimport com.streamvault.feature.catalog.presentation.components.dialogs.DeleteGroupDialog-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.SnackbarHostimport androidx.compose.material3.SnackbarHostStatediff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/search/SearchScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/search/SearchScreen.ktindex 1c4fdf7c..fd2178a3 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/search/SearchScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/search/SearchScreen.kt@@ -1,5 +1,6 @@package com.streamvault.feature.catalog.presentation.search+import com.streamvault.core.ui.design.BrowseShapesimport androidx.annotation.StringResimport com.streamvault.core.ui.interaction.TvClickableSurface@@ -11,7 +12,6 @@ import androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.CircleShape-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.ui.Alignment@@ -52,10 +52,10 @@ import com.streamvault.feature.catalog.presentation.components.SeriesCardimport com.streamvault.core.ui.components.TvEmptyStateimport com.streamvault.feature.catalog.api.CatalogNavigationChromeimport com.streamvault.feature.catalog.api.CatalogScaffoldContent-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.core.ui.design.requestFocusSafelyimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import com.streamvault.domain.manager.ParentalControlManagerimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.CatalogCompleteness@@ -836,7 +836,7 @@ private fun SearchHeroPanel() {Surface(modifier = Modifier.fillMaxWidth(),- shape = RoundedCornerShape(24.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated.copy(alpha = 0.92f))) {Column(@@ -972,7 +972,7 @@ private fun SearchPill(colors = ClickableSurfaceDefaults.colors(containerColor = if (selected) Primary.copy(alpha = 0.22f) else Surface.copy(alpha = 0.72f),focusedContainerColor = if (selected) Primary.copy(alpha = 0.30f) else SurfaceHighlight,- contentColor = if (selected) Color.White else TextSecondary,+ contentColor = if (selected) TextPrimary else TextSecondary,focusedContentColor = TextPrimary),border = ClickableSurfaceDefaults.border(@@ -1010,7 +1010,7 @@ private fun SearchStatusCard() {Surface(modifier = modifier,- shape = RoundedCornerShape(18.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = Surface.copy(alpha = 0.78f))) {Column(@@ -1233,7 +1233,7 @@ private fun SearchItemActionsDialog(properties = DialogProperties(usePlatformDefaultWidth = false)) {Surface(- shape = RoundedCornerShape(20.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated),modifier = Modifier.width(360.dp)@@ -1338,7 +1338,7 @@ private fun SearchActionButton(.border(width = if (isFocused) 2.dp else 0.dp,color = if (isFocused) AppColors.Focus else Color.Transparent,- shape = RoundedCornerShape(12.dp)+ shape = BrowseShapes.Artwork).mouseClickable(onClick = onClick)@@ -1357,7 +1357,7 @@ private fun SearchActionButton(disabledContainerColor = AppColors.Surface.copy(alpha = 0.3f),disabledContentColor = AppColors.TextSecondary),- shape = ButtonDefaults.shape(shape = RoundedCornerShape(12.dp))+ shape = ButtonDefaults.shape(shape = BrowseShapes.Artwork)) {Icon(imageVector = icon,diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesDetailScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesDetailScreen.ktindex 59325da0..7f7934dc 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesDetailScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesDetailScreen.kt@@ -1,5 +1,7 @@package com.streamvault.feature.catalog.presentation.series+import com.streamvault.core.ui.design.browsePrimaryButtonColors+import com.streamvault.core.ui.design.BrowseShapesimport android.content.ClipDataimport android.content.ClipboardManagerimport android.content.Context@@ -23,7 +25,6 @@ import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Favoriteimport androidx.compose.material.icons.outlined.FavoriteBorder@@ -69,7 +70,7 @@ import com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.image.rememberCrossfadeImageModelimport com.streamvault.core.ui.components.shell.ContentMetadataStripimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.domain.model.Episodeimport com.streamvault.domain.model.ExternalRatingsimport com.streamvault.domain.model.Season@@ -266,7 +267,7 @@ private fun SeriesDetailContent(modifier = Modifier.width(posterWidth).aspectRatio(2f / 3f)- .clip(RoundedCornerShape(24.dp))+ .clip(BrowseShapes.Panel).background(AppColors.SurfaceElevated)) {AsyncImage(@@ -354,7 +355,7 @@ private fun SeriesDetailContent(modifier = Modifier.width(posterWidth).aspectRatio(2f / 3f)- .clip(RoundedCornerShape(24.dp))+ .clip(BrowseShapes.Panel).background(AppColors.SurfaceElevated)) {AsyncImage(@@ -532,7 +533,7 @@ private fun SeriesVersionSelector(onClick = { onSelectVariant(variant.rawSeriesId) },colors = ButtonDefaults.colors(containerColor = if (selected) AppColors.Brand else AppColors.SurfaceEmphasis,- contentColor = if (selected) Color.White else AppColors.TextPrimary+ contentColor = if (selected) AppColors.OnPrimary else AppColors.TextPrimary)) {Text(@@ -560,10 +561,7 @@ private fun SeriesDetailActions(Row(horizontalArrangement = Arrangement.spacedBy(12.dp), verticalAlignment = Alignment.CenterVertically) {TvButton(onClick = { onResumeClick(resumeEpisode) },- colors = ButtonDefaults.colors(- containerColor = AppColors.Brand,- contentColor = Color.White- )+ colors = browsePrimaryButtonColors()) {Text(text = if (hasProgress) {@@ -618,7 +616,7 @@ private fun SeriesDetailFavoriteAction(onClick = onToggleFavorite,colors = ButtonDefaults.colors(containerColor = if (series.isFavorite) AppColors.Brand else AppColors.SurfaceEmphasis,- contentColor = if (series.isFavorite) Color.White else AppColors.TextSecondary+ contentColor = if (series.isFavorite) AppColors.OnPrimary else AppColors.TextSecondary)) {Icon(@@ -638,7 +636,7 @@ fun SeasonChip() {TvClickableSurface(onClick = onClick,- shape = ClickableSurfaceDefaults.shape(shape = RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(shape = BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = if (isSelected) AppColors.BrandMuted else AppColors.SurfaceElevated,contentColor = AppColors.TextPrimary,@@ -648,11 +646,11 @@ fun SeasonChip(border = ClickableSurfaceDefaults.border(border = Border(border = androidx.compose.foundation.BorderStroke(1.dp, if (isSelected) AppColors.Brand else AppColors.Outline),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control),focusedBorder = Border(border = androidx.compose.foundation.BorderStroke(2.dp, AppColors.Focus),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control))) {@@ -681,7 +679,7 @@ fun EpisodeItem() {TvClickableSurface(onClick = onClick,- shape = ClickableSurfaceDefaults.shape(shape = RoundedCornerShape(18.dp)),+ shape = ClickableSurfaceDefaults.shape(shape = BrowseShapes.Panel),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated,focusedContainerColor = AppColors.SurfaceEmphasisdiff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesScreen.ktindex e1228a50..5ead4efd 100644--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesScreen.kt@@ -18,12 +18,10 @@ import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.foundation.layout.aspectRatioimport androidx.compose.ui.unit.dp-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.tv.material3.*import androidx.compose.ui.layout.ContentScaleimport coil3.compose.AsyncImage-import androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.foundation.BorderStroke@@ -50,7 +48,7 @@ import com.streamvault.feature.catalog.presentation.components.SavedCategoryShorimport com.streamvault.feature.catalog.presentation.components.SelectionChipimport com.streamvault.feature.catalog.presentation.components.SelectionChipRowimport com.streamvault.feature.catalog.presentation.components.SeriesCard-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.LibraryFilterTypeimport com.streamvault.domain.model.LibrarySortBydiff --git a/feature/live/src/main/java/com/streamvault/feature/live/epg/LiveEpgHeroComponents.kt b/feature/live/src/main/java/com/streamvault/feature/live/epg/LiveEpgHeroComponents.ktindex d87ceb54..e07ecc62 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/epg/LiveEpgHeroComponents.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/epg/LiveEpgHeroComponents.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -11,7 +12,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.layout.widthIn-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.LinearProgressIndicatorimport androidx.compose.runtime.Composableimport androidx.compose.runtime.derivedStateOf@@ -39,11 +39,11 @@ import com.streamvault.domain.playback.isArchivePlayableimport com.streamvault.feature.live.presentation.model.guideLookupKeyimport com.streamvault.feature.live.presentation.time.LocalLiveTimeFormatimport com.streamvault.feature.live.presentation.time.createLiveTimeFormat-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Programimport java.util.Date@@ -143,7 +143,7 @@ internal fun ImmersiveGuideHero(Surface(modifier = modifier.height(96.dp),colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),- shape = RoundedCornerShape(20.dp)+ shape = BrowseShapes.Panel) {Row(modifier = Modifier@@ -159,7 +159,7 @@ internal fun ImmersiveGuideHero(modifier = Modifier.width(54.dp).height(54.dp),- shape = RoundedCornerShape(12.dp)+ shape = BrowseShapes.Artwork)Column(diff --git a/feature/live/src/main/java/com/streamvault/feature/live/epg/LiveEpgScreen.kt b/feature/live/src/main/java/com/streamvault/feature/live/epg/LiveEpgScreen.ktindex 7ce542dc..ed664a51 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/epg/LiveEpgScreen.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/epg/LiveEpgScreen.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.epg+import com.streamvault.core.ui.design.BrowseShapesimport android.view.inputmethod.InputMethodManagerimport com.streamvault.domain.playback.ArchiveReplayMechanismimport com.streamvault.domain.playback.archivePlaybackCapability@@ -68,7 +69,6 @@ import androidx.compose.foundation.horizontalScrollimport androidx.compose.foundation.relocation.BringIntoViewRequesterimport androidx.compose.foundation.relocation.bringIntoViewRequesterimport androidx.compose.foundation.rememberScrollState-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScrollimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Search@@ -124,14 +124,14 @@ import com.streamvault.core.ui.image.ChannelLogoBadgeimport com.streamvault.core.ui.platform.rememberNotificationPermissionGateimport kotlinx.coroutines.launchimport com.streamvault.core.ui.components.dialogs.PinDialog-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight-import com.streamvault.core.ui.theme.TextPrimary-import com.streamvault.core.ui.theme.TextSecondary+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlight+import com.streamvault.core.ui.design.browse.TextPrimary+import com.streamvault.core.ui.design.browse.TextSecondaryimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.EpgMatchType@@ -873,7 +873,7 @@ private fun GuideStatusCard(isGuideStale: Boolean) {Surface(- shape = RoundedCornerShape(16.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = SurfaceHighlight)) {Column(@@ -915,7 +915,7 @@ private fun GuideProviderTroubleshootingCard(isGuideStale: Boolean) {Surface(- shape = RoundedCornerShape(16.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = SurfaceHighlight.copy(alpha = 0.85f))) {Column(diff --git a/feature/live/src/main/java/com/streamvault/feature/live/epg/LivePlayerTransparentGuideOverlay.kt b/feature/live/src/main/java/com/streamvault/feature/live/epg/LivePlayerTransparentGuideOverlay.ktindex db26034b..1c2c760e 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/epg/LivePlayerTransparentGuideOverlay.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/epg/LivePlayerTransparentGuideOverlay.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.activity.compose.BackHandlerimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -10,7 +11,6 @@ import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthIn-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -43,8 +43,8 @@ import com.streamvault.feature.live.presentation.epg.LiveGuideGridimport com.streamvault.feature.live.presentation.epg.LiveGuideGridLabelsimport com.streamvault.feature.live.presentation.epg.currentLiveGuideNowimport com.streamvault.feature.live.epg.isGuideCategoryLocked-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primaryimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Program@@ -129,7 +129,7 @@ fun PlayerTransparentGuideOverlay(.align(Alignment.TopStart).fillMaxWidth().padding(start = 18.dp, top = 16.dp, end = 18.dp),- shape = RoundedCornerShape(18.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = Color.Black.copy(alpha = 0.32f))@@ -199,7 +199,7 @@ fun PlayerTransparentGuideOverlay(modifier = Modifier.fillMaxSize().padding(start = 18.dp, top = 112.dp, end = 18.dp, bottom = 16.dp)- .clip(RoundedCornerShape(24.dp))+ .clip(BrowseShapes.Panel).background(Color.Black.copy(alpha = 0.16f))) {when {diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/HomeSidebarComponents.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/HomeSidebarComponents.ktindex b7e927ef..143238bd 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/HomeSidebarComponents.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/HomeSidebarComponents.kt@@ -1,5 +1,7 @@package com.streamvault.feature.live.home+import com.streamvault.core.ui.design.browsePrimaryButtonColors+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.Canvasimport androidx.compose.foundation.background@@ -55,14 +57,14 @@ import com.streamvault.feature.live.presentation.components.LiveFocusedMarqueeTeimport com.streamvault.player.ui.PlayerRenderViewimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnBackground-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.PrimaryLight-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnBackground+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.PrimaryLight+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.feature.live.presentation.time.LocalLiveTimeFormatimport com.streamvault.feature.live.presentation.time.createLiveTimeFormatimport com.streamvault.domain.model.Category@@ -85,7 +87,7 @@ fun CompactSplitLauncherButton(modifier = modifier.widthIn(min = 112.dp).height(34.dp),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = Primary.copy(alpha = 0.18f),focusedContainerColor = Primary.copy(alpha = 0.3f),@@ -133,8 +135,9 @@ fun LivePreviewPane(Surface(modifier = modifier,- shape = RoundedCornerShape(18.dp),- colors = SurfaceDefaults.colors(containerColor = SurfaceElevated.copy(alpha = 0.72f))+ shape = BrowseShapes.Panel,+ colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),+ border = Border(BorderStroke(1.dp, com.streamvault.core.ui.design.BrowseColors.Outline), shape = BrowseShapes.Panel)) {Column(modifier = Modifier@@ -152,7 +155,7 @@ fun LivePreviewPane(modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f)- .background(Color.Black, RoundedCornerShape(16.dp)),+ .background(Color.Black, BrowseShapes.Control),contentAlignment = Alignment.Center) {if (playerEngine != null && errorMessage == null) {@@ -171,13 +174,13 @@ fun LivePreviewPane(Text(text = stringResource(R.string.live_preview_placeholder_title),style = MaterialTheme.typography.titleSmall,- color = OnBackground,+ color = Color.White,textAlign = TextAlign.Center)Text(text = errorMessage ?: stringResource(R.string.live_preview_placeholder_subtitle),style = MaterialTheme.typography.bodySmall,- color = OnSurfaceDim,+ color = Color.White.copy(alpha = 0.7f),textAlign = TextAlign.Center)}@@ -186,7 +189,7 @@ fun LivePreviewPane(if (isLoading && channel != null) {Row(modifier = Modifier- .background(Color.Black.copy(alpha = 0.62f), RoundedCornerShape(12.dp))+ .background(Color.Black.copy(alpha = 0.62f), BrowseShapes.Artwork).padding(horizontal = 14.dp, vertical = 10.dp),horizontalArrangement = Arrangement.spacedBy(10.dp),verticalAlignment = Alignment.CenterVertically@@ -431,10 +434,7 @@ fun ReorderSidePanel() {TvButton(onClick = onSave,- colors = ButtonDefaults.colors(- containerColor = Primary,- contentColor = Color.White- ),+ colors = browsePrimaryButtonColors(),modifier = Modifier.weight(1f)) { Text(stringResource(R.string.action_save), maxLines = 1) }diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategoryOptionsDialog.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategoryOptionsDialog.ktindex 6dc2d271..67cf1b7c 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategoryOptionsDialog.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategoryOptionsDialog.kt@@ -1,12 +1,12 @@package com.streamvault.feature.live.home+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.BoxWithConstraintsimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValue@@ -29,10 +29,10 @@ import androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.components.dialogs.rememberDialogOpenGestureBlockerimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport com.streamvault.domain.model.Categoryimport kotlinx.coroutines.delay@@ -100,7 +100,7 @@ fun LiveCategoryOptionsDialog(modifier = Modifier.fillMaxWidth(dialogWidth).onPreviewKeyEvent(blockOpenGesture),- shape = RoundedCornerShape(24.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategorySidebarHeader.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategorySidebarHeader.ktindex 4c320429..165b6c6c 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategorySidebarHeader.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategorySidebarHeader.kt@@ -15,7 +15,7 @@ import androidx.compose.ui.unit.dpimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.components.SearchInput-import com.streamvault.core.ui.theme.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceimport com.streamvault.domain.model.ActiveLiveSourceimport com.streamvault.domain.model.ActiveLiveSourceOptionimport com.streamvault.domain.model.LiveTvQuickFilterVisibilityModediff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelContentHost.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelContentHost.ktindex 850d0427..c23169a6 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelContentHost.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelContentHost.kt@@ -16,8 +16,8 @@ import androidx.compose.ui.unit.dpimport androidx.tv.material3.Iconimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.OnBackground-import com.streamvault.core.ui.theme.OnSurfaceDim+import com.streamvault.core.ui.design.browse.OnBackground+import com.streamvault.core.ui.design.browse.OnSurfaceDim@Composablefun LiveChannelContentHost(diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelResultsHeader.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelResultsHeader.ktindex 42e961ae..7e583e81 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelResultsHeader.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelResultsHeader.kt@@ -29,8 +29,8 @@ import androidx.tv.material3.Textimport com.streamvault.core.ui.components.SearchInputimport com.streamvault.core.ui.components.shell.ContentMetadataStripimport com.streamvault.core.ui.interaction.TvIconButton-import com.streamvault.core.ui.theme.OnBackground-import com.streamvault.core.ui.theme.OnSurfaceDim+import com.streamvault.core.ui.design.browse.OnBackground+import com.streamvault.core.ui.design.browse.OnSurfaceDim@Composablefun LiveChannelResultsHeader(diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHiddenCollectionsDialogs.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHiddenCollectionsDialogs.ktindex 084bddbd..683291f1 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHiddenCollectionsDialogs.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHiddenCollectionsDialogs.kt@@ -18,12 +18,12 @@ import androidx.tv.material3.Textimport com.streamvault.core.ui.components.dialogs.PremiumDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.PrimaryLight-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.PrimaryLight+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.Channeldiff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHomeScreen.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHomeScreen.ktindex 703359e1..9523fca4 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHomeScreen.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHomeScreen.kt@@ -1,5 +1,7 @@package com.streamvault.feature.live.home+import com.streamvault.core.ui.design.browsePanel+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.foundation.layout.*import androidx.compose.foundation.layout.PaddingValues@@ -9,7 +11,6 @@ import androidx.compose.foundation.lazy.grid.itemsimport androidx.compose.foundation.borderimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.runtime.saveable.rememberSaveable@@ -63,7 +64,7 @@ import com.streamvault.feature.live.presentation.home.shouldCollapseLiveCategoryimport com.streamvault.core.ui.design.FocusRestoreHostimport com.streamvault.core.ui.design.requestFocusSafelyimport androidx.activity.compose.BackHandler-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import com.streamvault.domain.model.ActiveLiveSourceimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.Channel@@ -714,7 +715,7 @@ fun LiveHomeScreen(modifier = Modifier.width(sidebarWidth).fillMaxHeight()- .background(SurfaceElevated.copy(alpha = 0.88f), RoundedCornerShape(20.dp))+ .browsePanel().padding(top = 10.dp).focusGroup()) {diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveM3uCategoryOrganizerDialog.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveM3uCategoryOrganizerDialog.ktindex 76ec8afb..7e54530c 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveM3uCategoryOrganizerDialog.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveM3uCategoryOrganizerDialog.kt@@ -16,8 +16,8 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport com.streamvault.domain.repository.M3uClassificationTargetdata class LiveM3uCategoryOrganizerLabels(diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveM3uSeriesAssignmentDialogs.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveM3uSeriesAssignmentDialogs.ktindex a4758858..02e65f17 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveM3uSeriesAssignmentDialogs.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveM3uSeriesAssignmentDialogs.kt@@ -26,8 +26,8 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport com.streamvault.domain.repository.M3uCategoryItemimport com.streamvault.domain.repository.M3uSeriesAssignmentdiff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveRenameGroupDialog.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveRenameGroupDialog.ktindex 771aac61..f09a4d02 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveRenameGroupDialog.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveRenameGroupDialog.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.home+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -8,7 +9,6 @@ import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.text.KeyboardActionsimport androidx.compose.foundation.text.KeyboardOptionsimport androidx.compose.material3.OutlinedTextField@@ -38,15 +38,15 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Text-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.design.requestFocusSafelyimport com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport kotlinx.coroutines.delaydata class LiveRenameGroupDialogLabels(@@ -92,7 +92,7 @@ fun LiveRenameGroupDialog(val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->Surface(modifier = resolvedModifier,- shape = RoundedCornerShape(24.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveCategoryRow.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveCategoryRow.ktindex 399a8938..6fea98a9 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveCategoryRow.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveCategoryRow.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -9,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.rememberimport androidx.compose.ui.Alignment@@ -31,11 +31,11 @@ import androidx.compose.material.icons.filled.PushPinimport androidx.compose.material.icons.outlined.PushPinimport com.streamvault.core.ui.components.shell.AppSectionHeaderimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlight/** Netflix-style horizontal category row for Live browse surfaces. */@OptIn(ExperimentalComposeUiApi::class)@@ -85,11 +85,11 @@ fun <T : Any> LiveCategoryRow(contentColor = if (isPinned) Primary else OnSurface,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control))) {@@ -132,11 +132,11 @@ private fun LiveCategoryAction(contentColor = contentColor,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control))) {diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveChannelCard.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveChannelCard.ktindex 9059d638..5d6c951b 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveChannelCard.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveChannelCard.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.animation.core.tweenimport androidx.compose.foundation.BorderStroke@@ -46,8 +47,8 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Textimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseColors as AppColors+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.image.ChannelLogoBadgeimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.interaction.rememberTvInteractionSounds@@ -112,7 +113,7 @@ fun LiveChannelCard(if (!isLocked) {Box(modifier = Modifier.align(Alignment.TopEnd).padding(6.dp)) {Column(horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.spacedBy(3.dp)) {- if (channel.isFavorite) Icon(imageVector = Icons.Filled.Star, contentDescription = null, tint = AppColors.Warning, modifier = Modifier.size(14.dp))+ if (channel.isFavorite) Icon(imageVector = Icons.Filled.Star, contentDescription = null, tint = AppColors.MediaWarning, modifier = Modifier.size(14.dp))if (hasArchive) StatusPill(label = catchUpLabel, containerColor = AppColors.Brand)if (isRecording) StatusPill(label = recordingLabel, containerColor = AppColors.Live)else if (isScheduledRecording) StatusPill(label = scheduledLabel, containerColor = AppColors.Warning, contentColor = Color.Black)@@ -147,9 +148,9 @@ private fun LiveFocusableCard(semanticsDescription?.let { contentDescription = it }semanticsStateDescription?.let { stateDescription = it }}.onFocusChanged { if (it.isFocused && !isFocused) sounds.playNavigate(); isFocused = it.isFocused },- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.Surface, focusedContainerColor = AppColors.SurfaceEmphasis),- border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(if (isDragging) 4.dp else FocusSpec.CardBorderWidth, if (isDragging) AppColors.Warning else AppColors.Focus), shape = RoundedCornerShape(12.dp))),+ border = ClickableSurfaceDefaults.border(border = Border(BorderStroke(1.dp, AppColors.Outline), shape = BrowseShapes.Artwork), focusedBorder = Border(border = BorderStroke(if (isDragging) 4.dp else FocusSpec.CardBorderWidth, if (isDragging) AppColors.Warning else AppColors.Focus), shape = BrowseShapes.Artwork)),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)) { Box(modifier = Modifier.fillMaxSize()) { content(isFocused) } }}diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveChannelRowSurface.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveChannelRowSurface.ktindex aeba8020..823f0466 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveChannelRowSurface.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveChannelRowSurface.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.background@@ -45,9 +46,9 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Textimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.core.ui.design.AppMotion-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.image.ChannelLogoBadgeimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.interaction.rememberTvInteractionSounds@@ -109,17 +110,19 @@ fun LiveChannelRowSurface(}.onFocusChanged { if (it.isFocused && !isFocused) sounds.playNavigate(); isFocused = it.isFocused },scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(16.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated, focusedContainerColor = AppColors.SurfaceEmphasis),border = ClickableSurfaceDefaults.border(+ border = Border(BorderStroke(1.dp, AppColors.Outline), shape = BrowseShapes.Control),focusedBorder = Border(border = BorderStroke(if (isDragging) 4.dp else FocusSpec.BorderWidth, if (isDragging) AppColors.Warning else AppColors.Focus),- shape = RoundedCornerShape(16.dp)+ shape = BrowseShapes.Control))) {Box {LiveChannelRowCard(+ highlighted = isFocused,channel = channel,nowMs = nowMs,sourceBadgeLabel = sourceBadgeLabel,@@ -142,7 +145,7 @@ fun LiveChannelRowSurface(}if (!isLocked && !isReorderMode && channel.isFavorite) {Box(modifier = Modifier.align(Alignment.TopEnd).padding(10.dp).background(Color.Black.copy(alpha = 0.55f), RoundedCornerShape(4.dp)).padding(4.dp)) {- Icon(imageVector = Icons.Filled.Star, contentDescription = null, tint = AppColors.Warning, modifier = Modifier.size(11.dp))+ Icon(imageVector = Icons.Filled.Star, contentDescription = null, tint = AppColors.MediaWarning, modifier = Modifier.size(11.dp))}}}@@ -151,6 +154,7 @@ fun LiveChannelRowSurface(@Composablefun LiveChannelRowCard(+ highlighted: Boolean = false,channel: Channel,nowMs: Long,sourceBadgeLabel: String? = null,@@ -165,9 +169,9 @@ fun LiveChannelRowCard(val ultraCompact = rowHeight <= 60.dpval logoWidth = if (dense) 42.dp else if (ultraCompact) 46.dp else 52.dpval hasArchive = channel.archivePlaybackCapability().canBuildReplayCandidate- Box(modifier = modifier.clip(RoundedCornerShape(18.dp)).background(AppColors.SurfaceElevated).fillMaxWidth().height(rowHeight)) {+ Box(modifier = modifier.clip(BrowseShapes.Panel).background(if (highlighted) AppColors.SurfaceEmphasis else AppColors.SurfaceElevated).fillMaxWidth().height(rowHeight)) {Row(modifier = Modifier.fillMaxSize().padding(horizontal = if (ultraCompact) 8.dp else 10.dp, vertical = if (ultraCompact) 5.dp else 6.dp), horizontalArrangement = Arrangement.spacedBy(if (ultraCompact) 8.dp else 10.dp), verticalAlignment = Alignment.CenterVertically) {- Box(modifier = Modifier.width(logoWidth).fillMaxHeight().clip(RoundedCornerShape(12.dp))) {+ Box(modifier = Modifier.width(logoWidth).fillMaxHeight().clip(BrowseShapes.Artwork)) {ChannelLogoBadge(channelName = channel.name, logoUrl = channel.logoUrl, backgroundColor = AppColors.SurfaceEmphasis, contentPadding = PaddingValues(if (dense) 5.dp else 8.dp), textStyle = MaterialTheme.typography.titleLarge, textColor = AppColors.TextSecondary, modifier = Modifier.fillMaxSize())}Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) {@@ -183,7 +187,7 @@ fun LiveChannelRowCard(channel.currentProgram?.let { program ->Text(text = program.title, style = if (dense) MaterialTheme.typography.labelMedium else MaterialTheme.typography.bodySmall, color = AppColors.TextSecondary, maxLines = 1, overflow = TextOverflow.Ellipsis)if (!dense) {- LinearProgressIndicator(progress = { liveChannelProgressFraction(nowMs, program.startTime, program.endTime) }, modifier = Modifier.fillMaxWidth().height(2.dp).clip(RoundedCornerShape(999.dp)), color = AppColors.Info, trackColor = AppColors.SurfaceEmphasis)+ LinearProgressIndicator(progress = { liveChannelProgressFraction(nowMs, program.startTime, program.endTime) }, modifier = Modifier.fillMaxWidth().height(2.dp).clip(BrowseShapes.Control), color = AppColors.Info, trackColor = AppColors.SurfaceEmphasis)}} ?: Text(text = noScheduleLabel, style = if (dense) MaterialTheme.typography.labelMedium else MaterialTheme.typography.bodySmall, color = AppColors.TextTertiary)}diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersPanel.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersPanel.ktindex 9e079ddc..8f273f60 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersPanel.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersPanel.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -7,7 +8,6 @@ import androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -22,11 +22,11 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightconst val LIVE_ALL_CATEGORY_FILTER_KEY = "__all_categories__"@@ -70,7 +70,7 @@ fun LiveQuickFiltersPanel(modifier = modifier.fillMaxWidth().padding(bottom = 10.dp),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = SurfaceElevated,focusedContainerColor = SurfaceHighlight.copy(alpha = 0.9f)@@ -78,7 +78,7 @@ fun LiveQuickFiltersPanel(border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, Primary.copy(alpha = 0.85f)),- shape = RoundedCornerShape(12.dp)+ shape = BrowseShapes.Artwork)),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveReorderTopBar.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveReorderTopBar.ktindex 6694eb54..b1dac4f4 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveReorderTopBar.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveReorderTopBar.kt@@ -1,5 +1,7 @@package com.streamvault.feature.live.presentation.components+import com.streamvault.core.ui.design.browsePrimaryButtonColors+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.animation.AnimatedVisibilityimport androidx.compose.animation.slideInVerticallyimport androidx.compose.animation.slideOutVertically@@ -10,7 +12,6 @@ import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -23,14 +24,14 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Text-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.interaction.TvButton-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.TextPrimary-import com.streamvault.core.ui.theme.TextSecondary+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.TextPrimary+import com.streamvault.core.ui.design.browse.TextSecondary@Composablefun LiveReorderTopBar(@@ -50,7 +51,7 @@ fun LiveReorderTopBar(exit = slideOutVertically(targetOffsetY = { -it }),modifier = modifier.fillMaxWidth().padding(bottom = 20.dp)) {- Surface(shape = RoundedCornerShape(24.dp), colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {+ Surface(shape = BrowseShapes.Panel, colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Row(modifier = Modifier.fillMaxWidth().background(Brush.horizontalGradient(listOf(Primary.copy(alpha = 0.08f), Color.Transparent))).padding(horizontal = 24.dp, vertical = 18.dp),horizontalArrangement = Arrangement.SpaceBetween,@@ -74,12 +75,7 @@ fun LiveReorderTopBar() { Text(cancelLabel, modifier = Modifier.padding(horizontal = 8.dp)) }TvButton(onClick = onSave,- colors = ButtonDefaults.colors(- containerColor = Primary,- contentColor = Color.White,- focusedContainerColor = Primary.copy(alpha = 0.88f),- focusedContentColor = Color.White- ),+ colors = browsePrimaryButtonColors(),border = ButtonDefaults.border(focusedBorder = Border(border = BorderStroke(FocusSpec.BorderWidth, FocusBorder))),scale = ButtonDefaults.scale(focusedScale = FocusSpec.FocusedScale)) { Text(saveLabel, modifier = Modifier.padding(horizontal = 8.dp)) }diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveSelectionChipRow.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveSelectionChipRow.ktindex 0deeca0b..f861d6a7 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveSelectionChipRow.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveSelectionChipRow.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -8,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -28,12 +28,12 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.interaction.rememberTvInteractionSounds-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightdata class LiveSelectionChip(val key: String,@@ -128,11 +128,11 @@ fun LiveChipRowSection(contentColor = if (selected) Primary else OnSurface,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control)),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveSourceSwitcher.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveSourceSwitcher.ktindex 11f37e60..7662f5d2 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveSourceSwitcher.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveSourceSwitcher.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.components+import com.streamvault.core.ui.design.BrowseShapesimport androidx.activity.compose.BackHandlerimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangement@@ -36,11 +37,11 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnBackground-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnBackground+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevatedimport com.streamvault.domain.model.ActiveLiveSourceimport com.streamvault.domain.model.ActiveLiveSourceOption@@ -81,7 +82,7 @@ fun LiveSourceSwitcher(.focusRequester(toggleRequester).mouseClickable(focusRequester = toggleRequester, onClick = { showSourceList = !showSourceList }).onFocusChanged { isFocused = it.isFocused },- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = if (isFocused) Primary.copy(alpha = 0.12f) else SurfaceElevated.copy(alpha = 0.96f),focusedContainerColor = Primary.copy(alpha = 0.18f)@@ -89,11 +90,11 @@ fun LiveSourceSwitcher(border = ClickableSurfaceDefaults.border(border = Border(border = BorderStroke(1.dp, Primary.copy(alpha = 0.14f)),- shape = RoundedCornerShape(12.dp)+ shape = BrowseShapes.Artwork),focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(12.dp)+ shape = BrowseShapes.Artwork))) {@@ -115,7 +116,7 @@ fun LiveSourceSwitcher(if (showSourceList && options.isNotEmpty()) {Surface(modifier = Modifier.padding(top = if (compact) 38.dp else 46.dp).width(dropdownWidth),- shape = RoundedCornerShape(12.dp),+ shape = BrowseShapes.Artwork,colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)) {Column(modifier = Modifier.padding(8.dp)) {diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveCompactGuideProgramDialog.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveCompactGuideProgramDialog.ktindex 243fd000..adf89e2b 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveCompactGuideProgramDialog.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveCompactGuideProgramDialog.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.interaction.MutableInteractionSource@@ -13,7 +14,6 @@ import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthInimport androidx.compose.foundation.rememberScrollState-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScrollimport androidx.compose.material3.LinearProgressIndicatorimport androidx.compose.runtime.Composable@@ -37,12 +37,12 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvButton-import com.streamvault.core.ui.theme.AccentRed-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.AccentRed+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Programimport com.streamvault.feature.live.presentation.time.LocalLiveTimeFormat@@ -87,7 +87,7 @@ fun LiveCompactGuideProgramDialog(Surface(modifier = Modifier.widthIn(min = 420.dp, max = 640.dp),colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),- shape = RoundedCornerShape(20.dp)+ shape = BrowseShapes.Panel) {Column(modifier = Modifierdiff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideCategoryPickerDialog.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideCategoryPickerDialog.ktindex 89977bf8..c8b4b919 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideCategoryPickerDialog.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideCategoryPickerDialog.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable@@ -17,7 +18,6 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.itemsIndexed-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValue@@ -40,12 +40,12 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.Categorydata class LiveGuideCategoryPickerLabels(@@ -94,7 +94,7 @@ fun LiveGuideCategoryPickerDialog(.fillMaxHeight(0.78f).focusGroup(),colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),- shape = RoundedCornerShape(22.dp)+ shape = BrowseShapes.Panel) {Column(modifier = Modifier@@ -168,11 +168,11 @@ fun LiveGuideCategoryPickerDialog(focusedContentColor = if (isSelected) Primary else OnSurface),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(14.dp)+ shape = BrowseShapes.Control))) {diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideContent.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideContent.ktindex 2ae3c63f..0ad0884d 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideContent.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideContent.kt@@ -14,9 +14,9 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.unit.dpimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.OnBackground-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.OnBackground+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Programimport com.streamvault.player.PlayerEnginediff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideControlComponents.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideControlComponents.ktindex 21b06be8..38f03dca 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideControlComponents.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideControlComponents.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -11,7 +12,6 @@ import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.remember@@ -25,12 +25,12 @@ import androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.feature.live.presentation.components.LiveSelectionChipimport com.streamvault.feature.live.presentation.components.LiveSelectionChipRowimport java.text.SimpleDateFormat@@ -211,11 +211,11 @@ fun LiveGuideDayRow(contentColor = if (isSelected) Primary else OnSurface,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control))) {@@ -248,11 +248,11 @@ fun LiveGuideViewOptionsRow(contentColor = if (showScheduledOnly) Primary else OnSurface,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control))) {diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideDialog.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideDialog.ktindex 502dacc5..b8edaefd 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideDialog.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideDialog.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.focusGroupimport androidx.compose.foundation.layout.Arrangement@@ -12,7 +13,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthInimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.LinearProgressIndicatorimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffect@@ -32,12 +32,12 @@ import androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.ChannelEpgMappingimport com.streamvault.domain.model.EpgMatchType@@ -120,7 +120,7 @@ fun LiveGuideEpgOverrideDialog(Surface(modifier = Modifier.widthIn(min = 560.dp, max = 760.dp),colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),- shape = RoundedCornerShape(20.dp)+ shape = BrowseShapes.Panel) {Column(modifier = Modifier@@ -207,11 +207,11 @@ fun LiveGuideEpgOverrideDialog(contentColor = OnSurface,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(14.dp)+ shape = BrowseShapes.Control))) {diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideGridRows.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideGridRows.ktindex 8f8685b6..8d40f9cd 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideGridRows.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideGridRows.kt@@ -38,14 +38,14 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.image.ChannelLogoBadgeimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight-import com.streamvault.core.ui.theme.TextPrimary-import com.streamvault.core.ui.theme.TextSecondary+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlight+import com.streamvault.core.ui.design.browse.TextPrimary+import com.streamvault.core.ui.design.browse.TextSecondaryimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Programimport com.streamvault.domain.playback.archivePlaybackCapabilitydiff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideHeroBadge.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideHeroBadge.ktindex 81b928dd..e445d2d6 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideHeroBadge.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideHeroBadge.kt@@ -1,7 +1,7 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Color@@ -11,9 +11,9 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceHighlight@Composablefun LiveGuideHeroBadge(@@ -22,7 +22,7 @@ fun LiveGuideHeroBadge(accentColor: Color = Primary) {Surface(- shape = RoundedCornerShape(999.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = if (highlight) accentColor.copy(alpha = 0.18f) else SurfaceHighlight)diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideMessageState.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideMessageState.ktindex d6e0b221..abde453c 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideMessageState.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideMessageState.kt@@ -14,9 +14,9 @@ import androidx.tv.material3.ButtonDefaultsimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvButton-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary@Composablefun LiveGuideMessageState(diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideOptionsOverlay.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideOptionsOverlay.ktindex 1d11d8b5..8f18d468 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideOptionsOverlay.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideOptionsOverlay.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.focusGroup@@ -13,7 +14,6 @@ import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.rememberScrollState-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScrollimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffect@@ -118,7 +118,7 @@ fun LiveGuideOptionsOverlay(.fillMaxHeight(0.78f).focusGroup(),colors = SurfaceDefaults.colors(containerColor = com.streamvault.core.ui.theme.SurfaceElevated),- shape = RoundedCornerShape(20.dp)+ shape = BrowseShapes.Panel) {Column(modifier = Modifierdiff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuidePreviewPane.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuidePreviewPane.ktindex f7d8e1b6..2dc70cb4 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuidePreviewPane.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuidePreviewPane.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -32,11 +33,11 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.image.ChannelLogoBadge-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Programimport com.streamvault.feature.live.presentation.time.LocalLiveTimeFormat@@ -72,7 +73,7 @@ fun LiveGuidePreviewPane(Surface(modifier = modifier.height(150.dp),colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),- shape = RoundedCornerShape(20.dp)+ shape = BrowseShapes.Panel) {Row(modifier = Modifier.fillMaxSize().padding(10.dp),@@ -83,8 +84,8 @@ fun LiveGuidePreviewPane(modifier = Modifier.fillMaxHeight().aspectRatio(16f / 9f)- .background(Color.Black, RoundedCornerShape(12.dp))- .clip(RoundedCornerShape(12.dp)),+ .background(Color.Black, BrowseShapes.Artwork)+ .clip(BrowseShapes.Artwork),contentAlignment = Alignment.Center) {if (previewPlayerEngine != null) {@@ -110,7 +111,7 @@ fun LiveGuidePreviewPane(Text(text = labels.placeholderTitle,style = MaterialTheme.typography.labelMedium,- color = OnSurfaceDim,+ color = Color.White.copy(alpha = 0.7f),textAlign = TextAlign.Center)}diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideSearchComponents.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideSearchComponents.ktindex f27e305f..ae75426a 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideSearchComponents.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideSearchComponents.kt@@ -51,12 +51,12 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport kotlinx.coroutines.delayimport kotlinx.coroutines.launchdiff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideSearchOverlay.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideSearchOverlay.ktindex 79adb42a..121d4e9b 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideSearchOverlay.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideSearchOverlay.kt@@ -1,5 +1,6 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.focusGroup@@ -13,7 +14,6 @@ import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.remember@@ -73,7 +73,7 @@ fun LiveGuideSearchOverlay(.padding(top = 32.dp).focusGroup(),colors = SurfaceDefaults.colors(containerColor = com.streamvault.core.ui.theme.SurfaceElevated),- shape = RoundedCornerShape(18.dp)+ shape = BrowseShapes.Panel) {Column(modifier = Modifier.padding(horizontal = 18.dp, vertical = 16.dp),diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideShortcutChip.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideShortcutChip.ktindex 9d536216..36527f38 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideShortcutChip.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideShortcutChip.kt@@ -1,8 +1,8 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.compose.ui.text.style.TextOverflow@@ -11,11 +11,11 @@ import androidx.tv.material3.Borderimport androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlight@Composablefun LiveGuideShortcutChip(@@ -33,11 +33,11 @@ fun LiveGuideShortcutChip(contentColor = if (isSelected) Primary else OnSurface,focusedContentColor = OnSurface),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(999.dp)+ shape = BrowseShapes.Control))) {diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideTimelineHeader.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideTimelineHeader.ktindex f1391b17..370ee473 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideTimelineHeader.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideTimelineHeader.kt@@ -21,8 +21,8 @@ import androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.dpimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.OnSurfaceDim-import com.streamvault.core.ui.theme.Primary+import com.streamvault.core.ui.design.browse.OnSurfaceDim+import com.streamvault.core.ui.design.browse.Primaryimport com.streamvault.feature.live.presentation.time.LocalLiveTimeFormatimport com.streamvault.feature.live.presentation.time.createLiveTimeFormatterimport java.time.Instantdiff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideToolbar.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideToolbar.ktindex 6ee396a6..29f9cd44 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideToolbar.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideToolbar.kt@@ -1,12 +1,12 @@package com.streamvault.feature.live.presentation.epg+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthIn-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -22,10 +22,10 @@ import androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightdata class LiveGuideToolbarLabels(val jumpNow: String,@@ -79,11 +79,11 @@ fun LiveGuideToolbarButton(containerColor = SurfaceElevated,focusedContainerColor = SurfaceHighlight),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),border = ClickableSurfaceDefaults.border(focusedBorder = Border(border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(14.dp)+ shape = BrowseShapes.Control))) {diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewPlannerDialog.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewPlannerDialog.ktindex 8afce855..36e306d5 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewPlannerDialog.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewPlannerDialog.kt@@ -1,5 +1,6 @@package com.streamvault.feature.playback.multiview+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -11,7 +12,6 @@ import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.width-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composableimport androidx.lifecycle.compose.collectAsStateWithLifecycle@@ -42,8 +42,8 @@ import com.streamvault.core.ui.components.dialogs.PremiumDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.core.ui.components.shell.AppMessageStateimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseColors as AppColors+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.domain.model.Channelimport kotlinx.coroutines.delayimport com.streamvault.core.ui.interaction.TvClickableSurface@@ -202,7 +202,7 @@ private fun MultiViewSlotCard(TvClickableSurface(onClick = { if (isPickerMode) onSlotClick() else onClearSlot() },modifier = modifier.aspectRatio(16f / 9f),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(18.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Panel),colors = ClickableSurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated,focusedContainerColor = AppColors.SurfaceEmphasis,diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewScreen.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewScreen.ktindex 2feb6fcd..fa8ff7e9 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewScreen.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewScreen.kt@@ -1,5 +1,6 @@package com.streamvault.feature.playback.multiview+import com.streamvault.core.ui.design.BrowseShapesimport android.view.Viewimport android.view.KeyEventimport android.view.WindowManager@@ -80,7 +81,7 @@ import com.streamvault.core.ui.components.dialogs.PinEntryDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogActionButtonimport com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton-import com.streamvault.core.ui.theme.Primary+import com.streamvault.core.ui.design.browse.Primaryimport com.streamvault.player.PlayerRenderSurfaceTypeimport com.streamvault.player.PlayerSurfaceResizeModeimport kotlinx.coroutines.launch@@ -639,8 +640,8 @@ private fun MultiViewControlHud(horizontalAlignment = Alignment.CenterHorizontally,verticalArrangement = Arrangement.spacedBy(10.dp),modifier = Modifier- .background(Color.Black.copy(alpha = 0.58f), RoundedCornerShape(18.dp))- .border(1.dp, Color.White.copy(alpha = 0.08f), RoundedCornerShape(18.dp))+ .background(Color.Black.copy(alpha = 0.58f), BrowseShapes.Panel)+ .border(1.dp, Color.White.copy(alpha = 0.08f), BrowseShapes.Panel).padding(horizontal = 18.dp, vertical = 14.dp)) {Row(@@ -772,7 +773,7 @@ private fun ReplaceSlotDialog(onValueChange = onSearchChange,modifier = Modifier.fillMaxWidth()- .background(Color.White.copy(alpha = 0.07f), RoundedCornerShape(12.dp))+ .background(Color.White.copy(alpha = 0.07f), BrowseShapes.Artwork).padding(horizontal = 16.dp, vertical = 10.dp),textStyle = MaterialTheme.typography.bodyMedium.copy(color = Color.White),singleLine = true,diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLiveOverlayHost.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLiveOverlayHost.ktindex aebec643..07592bf6 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLiveOverlayHost.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLiveOverlayHost.kt@@ -1,5 +1,6 @@package com.streamvault.feature.playback.player+import com.streamvault.core.ui.design.BrowseVisualStyleimport androidx.compose.animation.AnimatedVisibilityimport androidx.compose.animation.fadeInimport androidx.compose.animation.fadeOut@@ -89,154 +90,156 @@ internal fun BoxScope.PlayerLiveOverlayHost(val nextProgram by viewModel.nextProgram.collectAsStateWithLifecycle()val upcomingPrograms by viewModel.upcomingPrograms.collectAsStateWithLifecycle()- AnimatedVisibility(- visible = showChannelListOverlay,- enter = slideInHorizontally(initialOffsetX = { if (isRtl) it else -it }),- exit = slideOutHorizontally(targetOffsetX = { if (isRtl) it else -it }),- modifier = Modifier- .align(if (isRtl) Alignment.TopEnd else Alignment.TopStart)- .fillMaxHeight()- .width(sideOverlayWidth)- .focusGroup()- ) {- ChannelListOverlay(- channels = currentChannelList,- recentChannels = recentChannels,- currentChannelId = currentChannel?.id ?: internalChannelId,- overlayFocusRequester = channelListFocusRequester,- lastVisitedCategoryName = lastVisitedCategory?.name,- onOpenLastGroup = viewModel::openLastVisitedCategory,- onSelectChannel = viewModel::zapToChannel,- onOpenCategories = viewModel::openCategoryListOverlay,- onDismiss = viewModel::closeOverlays,- onOverlayInteracted = viewModel::onLiveOverlayInteraction- )- }+ BrowseVisualStyle {+ AnimatedVisibility(+ visible = showChannelListOverlay,+ enter = slideInHorizontally(initialOffsetX = { if (isRtl) it else -it }),+ exit = slideOutHorizontally(targetOffsetX = { if (isRtl) it else -it }),+ modifier = Modifier+ .align(if (isRtl) Alignment.TopEnd else Alignment.TopStart)+ .fillMaxHeight()+ .width(sideOverlayWidth)+ .focusGroup()+ ) {+ ChannelListOverlay(+ channels = currentChannelList,+ recentChannels = recentChannels,+ currentChannelId = currentChannel?.id ?: internalChannelId,+ overlayFocusRequester = channelListFocusRequester,+ lastVisitedCategoryName = lastVisitedCategory?.name,+ onOpenLastGroup = viewModel::openLastVisitedCategory,+ onSelectChannel = viewModel::zapToChannel,+ onOpenCategories = viewModel::openCategoryListOverlay,+ onDismiss = viewModel::closeOverlays,+ onOverlayInteracted = viewModel::onLiveOverlayInteraction+ )+ }- AnimatedVisibility(- visible = showCategoryListOverlay,- enter = slideInHorizontally(initialOffsetX = { if (isRtl) it else -it }),- exit = slideOutHorizontally(targetOffsetX = { if (isRtl) it else -it }),- modifier = Modifier- .align(if (isRtl) Alignment.TopEnd else Alignment.TopStart)- .fillMaxHeight()- .width(sideOverlayWidth)- .focusGroup()- ) {- CategoryListOverlay(- categories = availableCategories,- currentCategoryId = activeCategoryId,- overlayFocusRequester = categoryListFocusRequester,- isCategoryLocked = { category ->- parentalControlLevel in 1..2 && (category.isAdult || category.isUserProtected)- },- onSelectCategory = viewModel::selectCategoryFromOverlay,- onDismiss = viewModel::closeOverlays,- onOverlayInteracted = viewModel::onLiveOverlayInteraction- )- }+ AnimatedVisibility(+ visible = showCategoryListOverlay,+ enter = slideInHorizontally(initialOffsetX = { if (isRtl) it else -it }),+ exit = slideOutHorizontally(targetOffsetX = { if (isRtl) it else -it }),+ modifier = Modifier+ .align(if (isRtl) Alignment.TopEnd else Alignment.TopStart)+ .fillMaxHeight()+ .width(sideOverlayWidth)+ .focusGroup()+ ) {+ CategoryListOverlay(+ categories = availableCategories,+ currentCategoryId = activeCategoryId,+ overlayFocusRequester = categoryListFocusRequester,+ isCategoryLocked = { category ->+ parentalControlLevel in 1..2 && (category.isAdult || category.isUserProtected)+ },+ onSelectCategory = viewModel::selectCategoryFromOverlay,+ onDismiss = viewModel::closeOverlays,+ onOverlayInteracted = viewModel::onLiveOverlayInteraction+ )+ }- AnimatedVisibility(- visible = showEpgOverlay,- enter = slideInHorizontally(initialOffsetX = { if (isRtl) -it else it }),- exit = slideOutHorizontally(targetOffsetX = { if (isRtl) -it else it }),- modifier = Modifier- .align(if (isRtl) Alignment.TopStart else Alignment.TopEnd)- .fillMaxHeight()- .width(epgOverlayWidth)- .focusGroup()- ) {- EpgOverlay(- currentChannel = currentChannel,- displayChannelNumber = displayChannelNumber,- currentProgram = currentProgram,- nextProgram = nextProgram,- upcomingPrograms = upcomingPrograms,- onDismiss = viewModel::closeOverlays,- onOpenArchiveBrowser = {- onOpenModal(PlayerModal.ProgramHistory)- viewModel.closeOverlays()- },- onOverlayInteracted = viewModel::onLiveOverlayInteraction- )- }+ AnimatedVisibility(+ visible = showEpgOverlay,+ enter = slideInHorizontally(initialOffsetX = { if (isRtl) -it else it }),+ exit = slideOutHorizontally(targetOffsetX = { if (isRtl) -it else it }),+ modifier = Modifier+ .align(if (isRtl) Alignment.TopStart else Alignment.TopEnd)+ .fillMaxHeight()+ .width(epgOverlayWidth)+ .focusGroup()+ ) {+ EpgOverlay(+ currentChannel = currentChannel,+ displayChannelNumber = displayChannelNumber,+ currentProgram = currentProgram,+ nextProgram = nextProgram,+ upcomingPrograms = upcomingPrograms,+ onDismiss = viewModel::closeOverlays,+ onOpenArchiveBrowser = {+ onOpenModal(PlayerModal.ProgramHistory)+ viewModel.closeOverlays()+ },+ onOverlayInteracted = viewModel::onLiveOverlayInteraction+ )+ }- AnimatedVisibility(- visible = showChannelInfoOverlay,- enter = fadeIn(),- exit = fadeOut(),- modifier = Modifier- .align(Alignment.BottomCenter)- .fillMaxWidth()- .focusGroup()- ) {- val availableAudioTracks by viewModel.availableAudioTracks.collectAsStateWithLifecycle()- val availableSubtitleTracks by viewModel.availableSubtitleTracks.collectAsStateWithLifecycle()- val availableVideoQualities by viewModel.availableVideoQualities.collectAsStateWithLifecycle()- val liveTranslationAvailable by viewModel.liveTranslationAvailable.collectAsStateWithLifecycle()- val currentChannelRecording by viewModel.currentChannelRecording.collectAsStateWithLifecycle()- val isMuted by viewModel.isMuted.collectAsStateWithLifecycle()- val audioVideoSyncEnabled by viewModel.audioVideoSyncEnabled.collectAsStateWithLifecycle()- val castConnectionState by viewModel.castConnectionState.collectAsStateWithLifecycle()- val timeshiftUiState by viewModel.timeshiftUiState.collectAsStateWithLifecycle()+ AnimatedVisibility(+ visible = showChannelInfoOverlay,+ enter = fadeIn(),+ exit = fadeOut(),+ modifier = Modifier+ .align(Alignment.BottomCenter)+ .fillMaxWidth()+ .focusGroup()+ ) {+ val availableAudioTracks by viewModel.availableAudioTracks.collectAsStateWithLifecycle()+ val availableSubtitleTracks by viewModel.availableSubtitleTracks.collectAsStateWithLifecycle()+ val availableVideoQualities by viewModel.availableVideoQualities.collectAsStateWithLifecycle()+ val liveTranslationAvailable by viewModel.liveTranslationAvailable.collectAsStateWithLifecycle()+ val currentChannelRecording by viewModel.currentChannelRecording.collectAsStateWithLifecycle()+ val isMuted by viewModel.isMuted.collectAsStateWithLifecycle()+ val audioVideoSyncEnabled by viewModel.audioVideoSyncEnabled.collectAsStateWithLifecycle()+ val castConnectionState by viewModel.castConnectionState.collectAsStateWithLifecycle()+ val timeshiftUiState by viewModel.timeshiftUiState.collectAsStateWithLifecycle()- ChannelInfoOverlay(- currentChannel = currentChannel,- displayChannelNumber = displayChannelNumber,- currentProgram = currentProgram,- nextProgram = nextProgram,- focusRequester = channelInfoFocusRequester,- lastVisitedCategoryName = lastVisitedCategory?.name,- onDismiss = viewModel::closeChannelInfoOverlay,- onOverlayInteracted = viewModel::onLiveOverlayInteraction,- onOpenFullEpg = {- viewModel.closeChannelInfoOverlay()- viewModel.openEpgOverlay()- },- onOpenLastGroup = {- viewModel.closeChannelInfoOverlay()- viewModel.openLastVisitedCategory()- },- currentRecordingStatus = currentChannelRecording?.status,- onStartRecording = { onRunRecordingAction(viewModel::startManualRecording) },- onStopRecording = viewModel::stopCurrentRecording,- onScheduleRecording = { onRunRecordingAction(viewModel::scheduleRecording) },- onScheduleDailyRecording = { onRunRecordingAction(viewModel::scheduleDailyRecording) },- onScheduleWeeklyRecording = { onRunRecordingAction(viewModel::scheduleWeeklyRecording) },- onRestartProgram = viewModel::restartCurrentProgram,- onOpenArchive = { onOpenModal(PlayerModal.ProgramHistory) },- onToggleAspectRatio = viewModel::toggleAspectRatio,- onToggleDiagnostics = viewModel::toggleDiagnostics,- onTogglePlayPause = { if (isPlaying) viewModel.pause() else viewModel.play() },- onSeekBackward = viewModel::seekBackward,- onSeekForward = viewModel::seekForward,- onSeekToLiveEdge = viewModel::seekToLiveEdge,- isPlaying = isPlaying,- currentAspectRatio = aspectRatioLabel,- isDiagnosticsEnabled = showDiagnostics,- onOpenSplitScreen = { onOpenModal(PlayerModal.Split) },- subtitleTrackCount = availableSubtitleTracks.size,- liveTranslationAvailable = liveTranslationAvailable,- audioTrackCount = availableAudioTracks.size,- videoQualityCount = availableVideoQualities.size,- channelVariantCount = currentChannel?.variants?.size ?: 0,- isMuted = isMuted,- onToggleMute = viewModel::toggleMute,- onOpenSubtitleTracks = { onOpenModal(PlayerModal.TrackSelection(TrackType.TEXT)) },- onOpenAudioTracks = { onOpenModal(PlayerModal.TrackSelection(TrackType.AUDIO)) },- onOpenVideoTracks = { onOpenModal(PlayerModal.TrackSelection(TrackType.VIDEO)) },- onOpenVariants = { onOpenModal(PlayerModal.VariantSelection) },- onOpenAudioVideoSync = { onOpenModal(PlayerModal.AudioVideoOffset) },- audioVideoSyncEnabled = audioVideoSyncEnabled,- onEnterPictureInPicture = onEnterPictureInPicture,- isCastConnected = castConnectionState == CastConnectionState.CONNECTED,- onCast = { viewModel.castCurrentMedia(onOpenCastRouteChooser) },- onStopCasting = viewModel::stopCasting,- timeshiftUiState = timeshiftUiState,- onTransientPanelVisibilityChanged = onTransientPanelVisibilityChanged,- resolutionLabel = buildChannelInfoResolutionLabel(videoFormat),- showBackButton = showBackButton,- onBackToMenu = onBackToMenu- )+ ChannelInfoOverlay(+ currentChannel = currentChannel,+ displayChannelNumber = displayChannelNumber,+ currentProgram = currentProgram,+ nextProgram = nextProgram,+ focusRequester = channelInfoFocusRequester,+ lastVisitedCategoryName = lastVisitedCategory?.name,+ onDismiss = viewModel::closeChannelInfoOverlay,+ onOverlayInteracted = viewModel::onLiveOverlayInteraction,+ onOpenFullEpg = {+ viewModel.closeChannelInfoOverlay()+ viewModel.openEpgOverlay()+ },+ onOpenLastGroup = {+ viewModel.closeChannelInfoOverlay()+ viewModel.openLastVisitedCategory()+ },+ currentRecordingStatus = currentChannelRecording?.status,+ onStartRecording = { onRunRecordingAction(viewModel::startManualRecording) },+ onStopRecording = viewModel::stopCurrentRecording,+ onScheduleRecording = { onRunRecordingAction(viewModel::scheduleRecording) },+ onScheduleDailyRecording = { onRunRecordingAction(viewModel::scheduleDailyRecording) },+ onScheduleWeeklyRecording = { onRunRecordingAction(viewModel::scheduleWeeklyRecording) },+ onRestartProgram = viewModel::restartCurrentProgram,+ onOpenArchive = { onOpenModal(PlayerModal.ProgramHistory) },+ onToggleAspectRatio = viewModel::toggleAspectRatio,+ onToggleDiagnostics = viewModel::toggleDiagnostics,+ onTogglePlayPause = { if (isPlaying) viewModel.pause() else viewModel.play() },+ onSeekBackward = viewModel::seekBackward,+ onSeekForward = viewModel::seekForward,+ onSeekToLiveEdge = viewModel::seekToLiveEdge,+ isPlaying = isPlaying,+ currentAspectRatio = aspectRatioLabel,+ isDiagnosticsEnabled = showDiagnostics,+ onOpenSplitScreen = { onOpenModal(PlayerModal.Split) },+ subtitleTrackCount = availableSubtitleTracks.size,+ liveTranslationAvailable = liveTranslationAvailable,+ audioTrackCount = availableAudioTracks.size,+ videoQualityCount = availableVideoQualities.size,+ channelVariantCount = currentChannel?.variants?.size ?: 0,+ isMuted = isMuted,+ onToggleMute = viewModel::toggleMute,+ onOpenSubtitleTracks = { onOpenModal(PlayerModal.TrackSelection(TrackType.TEXT)) },+ onOpenAudioTracks = { onOpenModal(PlayerModal.TrackSelection(TrackType.AUDIO)) },+ onOpenVideoTracks = { onOpenModal(PlayerModal.TrackSelection(TrackType.VIDEO)) },+ onOpenVariants = { onOpenModal(PlayerModal.VariantSelection) },+ onOpenAudioVideoSync = { onOpenModal(PlayerModal.AudioVideoOffset) },+ audioVideoSyncEnabled = audioVideoSyncEnabled,+ onEnterPictureInPicture = onEnterPictureInPicture,+ isCastConnected = castConnectionState == CastConnectionState.CONNECTED,+ onCast = { viewModel.castCurrentMedia(onOpenCastRouteChooser) },+ onStopCasting = viewModel::stopCasting,+ timeshiftUiState = timeshiftUiState,+ onTransientPanelVisibilityChanged = onTransientPanelVisibilityChanged,+ resolutionLabel = buildChannelInfoResolutionLabel(videoFormat),+ showBackButton = showBackButton,+ onBackToMenu = onBackToMenu+ )+ }}}diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerChannelInfoOverlay.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerChannelInfoOverlay.ktindex de12128a..6fd0a3a1 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerChannelInfoOverlay.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerChannelInfoOverlay.kt@@ -1,5 +1,6 @@package com.streamvault.feature.playback.player.overlay+import com.streamvault.core.ui.design.BrowseShapesimport androidx.activity.compose.BackHandlerimport androidx.compose.foundation.basicMarqueeimport androidx.compose.foundation.border@@ -50,7 +51,7 @@ import androidx.tv.material3.Textimport com.streamvault.feature.playback.Rimport com.streamvault.core.ui.image.ChannelLogoBadgeimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.domain.playback.archivePlaybackCapabilityimport com.streamvault.domain.playback.isArchivePlayable@@ -62,8 +63,8 @@ import com.streamvault.domain.model.Programimport com.streamvault.domain.model.RecordingStatusimport com.streamvault.player.timeshift.LiveTimeshiftStatusimport java.util.Date-import com.streamvault.core.ui.design.AppColors.Brand as Primary-import com.streamvault.core.ui.design.AppColors.TextTertiary as OnSurfaceDim+import com.streamvault.core.ui.design.BrowseColors.Brand as Primary+import com.streamvault.core.ui.design.BrowseColors.TextTertiary as OnSurfaceDim@Composablefun ChannelInfoOverlay(@@ -195,8 +196,8 @@ fun ChannelInfoOverlay(Box(modifier = Modifier.size(44.dp)- .clip(RoundedCornerShape(12.dp))- .border(1.dp, AppColors.Focus.copy(alpha = 0.05f), RoundedCornerShape(12.dp))+ .clip(BrowseShapes.Artwork)+ .border(1.dp, AppColors.Focus.copy(alpha = 0.05f), BrowseShapes.Artwork)) {ChannelLogoBadge(channelName = currentChannel.name,@@ -793,7 +794,7 @@ private fun CompactTimeshiftTransport(}Surface(- shape = RoundedCornerShape(18.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = Color.White.copy(alpha = 0.06f))) {Column(@@ -808,7 +809,7 @@ private fun CompactTimeshiftTransport(verticalAlignment = Alignment.CenterVertically) {Surface(- shape = RoundedCornerShape(14.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = Color.Black.copy(alpha = 0.22f))) {Column(@@ -959,7 +960,7 @@ private fun CompactTransportButton(TvClickableSurface(onClick = onClick,enabled = enabled,- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = if (highlighted) {Primary.copy(alpha = 0.18f)@@ -1006,7 +1007,7 @@ private fun ChannelInfoActionMenuTray(if (actions.isEmpty()) returnSurface(- shape = RoundedCornerShape(18.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = Color.Black.copy(alpha = 0.22f))) {Column(@@ -1055,7 +1056,7 @@ private fun CompactMenuActionButton(onInteraction()onClick()},- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = Color.White.copy(alpha = 0.08f),focusedContainerColor = Color.White.copy(alpha = 0.16f)diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupActionButtons.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupActionButtons.ktindex d588c678..c3d5c6bf 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupActionButtons.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupActionButtons.kt@@ -19,11 +19,11 @@ import androidx.tv.material3.Glowimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnBackground-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.PrimaryLight-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnBackground+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.PrimaryLight+import com.streamvault.core.ui.design.browse.SurfaceHighlight@Composableinternal fun ActionButton(@@ -86,7 +86,7 @@ private fun ProviderActionButton(color = OnBackground.copy(alpha = 0.6f))} else {- Text(text = text, style = MaterialTheme.typography.bodySmall, color = Color.White)+ Text(text = text, style = MaterialTheme.typography.bodySmall, color = com.streamvault.core.ui.design.BrowseColors.OnPrimary)}}}diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupAdvancedOptions.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupAdvancedOptions.ktindex 5709abf8..c15a5681 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupAdvancedOptions.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupAdvancedOptions.kt@@ -1,9 +1,9 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.animation.AnimatedVisibilityimport androidx.compose.foundation.*import androidx.compose.foundation.layout.*-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.text.KeyboardOptionsimport androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Switch@@ -27,7 +27,7 @@ import androidx.tv.material3.Textimport com.streamvault.feature.provider.Rimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import com.streamvault.domain.model.ChannelLogoSourcePolicyimport com.streamvault.domain.model.GuideSourcePolicyimport com.streamvault.domain.model.ProviderEpgSyncMode@@ -203,7 +203,7 @@ internal fun AdvancedProviderOptionsSection(modifier = Modifier.fillMaxWidth().mouseClickable(onClick = { showAdvancedOptions = !showAdvancedOptions }),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = if (showAdvancedOptions) Primary.copy(alpha = 0.12f) else Surface,focusedContainerColor = Primary.copy(alpha = 0.24f)@@ -259,7 +259,7 @@ internal fun AdvancedProviderOptionsSection(modifier = Modifier.fillMaxWidth().mouseClickable(onClick = onToggleM3uVodClassification),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = if (uiState.m3uVodClassificationEnabled) Primary.copy(alpha = 0.1f) else Surface,focusedContainerColor = Primary.copy(alpha = 0.22f)@@ -337,8 +337,8 @@ internal fun AdvancedProviderOptionsSection(Column(modifier = Modifier.fillMaxWidth()- .background(Surface, RoundedCornerShape(12.dp))- .border(1.dp, SurfaceHighlight, RoundedCornerShape(12.dp))+ .background(Surface, BrowseShapes.Artwork)+ .border(1.dp, SurfaceHighlight, BrowseShapes.Artwork).padding(horizontal = 16.dp, vertical = 12.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -365,8 +365,8 @@ internal fun AdvancedProviderOptionsSection(Column(modifier = Modifier.fillMaxWidth()- .background(Surface, RoundedCornerShape(12.dp))- .border(1.dp, SurfaceHighlight, RoundedCornerShape(12.dp))+ .background(Surface, BrowseShapes.Artwork)+ .border(1.dp, SurfaceHighlight, BrowseShapes.Artwork).padding(horizontal = 16.dp, vertical = 12.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -392,8 +392,8 @@ internal fun AdvancedProviderOptionsSection(Column(modifier = Modifier.fillMaxWidth()- .background(Surface, RoundedCornerShape(12.dp))- .border(1.dp, SurfaceHighlight, RoundedCornerShape(12.dp))+ .background(Surface, BrowseShapes.Artwork)+ .border(1.dp, SurfaceHighlight, BrowseShapes.Artwork).padding(horizontal = 16.dp, vertical = 12.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -419,8 +419,8 @@ internal fun AdvancedProviderOptionsSection(Column(modifier = Modifier.fillMaxWidth()- .background(Surface, RoundedCornerShape(12.dp))- .border(1.dp, SurfaceHighlight, RoundedCornerShape(12.dp))+ .background(Surface, BrowseShapes.Artwork)+ .border(1.dp, SurfaceHighlight, BrowseShapes.Artwork).padding(horizontal = 16.dp, vertical = 12.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -455,8 +455,8 @@ internal fun AdvancedProviderOptionsSection(Column(modifier = Modifier.fillMaxWidth()- .background(Surface, RoundedCornerShape(12.dp))- .border(1.dp, SurfaceHighlight, RoundedCornerShape(12.dp))+ .background(Surface, BrowseShapes.Artwork)+ .border(1.dp, SurfaceHighlight, BrowseShapes.Artwork).padding(horizontal = 16.dp, vertical = 12.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -487,8 +487,8 @@ internal fun AdvancedProviderOptionsSection(Column(modifier = Modifier.fillMaxWidth()- .background(Surface, RoundedCornerShape(12.dp))- .border(1.dp, SurfaceHighlight, RoundedCornerShape(12.dp))+ .background(Surface, BrowseShapes.Artwork)+ .border(1.dp, SurfaceHighlight, BrowseShapes.Artwork).padding(horizontal = 16.dp, vertical = 12.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -633,7 +633,7 @@ internal fun AdvancedProviderOptionsSection(modifier = Modifier.fillMaxWidth().semantics { contentDescription = "Use HTTP proxy" },- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = if (stalkerProxyEnabled) Primary.copy(alpha = 0.1f) else Surface,focusedContainerColor = Primary.copy(alpha = 0.22f)diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupFormPrimitives.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupFormPrimitives.ktindex 18d0fc8d..dc9b9159 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupFormPrimitives.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupFormPrimitives.kt@@ -7,7 +7,7 @@ import androidx.compose.ui.text.input.TransformedTextimport androidx.compose.ui.text.input.VisualTransformationimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.ErrorColor+import com.streamvault.core.ui.design.browse.ErrorColor@Composableinternal fun FormErrors(validationError: String?, error: String?) {diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupImportDialogs.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupImportDialogs.ktindex 89551369..9df0e1d6 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupImportDialogs.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupImportDialogs.kt@@ -1,9 +1,9 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.*import androidx.compose.foundation.rememberScrollState-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScrollimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.SettingsBackupRestore@@ -32,7 +32,7 @@ import com.streamvault.core.ui.components.dialogs.PremiumDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import com.streamvault.domain.manager.DriveBackupSnapshot@Composable@@ -50,7 +50,7 @@ internal fun ImportOptionsButton(.height(if (compact) 38.dp else 44.dp).onFocusEvent { isFocused = it.hasFocus }.semantics { contentDescription = text },- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = Surface.copy(alpha = 0.9f),focusedContainerColor = SurfaceHighlight@@ -221,7 +221,7 @@ internal fun FileSelectorCard(TvSurface(onClick = onClick,modifier = Modifier.fillMaxWidth().height(80.dp).onFocusEvent { isFocused = it.hasFocus }.mouseClickable(onClick = onClick),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),border = ClickableSurfaceDefaults.border(border = Border(BorderStroke(1.dp, borderColor)),focusedBorder = Border(BorderStroke(2.dp, FocusBorder))diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupJellyfinForm.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupJellyfinForm.ktindex 447c2574..905f2a4b 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupJellyfinForm.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupJellyfinForm.kt@@ -2,11 +2,11 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.BrowseShapesimport android.graphics.Bitmapimport androidx.compose.foundation.Imageimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.*-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.rememberimport androidx.compose.ui.Alignment@@ -22,10 +22,10 @@ import com.google.zxing.BarcodeFormatimport com.google.zxing.qrcode.QRCodeWriterimport com.streamvault.feature.provider.Rimport com.streamvault.core.ui.interaction.TvButton-import com.streamvault.core.ui.theme.AccentCyan-import com.streamvault.core.ui.theme.TextPrimary-import com.streamvault.core.ui.theme.TextSecondary-import com.streamvault.core.ui.theme.TextTertiary+import com.streamvault.core.ui.design.browse.AccentCyan+import com.streamvault.core.ui.design.browse.TextPrimary+import com.streamvault.core.ui.design.browse.TextSecondary+import com.streamvault.core.ui.design.browse.TextTertiary@Composableinternal fun JellyfinProviderForm(@@ -75,7 +75,7 @@ internal fun JellyfinProviderForm(Box(modifier = Modifier.size(240.dp)- .background(Color.White, RoundedCornerShape(12.dp))+ .background(Color.White, BrowseShapes.Artwork).padding(8.dp),contentAlignment = Alignment.Center) {diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupPairingCard.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupPairingCard.ktindex 316a88f6..599308d5 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupPairingCard.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupPairingCard.kt@@ -1,10 +1,10 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.Imageimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.*-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -21,7 +21,7 @@ import com.streamvault.feature.provider.Rimport com.streamvault.feature.provider.pairing.ProviderQrPairingStateimport com.streamvault.feature.provider.pairing.ProviderQrPairingStatusimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*@Composableinternal fun PhonePairingCard(@@ -35,14 +35,14 @@ internal fun PhonePairingCard(Surface(modifier = Modifier.fillMaxWidth(),- shape = RoundedCornerShape(16.dp),+ shape = BrowseShapes.Control,colors = SurfaceDefaults.colors(containerColor = Surface.copy(alpha = 0.72f)),border = Border(border = BorderStroke(1.dp,if (isActive) Primary.copy(alpha = 0.55f) else SurfaceHighlight),- shape = RoundedCornerShape(16.dp)+ shape = BrowseShapes.Control)) {Column(@@ -93,7 +93,7 @@ internal fun PhonePairingCard(contentDescription = stringResource(R.string.setup_phone_pairing_qr_description),modifier = Modifier.size(156.dp)- .background(Color.White, RoundedCornerShape(12.dp))+ .background(Color.White, BrowseShapes.Artwork).padding(8.dp))Column(diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupPolicyOptions.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupPolicyOptions.ktindex 1d97366b..f06e37a2 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupPolicyOptions.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupPolicyOptions.kt@@ -20,7 +20,7 @@ import androidx.tv.material3.Surface as TvSurfaceimport androidx.tv.material3.Textimport com.streamvault.feature.provider.Rimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import com.streamvault.domain.model.ChannelLogoSourcePolicyimport com.streamvault.domain.model.GuideSourcePolicyimport com.streamvault.domain.model.ProviderEpgSyncModediff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupProviderForms.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupProviderForms.ktindex a9bf9dba..238e4740 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupProviderForms.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupProviderForms.kt@@ -1,5 +1,6 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -7,7 +8,6 @@ import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.imePaddingimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.rememberScrollState-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScrollimport androidx.compose.material3.HorizontalDividerimport androidx.compose.runtime.Composable@@ -20,8 +20,8 @@ import androidx.tv.material3.SurfaceDefaultsimport com.streamvault.feature.provider.Rimport com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.feature.provider.pairing.ProviderQrPairingState-import com.streamvault.core.ui.theme.SurfaceElevated-import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.core.ui.design.browse.SurfaceElevated+import com.streamvault.core.ui.design.browse.SurfaceHighlightimport com.streamvault.domain.model.ChannelLogoSourcePolicyimport com.streamvault.domain.model.GuideSourcePolicyimport com.streamvault.domain.model.ProviderEpgSyncMode@@ -168,10 +168,10 @@ internal fun ProviderFormContent(TvSurface(modifier = modifier,- shape = RoundedCornerShape(20.dp),+ shape = BrowseShapes.Panel,border = Border(border = BorderStroke(1.dp, SurfaceHighlight),- shape = RoundedCornerShape(20.dp)+ shape = BrowseShapes.Panel),colors = SurfaceDefaults.colors(containerColor = SurfaceElevated.copy(alpha = 0.95f))) {diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupScreen.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupScreen.ktindex d4966800..d3582989 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupScreen.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupScreen.kt@@ -1,5 +1,6 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.browseBackdropimport androidx.activity.compose.BackHandlerimport androidx.compose.animation.animateColorAsStateimport androidx.compose.animation.AnimatedVisibility@@ -19,7 +20,6 @@ import androidx.compose.foundation.relocation.bringIntoViewRequesterimport com.streamvault.core.ui.interaction.mouseClickableimport androidx.compose.foundation.layout.*import androidx.compose.foundation.rememberScrollState-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.text.KeyboardActionsimport androidx.compose.foundation.text.KeyboardOptionsimport androidx.compose.foundation.verticalScroll@@ -39,7 +39,6 @@ import androidx.compose.ui.focus.FocusRequesterimport androidx.compose.ui.focus.focusPropertiesimport androidx.compose.ui.focus.focusRequesterimport androidx.compose.ui.focus.onFocusEvent-import androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.SolidColorimport androidx.compose.ui.graphics.asImageBitmap@@ -83,7 +82,7 @@ import com.streamvault.core.ui.progress.extractProgressFractionimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import com.streamvault.domain.model.StalkerCompatibilityRegistryimport com.streamvault.domain.model.StalkerCatalogModeimport com.streamvault.domain.model.StalkerCompatibilityProfileIds@@ -401,7 +400,7 @@ fun ProviderSetupScreen(BoxWithConstraints(modifier = Modifier.fillMaxSize()- .background(Brush.verticalGradient(colors = listOf(BackgroundDeep, Background, Surface)))+ .browseBackdrop()) {val isWide = maxWidth >= 700.dpval hPad = if (isWide) 24.dp else 16.dpdiff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceForms.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceForms.ktindex 75ae4be9..b76e64e0 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceForms.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceForms.kt@@ -10,7 +10,7 @@ import androidx.compose.ui.text.input.KeyboardTypeimport androidx.tv.material3.MaterialThemeimport com.streamvault.feature.provider.Rimport com.streamvault.feature.provider.pairing.ProviderQrPairingState-import com.streamvault.core.ui.theme.ErrorColor+import com.streamvault.core.ui.design.browse.ErrorColorimport com.streamvault.domain.model.StalkerAuthMode@Composablediff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourcePanel.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourcePanel.ktindex 123e8bf9..2f5905fc 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourcePanel.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourcePanel.kt@@ -1,8 +1,8 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.layout.*-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -18,7 +18,7 @@ import androidx.tv.material3.Textimport com.streamvault.feature.provider.Rimport com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*@Composableinternal fun SourceTypeSelectorPanel(@@ -31,7 +31,7 @@ internal fun SourceTypeSelectorPanel() {TvSurface(modifier = modifier,- shape = RoundedCornerShape(20.dp),+ shape = BrowseShapes.Panel,colors = SurfaceDefaults.colors(containerColor = Surface.copy(alpha = 0.92f))) {Column(@@ -134,7 +134,7 @@ internal fun SourceTypeCard(TvSurface(onClick = { if (enabled) onClick() },modifier = Modifier.fillMaxWidth().mouseClickable(enabled = enabled, onClick = onClick),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Artwork),colors = ClickableSurfaceDefaults.colors(containerColor = if (selected) Primary.copy(alpha = 0.18f) else SurfaceElevated,focusedContainerColor = if (selected) Primary.copy(alpha = 0.28f) else SurfaceHighlightdiff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceSelector.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceSelector.ktindex 7eca9289..65046185 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceSelector.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSourceSelector.kt@@ -22,13 +22,13 @@ import androidx.tv.material3.Textimport com.streamvault.feature.provider.Rimport com.streamvault.core.ui.components.shell.StatusPillimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.AccentAmber-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.Primary-import com.streamvault.core.ui.theme.Surface as SurfaceColor-import com.streamvault.core.ui.theme.SurfaceHighlight-import com.streamvault.core.ui.theme.TextPrimary+import com.streamvault.core.ui.design.browse.AccentAmber+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.Primary+import com.streamvault.core.ui.design.browse.Surface as SurfaceColor+import com.streamvault.core.ui.design.browse.SurfaceHighlight+import com.streamvault.core.ui.design.browse.TextPrimaryinternal enum class SourceType { XTREAM, STALKER, M3U_URL, M3U_FILE, JELLYFIN }diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupStalkerCompatibilitySelector.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupStalkerCompatibilitySelector.ktindex 8bf0026f..25498190 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupStalkerCompatibilitySelector.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupStalkerCompatibilitySelector.kt@@ -11,8 +11,8 @@ import androidx.compose.runtime.setValueimport androidx.compose.ui.unit.dpimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.core.ui.theme.AccentAmber-import com.streamvault.core.ui.theme.OnBackground+import com.streamvault.core.ui.design.browse.AccentAmber+import com.streamvault.core.ui.design.browse.OnBackgroundimport com.streamvault.domain.model.StalkerCompatibilityRegistryimport com.streamvault.domain.model.StalkerCompatibilityProfileIdsimport com.streamvault.domain.model.StalkerProfileVerificationdiff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupStalkerRules.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupStalkerRules.ktindex 92c889c2..7fa2387f 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupStalkerRules.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupStalkerRules.kt@@ -1,5 +1,6 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.border@@ -23,7 +24,7 @@ import androidx.tv.material3.Surface as TvSurfaceimport androidx.tv.material3.Textimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import kotlinx.coroutines.delay@Composable@@ -35,7 +36,7 @@ internal fun StalkerLinkOptionButton(TvSurface(onClick = onClick,modifier = Modifier.mouseClickable(onClick = onClick),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),+ shape = ClickableSurfaceDefaults.shape(BrowseShapes.Control),colors = ClickableSurfaceDefaults.colors(containerColor = if (selected) Primary.copy(alpha = 0.18f) else Surface,focusedContainerColor = Primary.copy(alpha = 0.28f)@@ -76,8 +77,8 @@ internal fun StalkerRequestRulesEditor(Column(modifier = Modifier.fillMaxWidth()- .background(Surface, RoundedCornerShape(12.dp))- .border(1.dp, SurfaceHighlight, RoundedCornerShape(12.dp))+ .background(Surface, BrowseShapes.Artwork)+ .border(1.dp, SurfaceHighlight, BrowseShapes.Artwork).padding(12.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSyncDialog.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSyncDialog.ktindex 91c15f1d..f2aeef87 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSyncDialog.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupSyncDialog.kt@@ -1,5 +1,6 @@package com.streamvault.feature.provider.setup+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.animation.core.tweenimport androidx.compose.foundation.Image@@ -11,7 +12,6 @@ import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.size-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.LinearProgressIndicatorimport androidx.compose.material3.TextButton@@ -31,7 +31,7 @@ import com.streamvault.feature.provider.Rimport com.streamvault.core.ui.components.dialogs.PremiumDialogimport com.streamvault.core.ui.progress.extractProgressFractionimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*@Composablefun SyncProgressDialog(@@ -60,7 +60,7 @@ fun SyncProgressDialog(Box(modifier = Modifier.size(200.dp)- .background(Color.White, RoundedCornerShape(12.dp))+ .background(Color.White, BrowseShapes.Artwork).padding(8.dp),contentAlignment = Alignment.Center) {diff --git a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupTextField.kt b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupTextField.ktindex 4c6450bf..35ad676b 100644--- a/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupTextField.kt+++ b/feature/provider/src/main/java/com/streamvault/feature/provider/setup/ProviderSetupTextField.kt@@ -27,7 +27,7 @@ import androidx.tv.material3.Textimport com.streamvault.feature.provider.Rimport com.streamvault.core.ui.device.rememberIsTelevisionDeviceimport com.streamvault.core.ui.interaction.mouseClickable-import com.streamvault.core.ui.theme.*+import com.streamvault.core.ui.design.browse.*import kotlinx.coroutines.delayimport kotlinx.coroutines.launchdiff --git a/feature/system/src/main/java/com/streamvault/feature/system/presentation/downloads/DownloadsScreen.kt b/feature/system/src/main/java/com/streamvault/feature/system/presentation/downloads/DownloadsScreen.ktindex bb1bcdc9..bdb66b8a 100644--- a/feature/system/src/main/java/com/streamvault/feature/system/presentation/downloads/DownloadsScreen.kt+++ b/feature/system/src/main/java/com/streamvault/feature/system/presentation/downloads/DownloadsScreen.kt@@ -1,5 +1,7 @@package com.streamvault.feature.system.presentation.downloads+import com.streamvault.core.ui.design.contentOnColor+import com.streamvault.core.ui.design.BrowseShapesimport androidx.activity.compose.rememberLauncherForActivityResultimport androidx.activity.result.contract.ActivityResultContractsimport androidx.compose.foundation.background@@ -50,7 +52,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycleimport coil3.compose.AsyncImageimport com.streamvault.feature.system.Rimport com.streamvault.core.ui.image.rememberCrossfadeImageModel-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.core.navigation.AppDestinationimport com.streamvault.domain.model.DownloadItemimport com.streamvault.domain.model.DownloadStatus@@ -255,10 +257,10 @@ private fun DownloadCard(Surface(modifier = Modifier.fillMaxWidth()- .clip(RoundedCornerShape(14.dp))+ .clip(BrowseShapes.Control).clickable(enabled = download.status == DownloadStatus.COMPLETED, onClick = onOpenClick),color = AppColors.Surface,- shape = RoundedCornerShape(14.dp)+ shape = BrowseShapes.Control) {Column(modifier = Modifier@@ -366,7 +368,7 @@ private fun StatusBadge(status: DownloadStatus, modifier: Modifier = Modifier) {Text(text = statusLabel(status),style = MaterialTheme.typography.labelSmall,- color = Color.White,+ color = contentOnColor(color),modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp))}diff --git a/feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsScreen.kt b/feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsScreen.ktindex 00c26ff0..8e3bf094 100644--- a/feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsScreen.kt+++ b/feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsScreen.kt@@ -1,5 +1,6 @@package com.streamvault.feature.system.presentation.plugins+import com.streamvault.core.ui.design.browsePanelimport android.net.Uriimport androidx.activity.compose.rememberLauncherForActivityResultimport androidx.activity.result.contract.ActivityResultContracts@@ -63,12 +64,12 @@ import com.streamvault.feature.system.api.SystemScaffoldContentimport com.streamvault.core.ui.components.dialogs.PremiumDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors-import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.design.BrowseColors as AppColors+import com.streamvault.core.ui.design.BrowseFocusSpec as FocusSpecimport com.streamvault.core.ui.interaction.TvButton-import com.streamvault.core.ui.theme.FocusBorder-import com.streamvault.core.ui.theme.OnSurface-import com.streamvault.core.ui.theme.Primary+import com.streamvault.core.ui.design.browse.FocusBorder+import com.streamvault.core.ui.design.browse.OnSurface+import com.streamvault.core.ui.design.browse.Primary@Composablefun PluginsScreen(@@ -258,9 +259,9 @@ private fun PluginButton(val colors = when (tone) {PluginButtonTone.Primary -> ButtonDefaults.colors(containerColor = Primary,- contentColor = Color.White,+ contentColor = AppColors.OnPrimary,focusedContainerColor = Primary.copy(alpha = 0.88f),- focusedContentColor = Color.White,+ focusedContentColor = AppColors.OnPrimary,disabledContainerColor = AppColors.SurfaceEmphasis.copy(alpha = 0.56f),disabledContentColor = AppColors.TextDisabled)@@ -307,7 +308,7 @@ private fun PluginInstallPanel(Column(modifier = Modifier.fillMaxWidth()- .background(AppColors.Surface.copy(alpha = 0.72f), RoundedCornerShape(10.dp))+ .browsePanel().padding(12.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -432,7 +433,7 @@ private fun PluginCard(Column(modifier = Modifier.fillMaxWidth()- .background(AppColors.Surface.copy(alpha = 0.55f), RoundedCornerShape(10.dp))+ .browsePanel().padding(14.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -573,7 +574,7 @@ private fun PluginConfigurationHeader(Column(modifier = Modifier.fillMaxWidth()- .background(AppColors.Surface.copy(alpha = 0.72f), RoundedCornerShape(10.dp))+ .browsePanel().padding(14.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {@@ -638,7 +639,7 @@ private fun PluginConfigurationSectionCard(Column(modifier = Modifier.fillMaxWidth()- .background(AppColors.Surface.copy(alpha = 0.55f), RoundedCornerShape(10.dp))+ .browsePanel().padding(14.dp),verticalArrangement = Arrangement.spacedBy(12.dp)) {@@ -718,7 +719,7 @@ private fun PluginConfigurationBooleanField(Row(modifier = Modifier.fillMaxWidth()- .background(AppColors.Surface.copy(alpha = 0.38f), RoundedCornerShape(8.dp))+ .browsePanel().padding(horizontal = 12.dp, vertical = 10.dp),horizontalArrangement = Arrangement.SpaceBetween,verticalAlignment = Alignment.CenterVertically@@ -860,7 +861,7 @@ private fun PluginConfigurationActions(Column(modifier = Modifier.fillMaxWidth()- .background(AppColors.Surface.copy(alpha = 0.55f), RoundedCornerShape(10.dp))+ .browsePanel().padding(14.dp),verticalArrangement = Arrangement.spacedBy(10.dp)) {diff --git a/feature/system/src/main/java/com/streamvault/feature/system/presentation/welcome/WelcomeScreen.kt b/feature/system/src/main/java/com/streamvault/feature/system/presentation/welcome/WelcomeScreen.ktindex ca1c597e..88036748 100644--- a/feature/system/src/main/java/com/streamvault/feature/system/presentation/welcome/WelcomeScreen.kt+++ b/feature/system/src/main/java/com/streamvault/feature/system/presentation/welcome/WelcomeScreen.kt@@ -1,5 +1,7 @@package com.streamvault.feature.system.presentation.welcome+import com.streamvault.core.ui.design.browseBackdrop+import com.streamvault.core.ui.design.BrowseShapesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -12,7 +14,6 @@ import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.layout.widthIn-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.LinearProgressIndicatorimport androidx.compose.runtime.Composable@@ -20,7 +21,6 @@ import androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier-import androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.style.TextAlign@@ -36,7 +36,7 @@ import androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.feature.system.Rimport com.streamvault.core.ui.components.shell.StatusPill-import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.BrowseColors as AppColorsimport com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.domain.repository.ProviderRepositoryimport com.streamvault.domain.sync.Section@@ -159,15 +159,7 @@ internal fun WelcomeContent(Box(modifier = Modifier.fillMaxSize()- .background(- Brush.verticalGradient(- colors = listOf(- Color.Black.copy(alpha = 0.22f),- AppColors.HeroTop,- AppColors.HeroBottom- )- )- )+ .browseBackdrop())when (hasProviders) {@@ -196,7 +188,7 @@ private fun WelcomeLoadingCard() {Surface(modifier = modifier,- shape = RoundedCornerShape(28.dp),+ shape = BrowseShapes.Hero,colors = SurfaceDefaults.colors(containerColor = AppColors.Surface.copy(alpha = 0.9f))) {Column(@@ -279,7 +271,7 @@ private fun WelcomeStartCard(modifier = modifier.widthIn(max = 720.dp).fillMaxWidth(),- shape = RoundedCornerShape(28.dp),+ shape = BrowseShapes.Hero,colors = SurfaceDefaults.colors(containerColor = AppColors.Surface.copy(alpha = 0.9f))) {Column(