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 playback foundations to stable modules

David Nashash3b1becbac8c3
diff --git a/app/src/main/java/com/streamvault/app/MainActivity.kt b/app/src/main/java/com/streamvault/app/MainActivity.kt
index 1bdcf0a9..567cbfeb 100644
--- a/app/src/main/java/com/streamvault/app/MainActivity.kt
+++ b/app/src/main/java/com/streamvault/app/MainActivity.kt
@@ -21,6 +21,8 @@ import com.streamvault.core.navigation.PlayerNavigationRequest
import com.streamvault.core.navigation.ExternalNavigationRequest
import com.streamvault.core.ui.theme.StreamVaultTheme
import com.streamvault.app.ui.time.LocalAppTimeFormat
+import com.streamvault.app.ui.time.toUiTimeFormat
+import com.streamvault.core.ui.time.LocalUiTimeFormat
import com.streamvault.domain.repository.ProviderRepository
import dagger.hilt.android.AndroidEntryPoint
@@ -151,7 +153,8 @@ class MainActivity : ComponentActivity() {
CompositionLocalProvider(
LocalContext provides localizedContext,
LocalLayoutDirection provides layoutDirection,
- LocalAppTimeFormat provides appTimeFormat
+ LocalAppTimeFormat provides appTimeFormat,
+ LocalUiTimeFormat provides appTimeFormat.toUiTimeFormat()
) {
StreamVaultTheme {
AppNavigation(coordinator = appNavigationCoordinator)
diff --git a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt b/app/src/main/java/com/streamvault/app/StreamVaultApp.kt
index 0e686272..4b35fd69 100644
--- a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt
+++ b/app/src/main/java/com/streamvault/app/StreamVaultApp.kt
@@ -10,7 +10,7 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
import coil3.request.crossfade
import com.streamvault.app.diagnostics.CrashReportStore
import com.streamvault.app.diagnostics.RuntimeDiagnosticsManager
-import com.streamvault.app.ui.accessibility.isReducedMotionEnabled
+import com.streamvault.core.ui.accessibility.isReducedMotionEnabled
import com.streamvault.data.remote.jellyfin.JellyfinImageAuthInterceptor
import dagger.hilt.android.HiltAndroidApp
import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/streamvault/app/di/NetworkModule.kt b/app/src/main/java/com/streamvault/app/di/NetworkModule.kt
index 49cf92cb..e64b4043 100644
--- a/app/src/main/java/com/streamvault/app/di/NetworkModule.kt
+++ b/app/src/main/java/com/streamvault/app/di/NetworkModule.kt
@@ -20,6 +20,8 @@ import com.streamvault.player.AudioCompatibilityMemoryStore
import com.streamvault.player.Media3PlayerEngine
import com.streamvault.player.PlayerEngine
import com.streamvault.player.PlaybackSupportSnapshotStore
+import com.streamvault.player.di.AuxiliaryPlayerEngine
+import com.streamvault.player.di.MainPlayerEngine
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
diff --git a/app/src/main/java/com/streamvault/app/navigation/graph/LiveGraph.kt b/app/src/main/java/com/streamvault/app/navigation/graph/LiveGraph.kt
index 9126d67f..782d7713 100644
--- a/app/src/main/java/com/streamvault/app/navigation/graph/LiveGraph.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/graph/LiveGraph.kt
@@ -8,7 +8,7 @@ import com.streamvault.app.navigation.AppRouteCodec
import com.streamvault.app.navigation.AppRoutePatterns
import com.streamvault.app.navigation.playerNavigationRequest
import com.streamvault.app.navigation.toLivePlayerRequest
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.app.ui.screens.epg.FullEpgScreen
import com.streamvault.app.ui.screens.home.HomeScreen
import com.streamvault.core.navigation.AppDestination
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 414bc518..b43485b0 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
@@ -50,12 +50,13 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import coil3.compose.AsyncImage
import com.streamvault.app.R
-import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.core.ui.image.rememberCrossfadeImageModel
+import com.streamvault.core.ui.image.ChannelLogoBadge
import com.streamvault.app.ui.components.shell.MoviePosterCard
import com.streamvault.app.ui.components.shell.SeriesPosterCard
import com.streamvault.core.ui.components.shell.StatusPill
import com.streamvault.app.ui.model.formatVodRatingLabel
-import com.streamvault.app.ui.model.archivePlaybackCapability
+import com.streamvault.domain.playback.archivePlaybackCapability
import com.streamvault.core.ui.theme.AccentAmber
import com.streamvault.core.ui.theme.AccentCyan
import com.streamvault.core.ui.theme.AccentRed
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 ad1e4308..c094160c 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
@@ -31,7 +31,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import coil3.compose.AsyncImage
import com.streamvault.app.R
-import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.core.ui.image.rememberCrossfadeImageModel
import com.streamvault.core.ui.theme.AccentCyan
import com.streamvault.core.ui.theme.GradientOverlayBottom
import com.streamvault.core.ui.theme.SurfaceElevated
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SkeletonLoader.kt b/app/src/main/java/com/streamvault/app/ui/components/SkeletonLoader.kt
index ecd81b11..4d492edf 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SkeletonLoader.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SkeletonLoader.kt
@@ -18,7 +18,7 @@ import androidx.compose.ui.node.ModifierNodeElement
import androidx.compose.ui.node.invalidateDraw
import androidx.compose.ui.platform.InspectorInfo
import androidx.compose.ui.unit.dp
-import com.streamvault.app.ui.accessibility.rememberReducedMotionEnabled
+import com.streamvault.core.ui.accessibility.rememberReducedMotionEnabled
import kotlinx.coroutines.Job
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
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 660badb4..979f3fef 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
@@ -32,6 +32,7 @@ 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.interaction.mouseClickable
+import com.streamvault.core.ui.components.dialogs.rememberDialogOpenGestureBlocker
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.ui.Alignment
import com.streamvault.domain.model.Category
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 492a250f..8717c0f9 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,6 +18,8 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
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 872ef27a..b55efff8 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,6 +18,8 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.PrimaryLight
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 78f908fd..005dfbc8 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
@@ -1,43 +1,10 @@
package com.streamvault.app.ui.components.dialogs
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.tv.material3.Button
-import androidx.tv.material3.ButtonDefaults
-import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.key.onPreviewKeyEvent
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.core.ui.interaction.mouseClickable
-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.runtime.Composable
import androidx.compose.ui.res.stringResource
import com.streamvault.app.R
-import com.streamvault.core.ui.design.FocusSpec
-import androidx.tv.material3.Border
+import com.streamvault.core.ui.components.dialogs.PinEntryDialog
-/**
- * PIN entry dialog with a D-pad-navigable numeric keypad ג€” no hidden text field.
- * Each digit button is a full TV-focusable surface, so users can navigate with
- * the remote directional pad even without a software keyboard.
- */
@Composable
fun PinDialog(
onDismissRequest: () -> Unit,
@@ -45,165 +12,11 @@ fun PinDialog(
title: String? = null,
error: String? = null
) {
- var pin by remember { mutableStateOf("") }
- var canInteract by remember { mutableStateOf(false) }
- val firstKeyFocusRequester = remember { FocusRequester() }
- val isTelevisionDevice = rememberIsTelevisionDevice()
- val blockOpenGesture = rememberDialogOpenGestureBlocker(canInteract)
-
- LaunchedEffect(Unit) {
- firstKeyFocusRequester.requestFocusSafely(tag = "PinDialog", target = "PIN keypad")
- delay(500)
- canInteract = true
- }
-
- // Auto-submit when all 4 digits entered
- LaunchedEffect(pin) {
- if (pin.length == 4) {
- val submittedPin = pin
- delay(200)
- if (pin == submittedPin) {
- onPinEntered(submittedPin)
- pin = ""
- }
- }
- }
-
- Dialog(
+ PinEntryDialog(
+ title = title ?: stringResource(R.string.pin_dialog_title),
+ cancelLabel = stringResource(R.string.pin_dialog_cancel),
onDismissRequest = onDismissRequest,
- properties = DialogProperties(
- dismissOnBackPress = canInteract,
- dismissOnClickOutside = canInteract,
- usePlatformDefaultWidth = false
- )
- ) {
- val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
- Box(
- modifier = resolvedModifier
- .onPreviewKeyEvent(blockOpenGesture)
- .background(SurfaceElevated, RoundedCornerShape(16.dp))
- .border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(16.dp))
- .padding(24.dp),
- contentAlignment = Alignment.Center
- ) {
- Column(
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(20.dp)
- ) {
- Text(
- text = title ?: stringResource(R.string.pin_dialog_title),
- style = MaterialTheme.typography.titleLarge,
- color = Color.White
- )
-
- Row(
- horizontalArrangement = Arrangement.spacedBy(16.dp),
- verticalAlignment = Alignment.CenterVertically
- ) {
- repeat(4) { index ->
- val isFilled = index < pin.length
- Box(
- modifier = Modifier
- .size(20.dp)
- .clip(CircleShape)
- .background(if (isFilled) Primary else Color.White.copy(alpha = 0.1f))
- .border(1.dp, if (isFilled) Primary else Color.White.copy(alpha = 0.3f), CircleShape)
- )
- }
- }
-
- if (error != null) {
- Text(
- text = error,
- style = MaterialTheme.typography.bodyMedium,
- color = ErrorColor
- )
- }
-
- val keys = listOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "גŒ«")
- val handleKeyPress: (String) -> Unit = { key ->
- if (canInteract) {
- if (key == "גŒ«") {
- if (pin.isNotEmpty()) pin = pin.dropLast(1)
- } else if (pin.length < 4) {
- pin += key
- }
- }
- }
- Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
- keys.chunked(3).forEach { row ->
- Row(
- horizontalArrangement = Arrangement.spacedBy(8.dp),
- modifier = Modifier.fillMaxWidth()
- ) {
- row.forEach { key ->
- val isFirst = key == "1"
- Box(modifier = Modifier.weight(1f)) {
- if (key.isEmpty()) {
- Spacer(modifier = Modifier.fillMaxWidth().height(48.dp))
- } else {
- Button(
- onClick = { handleKeyPress(key) },
- modifier = Modifier
- .fillMaxWidth()
- .then(if (isFirst) Modifier.focusRequester(firstKeyFocusRequester) else Modifier)
- .mouseClickable(onClick = { handleKeyPress(key) }),
- colors = ButtonDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.08f),
- contentColor = Color.White,
- focusedContainerColor = Primary.copy(alpha = 0.35f),
- focusedContentColor = Color.White
- )
- ) {
- Text(
- text = key,
- style = MaterialTheme.typography.titleMedium
- )
- }
- }
- }
- }
- }
- }
- }
-
- val dismissHandler = { if (canInteract) onDismissRequest() }
- Button(
- onClick = dismissHandler,
- modifier = Modifier.mouseClickable(onClick = dismissHandler),
- colors = ButtonDefaults.colors(
- containerColor = Color.Transparent,
- contentColor = Color.White.copy(alpha = 0.7f),
- focusedContainerColor = Color.White.copy(alpha = 0.12f),
- focusedContentColor = Color.White
- ),
- border = ButtonDefaults.border(
- focusedBorder = Border(
- border = androidx.compose.foundation.BorderStroke(FocusSpec.BorderWidth, FocusBorder)
- )
- ),
- scale = ButtonDefaults.scale(focusedScale = FocusSpec.FocusedScale)
- ) {
- Text(stringResource(R.string.pin_dialog_cancel))
- }
- }
- }
- }
-
- if (isTelevisionDevice) {
- dialogContent(Modifier.width(360.dp))
- } else {
- BoxWithConstraints(
- modifier = Modifier.fillMaxWidth(),
- contentAlignment = Alignment.Center
- ) {
- val dialogModifier = when {
- maxWidth < 700.dp -> Modifier.fillMaxWidth(0.9f)
- maxWidth < 1280.dp -> Modifier.fillMaxWidth(0.54f)
- else -> Modifier.width(360.dp)
- }
- dialogContent(dialogModifier)
- }
- }
- }
+ onPinEntered = onPinEntered,
+ error = error
+ )
}
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 937037c9..4ea5ff59 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
@@ -52,9 +52,9 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import coil3.compose.AsyncImage
import com.streamvault.app.R
-import com.streamvault.app.ui.components.ChannelLogoBadge
+import com.streamvault.core.ui.image.ChannelLogoBadge
import com.streamvault.app.ui.components.channelProgressFraction
-import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.core.ui.image.rememberCrossfadeImageModel
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.AppMotion
import com.streamvault.core.ui.design.FocusSpec
@@ -62,7 +62,7 @@ import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.interaction.rememberTvInteractionSounds
import com.streamvault.core.ui.components.shell.ContentMetadataStrip
import com.streamvault.core.ui.components.shell.StatusPill
-import com.streamvault.app.ui.model.archivePlaybackCapability
+import com.streamvault.domain.playback.archivePlaybackCapability
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Episode
import com.streamvault.domain.model.Movie
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 f277536d..03557db8 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
@@ -38,7 +38,7 @@ import androidx.tv.material3.Surface
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.core.ui.image.rememberCrossfadeImageModel
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.design.LocalAppSpacing
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 83437aa0..d70bfb76 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
@@ -51,8 +51,8 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.SearchInput
import com.streamvault.app.ui.components.SelectionChip
import com.streamvault.app.ui.components.SelectionChipRow
-import com.streamvault.app.ui.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.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 b45fecb9..2cb889af 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
@@ -52,14 +52,14 @@ import androidx.tv.material3.Text
import coil3.compose.AsyncImage
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.components.ChannelLogoBadge
+import com.streamvault.core.ui.image.ChannelLogoBadge
import com.streamvault.app.ui.components.ChannelProgressTicker
import com.streamvault.app.navigation.Routes
import com.streamvault.app.ui.components.CategoryRow
import com.streamvault.app.ui.components.ChannelCard
import com.streamvault.app.ui.components.ContinueWatchingRow
import com.streamvault.app.ui.components.MovieCard
-import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.core.ui.image.rememberCrossfadeImageModel
import com.streamvault.app.ui.components.SeriesCard
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.core.ui.components.shell.AppHeroHeader
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 8c4fd66f..341e9f4d 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
@@ -24,8 +24,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.interaction.TvClickableSurface
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
index 2a019206..d5d356a1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
@@ -2,7 +2,7 @@ package com.streamvault.app.ui.screens.dashboard
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import com.streamvault.app.ui.model.orderedByRequestedRawIds
+import com.streamvault.domain.playback.orderedByRequestedRawIds
import com.streamvault.data.preferences.PreferencesRepository
import com.streamvault.data.sync.ProviderSyncStateSource
import com.streamvault.app.update.AppUpdateActionState
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 25a3c9ac..5d087090 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
@@ -50,7 +50,7 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import coil3.compose.AsyncImage
import com.streamvault.app.R
-import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.core.ui.image.rememberCrossfadeImageModel
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.core.ui.design.AppColors
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 06416312..0b970aa7 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
@@ -50,10 +50,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.components.ChannelLogoBadge
+import com.streamvault.core.ui.image.ChannelLogoBadge
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.model.archivePlaybackCapability
+import com.streamvault.domain.playback.archivePlaybackCapability
import com.streamvault.app.ui.model.guideLookupKey
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormatter
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 3d0a4284..cfa92cf5 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
@@ -42,9 +42,9 @@ 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.components.ChannelLogoBadge
-import com.streamvault.app.ui.components.PlayerRenderView
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.core.ui.image.ChannelLogoBadge
+import com.streamvault.player.ui.PlayerRenderView
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.guideLookupKey
import com.streamvault.app.ui.time.LocalAppTimeFormat
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 7001b38f..6cab9c69 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
@@ -1,9 +1,9 @@
package com.streamvault.app.ui.screens.epg
import android.view.inputmethod.InputMethodManager
-import com.streamvault.app.ui.model.ArchiveReplayMechanism
-import com.streamvault.app.ui.model.archivePlaybackCapability
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.domain.playback.ArchiveReplayMechanism
+import com.streamvault.domain.playback.archivePlaybackCapability
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.app.ui.model.guideLookupKey
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
@@ -92,9 +92,9 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.components.ChannelLogoBadge
+import com.streamvault.core.ui.image.ChannelLogoBadge
import com.streamvault.app.navigation.Routes
-import com.streamvault.app.ui.notifications.rememberNotificationPermissionGate
+import com.streamvault.core.ui.platform.rememberNotificationPermissionGate
import com.streamvault.app.ui.components.SelectionChip
import com.streamvault.app.ui.components.SelectionChipRow
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgViewModel.kt
index f93bacda..93bfe49e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgViewModel.kt
@@ -1,11 +1,11 @@
package com.streamvault.app.ui.screens.epg
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.app.ui.model.guideLookupKey
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.streamvault.app.ui.model.applyProviderCategoryDisplayPreferences
-import com.streamvault.app.ui.model.orderedByRequestedRawIds
+import com.streamvault.domain.playback.orderedByRequestedRawIds
import com.streamvault.domain.manager.ParentalControlManager
import com.streamvault.domain.manager.ProgramReminderManager
import com.streamvault.domain.model.ActiveLiveSource
@@ -66,7 +66,7 @@ import java.time.ZoneId
import javax.inject.Inject
import android.app.Application
import com.streamvault.app.R
-import com.streamvault.app.di.AuxiliaryPlayerEngine
+import com.streamvault.player.di.AuxiliaryPlayerEngine
import com.streamvault.app.player.LivePreviewHandoffManager
import com.streamvault.app.player.PreviewHandoffSource
import com.streamvault.app.plugins.StreamVaultPluginManager
@@ -500,10 +500,8 @@ class EpgViewModel @Inject constructor(
previewPlayerEngine?.stop()
previewPlayerEngine?.release()
previewPlayerEngine = engine
- (engine as? com.streamvault.player.Media3PlayerEngine)?.let {
- it.enableMediaSession = false
- it.bypassAudioFocus = true
- }
+ engine.setMediaSessionEnabled(false)
+ engine.setAudioFocusBypassed(true)
engine.play()
livePreviewHandoffManager.registerPreviewSession(
channelId = session.channelId,
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 e293f87a..418beee5 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
@@ -57,9 +57,9 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.SelectionChip
import com.streamvault.app.ui.components.SelectionChipRow
-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.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogActionButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.core.ui.components.shell.AppHeroHeader
import com.streamvault.app.ui.components.shell.AppScreenScaffold
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesViewModel.kt
index f0b5e493..00ffdf34 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesViewModel.kt
@@ -4,7 +4,7 @@ import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.streamvault.app.R
-import com.streamvault.app.ui.model.associateByAnyRawId
+import com.streamvault.domain.playback.associateByAnyRawId
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.Favorite
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 54bef35a..3a32a02e 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
@@ -59,9 +59,9 @@ import com.streamvault.app.ui.components.dialogs.CategoryOptionsDialog
import com.streamvault.app.ui.components.dialogs.HiddenCategoriesDialog
import com.streamvault.app.ui.components.dialogs.HiddenChannelsDialog
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.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogActionButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.components.dialogs.RenameGroupDialog
import com.streamvault.app.ui.components.ReorderTopBar
import com.streamvault.app.ui.components.shell.AppNavigationChrome
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt
index fba17374..219b6ffc 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt
@@ -17,9 +17,9 @@ import com.streamvault.app.ui.components.SearchInput
import com.streamvault.app.ui.components.dialogs.AddToGroupDialog
import com.streamvault.app.ui.components.dialogs.CategoryOptionsDialog
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.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogActionButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.components.dialogs.RenameGroupDialog
import com.streamvault.app.ui.components.dialogs.M3uCategoryOrganizerDialog
import com.streamvault.app.ui.components.dialogs.M3uCategorySeriesAssignmentDialog
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 af864547..7e9efe66 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
@@ -52,7 +52,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.FocusedMarqueeText
-import com.streamvault.app.ui.components.PlayerRenderView
+import com.streamvault.player.ui.PlayerRenderView
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.FocusBorder
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
index b13ac1c8..9b38dd9e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
@@ -2,14 +2,14 @@ package com.streamvault.app.ui.screens.home
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import com.streamvault.app.di.AuxiliaryPlayerEngine
+import com.streamvault.player.di.AuxiliaryPlayerEngine
import com.streamvault.app.player.LivePreviewHandoffManager
import com.streamvault.app.player.PreviewHandoffSource
import com.streamvault.app.plugins.StreamVaultPluginManager
import com.streamvault.app.tvinput.TvInputChannelSyncManager
import com.streamvault.app.ui.screens.multiview.MultiViewManager
import com.streamvault.app.ui.model.applyProviderCategoryDisplayPreferences
-import com.streamvault.app.ui.model.orderedByRequestedRawIds
+import com.streamvault.domain.playback.orderedByRequestedRawIds
import com.streamvault.app.ui.model.guideLookupKey
import com.streamvault.app.ui.model.LiveTvChannelMode
import com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityMode
@@ -1180,10 +1180,8 @@ class HomeViewModel @Inject constructor(
previewPlayerEngine?.release()
previewPlayerEngine = engine
// Restore auxiliary-engine defaults that the fullscreen handoff flipped.
- (engine as? com.streamvault.player.Media3PlayerEngine)?.let {
- it.enableMediaSession = false
- it.bypassAudioFocus = true
- }
+ engine.setMediaSessionEnabled(false)
+ engine.setAudioFocusBypassed(true)
engine.play()
// Re-register the forward-handoff slot so a subsequent click can open fullscreen again.
livePreviewHandoffManager.registerPreviewSession(
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 d21ea12e..413e4260 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
@@ -58,7 +58,7 @@ import com.streamvault.app.MainActivity
import com.streamvault.app.R
import com.streamvault.app.cast.CastUiEvent
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.core.ui.image.rememberCrossfadeImageModel
import com.streamvault.app.util.formatPositionMs
import com.streamvault.core.ui.components.shell.ContentMetadataStrip
import com.streamvault.app.ui.components.shell.ExternalRatingsStrip
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailViewModel.kt
index 7f3273ed..fad66235 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailViewModel.kt
@@ -20,7 +20,7 @@ import com.streamvault.app.cast.toCastUnsupportedMessageRes
import com.streamvault.app.navigation.MOVIE_DETAIL_PRESENTATION_HINT_KEY
import com.streamvault.app.plugins.StreamVaultPluginManager
import com.streamvault.app.service.DownloadForegroundService
-import com.streamvault.app.util.isPlaybackComplete
+import com.streamvault.domain.playback.isPlaybackComplete
import com.streamvault.data.preferences.PreferencesRepository
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.DownloadContentType
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
index a7b74247..02206c4e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
@@ -43,7 +43,7 @@ import com.streamvault.app.ui.screens.vod.setVodSearchQuery
import com.streamvault.app.ui.screens.vod.setVodFavorite
import com.streamvault.app.ui.screens.vod.updateVodGroupMembership
import com.streamvault.app.ui.screens.vod.VodBrowseDefaults
-import com.streamvault.app.util.isPlaybackComplete
+import com.streamvault.domain.playback.isPlaybackComplete
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
import kotlinx.coroutines.ExperimentalCoroutinesApi
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 e63cc930..2bddc2c6 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
@@ -38,8 +38,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.components.shell.AppMessageState
import com.streamvault.core.ui.components.shell.StatusPill
import com.streamvault.core.ui.design.AppColors
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 5dc6a09e..08265df3 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
@@ -77,11 +77,11 @@ import androidx.tv.material3.Surface
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext
import com.streamvault.app.R
-import com.streamvault.app.ui.components.PlayerRenderView
-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.player.ui.PlayerRenderView
+import com.streamvault.core.ui.components.dialogs.PinEntryDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogActionButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.theme.Primary
import com.streamvault.player.PlayerRenderSurfaceType
import com.streamvault.player.PlayerSurfaceResizeMode
@@ -877,7 +877,9 @@ private fun ReplaceSlotDialog(
)
if (showPinDialog) {
- PinDialog(
+ PinEntryDialog(
+ title = stringResource(R.string.pin_dialog_title),
+ cancelLabel = stringResource(R.string.pin_dialog_cancel),
onDismissRequest = {
showPinDialog = false
pinError = null
@@ -899,7 +901,6 @@ private fun ReplaceSlotDialog(
}
}
},
- title = stringResource(R.string.pin_dialog_title),
error = pinError
)
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt
index 55491a35..02e5f074 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt
@@ -6,8 +6,8 @@ import android.os.Build
import android.os.PowerManager
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import com.streamvault.app.di.AuxiliaryPlayerEngine
-import com.streamvault.app.ui.model.associateByAnyRawId
+import com.streamvault.player.di.AuxiliaryPlayerEngine
+import com.streamvault.domain.playback.associateByAnyRawId
import com.streamvault.data.preferences.PreferencesRepository
import com.streamvault.domain.manager.ParentalControlManager
import com.streamvault.domain.model.Category
@@ -265,12 +265,9 @@ class MultiViewViewModel @Inject constructor(
try {
localEngine = playerEngineProvider.get()
// Cap each multi-view slot to 720p so slots don't compete for 4K bandwidth
- (localEngine as? com.streamvault.player.Media3PlayerEngine)
- ?.let {
- it.constrainResolutionForMultiView = true
- it.bypassAudioFocus = true
- it.enableMediaSession = false
- }
+ localEngine.setResolutionConstrainedForMultiView(true)
+ localEngine.setAudioFocusBypassed(true)
+ localEngine.setMediaSessionEnabled(false)
if (initVersion != slotInitVersion || slotGen != slotGenerations.getOrDefault(index, 0L)) {
return@launch
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerCatchUpActions.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerCatchUpActions.kt
index deb49c11..78160387 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerCatchUpActions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerCatchUpActions.kt
@@ -1,7 +1,7 @@
package com.streamvault.app.ui.screens.player
import androidx.lifecycle.viewModelScope
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.Program
import com.streamvault.domain.model.Result
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerDiagnosticsSupport.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerDiagnosticsSupport.kt
index b8f440fc..2470b077 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerDiagnosticsSupport.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerDiagnosticsSupport.kt
@@ -1,7 +1,7 @@
package com.streamvault.app.ui.screens.player
-import com.streamvault.app.ui.model.ArchiveReplayMechanism
-import com.streamvault.app.ui.model.archivePlaybackCapability
+import com.streamvault.domain.playback.ArchiveReplayMechanism
+import com.streamvault.domain.playback.archivePlaybackCapability
import com.streamvault.domain.model.Channel
internal fun updateChannelDiagnosticsState(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerEngineCoordinator.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerEngineCoordinator.kt
index 1a68a17e..8dca555b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerEngineCoordinator.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerEngineCoordinator.kt
@@ -1,6 +1,6 @@
package com.streamvault.app.ui.screens.player
-import com.streamvault.app.di.MainPlayerEngine
+import com.streamvault.player.di.MainPlayerEngine
import com.streamvault.player.PlayerEngine
import dagger.hilt.android.scopes.ViewModelScoped
import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerNoticeActions.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerNoticeActions.kt
index 33c483e7..bd33443f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerNoticeActions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerNoticeActions.kt
@@ -1,7 +1,7 @@
package com.streamvault.app.ui.screens.player
import androidx.lifecycle.viewModelScope
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.domain.model.ContentType
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPlaybackMessageSupport.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPlaybackMessageSupport.kt
index d7516fdc..12359ad4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPlaybackMessageSupport.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPlaybackMessageSupport.kt
@@ -1,6 +1,6 @@
package com.streamvault.app.ui.screens.player
-import com.streamvault.app.ui.model.archivePlaybackCapability
+import com.streamvault.domain.playback.archivePlaybackCapability
import com.streamvault.domain.model.Channel
import java.util.Locale
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPlaylistActions.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPlaylistActions.kt
index 554c6311..76c88b1d 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPlaylistActions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPlaylistActions.kt
@@ -2,7 +2,7 @@
package com.streamvault.app.ui.screens.player
-import com.streamvault.app.ui.model.orderedByRequestedRawIds
+import com.streamvault.domain.playback.orderedByRequestedRawIds
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.ChannelNumberingMode
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPreviewCoordinator.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPreviewCoordinator.kt
index c1d854e1..25910363 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPreviewCoordinator.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerPreviewCoordinator.kt
@@ -7,7 +7,6 @@ import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.StreamInfo
import com.streamvault.domain.model.StreamType
-import com.streamvault.player.Media3PlayerEngine
import com.streamvault.player.PlayerEngine
import android.util.Log
import kotlinx.coroutines.flow.first
@@ -67,11 +66,9 @@ class PlayerPreviewCoordinator @Inject constructor(
adoptedEngine.clearRenderBinding()
engineCoordinator.mainEngine.setMediaSessionEnabled(false)
engineCoordinator.switchTo(adoptedEngine)
- (adoptedEngine as? Media3PlayerEngine)?.let {
- it.bypassAudioFocus = false
- it.enableMediaSession = preferencesCoordinator.playerMediaSessionEnabled.first()
- it.constrainResolutionForMultiView = false
- }
+ adoptedEngine.setAudioFocusBypassed(false)
+ adoptedEngine.setMediaSessionEnabled(preferencesCoordinator.playerMediaSessionEnabled.first())
+ adoptedEngine.setResolutionConstrainedForMultiView(false)
preparationCoordinator.applyPlaybackPreferences(
engine = adoptedEngine,
contentType = contentType,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerProgramTimelineSupport.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerProgramTimelineSupport.kt
index 37bb2fdb..defe2fe0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerProgramTimelineSupport.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerProgramTimelineSupport.kt
@@ -1,6 +1,6 @@
package com.streamvault.app.ui.screens.player
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Program
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 7f08bd04..222a6752 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
@@ -73,9 +73,9 @@ import androidx.compose.ui.res.stringResource
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.player.ui.PlayerRenderView
import com.streamvault.core.ui.design.requestFocusSafely
-import com.streamvault.app.ui.notifications.rememberNotificationPermissionGate
+import com.streamvault.core.ui.platform.rememberNotificationPermissionGate
import com.streamvault.app.ui.screens.player.overlay.ChannelInfoOverlay
import com.streamvault.app.ui.screens.player.overlay.CategoryListOverlay
import com.streamvault.app.ui.screens.player.overlay.ChannelListOverlay
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
index 2c2bacce..f14c714b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.streamvault.app.cast.CastConnectionState
import com.streamvault.app.cast.CastPlaybackReportMode
-import com.streamvault.app.util.isPlaybackComplete
+import com.streamvault.domain.playback.isPlaybackComplete
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.ChannelNumberingMode
import com.streamvault.domain.model.CombinedCategory
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 f51673e6..2706e958 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
@@ -62,13 +62,13 @@ import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.core.ui.components.shell.StatusPill
import com.streamvault.core.ui.design.AppColors
-import com.streamvault.app.ui.model.archivePlaybackCapability
+import com.streamvault.domain.playback.archivePlaybackCapability
import com.streamvault.app.ui.screens.player.playerCategoryOverlayItemKey
import com.streamvault.app.ui.screens.player.playerChannelOverlayItemKey
import com.streamvault.app.ui.screens.player.PlayerDiagnosticsUiState
import com.streamvault.app.ui.screens.player.playerProgramOverlayItemKey
-import com.streamvault.app.ui.time.LocalAppTimeFormat
-import com.streamvault.app.ui.time.createTimeFormat
+import com.streamvault.core.ui.time.LocalUiTimeFormat
+import com.streamvault.core.ui.time.createTimeFormat
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Program
@@ -478,7 +478,7 @@ fun EpgOverlay(
onOpenArchiveBrowser: (() -> Unit)? = null,
onOverlayInteracted: () -> Unit = {}
) {
- val appTimeFormat = LocalAppTimeFormat.current
+ val appTimeFormat = LocalUiTimeFormat.current
val timeFormat = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }
val listState = rememberLazyListState()
val coroutineScope = rememberCoroutineScope()
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 cd6c5774..6de0c5b7 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
@@ -47,15 +47,15 @@ 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.components.ChannelLogoBadge
+import com.streamvault.core.ui.image.ChannelLogoBadge
import com.streamvault.core.ui.components.shell.StatusPill
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.model.archivePlaybackCapability
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.domain.playback.archivePlaybackCapability
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.app.ui.screens.player.PlayerTimeshiftUiState
-import com.streamvault.app.ui.time.LocalAppTimeFormat
-import com.streamvault.app.ui.time.createTimeFormat
+import com.streamvault.core.ui.time.LocalUiTimeFormat
+import com.streamvault.core.ui.time.createTimeFormat
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Program
import com.streamvault.domain.model.RecordingStatus
@@ -117,7 +117,7 @@ fun ChannelInfoOverlay(
onTransientPanelVisibilityChanged: (Boolean) -> Unit = {},
resolutionLabel: String? = null
) {
- val appTimeFormat = LocalAppTimeFormat.current
+ val appTimeFormat = LocalUiTimeFormat.current
val timeFormat = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }
val showTimeshiftControls = timeshiftUiState.available && !isCastConnected
val archiveCapability = currentChannel?.archivePlaybackCapability()
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 ab397ba0..25484129 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
@@ -69,14 +69,14 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.components.rememberCrossfadeImageModel
-import com.streamvault.app.ui.model.isArchivePlayable
+import com.streamvault.core.ui.image.rememberCrossfadeImageModel
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.app.ui.screens.player.NumericChannelInputState
import com.streamvault.app.ui.screens.player.PlayerTimeshiftUiState
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.core.ui.time.LocalUiTimeFormat
+import com.streamvault.core.ui.time.createTimeFormat
import com.streamvault.core.ui.theme.ErrorColor
import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.Channel
@@ -424,7 +424,7 @@ private fun PlayerTopBar(
) {
val screenWidth = LocalConfiguration.current.screenWidthDp.dp
val isTelevisionDevice = rememberIsTelevisionDevice()
- val appTimeFormat = LocalAppTimeFormat.current
+ val appTimeFormat = LocalUiTimeFormat.current
val timeFormat = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }
val topBarHeight = when {
screenWidth < 700.dp -> 100.dp
@@ -779,7 +779,7 @@ private fun PlayerLiveInfo(
onOpenExternalPlayer: () -> Unit
) {
val showTimeshiftControls = timeshiftUiState.available && !isCastConnected
- val appTimeFormat = LocalAppTimeFormat.current
+ val appTimeFormat = LocalUiTimeFormat.current
val timeFormat = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }
val canRestartProgram = currentChannel != null &&
currentProgram != null &&
@@ -1701,7 +1701,7 @@ private fun LiveTimeshiftScrubber(
val engineState = timeshiftUiState.engineState
val oldestWallMs = engineState.bufferStartMs
- val appTimeFormat = LocalAppTimeFormat.current
+ val appTimeFormat = LocalUiTimeFormat.current
val timeFormat = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }
val oldestLabel = if (oldestWallMs > 0L) {
timeFormat.format(Date(oldestWallMs))
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 35142be0..f34fc23c 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
@@ -29,7 +29,7 @@ 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.model.isArchivePlayable
+import com.streamvault.domain.playback.isArchivePlayable
import com.streamvault.app.ui.screens.epg.CompactGuideProgramDialog
import com.streamvault.app.ui.screens.epg.EpgGrid
import com.streamvault.app.ui.screens.epg.EpgUiState
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 32b7c2f3..b77e3dd4 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
@@ -57,8 +57,8 @@ import com.streamvault.app.plugins.PluginConfigurationAction
import com.streamvault.app.plugins.PluginConfigurationField
import com.streamvault.app.plugins.PluginConfigurationSection
import com.streamvault.app.plugins.owner
-import com.streamvault.app.ui.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.core.ui.components.shell.StatusPill
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupCompletionHost.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupCompletionHost.kt
index 6b10bdfd..a9fc9098 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupCompletionHost.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupCompletionHost.kt
@@ -8,8 +8,8 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.tv.material3.Text
-import com.streamvault.app.ui.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlin.coroutines.resume
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 5d0fcf40..ae59add2 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
@@ -28,8 +28,8 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface as TvSurface
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.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
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 aac94fc3..36838c3e 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
@@ -75,8 +75,8 @@ import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.pairing.ProviderQrPairingState
import com.streamvault.app.pairing.ProviderQrPairingStatus
-import com.streamvault.app.ui.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.components.extractProgressFraction
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.interaction.TvClickableSurface
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 a43dc1df..b4f2b254 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
@@ -28,7 +28,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.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.extractProgressFraction
import com.streamvault.core.ui.components.shell.StatusPill
import com.streamvault.core.ui.theme.*
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 b770492d..817989b0 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
@@ -61,7 +61,7 @@ import com.streamvault.app.MainActivity
import com.streamvault.app.R
import com.streamvault.app.cast.CastUiEvent
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.core.ui.image.rememberCrossfadeImageModel
import com.streamvault.app.util.formatPositionMs
import com.streamvault.core.ui.components.shell.ContentMetadataStrip
import com.streamvault.app.ui.components.shell.EpisodeRowCard
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 63b57877..51d02de2 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
@@ -22,8 +22,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
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 e4b78c87..b24d070f 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
@@ -29,8 +29,8 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
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.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
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 3fad320e..969988e9 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
@@ -35,8 +35,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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.ErrorColor
@@ -491,4 +491,4 @@ private fun ProviderChip(
)
}
}
-}
\ No newline at end of file
+}
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 c79800c7..fe075a55 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
@@ -18,8 +18,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.LiveTvChannelMode
import com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityMode
@@ -216,4 +216,4 @@ internal fun LiveTvQuickFilterVisibilityDialog(
)
}
)
-}
\ No newline at end of file
+}
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 6e413f44..2461dfc8 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
@@ -13,8 +13,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.core.ui.theme.OnBackground
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 f56411c9..f0585803 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
@@ -37,8 +37,8 @@ import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
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.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.interaction.TvClickableSurface
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 d4aeba77..8d8a2baf 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
@@ -10,8 +10,8 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
-import com.streamvault.app.ui.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.tv.material3.Text
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 ba612265..1cd0092d 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
@@ -16,8 +16,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
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 619d82c7..d776beea 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
@@ -37,9 +37,9 @@ import androidx.compose.ui.window.DialogProperties
import androidx.tv.material3.*
import com.streamvault.app.R
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.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogActionButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.interaction.TvClickableSurface
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 3d51d332..75951b58 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
@@ -34,9 +34,9 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogActionButton
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogActionButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.interaction.mouseClickable
@@ -346,4 +346,4 @@ internal fun SettingsNavItem(
)
}
}
-}
\ No newline at end of file
+}
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 0fda9855..26bc0760 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
@@ -31,8 +31,8 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.ClickableSurfaceDefaults
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.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
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 d491c163..b4a56585 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
@@ -34,7 +34,7 @@ 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.components.dialogs.rememberDialogOpenGestureBlocker
+import com.streamvault.core.ui.components.dialogs.rememberDialogOpenGestureBlocker
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
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 dbe1679e..3ebcb939 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
@@ -16,8 +16,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
@@ -103,4 +103,4 @@ internal fun CategorySortModeDialog(
)
}
)
-}
\ No newline at end of file
+}
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 e1cc7bb4..7a581ad3 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
@@ -37,8 +37,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
@@ -207,4 +207,4 @@ private fun NumericSettingsTextField(
)
}
}
-}
\ No newline at end of file
+}
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 fc8fde39..3d037716 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
@@ -19,9 +19,9 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogActionButton
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogActionButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.theme.Primary
internal fun formatPlaybackTimerMinutesLabel(minutes: Int, context: Context): String {
@@ -153,4 +153,4 @@ internal fun SimpleTextValueDialog(
}
}
)
-}
\ No newline at end of file
+}
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 400990a3..ad9a293f 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
@@ -24,8 +24,8 @@ 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.components.dialogs.PremiumDialog
-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.core.ui.components.dialogs.PremiumDialog
+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.design.FocusSpec
diff --git a/app/src/main/java/com/streamvault/app/ui/time/UiTimeFormatAdapter.kt b/app/src/main/java/com/streamvault/app/ui/time/UiTimeFormatAdapter.kt
new file mode 100644
index 00000000..26339a79
--- /dev/null
+++ b/app/src/main/java/com/streamvault/app/ui/time/UiTimeFormatAdapter.kt
@@ -0,0 +1,10 @@
+package com.streamvault.app.ui.time
+
+import com.streamvault.core.ui.time.UiTimeFormat
+import com.streamvault.domain.model.AppTimeFormat
+
+fun AppTimeFormat.toUiTimeFormat(): UiTimeFormat = when (this) {
+ AppTimeFormat.SYSTEM -> UiTimeFormat.SYSTEM
+ AppTimeFormat.TWELVE_HOUR -> UiTimeFormat.TWELVE_HOUR
+ AppTimeFormat.TWENTY_FOUR_HOUR -> UiTimeFormat.TWENTY_FOUR_HOUR
+}
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 3280d64f..086090c3 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -94,6 +94,9 @@ dependencies {
implementation(libs.compose.tv.material)
implementation(libs.lifecycle.runtime.compose)
implementation(libs.core.ktx)
+ implementation(libs.activity.compose)
+ implementation(libs.coil.compose)
+ implementation(libs.coil.network.okhttp)
testImplementation(libs.junit)
testImplementation(libs.robolectric)
diff --git a/app/src/main/java/com/streamvault/app/ui/accessibility/MotionPreferences.kt b/core/ui/src/main/java/com/streamvault/core/ui/accessibility/MotionPreferences.kt
similarity index 96%
rename from app/src/main/java/com/streamvault/app/ui/accessibility/MotionPreferences.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/accessibility/MotionPreferences.kt
index 31ad7442..9f2e5bfd 100644
--- a/app/src/main/java/com/streamvault/app/ui/accessibility/MotionPreferences.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/accessibility/MotionPreferences.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.accessibility
+package com.streamvault.core.ui.accessibility
import android.content.Context
import android.database.ContentObserver
@@ -41,4 +41,4 @@ fun rememberReducedMotionEnabled(): Boolean {
}
return reducedMotionEnabled
-}
\ No newline at end of file
+}
diff --git a/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PinEntryDialog.kt b/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PinEntryDialog.kt
new file mode 100644
index 00000000..8e704712
--- /dev/null
+++ b/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PinEntryDialog.kt
@@ -0,0 +1,180 @@
+package com.streamvault.core.ui.components.dialogs
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.tv.material3.Border
+import androidx.tv.material3.Button
+import androidx.tv.material3.ButtonDefaults
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+import com.streamvault.core.ui.design.FocusSpec
+import com.streamvault.core.ui.design.requestFocusSafely
+import com.streamvault.core.ui.device.rememberIsTelevisionDevice
+import com.streamvault.core.ui.interaction.mouseClickable
+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 kotlinx.coroutines.delay
+
+@Composable
+fun PinEntryDialog(
+ title: String,
+ cancelLabel: String,
+ onDismissRequest: () -> Unit,
+ onPinEntered: (String) -> Unit,
+ error: String? = null
+) {
+ var pin by remember { mutableStateOf("") }
+ var canInteract by remember { mutableStateOf(false) }
+ val firstKeyFocusRequester = remember { FocusRequester() }
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val blockOpenGesture = rememberDialogOpenGestureBlocker(canInteract)
+
+ LaunchedEffect(Unit) {
+ firstKeyFocusRequester.requestFocusSafely(tag = "PinDialog", target = "PIN keypad")
+ delay(500)
+ canInteract = true
+ }
+ LaunchedEffect(pin) {
+ if (pin.length == 4) {
+ val submittedPin = pin
+ delay(200)
+ if (pin == submittedPin) {
+ onPinEntered(submittedPin)
+ pin = ""
+ }
+ }
+ }
+ Dialog(
+ onDismissRequest = onDismissRequest,
+ properties = DialogProperties(
+ dismissOnBackPress = canInteract,
+ dismissOnClickOutside = canInteract,
+ usePlatformDefaultWidth = false
+ )
+ ) {
+ val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
+ Box(
+ modifier = resolvedModifier
+ .onPreviewKeyEvent(blockOpenGesture)
+ .background(SurfaceElevated, RoundedCornerShape(16.dp))
+ .border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(16.dp))
+ .padding(24.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(20.dp)
+ ) {
+ Text(text = title, style = MaterialTheme.typography.titleLarge, color = Color.White)
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ repeat(4) { index ->
+ val isFilled = index < pin.length
+ Box(
+ modifier = Modifier.size(20.dp).clip(CircleShape)
+ .background(if (isFilled) Primary else Color.White.copy(alpha = 0.1f))
+ .border(1.dp, if (isFilled) Primary else Color.White.copy(alpha = 0.3f), CircleShape)
+ )
+ }
+ }
+ if (error != null) Text(text = error, style = MaterialTheme.typography.bodyMedium, color = ErrorColor)
+ val keys = listOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "⌫")
+ val handleKeyPress: (String) -> Unit = { key ->
+ if (canInteract) {
+ if (key == "⌫") {
+ if (pin.isNotEmpty()) pin = pin.dropLast(1)
+ } else if (pin.length < 4) pin += key
+ }
+ }
+ Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+ keys.chunked(3).forEach { row ->
+ Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) {
+ row.forEach { key ->
+ val isFirst = key == "1"
+ Box(modifier = Modifier.weight(1f)) {
+ if (key.isEmpty()) {
+ Spacer(modifier = Modifier.fillMaxWidth().height(48.dp))
+ } else {
+ Button(
+ onClick = { handleKeyPress(key) },
+ modifier = Modifier.fillMaxWidth()
+ .then(if (isFirst) Modifier.focusRequester(firstKeyFocusRequester) else Modifier)
+ .mouseClickable(onClick = { handleKeyPress(key) }),
+ colors = ButtonDefaults.colors(
+ containerColor = Color.White.copy(alpha = 0.08f),
+ contentColor = Color.White,
+ focusedContainerColor = Primary.copy(alpha = 0.35f),
+ focusedContentColor = Color.White
+ )
+ ) { Text(text = key, style = MaterialTheme.typography.titleMedium) }
+ }
+ }
+ }
+ }
+ }
+ }
+ val dismissHandler = { if (canInteract) onDismissRequest() }
+ Button(
+ onClick = dismissHandler,
+ modifier = Modifier.mouseClickable(onClick = dismissHandler),
+ colors = ButtonDefaults.colors(
+ containerColor = Color.Transparent,
+ contentColor = Color.White.copy(alpha = 0.7f),
+ focusedContainerColor = Color.White.copy(alpha = 0.12f),
+ focusedContentColor = Color.White
+ ),
+ border = ButtonDefaults.border(
+ focusedBorder = Border(border = androidx.compose.foundation.BorderStroke(FocusSpec.BorderWidth, FocusBorder))
+ ),
+ scale = ButtonDefaults.scale(focusedScale = FocusSpec.FocusedScale)
+ ) { Text(cancelLabel) }
+ }
+ }
+ }
+ if (isTelevisionDevice) {
+ dialogContent(Modifier.width(360.dp))
+ } else {
+ BoxWithConstraints(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
+ val dialogModifier = when {
+ maxWidth < 700.dp -> Modifier.fillMaxWidth(0.9f)
+ maxWidth < 1280.dp -> Modifier.fillMaxWidth(0.54f)
+ else -> Modifier.width(360.dp)
+ }
+ dialogContent(dialogModifier)
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt b/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PremiumDialog.kt
similarity index 98%
rename from app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PremiumDialog.kt
index 4bcd41e8..24689061 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/components/dialogs/PremiumDialog.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.components.dialogs
+package com.streamvault.core.ui.components.dialogs
import android.view.KeyEvent as AndroidKeyEvent
import androidx.compose.foundation.BorderStroke
@@ -44,7 +44,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
-import com.streamvault.app.device.rememberIsTelevisionDevice
+import com.streamvault.core.ui.device.rememberIsTelevisionDevice
import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.design.AppColors
@@ -53,7 +53,7 @@ import com.streamvault.core.ui.design.FocusSpec
internal val LocalDialogCanInteract = compositionLocalOf { true }
@Composable
-internal fun rememberDialogOpenGestureBlocker(canInteract: Boolean): (KeyEvent) -> Boolean = remember(canInteract) {
+fun rememberDialogOpenGestureBlocker(canInteract: Boolean): (KeyEvent) -> Boolean = remember(canInteract) {
{ event ->
!canInteract &&
event.nativeKeyEvent.action == AndroidKeyEvent.ACTION_UP &&
diff --git a/core/ui/src/main/java/com/streamvault/core/ui/device/TelevisionDevice.kt b/core/ui/src/main/java/com/streamvault/core/ui/device/TelevisionDevice.kt
index 989afe22..248bf801 100644
--- a/core/ui/src/main/java/com/streamvault/core/ui/device/TelevisionDevice.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/device/TelevisionDevice.kt
@@ -4,6 +4,9 @@ import android.app.UiModeManager
import android.content.Context
import android.content.pm.PackageManager
import android.content.res.Configuration
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
internal fun classifyTelevisionDevice(
hasLeanback: Boolean,
@@ -47,3 +50,9 @@ fun Context.isTelevisionDevice(): Boolean {
hasTouchscreen = packageManager.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)
)
}
+
+@Composable
+fun rememberIsTelevisionDevice(): Boolean {
+ val context = LocalContext.current
+ return remember(context) { context.isTelevisionDevice() }
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/AsyncImageModels.kt b/core/ui/src/main/java/com/streamvault/core/ui/image/AsyncImageModels.kt
similarity index 83%
rename from app/src/main/java/com/streamvault/app/ui/components/AsyncImageModels.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/image/AsyncImageModels.kt
index 444877c6..65f30ded 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/AsyncImageModels.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/image/AsyncImageModels.kt
@@ -1,9 +1,9 @@
-package com.streamvault.app.ui.components
+package com.streamvault.core.ui.image
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
-import com.streamvault.app.ui.accessibility.rememberReducedMotionEnabled
+import com.streamvault.core.ui.accessibility.rememberReducedMotionEnabled
import coil3.request.ImageRequest
import coil3.request.crossfade
@@ -19,4 +19,4 @@ fun rememberCrossfadeImageModel(data: Any?): Any? {
.build()
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/ChannelLogo.kt b/core/ui/src/main/java/com/streamvault/core/ui/image/ChannelLogoBadge.kt
similarity index 98%
rename from app/src/main/java/com/streamvault/app/ui/components/ChannelLogo.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/image/ChannelLogoBadge.kt
index be895dee..0743cd1b 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/ChannelLogo.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/image/ChannelLogoBadge.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.components
+package com.streamvault.core.ui.image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
@@ -98,4 +98,4 @@ private fun channelInitials(name: String): String {
}
return initials.uppercase(Locale.ROOT)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/notifications/NotificationPermissionGate.kt b/core/ui/src/main/java/com/streamvault/core/ui/platform/NotificationPermissionGate.kt
similarity index 96%
rename from app/src/main/java/com/streamvault/app/ui/notifications/NotificationPermissionGate.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/platform/NotificationPermissionGate.kt
index 334c310a..9523424b 100644
--- a/app/src/main/java/com/streamvault/app/ui/notifications/NotificationPermissionGate.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/platform/NotificationPermissionGate.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.notifications
+package com.streamvault.core.ui.platform
import android.content.Context
import android.content.pm.PackageManager
@@ -14,7 +14,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.core.app.NotificationManagerCompat
import androidx.core.content.ContextCompat
-internal class NotificationPermissionGate(
+class NotificationPermissionGate(
private val runReminderActionImpl: (() -> Unit) -> Unit,
private val runRecordingActionImpl: (() -> Unit) -> Unit,
) {
@@ -33,7 +33,7 @@ private enum class NotificationPermissionRequestType {
}
@Composable
-internal fun rememberNotificationPermissionGate(
+fun rememberNotificationPermissionGate(
onNotificationsBlocked: (String) -> Unit,
reminderBlockedMessage: String,
recordingBlockedMessage: String,
diff --git a/core/ui/src/main/java/com/streamvault/core/ui/time/UiTimeFormat.kt b/core/ui/src/main/java/com/streamvault/core/ui/time/UiTimeFormat.kt
new file mode 100644
index 00000000..c0e095eb
--- /dev/null
+++ b/core/ui/src/main/java/com/streamvault/core/ui/time/UiTimeFormat.kt
@@ -0,0 +1,34 @@
+package com.streamvault.core.ui.time
+
+import androidx.compose.runtime.compositionLocalOf
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.util.Locale
+
+enum class UiTimeFormat {
+ SYSTEM,
+ TWELVE_HOUR,
+ TWENTY_FOUR_HOUR
+}
+
+val LocalUiTimeFormat = compositionLocalOf { UiTimeFormat.SYSTEM }
+
+fun UiTimeFormat.createTimeFormat(locale: Locale = Locale.getDefault()): DateFormat = when (this) {
+ UiTimeFormat.SYSTEM -> DateFormat.getTimeInstance(DateFormat.SHORT, locale)
+ UiTimeFormat.TWELVE_HOUR -> SimpleDateFormat("h:mm a", locale)
+ UiTimeFormat.TWENTY_FOUR_HOUR -> SimpleDateFormat("HH:mm", locale)
+}
+
+fun UiTimeFormat.createDateTimeFormat(locale: Locale = Locale.getDefault()): DateFormat = when (this) {
+ UiTimeFormat.SYSTEM -> DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, locale)
+ UiTimeFormat.TWELVE_HOUR -> SimpleDateFormat("MMM d, h:mm a", locale)
+ UiTimeFormat.TWENTY_FOUR_HOUR -> SimpleDateFormat("MMM d, HH:mm", locale)
+}
+
+fun UiTimeFormat.createTimeFormatter(locale: Locale = Locale.getDefault()): DateTimeFormatter = when (this) {
+ UiTimeFormat.SYSTEM -> DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).withLocale(locale)
+ UiTimeFormat.TWELVE_HOUR -> DateTimeFormatter.ofPattern("h:mm a", locale)
+ UiTimeFormat.TWENTY_FOUR_HOUR -> DateTimeFormatter.ofPattern("HH:mm", locale)
+}
diff --git a/core/ui/src/test/java/com/streamvault/core/ui/time/UiTimeFormatTest.kt b/core/ui/src/test/java/com/streamvault/core/ui/time/UiTimeFormatTest.kt
new file mode 100644
index 00000000..76f91497
--- /dev/null
+++ b/core/ui/src/test/java/com/streamvault/core/ui/time/UiTimeFormatTest.kt
@@ -0,0 +1,18 @@
+package com.streamvault.core.ui.time
+
+import com.google.common.truth.Truth.assertThat
+import java.time.LocalTime
+import java.util.Locale
+import org.junit.Test
+
+class UiTimeFormatTest {
+
+ @Test
+ fun `twenty four hour formatter preserves padded 24 hour output`() {
+ val formatted = UiTimeFormat.TWENTY_FOUR_HOUR
+ .createTimeFormatter(Locale.US)
+ .format(LocalTime.of(13, 5))
+
+ assertThat(formatted).isEqualTo("13:05")
+ }
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/model/ArchivePlayback.kt b/domain/src/main/java/com/streamvault/domain/playback/ArchivePlayback.kt
similarity index 98%
rename from app/src/main/java/com/streamvault/app/ui/model/ArchivePlayback.kt
rename to domain/src/main/java/com/streamvault/domain/playback/ArchivePlayback.kt
index e02b6b57..c67a1d16 100644
--- a/app/src/main/java/com/streamvault/app/ui/model/ArchivePlayback.kt
+++ b/domain/src/main/java/com/streamvault/domain/playback/ArchivePlayback.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.model
+package com.streamvault.domain.playback
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Program
diff --git a/app/src/main/java/com/streamvault/app/ui/model/ChannelVariantUiHelpers.kt b/domain/src/main/java/com/streamvault/domain/playback/ChannelIdentity.kt
similarity index 96%
rename from app/src/main/java/com/streamvault/app/ui/model/ChannelVariantUiHelpers.kt
rename to domain/src/main/java/com/streamvault/domain/playback/ChannelIdentity.kt
index 788020c0..b4dc2660 100644
--- a/app/src/main/java/com/streamvault/app/ui/model/ChannelVariantUiHelpers.kt
+++ b/domain/src/main/java/com/streamvault/domain/playback/ChannelIdentity.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.model
+package com.streamvault.domain.playback
import com.streamvault.domain.model.Channel
diff --git a/app/src/main/java/com/streamvault/app/util/PlaybackCompletion.kt b/domain/src/main/java/com/streamvault/domain/playback/PlaybackCompletion.kt
similarity index 89%
rename from app/src/main/java/com/streamvault/app/util/PlaybackCompletion.kt
rename to domain/src/main/java/com/streamvault/domain/playback/PlaybackCompletion.kt
index 9b7d5b19..5a302775 100644
--- a/app/src/main/java/com/streamvault/app/util/PlaybackCompletion.kt
+++ b/domain/src/main/java/com/streamvault/domain/playback/PlaybackCompletion.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.util
+package com.streamvault.domain.playback
import com.streamvault.domain.util.isPlaybackComplete as domainIsPlaybackComplete
diff --git a/app/src/test/java/com/streamvault/app/ui/model/ArchivePlaybackTest.kt b/domain/src/test/java/com/streamvault/domain/playback/ArchivePlaybackTest.kt
similarity index 99%
rename from app/src/test/java/com/streamvault/app/ui/model/ArchivePlaybackTest.kt
rename to domain/src/test/java/com/streamvault/domain/playback/ArchivePlaybackTest.kt
index 5d530cc6..7a04f319 100644
--- a/app/src/test/java/com/streamvault/app/ui/model/ArchivePlaybackTest.kt
+++ b/domain/src/test/java/com/streamvault/domain/playback/ArchivePlaybackTest.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.model
+package com.streamvault.domain.playback
import com.google.common.truth.Truth.assertThat
import com.streamvault.domain.model.Channel
diff --git a/app/src/test/java/com/streamvault/app/ui/model/ChannelVariantUiHelpersTest.kt b/domain/src/test/java/com/streamvault/domain/playback/ChannelIdentityTest.kt
similarity index 97%
rename from app/src/test/java/com/streamvault/app/ui/model/ChannelVariantUiHelpersTest.kt
rename to domain/src/test/java/com/streamvault/domain/playback/ChannelIdentityTest.kt
index 2e0e9d22..a7e6546a 100644
--- a/app/src/test/java/com/streamvault/app/ui/model/ChannelVariantUiHelpersTest.kt
+++ b/domain/src/test/java/com/streamvault/domain/playback/ChannelIdentityTest.kt
@@ -1,11 +1,11 @@
-package com.streamvault.app.ui.model
+package com.streamvault.domain.playback
import com.google.common.truth.Truth.assertThat
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.LiveChannelVariant
import org.junit.Test
-class ChannelVariantUiHelpersTest {
+class ChannelIdentityTest {
@Test
fun `orderedByRequestedRawIds preserves raw variants from same logical group`() {
@@ -67,4 +67,4 @@ class ChannelVariantUiHelpersTest {
)
)
)
-}
\ No newline at end of file
+}
diff --git a/player/build.gradle.kts b/player/build.gradle.kts
index 4e2bc98c..30721cdb 100644
--- a/player/build.gradle.kts
+++ b/player/build.gradle.kts
@@ -12,6 +12,7 @@ import org.gradle.api.tasks.TaskAction
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
+ alias(libs.plugins.kotlin.compose)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.kover)
@@ -149,6 +150,10 @@ android {
baseline = file("lint-baseline.xml")
warningsAsErrors = true
}
+
+ buildFeatures {
+ compose = true
+ }
}
kotlin {
@@ -182,6 +187,9 @@ dependencies {
implementation(project(":domain"))
+ implementation(platform(libs.compose.bom))
+ implementation(libs.compose.ui)
+
// Media3
implementation(libs.media3.exoplayer)
implementation(libs.media3.exoplayer.hls)
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 2fd69752..1504b423 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -585,6 +585,14 @@ class Media3PlayerEngine @Inject constructor(
enableMediaSession = enabled
}
+ override fun setAudioFocusBypassed(bypassed: Boolean) {
+ bypassAudioFocus = bypassed
+ }
+
+ override fun setResolutionConstrainedForMultiView(constrained: Boolean) {
+ constrainResolutionForMultiView = constrained
+ }
+
override fun setFastRetryOnTransientFailures(enabled: Boolean) {
fastRetryOnTransientFailures = enabled
}
diff --git a/player/src/main/java/com/streamvault/player/PlayerEngine.kt b/player/src/main/java/com/streamvault/player/PlayerEngine.kt
index 71b6ce96..f7a99d19 100644
--- a/player/src/main/java/com/streamvault/player/PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/PlayerEngine.kt
@@ -77,6 +77,8 @@ interface PlayerEngine {
fun setSurfaceMode(mode: PlayerSurfaceMode)
fun setVodHttpProtocolMode(mode: VodHttpProtocolMode)
fun setMediaSessionEnabled(enabled: Boolean)
+ fun setAudioFocusBypassed(bypassed: Boolean) {}
+ fun setResolutionConstrainedForMultiView(constrained: Boolean) {}
fun setFastRetryOnTransientFailures(enabled: Boolean)
fun setVolume(volume: Float)
fun setMuted(muted: Boolean)
diff --git a/app/src/main/java/com/streamvault/app/di/PlayerEngineQualifiers.kt b/player/src/main/java/com/streamvault/player/di/PlayerEngineQualifiers.kt
similarity index 69%
rename from app/src/main/java/com/streamvault/app/di/PlayerEngineQualifiers.kt
rename to player/src/main/java/com/streamvault/player/di/PlayerEngineQualifiers.kt
index a415e907..96df25b2 100644
--- a/app/src/main/java/com/streamvault/app/di/PlayerEngineQualifiers.kt
+++ b/player/src/main/java/com/streamvault/player/di/PlayerEngineQualifiers.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.di
+package com.streamvault.player.di
import javax.inject.Qualifier
@@ -8,4 +8,4 @@ annotation class MainPlayerEngine
@Qualifier
@Retention(AnnotationRetention.BINARY)
-annotation class AuxiliaryPlayerEngine
\ No newline at end of file
+annotation class AuxiliaryPlayerEngine
diff --git a/app/src/main/java/com/streamvault/app/ui/components/PlayerRenderView.kt b/player/src/main/java/com/streamvault/player/ui/PlayerRenderView.kt
similarity index 96%
rename from app/src/main/java/com/streamvault/app/ui/components/PlayerRenderView.kt
rename to player/src/main/java/com/streamvault/player/ui/PlayerRenderView.kt
index bfac4b90..d6b67042 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/PlayerRenderView.kt
+++ b/player/src/main/java/com/streamvault/player/ui/PlayerRenderView.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.components
+package com.streamvault.player.ui
import android.view.View
import androidx.compose.runtime.Composable
@@ -33,4 +33,4 @@ fun PlayerRenderView(
modifier = modifier
)
}
-}
\ No newline at end of file
+}
diff --git a/player/src/test/java/com/streamvault/player/PlayerEngineFeatureConfigurationTest.kt b/player/src/test/java/com/streamvault/player/PlayerEngineFeatureConfigurationTest.kt
new file mode 100644
index 00000000..bc07ddb7
--- /dev/null
+++ b/player/src/test/java/com/streamvault/player/PlayerEngineFeatureConfigurationTest.kt
@@ -0,0 +1,54 @@
+package com.streamvault.player
+
+import com.google.common.truth.Truth.assertThat
+import com.streamvault.domain.model.PlaybackCompatibilityKey
+import com.streamvault.domain.repository.PlaybackCompatibilityRepository
+import okhttp3.OkHttpClient
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+
+@RunWith(RobolectricTestRunner::class)
+class PlayerEngineFeatureConfigurationTest {
+
+ private val engine = Media3PlayerEngine(
+ context = RuntimeEnvironment.getApplication(),
+ okHttpClient = OkHttpClient(),
+ playbackCompatibilityRepository = NoOpPlaybackCompatibilityRepository,
+ audioCompatibilityMemoryStore = AudioCompatibilityMemoryStore(RuntimeEnvironment.getApplication()),
+ playbackSupportSnapshotStore = PlaybackSupportSnapshotStore(RuntimeEnvironment.getApplication())
+ )
+
+ @After
+ fun tearDown() {
+ engine.release()
+ }
+
+ @Test
+ fun `feature configuration APIs update Media3 audio focus and multiview resolution settings`() {
+ val featureEngine: PlayerEngine = engine
+
+ featureEngine.setAudioFocusBypassed(true)
+ featureEngine.setResolutionConstrainedForMultiView(true)
+
+ assertThat(engine.bypassAudioFocus).isTrue()
+ assertThat(engine.constrainResolutionForMultiView).isTrue()
+ }
+
+ private object NoOpPlaybackCompatibilityRepository : PlaybackCompatibilityRepository {
+ override suspend fun getKnownBadRecords(
+ deviceFingerprint: String,
+ streamType: String,
+ videoMimeType: String,
+ resolutionBucket: String
+ ) = emptyList<com.streamvault.domain.model.PlaybackCompatibilityRecord>()
+
+ override suspend fun recordFailure(key: PlaybackCompatibilityKey, failureType: String, at: Long) = Unit
+
+ override suspend fun recordSuccess(key: PlaybackCompatibilityKey, at: Long) = Unit
+
+ override suspend fun prune(maxRecords: Int, olderThanMs: Long) = Unit
+ }
+}