Skip to content

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

refactor: move design system into core ui

David Nashash66dfac60d6b3
diff --git a/app/src/androidTest/java/com/streamvault/app/ui/PlayerSmokeTest.kt b/app/src/androidTest/java/com/streamvault/app/ui/PlayerSmokeTest.kt
index a30c5b6b..ab86f7fe 100644
--- a/app/src/androidTest/java/com/streamvault/app/ui/PlayerSmokeTest.kt
+++ b/app/src/androidTest/java/com/streamvault/app/ui/PlayerSmokeTest.kt
@@ -17,7 +17,7 @@ import com.streamvault.app.ui.components.shell.CategoryRailPanel
import com.streamvault.app.ui.screens.player.overlay.PlayerControlsOverlay
import com.streamvault.app.ui.screens.player.overlay.PlayerTrackSelectionDialog
import com.streamvault.app.ui.test.TestFixtures
-import com.streamvault.app.ui.theme.StreamVaultTheme
+import com.streamvault.core.ui.theme.StreamVaultTheme
import com.streamvault.player.TrackType
import org.junit.Rule
import org.junit.Test
diff --git a/app/src/androidTest/java/com/streamvault/app/ui/PremiumRouteGoldenTest.kt b/app/src/androidTest/java/com/streamvault/app/ui/PremiumRouteGoldenTest.kt
index 439445ab..8c84fd58 100644
--- a/app/src/androidTest/java/com/streamvault/app/ui/PremiumRouteGoldenTest.kt
+++ b/app/src/androidTest/java/com/streamvault/app/ui/PremiumRouteGoldenTest.kt
@@ -26,10 +26,10 @@ import com.streamvault.app.ui.components.shell.LoadMoreCard
import com.streamvault.app.ui.components.shell.MoviePosterCard
import com.streamvault.app.ui.components.shell.SeriesPosterCard
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.app.ui.test.TestFixtures
import com.streamvault.app.ui.test.assertAgainstGolden
-import com.streamvault.app.ui.theme.StreamVaultTheme
+import com.streamvault.core.ui.theme.StreamVaultTheme
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/app/src/androidTest/java/com/streamvault/app/ui/components/shell/ShellGoldenTest.kt b/app/src/androidTest/java/com/streamvault/app/ui/components/shell/ShellGoldenTest.kt
index 5192d689..8ba4222b 100644
--- a/app/src/androidTest/java/com/streamvault/app/ui/components/shell/ShellGoldenTest.kt
+++ b/app/src/androidTest/java/com/streamvault/app/ui/components/shell/ShellGoldenTest.kt
@@ -12,7 +12,7 @@ import androidx.compose.ui.test.onNodeWithTag
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.streamvault.app.navigation.Routes
import com.streamvault.app.ui.test.assertAgainstGolden
-import com.streamvault.app.ui.theme.StreamVaultTheme
+import com.streamvault.core.ui.theme.StreamVaultTheme
import com.streamvault.domain.model.Channel
import org.junit.Rule
import org.junit.Test
diff --git a/app/src/androidTest/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayGoldenTest.kt b/app/src/androidTest/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayGoldenTest.kt
index d81b322f..471c74a0 100644
--- a/app/src/androidTest/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayGoldenTest.kt
+++ b/app/src/androidTest/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayGoldenTest.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.test.onNodeWithTag
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.streamvault.app.ui.test.TestFixtures
import com.streamvault.app.ui.test.assertAgainstGolden
-import com.streamvault.app.ui.theme.StreamVaultTheme
+import com.streamvault.core.ui.theme.StreamVaultTheme
import com.streamvault.player.PlayerError
import com.streamvault.player.TrackType
import org.junit.Rule
diff --git a/app/src/androidTest/java/com/streamvault/app/ui/screens/provider/ProviderSetupCompletionLayerTest.kt b/app/src/androidTest/java/com/streamvault/app/ui/screens/provider/ProviderSetupCompletionLayerTest.kt
index 74ef9974..9d49a327 100644
--- a/app/src/androidTest/java/com/streamvault/app/ui/screens/provider/ProviderSetupCompletionLayerTest.kt
+++ b/app/src/androidTest/java/com/streamvault/app/ui/screens/provider/ProviderSetupCompletionLayerTest.kt
@@ -9,7 +9,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
-import com.streamvault.app.ui.theme.StreamVaultTheme
+import com.streamvault.core.ui.theme.StreamVaultTheme
import org.junit.Assert.assertEquals
import org.junit.Rule
import org.junit.Test
diff --git a/app/src/main/java/com/streamvault/app/MainActivity.kt b/app/src/main/java/com/streamvault/app/MainActivity.kt
index 7987dac3..5e824828 100644
--- a/app/src/main/java/com/streamvault/app/MainActivity.kt
+++ b/app/src/main/java/com/streamvault/app/MainActivity.kt
@@ -19,7 +19,7 @@ import com.streamvault.app.navigation.AppNavigation
import com.streamvault.app.navigation.ExternalDestination
import com.streamvault.app.navigation.ExternalNavigationRequest
import com.streamvault.app.navigation.PlayerNavigationRequest
-import com.streamvault.app.ui.theme.StreamVaultTheme
+import com.streamvault.core.ui.theme.StreamVaultTheme
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.domain.repository.ChannelRepository
import com.streamvault.domain.repository.CombinedM3uRepository
diff --git a/app/src/main/java/com/streamvault/app/tvinput/TvInputSetupActivity.kt b/app/src/main/java/com/streamvault/app/tvinput/TvInputSetupActivity.kt
index 13a7bd3f..314c1b51 100644
--- a/app/src/main/java/com/streamvault/app/tvinput/TvInputSetupActivity.kt
+++ b/app/src/main/java/com/streamvault/app/tvinput/TvInputSetupActivity.kt
@@ -39,12 +39,12 @@ import androidx.lifecycle.viewModelScope
import com.streamvault.app.R
import com.streamvault.app.MainActivity
import com.streamvault.app.navigation.ExternalDestination
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.StreamVaultTheme
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.ErrorColor
+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.StreamVaultTheme
+import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.domain.model.LegacyProvider as Provider
import com.streamvault.domain.repository.ProviderRepository
import dagger.hilt.android.AndroidEntryPoint
diff --git a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
index 0df80ab5..d173c32c 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
@@ -44,7 +44,7 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.tv.material3.Border
import androidx.tv.material3.ClickableSurfaceDefaults
-import com.streamvault.app.ui.design.LocalAppShapes
+import com.streamvault.core.ui.design.LocalAppShapes
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.Text
@@ -56,22 +56,22 @@ import com.streamvault.app.ui.components.shell.SeriesPosterCard
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.app.ui.model.formatVodRatingLabel
import com.streamvault.app.ui.model.archivePlaybackCapability
-import com.streamvault.app.ui.theme.AccentAmber
-import com.streamvault.app.ui.theme.AccentCyan
-import com.streamvault.app.ui.theme.AccentRed
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.GradientOverlayBottom
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Surface
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
-import com.streamvault.app.ui.theme.TextPrimary
-import com.streamvault.app.ui.theme.TextSecondary
-import com.streamvault.app.ui.theme.TextTertiary
+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.domain.model.Channel
import com.streamvault.domain.model.Movie
import com.streamvault.domain.model.Series
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.mouseClickable
import com.streamvault.app.ui.interaction.rememberTvInteractionSounds
diff --git a/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt b/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
index 785d58ad..973eacec 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
@@ -32,11 +32,11 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.shell.AppSectionHeader
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.app.ui.interaction.mouseClickable
// ── Netflix-style horizontal category row ─────────────────────────
diff --git a/app/src/main/java/com/streamvault/app/ui/components/ChannelLogo.kt b/app/src/main/java/com/streamvault/app/ui/components/ChannelLogo.kt
index b8525213..be895dee 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/ChannelLogo.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/ChannelLogo.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import coil3.compose.AsyncImage
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import java.util.Locale
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/components/ContinueWatchingRow.kt b/app/src/main/java/com/streamvault/app/ui/components/ContinueWatchingRow.kt
index 2189da5f..ad1e4308 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/ContinueWatchingRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/ContinueWatchingRow.kt
@@ -32,12 +32,12 @@ import androidx.tv.material3.Text
import coil3.compose.AsyncImage
import com.streamvault.app.R
import com.streamvault.app.ui.components.rememberCrossfadeImageModel
-import com.streamvault.app.ui.theme.AccentCyan
-import com.streamvault.app.ui.theme.GradientOverlayBottom
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.TextPrimary
-import com.streamvault.app.ui.theme.TextSecondary
-import com.streamvault.app.ui.theme.TextTertiary
+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.domain.model.ContentType
import com.streamvault.domain.model.PlaybackHistory
diff --git a/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt b/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
index ad08c3a0..3e67712d 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.res.stringResource
import androidx.tv.material3.*
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvIconButton
diff --git a/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt b/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
index c3397e1a..0c49e069 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
@@ -34,12 +34,12 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.FocusBorder
+import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.domain.model.ActiveLiveSource
import com.streamvault.domain.model.ActiveLiveSourceOption
import androidx.compose.foundation.BorderStroke
diff --git a/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt b/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
index 29699bfa..13f06eec 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
@@ -16,13 +16,13 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.res.stringResource
import androidx.tv.material3.*
import com.streamvault.app.R
-import com.streamvault.app.ui.design.FocusSpec
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.TextPrimary
-import com.streamvault.app.ui.theme.TextSecondary
+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.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvIconButton
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryContextCard.kt b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryContextCard.kt
index 2ebfab8d..db68b691 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryContextCard.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryContextCard.kt
@@ -25,12 +25,12 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.design.FocusSpec
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.app.ui.interaction.mouseClickable
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
index a1c345d9..a9030be6 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
@@ -27,12 +27,12 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.design.FocusSpec
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.app.ui.interaction.mouseClickable
data class SavedCategoryShortcut(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt b/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
index cc858fb3..8777fe26 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
@@ -50,12 +50,12 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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 kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SelectionChipRow.kt b/app/src/main/java/com/streamvault/app/ui/components/SelectionChipRow.kt
index 4d878225..92d3ad94 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SelectionChipRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SelectionChipRow.kt
@@ -26,12 +26,12 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.Text
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.app.ui.interaction.mouseClickable
import com.streamvault.app.ui.interaction.rememberTvInteractionSounds
diff --git a/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt b/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt
index 97eb2833..8031c2ba 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt
@@ -20,8 +20,8 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.ui.components.shell.AppMessageState
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.OnSurfaceDim
@Composable
fun TvEmptyState(
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.kt
index eaebb0c3..0add156d 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
@@ -24,7 +24,7 @@ import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Category
import androidx.compose.ui.res.stringResource
import com.streamvault.app.R
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import androidx.compose.ui.input.key.*
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.foundation.shape.CircleShape
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
index 10919a50..0fccabcf 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
@@ -27,10 +27,10 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.app.ui.interaction.mouseClickable
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.ui.Alignment
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
index 8a26d823..4d345d1e 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.components.dialogs
+package com.streamvault.app.ui.components.dialogs
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -40,10 +40,10 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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
@Composable
fun CreateGroupDialog(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
index 354f6a2c..0f480abe 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
@@ -31,10 +31,10 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.SurfaceElevated
+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 kotlinx.coroutines.delay
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
index df3513e7..95d5922e 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
@@ -18,12 +18,12 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.PrimaryLight
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.domain.model.Category
/**
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt
index 10c87831..0da9ecab 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt
@@ -18,11 +18,11 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.PrimaryLight
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+import com.streamvault.core.ui.theme.OnSurface
+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.domain.model.Channel
/**
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uCategoryOrganizerDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uCategoryOrganizerDialog.kt
index b9fdd963..cbb174f4 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uCategoryOrganizerDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uCategoryOrganizerDialog.kt
@@ -18,8 +18,8 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.domain.repository.M3uClassificationTarget
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uCategorySeriesAssignmentDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uCategorySeriesAssignmentDialog.kt
index 67bf7ebf..608646e8 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uCategorySeriesAssignmentDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uCategorySeriesAssignmentDialog.kt
@@ -28,8 +28,8 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.domain.repository.M3uCategoryItem
import com.streamvault.domain.repository.M3uSeriesAssignment
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uSeriesAssignmentDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uSeriesAssignmentDialog.kt
index accd9982..e618121b 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uSeriesAssignmentDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/M3uSeriesAssignmentDialog.kt
@@ -24,8 +24,8 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.domain.repository.M3uSeriesAssignment
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PinDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PinDialog.kt
index 04d1c6f6..cd0ba23e 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PinDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PinDialog.kt
@@ -22,15 +22,15 @@ import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.theme.ErrorColor
+import com.streamvault.core.ui.theme.FocusBorder
+import com.streamvault.core.ui.theme.Primary
+import com.streamvault.core.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.design.requestFocusSafely
import kotlinx.coroutines.delay
import androidx.compose.ui.res.stringResource
import com.streamvault.app.R
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import androidx.tv.material3.Border
/**
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
index 21b7754a..b3da9750 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
@@ -45,10 +45,10 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.FocusSpec
internal val LocalDialogCanInteract = compositionLocalOf { true }
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
index 64b5e89d..34ad24fe 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.components.dialogs
+package com.streamvault.app.ui.components.dialogs
import androidx.compose.foundation.background
import androidx.compose.foundation.text.KeyboardActions
@@ -40,16 +40,16 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
-import com.streamvault.app.ui.design.requestFocusSafely
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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
@Composable
fun RenameGroupDialog(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
index 186071fd..8bddfb80 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
@@ -55,9 +55,9 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.ChannelLogoBadge
import com.streamvault.app.ui.components.channelProgressFraction
import com.streamvault.app.ui.components.rememberCrossfadeImageModel
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.AppMotion
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.AppMotion
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.mouseClickable
import com.streamvault.app.ui.interaction.rememberTvInteractionSounds
import com.streamvault.app.ui.model.archivePlaybackCapability
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt
index 11c73b53..33087780 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt
@@ -78,14 +78,14 @@ import com.streamvault.app.R
import com.streamvault.app.MainActivity
import com.streamvault.app.navigation.toAppRoute
import com.streamvault.app.navigation.Routes
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.AppMotion
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.AppMotion
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.mouseClickable
import com.streamvault.app.ui.interaction.rememberTvInteractionSounds
import com.streamvault.app.ui.interaction.TvIconButton
-import com.streamvault.app.ui.design.LocalAppShapes
-import com.streamvault.app.ui.design.LocalAppSpacing
+import com.streamvault.core.ui.design.LocalAppShapes
+import com.streamvault.core.ui.design.LocalAppSpacing
import com.streamvault.domain.model.AppTopLevelDestination
import com.streamvault.domain.model.CatalogLayout
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/ExternalRatingsStrip.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/ExternalRatingsStrip.kt
index d99a7a42..0a39c86b 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/ExternalRatingsStrip.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/ExternalRatingsStrip.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.domain.model.ExternalRatingValue
import com.streamvault.domain.model.ExternalRatings
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
index c0827107..6a376b34 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
@@ -39,9 +39,9 @@ import androidx.tv.material3.Text
import coil3.compose.AsyncImage
import com.streamvault.app.ui.components.SearchInput
import com.streamvault.app.ui.components.rememberCrossfadeImageModel
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.FocusSpec
-import com.streamvault.app.ui.design.LocalAppSpacing
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.FocusSpec
+import com.streamvault.core.ui.design.LocalAppSpacing
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvIconButton
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
index f8106b6f..1a8b4bb5 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
@@ -37,15 +37,15 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.app.ui.components.ChipRowItem
import com.streamvault.app.ui.components.ChipRowSection
-import com.streamvault.app.ui.design.AppColors.Brand as Primary
-import com.streamvault.app.ui.design.AppColors.Focus as FocusBorder
-import com.streamvault.app.ui.design.AppColors.SurfaceElevated as SurfaceElevated
-import com.streamvault.app.ui.design.AppColors.SurfaceEmphasis as SurfaceHighlight
-import com.streamvault.app.ui.design.AppColors.TextPrimary as TextPrimary
-import com.streamvault.app.ui.design.AppColors.TextTertiary as OnSurfaceDim
+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 androidx.compose.foundation.BorderStroke
import com.streamvault.app.R
import com.streamvault.app.ui.components.SearchInput
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt
index a1e59e0f..f396d044 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt
@@ -35,8 +35,8 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.FocusedMarqueeText
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvIconButton
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
index a9e50614..00da70ea 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
@@ -65,17 +65,17 @@ import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppHeroHeader
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
-import com.streamvault.app.ui.design.AppColors.Brand as Primary
-import com.streamvault.app.ui.design.AppColors.Focus as FocusBorder
-import com.streamvault.app.ui.design.AppColors.SurfaceElevated as SurfaceElevated
-import com.streamvault.app.ui.design.AppColors.SurfaceEmphasis as SurfaceHighlight
-import com.streamvault.app.ui.design.AppColors.TextPrimary as OnBackground
-import com.streamvault.app.ui.design.AppColors.TextPrimary as TextPrimary
-import com.streamvault.app.ui.design.AppColors.TextTertiary as OnSurfaceDim
-import com.streamvault.app.ui.design.AppColors.TextTertiary as TextTertiary
+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.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.Channel
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt
index e814db11..b16edbaf 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt
@@ -26,12 +26,12 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.AppHomeDashboardShelf
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/downloads/DownloadsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/downloads/DownloadsScreen.kt
index 066ade40..25a3c9ac 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/downloads/DownloadsScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/downloads/DownloadsScreen.kt
@@ -53,7 +53,7 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.rememberCrossfadeImageModel
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.domain.model.DownloadItem
import com.streamvault.domain.model.DownloadStatus
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgControlComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgControlComponents.kt
index 093c3282..4e56c019 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgControlComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgControlComponents.kt
@@ -60,12 +60,12 @@ import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.SelectionChip
import com.streamvault.app.ui.components.SelectionChipRow
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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 java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgGridComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgGridComponents.kt
index ad3534a7..2682b7bf 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgGridComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgGridComponents.kt
@@ -57,14 +57,14 @@ import com.streamvault.app.ui.model.archivePlaybackCapability
import com.streamvault.app.ui.model.guideLookupKey
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormatter
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
-import com.streamvault.app.ui.theme.TextPrimary
-import com.streamvault.app.ui.theme.TextSecondary
+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.domain.model.Channel
import com.streamvault.domain.model.Program
import java.time.Instant
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgHeroComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgHeroComponents.kt
index ac1042ae..a8131f73 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgHeroComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgHeroComponents.kt
@@ -49,12 +49,12 @@ import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.guideLookupKey
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormat
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.domain.model.Channel
import com.streamvault.domain.model.Program
import com.streamvault.player.PlayerEngine
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
index b70f274e..dc13bd60 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
@@ -101,15 +101,15 @@ import kotlinx.coroutines.launch
import com.streamvault.app.ui.components.dialogs.PinDialog
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
-import com.streamvault.app.ui.theme.TextPrimary
-import com.streamvault.app.ui.theme.TextSecondary
+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.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.domain.model.Category
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.EpgMatchType
@@ -271,7 +271,7 @@ fun FullEpgScreen(
title = {
androidx.compose.material3.Text(
text = stringResource(R.string.epg_recording_conflict_title),
- color = com.streamvault.app.ui.theme.OnSurface
+ color = com.streamvault.core.ui.theme.OnSurface
)
},
text = {
@@ -280,7 +280,7 @@ fun FullEpgScreen(
}
androidx.compose.material3.Text(
text = stringResource(R.string.epg_recording_conflict_body, conflict.programTitle, conflictNames),
- color = com.streamvault.app.ui.theme.TextSecondary
+ color = com.streamvault.core.ui.theme.TextSecondary
)
},
confirmButton = {
@@ -293,7 +293,7 @@ fun FullEpgScreen(
) {
androidx.compose.material3.Text(
text = stringResource(R.string.epg_recording_conflict_replace),
- color = com.streamvault.app.ui.theme.Primary
+ color = com.streamvault.core.ui.theme.Primary
)
}
},
@@ -301,13 +301,13 @@ fun FullEpgScreen(
androidx.compose.material3.TextButton(onClick = { viewModel.dismissRecordingConflict() }) {
androidx.compose.material3.Text(
text = stringResource(R.string.epg_recording_conflict_cancel),
- color = com.streamvault.app.ui.theme.OnSurface
+ color = com.streamvault.core.ui.theme.OnSurface
)
}
},
- containerColor = com.streamvault.app.ui.theme.SurfaceElevated,
- titleContentColor = com.streamvault.app.ui.theme.OnSurface,
- textContentColor = com.streamvault.app.ui.theme.TextSecondary
+ containerColor = com.streamvault.core.ui.theme.SurfaceElevated,
+ titleContentColor = com.streamvault.core.ui.theme.OnSurface,
+ textContentColor = com.streamvault.core.ui.theme.TextSecondary
)
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt
index ab7e8e25..c40ca62c 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt
@@ -54,12 +54,12 @@ import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormat
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.domain.model.Category
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.EpgMatchType
@@ -421,7 +421,7 @@ internal fun CompactGuideProgramDialog(
modifier = Modifier.fillMaxWidth(),
scale = ButtonDefaults.scale(focusedScale = 1f),
colors = ButtonDefaults.colors(
- containerColor = com.streamvault.app.ui.theme.AccentRed,
+ containerColor = com.streamvault.core.ui.theme.AccentRed,
contentColor = Color.White
)
) {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
index c1270ac6..b6bf0e8b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
@@ -65,14 +65,14 @@ import com.streamvault.app.ui.components.shell.AppHeroHeader
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.app.ui.components.shell.AppSectionHeader
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnPrimary
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Surface
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.domain.model.ContentType
import kotlinx.coroutines.launch
import com.streamvault.app.ui.interaction.TvClickableSurface
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
index 0d28c56d..4fde8a5b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
@@ -66,11 +66,11 @@ import com.streamvault.app.ui.components.dialogs.RenameGroupDialog
import com.streamvault.app.ui.components.ReorderTopBar
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
-import com.streamvault.app.ui.design.FocusRestoreHost
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.FocusRestoreHost
+import com.streamvault.core.ui.design.requestFocusSafely
import androidx.activity.compose.BackHandler
import com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityMode
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.domain.model.ActiveLiveSource
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.Channel
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeSidebarComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeSidebarComponents.kt
index 86f42043..2d404157 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeSidebarComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeSidebarComponents.kt
@@ -55,14 +55,14 @@ import com.streamvault.app.ui.components.FocusedMarqueeText
import com.streamvault.app.ui.components.PlayerRenderView
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.PrimaryLight
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormat
import com.streamvault.domain.model.Category
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
index be22fc4f..eb49e4b3 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
@@ -63,8 +63,8 @@ import com.streamvault.app.util.formatPositionMs
import com.streamvault.app.ui.components.shell.ContentMetadataStrip
import com.streamvault.app.ui.components.shell.ExternalRatingsStrip
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.app.ui.model.formatVodRatingLabel
import com.streamvault.domain.model.ExternalRatings
import com.streamvault.domain.model.Movie
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
index 8a3e0bfb..a40c7398 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
@@ -48,7 +48,7 @@ import com.streamvault.app.ui.components.SelectionChipRow
import com.streamvault.app.ui.components.SavedCategoryContextCard
import com.streamvault.app.ui.components.SavedCategoryShortcut
import com.streamvault.app.ui.components.SavedCategoryShortcutsRow
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.LibraryFilterType
import com.streamvault.domain.model.LibrarySortBy
@@ -83,8 +83,8 @@ import com.streamvault.app.ui.components.shell.VodClassicContentHeader
import com.streamvault.app.ui.components.shell.VodClassicSplitLayout
import com.streamvault.app.ui.components.shell.VodHeroStrip
import com.streamvault.app.ui.components.shell.VodSectionHeader
-import com.streamvault.app.ui.design.FocusRestoreHost
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.FocusRestoreHost
+import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.app.ui.screens.vod.HandleVodUserMessage
import com.streamvault.app.ui.screens.vod.ProtectedVodPinDialog
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt
index cab21a88..6050c924 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt
@@ -23,7 +23,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvIconButton
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt
index e15bd8eb..a59241d2 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt
@@ -42,8 +42,8 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.components.shell.AppMessageState
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.domain.model.Channel
import kotlinx.coroutines.delay
import com.streamvault.app.ui.interaction.TvClickableSurface
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
index 671b99cc..196a6ad0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.screens.multiview
+package com.streamvault.app.ui.screens.multiview
import android.app.Activity
import android.view.View
@@ -82,7 +82,7 @@ import com.streamvault.app.ui.components.dialogs.PinDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogActionButton
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.player.PlayerRenderSurfaceType
import com.streamvault.player.PlayerSurfaceResizeMode
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
index 178fb6f7..bd30e609 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
@@ -42,7 +42,7 @@ import androidx.lifecycle.viewModelScope
import androidx.media3.common.util.UnstableApi
import androidx.tv.material3.*
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.DecoderMode
import com.streamvault.domain.model.StreamInfo
@@ -74,7 +74,7 @@ import com.streamvault.app.R
import com.streamvault.app.MainActivity
import com.streamvault.app.cast.CastConnectionState
import com.streamvault.app.ui.components.PlayerRenderView
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.app.ui.notifications.rememberNotificationPermissionGate
import com.streamvault.app.ui.screens.player.overlay.ChannelInfoOverlay
import com.streamvault.app.ui.screens.player.overlay.CategoryListOverlay
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt
index 450c2585..0efea6b9 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt
@@ -61,7 +61,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.app.ui.model.archivePlaybackCapability
import com.streamvault.app.ui.screens.player.playerCategoryOverlayItemKey
import com.streamvault.app.ui.screens.player.playerChannelOverlayItemKey
@@ -75,10 +75,10 @@ import com.streamvault.domain.model.Program
import com.streamvault.player.PlayerStats
import java.util.Date
import kotlinx.coroutines.launch
-import com.streamvault.app.ui.design.AppColors.Brand as Primary
-import com.streamvault.app.ui.design.AppColors.SurfaceElevated as SurfaceVariant
-import com.streamvault.app.ui.design.AppColors.TextSecondary as TextSecondary
-import com.streamvault.app.ui.design.AppColors.TextTertiary as OnSurfaceDim
+import com.streamvault.core.ui.design.AppColors.Brand as Primary
+import com.streamvault.core.ui.design.AppColors.SurfaceElevated as SurfaceVariant
+import com.streamvault.core.ui.design.AppColors.TextSecondary as TextSecondary
+import com.streamvault.core.ui.design.AppColors.TextTertiary as OnSurfaceDim
@Composable
fun ChannelListOverlay(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt
index b48adb32..7a02f1ab 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt
@@ -49,7 +49,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.ChannelLogoBadge
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.archivePlaybackCapability
import com.streamvault.app.ui.model.isArchivePlayable
@@ -61,8 +61,8 @@ import com.streamvault.domain.model.Program
import com.streamvault.domain.model.RecordingStatus
import com.streamvault.player.timeshift.LiveTimeshiftStatus
import java.util.Date
-import com.streamvault.app.ui.design.AppColors.Brand as Primary
-import com.streamvault.app.ui.design.AppColors.TextTertiary as OnSurfaceDim
+import com.streamvault.core.ui.design.AppColors.Brand as Primary
+import com.streamvault.core.ui.design.AppColors.TextTertiary as OnSurfaceDim
@Composable
fun ChannelInfoOverlay(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
index e05d4e6b..0bbf70f9 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
@@ -77,8 +77,8 @@ import com.streamvault.app.ui.screens.player.SeekPreviewState
import com.streamvault.app.ui.screens.player.SleepTimerUiState
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormat
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.ErrorColor
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Program
import com.streamvault.domain.model.RecordingStatus
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayShared.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayShared.kt
index 7d8d7e19..3ec93756 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayShared.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayShared.kt
@@ -32,10 +32,10 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.app.ui.interaction.TvClickableSurface
import java.util.Locale
-import com.streamvault.app.ui.design.AppColors.Brand as Primary
+import com.streamvault.core.ui.design.AppColors.Brand as Primary
@Composable
internal fun PlayerOverlayPanel(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerSystemOverlays.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerSystemOverlays.kt
index 503bafb0..020f79a4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerSystemOverlays.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerSystemOverlays.kt
@@ -61,23 +61,23 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import coil3.compose.AsyncImage
import com.streamvault.app.R
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.app.ui.screens.player.PlayerNoticeAction
import com.streamvault.app.ui.screens.player.PlayerNoticeState
import com.streamvault.app.ui.screens.player.PlayerAudioVideoOffsetUiState
import com.streamvault.app.ui.screens.player.PlayerRecoveryType
import com.streamvault.app.ui.screens.player.SleepTimerUiState
-import com.streamvault.app.ui.theme.AccentAmber
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
-import com.streamvault.app.ui.theme.PrimaryLight
-import com.streamvault.app.ui.theme.TextSecondary
+import com.streamvault.core.ui.theme.AccentAmber
+import com.streamvault.core.ui.theme.ErrorColor
+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.SurfaceElevated
+import com.streamvault.core.ui.theme.SurfaceHighlight
+import com.streamvault.core.ui.theme.PrimaryLight
+import com.streamvault.core.ui.theme.TextSecondary
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.ChannelQualityOption
import com.streamvault.domain.model.Episode
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerTransparentGuideOverlay.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerTransparentGuideOverlay.kt
index 5624874d..35142be0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerTransparentGuideOverlay.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerTransparentGuideOverlay.kt
@@ -41,8 +41,8 @@ import com.streamvault.app.ui.screens.epg.GuideSearchOverlay
import com.streamvault.app.ui.screens.epg.GuideToolbarButton
import com.streamvault.app.ui.screens.epg.currentGuideNow
import com.streamvault.app.ui.screens.epg.isGuideCategoryLocked
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Program
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt
index 73ec95ec..873435eb 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt
@@ -62,12 +62,12 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.FocusBorder
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.Primary
@Composable
fun PluginsScreen(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupActionButtons.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupActionButtons.kt
index 7129dad9..7f84e342 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupActionButtons.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupActionButtons.kt
@@ -19,11 +19,11 @@ import androidx.tv.material3.Glow
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.PrimaryLight
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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
@Composable
internal fun ActionButton(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupAdvancedOptions.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupAdvancedOptions.kt
index 10986e21..fe8068f6 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupAdvancedOptions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupAdvancedOptions.kt
@@ -27,7 +27,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.data.remote.stalker.StalkerAdvancedOptions
import com.streamvault.domain.model.ChannelLogoSourcePolicy
import com.streamvault.domain.model.GuideSourcePolicy
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupFormPrimitives.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupFormPrimitives.kt
index 4de580f1..3eb2835d 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupFormPrimitives.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupFormPrimitives.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.text.input.TransformedText
import androidx.compose.ui.text.input.VisualTransformation
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
-import com.streamvault.app.ui.theme.ErrorColor
+import com.streamvault.core.ui.theme.ErrorColor
@Composable
internal fun FormErrors(validationError: String?, error: String?) {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupImportDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupImportDialogs.kt
index 3394ba20..47e3d507 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupImportDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupImportDialogs.kt
@@ -32,7 +32,7 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.domain.manager.DriveBackupSnapshot
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupJellyfinForm.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupJellyfinForm.kt
index 5997e11f..be54b9d0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupJellyfinForm.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupJellyfinForm.kt
@@ -22,10 +22,10 @@ import com.google.zxing.BarcodeFormat
import com.google.zxing.qrcode.QRCodeWriter
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.theme.AccentCyan
-import com.streamvault.app.ui.theme.TextPrimary
-import com.streamvault.app.ui.theme.TextSecondary
-import com.streamvault.app.ui.theme.TextTertiary
+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
@Composable
internal fun JellyfinProviderForm(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPairingCard.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPairingCard.kt
index 21203da1..965d0964 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPairingCard.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPairingCard.kt
@@ -21,7 +21,7 @@ import com.streamvault.app.R
import com.streamvault.app.pairing.ProviderQrPairingState
import com.streamvault.app.pairing.ProviderQrPairingStatus
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
@Composable
internal fun PhonePairingCard(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPolicyOptions.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPolicyOptions.kt
index ccd31a90..5b2c4baa 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPolicyOptions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPolicyOptions.kt
@@ -20,7 +20,7 @@ import androidx.tv.material3.Surface as TvSurface
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.domain.model.ChannelLogoSourcePolicy
import com.streamvault.domain.model.GuideSourcePolicy
import com.streamvault.domain.model.ProviderEpgSyncMode
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupProviderForms.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupProviderForms.kt
index 599e59e0..2be5879e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupProviderForms.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupProviderForms.kt
@@ -20,8 +20,8 @@ import androidx.tv.material3.SurfaceDefaults
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.pairing.ProviderQrPairingState
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+import com.streamvault.core.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.SurfaceHighlight
import com.streamvault.domain.model.ChannelLogoSourcePolicy
import com.streamvault.domain.model.GuideSourcePolicy
import com.streamvault.domain.model.ProviderEpgSyncMode
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
index 504e4e38..c318f46a 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
@@ -82,7 +82,7 @@ import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.app.ui.screens.settings.BackupImportPreviewDialog
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.data.remote.stalker.StalkerAdvancedOptions
import com.streamvault.data.remote.stalker.StalkerAdvancedOptionsCodec
import com.streamvault.data.remote.stalker.StalkerCompatibilityRegistry
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceForms.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceForms.kt
index 6abee507..d685f901 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceForms.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceForms.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.tv.material3.MaterialTheme
import com.streamvault.app.R
import com.streamvault.app.pairing.ProviderQrPairingState
-import com.streamvault.app.ui.theme.ErrorColor
+import com.streamvault.core.ui.theme.ErrorColor
import com.streamvault.domain.model.StalkerAuthMode
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt
index 3dc16377..28618e44 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt
@@ -18,7 +18,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
@Composable
internal fun SourceTypeSelectorPanel(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt
index 91ee2896..41fccd0d 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt
@@ -22,13 +22,13 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.AccentAmber
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Surface as SurfaceColor
-import com.streamvault.app.ui.theme.SurfaceHighlight
-import com.streamvault.app.ui.theme.TextPrimary
+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
internal enum class SourceType { XTREAM, STALKER, M3U_URL, M3U_FILE, JELLYFIN }
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerCompatibilitySelector.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerCompatibilitySelector.kt
index 1fbb11e9..f16aa2b1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerCompatibilitySelector.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerCompatibilitySelector.kt
@@ -11,8 +11,8 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
-import com.streamvault.app.ui.theme.AccentAmber
-import com.streamvault.app.ui.theme.OnBackground
+import com.streamvault.core.ui.theme.AccentAmber
+import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.data.remote.stalker.StalkerCompatibilityRegistry
import com.streamvault.domain.model.StalkerCompatibilityProfileIds
import com.streamvault.domain.model.StalkerProfileVerification
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerRules.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerRules.kt
index 1db0a346..d29601d1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerRules.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerRules.kt
@@ -23,7 +23,7 @@ import androidx.tv.material3.Surface as TvSurface
import androidx.tv.material3.Text
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import kotlinx.coroutines.delay
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSyncDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSyncDialog.kt
index ea5439ec..951bb29b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSyncDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSyncDialog.kt
@@ -31,7 +31,7 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.extractProgressFraction
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
@Composable
fun SyncProgressDialog(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupTextField.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupTextField.kt
index b74c99f4..d335114b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupTextField.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupTextField.kt
@@ -27,7 +27,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
index bbce05e7..f9c9b28b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
@@ -52,10 +52,10 @@ import com.streamvault.app.ui.components.SeriesCard
import com.streamvault.app.ui.components.TvEmptyState
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.domain.manager.ParentalControlManager
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.CatalogCompleteness
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
index e1e135b8..e7bdc3e8 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
@@ -67,7 +67,7 @@ import com.streamvault.app.ui.components.shell.ContentMetadataStrip
import com.streamvault.app.ui.components.shell.EpisodeRowCard
import com.streamvault.app.ui.components.shell.ExternalRatingsStrip
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.app.ui.model.formatVodRatingLabel
import com.streamvault.domain.model.Episode
import com.streamvault.domain.model.ExternalRatings
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
index b1b0cf17..b71556f4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
@@ -50,7 +50,7 @@ import com.streamvault.app.ui.components.SavedCategoryShortcutsRow
import com.streamvault.app.ui.components.SelectionChip
import com.streamvault.app.ui.components.SelectionChipRow
import com.streamvault.app.ui.components.SeriesCard
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.LibraryFilterType
import com.streamvault.domain.model.LibrarySortBy
@@ -83,8 +83,8 @@ import com.streamvault.app.ui.components.shell.VodClassicContentHeader
import com.streamvault.app.ui.components.shell.VodClassicSplitLayout
import com.streamvault.app.ui.components.shell.VodHeroStrip
import com.streamvault.app.ui.components.shell.VodSectionHeader
-import com.streamvault.app.ui.design.FocusRestoreHost
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.FocusRestoreHost
+import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.app.ui.screens.vod.HandleVodUserMessage
import com.streamvault.app.ui.screens.vod.ProtectedVodPinDialog
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
index d9229df7..cd566db8 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
@@ -23,10 +23,10 @@ import com.streamvault.app.BuildConfig
import com.streamvault.app.R
import com.streamvault.app.update.AppUpdateActionState
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
+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.Secondary
import com.streamvault.domain.manager.DriveAuthState
internal fun LazyListScope.settingsBackupSection(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupDialogs.kt
index 51d12adc..4a277054 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupDialogs.kt
@@ -25,10 +25,10 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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
internal data class BackupDialogItem(
val id: String,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupImportPreviewDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupImportPreviewDialog.kt
index 2e4b3f8e..79673637 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupImportPreviewDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupImportPreviewDialog.kt
@@ -32,11 +32,11 @@ import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.Secondary
+import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.domain.manager.BackupConflictStrategy
import com.streamvault.domain.manager.BackupImportPlan
import com.streamvault.domain.manager.BackupPreview
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
index 093f1290..2eafeeb5 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
@@ -30,14 +30,14 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.VodViewMode
-import com.streamvault.app.ui.theme.AccentAmber
-import com.streamvault.app.ui.theme.AccentCyan
-import com.streamvault.app.ui.theme.AccentGreen
-import com.streamvault.app.ui.theme.AccentRed
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.AccentAmber
+import com.streamvault.core.ui.theme.AccentCyan
+import com.streamvault.core.ui.theme.AccentGreen
+import com.streamvault.core.ui.theme.AccentRed
+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.domain.model.CategorySortMode
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.LiveChannelGroupingMode
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsCombinedM3uComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsCombinedM3uComponents.kt
index 58fcac42..3e015048 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsCombinedM3uComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsCombinedM3uComponents.kt
@@ -37,14 +37,14 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.ErrorColor
+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.SurfaceElevated
import com.streamvault.domain.model.ActiveLiveSource
import com.streamvault.domain.model.CombinedM3uProfile
import com.streamvault.domain.model.LegacyProvider as Provider
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgAssignmentComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgAssignmentComponents.kt
index 06d83797..71eab321 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgAssignmentComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgAssignmentComponents.kt
@@ -20,7 +20,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.domain.model.EpgResolutionSummary
import com.streamvault.domain.model.EpgSource
import com.streamvault.domain.model.ProviderEpgSourceAssignment
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSection.kt
index 36ba811f..409fbc3f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSection.kt
@@ -33,10 +33,10 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import androidx.compose.foundation.lazy.items
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.ChannelLogoSourcePolicy
import com.streamvault.domain.model.GuideSourcePolicy
import com.streamvault.domain.model.ProviderType
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt
index b4765925..451f52b8 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt
@@ -27,10 +27,10 @@ import androidx.tv.material3.Border
import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.EpgSource
import com.streamvault.domain.model.XmltvTimezonePolicy
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsInternetSpeedTestCard.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsInternetSpeedTestCard.kt
index 1bc3fb64..8e2a9d86 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsInternetSpeedTestCard.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsInternetSpeedTestCard.kt
@@ -23,12 +23,12 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.Secondary
+import com.streamvault.core.ui.theme.SurfaceElevated
@Composable
internal fun InternetSpeedTestCard(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsLiveTvComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsLiveTvComponents.kt
index 93532daf..962bc545 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsLiveTvComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsLiveTvComponents.kt
@@ -23,12 +23,12 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.LiveTvChannelMode
import com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityMode
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.ErrorColor
+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.Secondary
+import com.streamvault.core.ui.theme.SurfaceElevated
internal enum class ParentalAction {
ChangeLevel, ChangePin, SetNewPin
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsModeDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsModeDialogs.kt
index db282574..8da3ca0c 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsModeDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsModeDialogs.kt
@@ -17,10 +17,10 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.VodViewMode
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.domain.model.ChannelNumberingMode
import com.streamvault.domain.model.GroupedChannelLabelMode
import com.streamvault.domain.model.LiveChannelGroupingMode
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsNavigationRail.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsNavigationRail.kt
index 5635479f..2d2114b0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsNavigationRail.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsNavigationRail.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.Primary
private data class SettingsNavEntry(
val id: String,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
index 92b67708..83260369 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
@@ -26,9 +26,9 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnBackground
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.LiveStreamFormatMode
internal fun LazyListScope.settingsPlaybackSection(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt
index 7dfdb6ae..0cd977a0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt
@@ -21,9 +21,9 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnBackground
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.Primary
internal fun LazyListScope.settingsPrivacySection(
uiState: SettingsUiState,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderCardSections.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderCardSections.kt
index 394592a2..c5d3bd7b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderCardSections.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderCardSections.kt
@@ -22,15 +22,15 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
-import com.streamvault.app.ui.theme.Surface
-import com.streamvault.app.ui.theme.SurfaceHighlight
+import com.streamvault.core.ui.theme.ErrorColor
+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.Secondary
+import com.streamvault.core.ui.theme.Surface
+import com.streamvault.core.ui.theme.SurfaceHighlight
import com.streamvault.domain.model.ProviderType
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt
index f54ac375..4e756d3a 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt
@@ -39,11 +39,11 @@ import androidx.tv.material3.*
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
import com.streamvault.domain.model.ActiveLiveSource
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderDiagnosticsPanel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderDiagnosticsPanel.kt
index 59cdcac5..e518b23d 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderDiagnosticsPanel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderDiagnosticsPanel.kt
@@ -16,10 +16,10 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+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.Primary
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
import com.streamvault.domain.model.LegacyProvider as Provider
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderManagementDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderManagementDialogs.kt
index 568ff130..d4aeba77 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderManagementDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderManagementDialogs.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
@Composable
internal fun SettingsProviderManagementDialogs(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt
index 16b38447..88ae06f9 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt
@@ -27,8 +27,8 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.TvEmptyState
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.LegacyProvider as Provider
import com.streamvault.domain.model.ProviderType
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSyncDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSyncDialogs.kt
index fb5cd2d3..8d71c807 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSyncDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSyncDialogs.kt
@@ -19,8 +19,8 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.OnBackground
+import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.domain.model.LegacyProvider as Provider
import com.streamvault.domain.model.ProviderType
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderUiComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderUiComponents.kt
index 2e2cdf7e..08fd1293 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderUiComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderUiComponents.kt
@@ -23,12 +23,12 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.ErrorColor
+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.Secondary
+import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.domain.model.LegacyProvider as Provider
import com.streamvault.domain.model.ProviderStatus
import androidx.compose.foundation.BorderStroke
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDetailSections.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDetailSections.kt
index cbc264c0..8bec4d0f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDetailSections.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDetailSections.kt
@@ -10,10 +10,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
+import com.streamvault.core.ui.theme.ErrorColor
+import com.streamvault.core.ui.theme.OnBackground
+import com.streamvault.core.ui.theme.Primary
+import com.streamvault.core.ui.theme.Secondary
import com.streamvault.domain.model.RecordingItem
import com.streamvault.domain.model.RecordingStatus
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDialog.kt
index a97a7672..3f435582 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDialog.kt
@@ -38,18 +38,18 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.TvEmptyState
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.theme.ErrorColor
+import com.streamvault.core.ui.theme.OnBackground
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.Secondary
+import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
-import com.streamvault.app.ui.theme.SurfaceHighlight
+import com.streamvault.core.ui.theme.SurfaceHighlight
import com.streamvault.domain.model.RecordingFailureCategory
import com.streamvault.domain.model.RecordingItem
import com.streamvault.domain.model.RecordingRecurrence
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDisplay.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDisplay.kt
index 25bc88c9..c25902ad 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDisplay.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDisplay.kt
@@ -16,11 +16,11 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
+import com.streamvault.core.ui.theme.ErrorColor
+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.Secondary
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
import com.streamvault.domain.model.RecordingItem
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserSidebarControls.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserSidebarControls.kt
index 1e6eee25..d255a222 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserSidebarControls.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserSidebarControls.kt
@@ -32,12 +32,12 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.theme.SurfaceHighlight
import com.streamvault.domain.model.RecordingStatus
@OptIn(ExperimentalLayoutApi::class)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingComponents.kt
index 2a56e1a5..f67569a4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingComponents.kt
@@ -40,11 +40,11 @@ import com.streamvault.app.ui.components.TvEmptyState
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogActionButton
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
import com.streamvault.domain.manager.BackupConflictStrategy
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDashboardCards.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDashboardCards.kt
index 4f8773d1..a1bd457c 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDashboardCards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDashboardCards.kt
@@ -26,14 +26,14 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.FocusBorder
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.ErrorColor
+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.Secondary
+import com.streamvault.core.ui.theme.SurfaceElevated
@OptIn(ExperimentalLayoutApi::class)
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDialogs.kt
index 6e2c6046..4a608a22 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDialogs.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.OnSurfaceDim
@Composable
internal fun SettingsRecordingDialogs(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingItemComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingItemComponents.kt
index 02b668fd..2147e8c1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingItemComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingItemComponents.kt
@@ -24,14 +24,14 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.ErrorColor
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.Secondary
-import com.streamvault.app.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.ErrorColor
+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.Secondary
+import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
import com.streamvault.domain.model.RecordingFailureCategory
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt
index 5d8e782a..6e06b069 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt
@@ -40,10 +40,10 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+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
@Composable
internal fun SettingsSectionHeader(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
index bb3536ca..73937a46 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
@@ -31,11 +31,11 @@ import com.streamvault.app.util.OfficialBuildVerifier
import com.streamvault.app.ui.components.shell.AppTopBarCloseAction
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
-import com.streamvault.app.ui.theme.*
+import com.streamvault.core.ui.theme.*
import com.streamvault.domain.model.LegacyProvider as Provider
import androidx.compose.ui.res.stringResource
import com.streamvault.app.R
-import com.streamvault.app.ui.design.requestFocusSafely
+import com.streamvault.core.ui.design.requestFocusSafely
import kotlinx.coroutines.delay
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
index b24f7f42..d1820216 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
@@ -34,12 +34,12 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.TextSecondary
+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.SurfaceElevated
+import com.streamvault.core.ui.theme.TextSecondary
import com.streamvault.domain.model.ExternalPlaybackMode
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt
index d841e93e..39f90167 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt
@@ -36,10 +36,10 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.rememberDialogOpenGestureBlocker
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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
@Composable
internal fun PremiumSelectionDialog(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
index 2086757f..70fcab87 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
@@ -19,10 +19,10 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
+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.domain.model.CategorySortMode
import com.streamvault.domain.model.ContentType
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSharedUiComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSharedUiComponents.kt
index 0ee0bdca..a5b526ca 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSharedUiComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSharedUiComponents.kt
@@ -43,13 +43,13 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnBackground
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
-import com.streamvault.app.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.theme.SurfaceHighlight
+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.theme.SurfaceHighlight
import kotlinx.coroutines.launch
import java.util.Locale
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSyncOverlay.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSyncOverlay.kt
index 8aba10c9..1c7ccb0f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSyncOverlay.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSyncOverlay.kt
@@ -31,9 +31,9 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.extractProgressFraction
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
@Composable
internal fun SyncingOverlay(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt
index 83405de2..5e558e99 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt
@@ -40,9 +40,9 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
@Composable
internal fun TimeoutValueDialog(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsValueDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsValueDialogs.kt
index e9be6560..fc8fde39 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsValueDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsValueDialogs.kt
@@ -22,7 +22,7 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogActionButton
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.theme.Primary
internal fun formatPlaybackTimerMinutesLabel(minutes: Int, context: Context): String {
return if (minutes <= 0) {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt
index cf26fc79..b6b19ee1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt
@@ -28,10 +28,10 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.design.FocusSpec
-import com.streamvault.app.ui.theme.OnSurface
-import com.streamvault.app.ui.theme.OnSurfaceDim
-import com.streamvault.app.ui.theme.Primary
+import com.streamvault.core.ui.design.FocusSpec
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.AppTopLevelDestination
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
index 4835be9c..3980b643 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
@@ -37,7 +37,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.BuildConfig
import com.streamvault.app.R
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.data.sync.SyncProgressBus
import com.streamvault.data.sync.SyncProgressAggregate
diff --git a/app/src/main/java/com/streamvault/app/ui/theme/Spacing.kt b/app/src/main/java/com/streamvault/app/ui/theme/Spacing.kt
deleted file mode 100644
index 7456c6a1..00000000
--- a/app/src/main/java/com/streamvault/app/ui/theme/Spacing.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.streamvault.app.ui.theme
-
-import com.streamvault.app.ui.design.AppSpacing
-import com.streamvault.app.ui.design.LocalAppSpacing
-
-typealias Spacing = AppSpacing
-
-val LocalSpacing = LocalAppSpacing
-
-fun defaultSpacing(): Spacing = AppSpacing()
diff --git a/app/src/main/java/com/streamvault/app/ui/design/AppColors.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/AppColors.kt
similarity index 95%
rename from app/src/main/java/com/streamvault/app/ui/design/AppColors.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/design/AppColors.kt
index 337f4cf5..c0826450 100644
--- a/app/src/main/java/com/streamvault/app/ui/design/AppColors.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/AppColors.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.design
+package com.streamvault.core.ui.design
import androidx.compose.ui.graphics.Color
diff --git a/app/src/main/java/com/streamvault/app/ui/design/AppMotion.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/AppMotion.kt
similarity index 91%
rename from app/src/main/java/com/streamvault/app/ui/design/AppMotion.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/design/AppMotion.kt
index f96ed6b7..4618a9cb 100644
--- a/app/src/main/java/com/streamvault/app/ui/design/AppMotion.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/AppMotion.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.design
+package com.streamvault.core.ui.design
import androidx.compose.animation.core.FiniteAnimationSpec
import androidx.compose.animation.core.LinearOutSlowInEasing
diff --git a/app/src/main/java/com/streamvault/app/ui/design/AppShapes.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/AppShapes.kt
similarity index 94%
rename from app/src/main/java/com/streamvault/app/ui/design/AppShapes.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/design/AppShapes.kt
index e11d2712..dd706ca3 100644
--- a/app/src/main/java/com/streamvault/app/ui/design/AppShapes.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/AppShapes.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.design
+package com.streamvault.core.ui.design
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.staticCompositionLocalOf
diff --git a/app/src/main/java/com/streamvault/app/ui/design/AppSpacing.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/AppSpacing.kt
similarity index 93%
rename from app/src/main/java/com/streamvault/app/ui/design/AppSpacing.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/design/AppSpacing.kt
index b5465e75..e6173c9c 100644
--- a/app/src/main/java/com/streamvault/app/ui/design/AppSpacing.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/AppSpacing.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.design
+package com.streamvault.core.ui.design
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.unit.Dp
diff --git a/app/src/main/java/com/streamvault/app/ui/design/AppTypography.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/AppTypography.kt
similarity index 98%
rename from app/src/main/java/com/streamvault/app/ui/design/AppTypography.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/design/AppTypography.kt
index d555aee2..bb621e0d 100644
--- a/app/src/main/java/com/streamvault/app/ui/design/AppTypography.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/AppTypography.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.design
+package com.streamvault.core.ui.design
import android.os.Build
import androidx.compose.runtime.Composable
@@ -10,7 +10,7 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
import androidx.tv.material3.Typography
-import com.streamvault.app.R
+import com.streamvault.core.ui.R
import java.util.Locale
val InterFamily = FontFamily(
diff --git a/app/src/main/java/com/streamvault/app/ui/design/FocusHelpers.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/FocusHelpers.kt
similarity index 98%
rename from app/src/main/java/com/streamvault/app/ui/design/FocusHelpers.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/design/FocusHelpers.kt
index b4523f4f..08b6ba6b 100644
--- a/app/src/main/java/com/streamvault/app/ui/design/FocusHelpers.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/FocusHelpers.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.design
+package com.streamvault.core.ui.design
import android.util.Log
import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/design/FocusSpec.kt b/core/ui/src/main/java/com/streamvault/core/ui/design/FocusSpec.kt
similarity index 82%
rename from app/src/main/java/com/streamvault/app/ui/design/FocusSpec.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/design/FocusSpec.kt
index 25bdd4d5..5a9fbff5 100644
--- a/app/src/main/java/com/streamvault/app/ui/design/FocusSpec.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/design/FocusSpec.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.design
+package com.streamvault.core.ui.design
import androidx.compose.ui.unit.dp
diff --git a/app/src/main/java/com/streamvault/app/ui/theme/Color.kt b/core/ui/src/main/java/com/streamvault/core/ui/theme/Color.kt
similarity index 92%
rename from app/src/main/java/com/streamvault/app/ui/theme/Color.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/theme/Color.kt
index e4c0fca7..166362bb 100644
--- a/app/src/main/java/com/streamvault/app/ui/theme/Color.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/theme/Color.kt
@@ -1,7 +1,7 @@
-package com.streamvault.app.ui.theme
+package com.streamvault.core.ui.theme
import androidx.compose.ui.graphics.Color
-import com.streamvault.app.ui.design.AppColors
+import com.streamvault.core.ui.design.AppColors
val Primary = AppColors.Brand
val PrimaryLight = AppColors.BrandStrong
diff --git a/core/ui/src/main/java/com/streamvault/core/ui/theme/Spacing.kt b/core/ui/src/main/java/com/streamvault/core/ui/theme/Spacing.kt
new file mode 100644
index 00000000..ecac06e7
--- /dev/null
+++ b/core/ui/src/main/java/com/streamvault/core/ui/theme/Spacing.kt
@@ -0,0 +1,10 @@
+package com.streamvault.core.ui.theme
+
+import com.streamvault.core.ui.design.AppSpacing
+import com.streamvault.core.ui.design.LocalAppSpacing
+
+typealias Spacing = AppSpacing
+
+val LocalSpacing = LocalAppSpacing
+
+fun defaultSpacing(): Spacing = AppSpacing()
diff --git a/app/src/main/java/com/streamvault/app/ui/theme/Theme.kt b/core/ui/src/main/java/com/streamvault/core/ui/theme/Theme.kt
similarity index 71%
rename from app/src/main/java/com/streamvault/app/ui/theme/Theme.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/theme/Theme.kt
index 08845345..ddc05268 100644
--- a/app/src/main/java/com/streamvault/app/ui/theme/Theme.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/theme/Theme.kt
@@ -1,14 +1,14 @@
-package com.streamvault.app.ui.theme
+package com.streamvault.core.ui.theme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.darkColorScheme
-import com.streamvault.app.ui.design.AppColors
-import com.streamvault.app.ui.design.AppShapes
-import com.streamvault.app.ui.design.LocalAppShapes
-import com.streamvault.app.ui.design.LocalAppSpacing
-import com.streamvault.app.ui.design.rememberAppTypography
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.AppShapes
+import com.streamvault.core.ui.design.LocalAppShapes
+import com.streamvault.core.ui.design.LocalAppSpacing
+import com.streamvault.core.ui.design.rememberAppTypography
private val DarkColorScheme = darkColorScheme(
primary = AppColors.Brand,
@@ -27,7 +27,7 @@ private val DarkColorScheme = darkColorScheme(
fun StreamVaultTheme(content: @Composable () -> Unit) {
val typography = rememberAppTypography()
CompositionLocalProvider(
- LocalAppSpacing provides com.streamvault.app.ui.design.AppSpacing(),
+ LocalAppSpacing provides com.streamvault.core.ui.design.AppSpacing(),
LocalAppShapes provides AppShapes()
) {
MaterialTheme(
diff --git a/app/src/main/res/font/inter_bold.ttf b/core/ui/src/main/res/font/inter_bold.ttf
similarity index 100%
rename from app/src/main/res/font/inter_bold.ttf
rename to core/ui/src/main/res/font/inter_bold.ttf
diff --git a/app/src/main/res/font/inter_medium.ttf b/core/ui/src/main/res/font/inter_medium.ttf
similarity index 100%
rename from app/src/main/res/font/inter_medium.ttf
rename to core/ui/src/main/res/font/inter_medium.ttf
diff --git a/app/src/main/res/font/inter_regular.ttf b/core/ui/src/main/res/font/inter_regular.ttf
similarity index 100%
rename from app/src/main/res/font/inter_regular.ttf
rename to core/ui/src/main/res/font/inter_regular.ttf
diff --git a/app/src/main/res/font/inter_semibold.ttf b/core/ui/src/main/res/font/inter_semibold.ttf
similarity index 100%
rename from app/src/main/res/font/inter_semibold.ttf
rename to core/ui/src/main/res/font/inter_semibold.ttf