Skip to content

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

Add phone and tablet support with TV-safe layouts

Davidona8924aed5b0de
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e0c711e..3a1e1435 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
<uses-feature
android:name="android.software.leanback"
- android:required="true" />
+ android:required="false" />
<uses-feature
android:name="android.hardware.touchscreen"
diff --git a/app/src/main/java/com/streamvault/app/MainActivity.kt b/app/src/main/java/com/streamvault/app/MainActivity.kt
index 4d6d9bc8..108d7ab3 100644
--- a/app/src/main/java/com/streamvault/app/MainActivity.kt
+++ b/app/src/main/java/com/streamvault/app/MainActivity.kt
@@ -12,6 +12,7 @@ import androidx.activity.compose.setContent
import androidx.lifecycle.lifecycleScope
import com.streamvault.app.cast.CastManager
import com.streamvault.app.cast.CastRouteChooserActivity
+import com.streamvault.app.device.isTelevisionDevice
import com.streamvault.app.navigation.AppNavigation
import com.streamvault.app.navigation.ExternalNavigationRequest
import com.streamvault.app.navigation.PlayerNavigationRequest
@@ -95,10 +96,12 @@ class MainActivity : ComponentActivity() {
_pictureInPictureModeFlow.value = isInPictureInPictureMode
handleExternalIntent(intent)
castManager.ensureInitialized()
- lifecycleScope.launch {
- watchNextManager.refreshWatchNext()
- launcherRecommendationsManager.refreshRecommendations()
- tvInputChannelSyncManager.refreshTvInputCatalog()
+ if (isTelevisionDevice()) {
+ lifecycleScope.launch {
+ watchNextManager.refreshWatchNext()
+ launcherRecommendationsManager.refreshRecommendations()
+ tvInputChannelSyncManager.refreshTvInputCatalog()
+ }
}
setContent {
val appLanguage by preferencesRepository.appLanguage.collectAsState(initial = "system")
diff --git a/app/src/main/java/com/streamvault/app/device/DeviceSupport.kt b/app/src/main/java/com/streamvault/app/device/DeviceSupport.kt
new file mode 100644
index 00000000..680ba98f
--- /dev/null
+++ b/app/src/main/java/com/streamvault/app/device/DeviceSupport.kt
@@ -0,0 +1,38 @@
+package com.streamvault.app.device
+
+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
+
+fun Context.isTelevisionDevice(): Boolean {
+ val packageManager = packageManager
+ if (packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+ return true
+ }
+ if (packageManager.hasSystemFeature("android.software.leanback_only")) {
+ return true
+ }
+ if (packageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+ return true
+ }
+ if (packageManager.hasSystemFeature("amazon.hardware.fire_tv")) {
+ return true
+ }
+ val uiModeManager = getSystemService(Context.UI_MODE_SERVICE) as? UiModeManager
+ if (uiModeManager?.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION) {
+ return true
+ }
+
+ val screenWidthDp = resources.configuration.screenWidthDp
+ return !packageManager.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN) && screenWidthDp >= 900
+}
+
+@Composable
+fun rememberIsTelevisionDevice(): Boolean {
+ val context = LocalContext.current
+ return remember(context) { context.isTelevisionDevice() }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/streamvault/app/tv/LauncherRecommendationsManager.kt b/app/src/main/java/com/streamvault/app/tv/LauncherRecommendationsManager.kt
index dc74c5dc..ad98b86b 100644
--- a/app/src/main/java/com/streamvault/app/tv/LauncherRecommendationsManager.kt
+++ b/app/src/main/java/com/streamvault/app/tv/LauncherRecommendationsManager.kt
@@ -12,6 +12,7 @@ import android.provider.BaseColumns
import android.util.Log
import com.streamvault.app.MainActivity
import com.streamvault.app.R
+import com.streamvault.app.device.isTelevisionDevice
import com.streamvault.app.navigation.PlayerNavigationRequest
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.PlaybackHistory
@@ -38,6 +39,7 @@ class LauncherRecommendationsManager @Inject constructor(
private val getRecommendations = GetRecommendations(movieRepository)
suspend fun refreshRecommendations() {
+ if (!context.isTelevisionDevice()) return
val provider = providerRepository.getActiveProvider().first()
if (provider == null) {
deleteAllManagedChannels()
diff --git a/app/src/main/java/com/streamvault/app/tv/WatchNextManager.kt b/app/src/main/java/com/streamvault/app/tv/WatchNextManager.kt
index 68ab5be4..8e856daf 100644
--- a/app/src/main/java/com/streamvault/app/tv/WatchNextManager.kt
+++ b/app/src/main/java/com/streamvault/app/tv/WatchNextManager.kt
@@ -10,6 +10,7 @@ import android.provider.BaseColumns
import android.util.Log
import com.streamvault.app.MainActivity
import com.streamvault.app.R
+import com.streamvault.app.device.isTelevisionDevice
import com.streamvault.app.navigation.PlayerNavigationRequest
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.PlaybackHistory
@@ -26,6 +27,7 @@ class WatchNextManager @Inject constructor(
) {
suspend fun refreshWatchNext() {
+ if (!context.isTelevisionDevice()) return
val historyEntries = playbackHistoryRepository.getRecentlyWatched(limit = 40)
.first()
.asSequence()
diff --git a/app/src/main/java/com/streamvault/app/tvinput/TvInputChannelSyncManager.kt b/app/src/main/java/com/streamvault/app/tvinput/TvInputChannelSyncManager.kt
index 02b08efc..715590a3 100644
--- a/app/src/main/java/com/streamvault/app/tvinput/TvInputChannelSyncManager.kt
+++ b/app/src/main/java/com/streamvault/app/tvinput/TvInputChannelSyncManager.kt
@@ -10,6 +10,7 @@ import android.media.tv.TvContract
import android.provider.BaseColumns
import android.util.Log
import com.streamvault.app.MainActivity
+import com.streamvault.app.device.isTelevisionDevice
import com.streamvault.app.navigation.PlayerNavigationRequest
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Program
@@ -39,6 +40,9 @@ class TvInputChannelSyncManager @Inject constructor(
suspend fun refreshTvInputCatalogResult(): Result<Unit> = withContext(Dispatchers.IO) {
runCatching {
+ if (!context.isTelevisionDevice()) {
+ return@runCatching
+ }
val provider = providerRepository.getActiveProvider().first()
if (provider == null) {
deleteManagedChannels()
diff --git a/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt b/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
index 8fb79ffc..80e5bec3 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
@@ -20,6 +20,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.tv.material3.ClickableSurfaceDefaults
@@ -44,6 +45,8 @@ fun PlaylistSwitcher(
) {
var showProviderList by remember { mutableStateOf(false) }
var isFocused by remember { mutableStateOf(false) }
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val dropdownWidth = if (screenWidth < 700.dp) 180.dp else 250.dp
BackHandler(enabled = showProviderList) { showProviderList = false }
@@ -84,7 +87,7 @@ fun PlaylistSwitcher(
Surface(
modifier = Modifier
.padding(top = 48.dp)
- .width(250.dp),
+ .width(dropdownWidth),
shape = RoundedCornerShape(8.dp),
colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)
) {
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
index 5a06d9d0..06bce975 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
@@ -16,6 +16,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.focusRestorer
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.res.stringResource
@@ -54,6 +55,9 @@ fun SavedCategoryShortcutsRow(
onShortcutClick: (String) -> Unit,
modifier: Modifier = Modifier
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val shortcutWidth = if (screenWidth < 700.dp) 156.dp else 192.dp
+
Column(modifier = modifier.fillMaxWidth()) {
Row(
modifier = Modifier
@@ -112,7 +116,7 @@ fun SavedCategoryShortcutsRow(
item(key = "primary_shortcut") {
Surface(
onClick = onPrimaryShortcutClick,
- modifier = Modifier.width(192.dp),
+ modifier = Modifier.width(shortcutWidth),
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = if (isPrimaryShortcutSelected) {
@@ -160,7 +164,7 @@ fun SavedCategoryShortcutsRow(
onLongClick = onShortcutLongClick?.let { handler ->
{ handler(shortcut.name) }
},
- modifier = Modifier.width(192.dp),
+ modifier = Modifier.width(shortcutWidth),
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = if (isSelected) Primary.copy(alpha = 0.18f) else SurfaceElevated,
diff --git a/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt b/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt
index 03d2cb57..97eb2833 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/TvEmptyState.kt
@@ -4,6 +4,7 @@ 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.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
@@ -28,14 +29,15 @@ fun TvEmptyState(
subtitle: String,
modifier: Modifier = Modifier
) {
- Box(
+ BoxWithConstraints(
modifier = modifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
+ val contentWidthFraction = if (maxWidth < 700.dp) 0.9f else 0.62f
AppMessageState(
title = title,
subtitle = subtitle,
- modifier = Modifier.fillMaxWidth(0.62f),
+ modifier = Modifier.fillMaxWidth(contentWidthFraction),
containerBrush = Brush.horizontalGradient(
listOf(
Color.White.copy(alpha = 0.05f),
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
index bf5f82d3..516db87e 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.foundation.shape.CircleShape
import kotlinx.coroutines.delay
import androidx.tv.material3.*
+import com.streamvault.app.device.rememberIsTelevisionDevice
import android.view.KeyEvent as AndroidKeyEvent
@Composable
@@ -47,6 +48,7 @@ fun AddToGroupDialog(
onOpenSplitScreenPlanner: (() -> Unit)? = null
) {
var showCreateGroup by remember { mutableStateOf(false) }
+ val isTelevisionDevice = rememberIsTelevisionDevice()
val contentFocusRequester = remember { FocusRequester() } // focuses first interactive item, not close button
// Ghost-click debounce
@@ -91,38 +93,44 @@ fun AddToGroupDialog(
onDismissRequest = safeDismiss,
properties = DialogProperties(usePlatformDefaultWidth = false)
) {
- Surface(
- shape = RoundedCornerShape(16.dp),
- colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated),
- modifier = Modifier
- .width(400.dp)
- .padding(16.dp)
- .onPreviewKeyEvent(blockOpenGesture)
- ) {
- Column(modifier = Modifier.padding(24.dp)) {
- // Header
- Row(
- modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Text(
- text = stringResource(R.string.add_group_manage_title, contentTitle),
- style = MaterialTheme.typography.titleLarge,
- color = AppColors.TextPrimary,
- modifier = Modifier.weight(1f)
- )
- IconButton(
- onClick = safeDismiss
+ val dialogModifier = if (isTelevisionDevice) {
+ Modifier.width(400.dp)
+ } else {
+ Modifier
+ }
+
+ val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
+ Surface(
+ shape = RoundedCornerShape(16.dp),
+ colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated),
+ modifier = resolvedModifier
+ .padding(16.dp)
+ .onPreviewKeyEvent(blockOpenGesture)
+ ) {
+ Column(modifier = Modifier.padding(24.dp)) {
+ // Header
+ Row(
+ modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
) {
- Icon(Icons.Default.Close, contentDescription = stringResource(R.string.add_group_close_cd))
+ Text(
+ text = stringResource(R.string.add_group_manage_title, contentTitle),
+ style = MaterialTheme.typography.titleLarge,
+ color = AppColors.TextPrimary,
+ modifier = Modifier.weight(1f)
+ )
+ IconButton(
+ onClick = safeDismiss
+ ) {
+ Icon(Icons.Default.Close, contentDescription = stringResource(R.string.add_group_close_cd))
+ }
}
- }
- LazyColumn(
- modifier = Modifier.weight(1f, fill = false),
- verticalArrangement = Arrangement.spacedBy(8.dp)
- ) {
+ LazyColumn(
+ modifier = Modifier.weight(1f, fill = false),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
// ── Favorites ────────────────────────────────
item {
var isFocused by remember { mutableStateOf(false) }
@@ -298,7 +306,24 @@ fun AddToGroupDialog(
Text(stringResource(R.string.add_group_create_new_btn))
}
}
+ }
+ }
+ }
+ }
+
+ if (isTelevisionDevice) {
+ dialogContent(dialogModifier)
+ } else {
+ BoxWithConstraints(
+ modifier = Modifier.fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ val responsiveModifier = when {
+ maxWidth < 700.dp -> Modifier.fillMaxWidth(0.92f)
+ maxWidth < 1280.dp -> Modifier.fillMaxWidth(0.58f)
+ else -> Modifier.width(400.dp)
}
+ dialogContent(responsiveModifier)
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
index 6f46c652..a061ad3f 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
@@ -2,6 +2,7 @@ package com.streamvault.app.ui.components.dialogs
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,6 +19,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
@@ -36,6 +38,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.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.theme.OnSurface
import com.streamvault.app.ui.theme.OnSurfaceDim
import com.streamvault.app.ui.theme.Primary
@@ -50,6 +53,7 @@ fun CreateGroupDialog(
var canInteract by remember { mutableStateOf(false) }
val focusRequester = remember { FocusRequester() }
val keyboardController = LocalSoftwareKeyboardController.current
+ val isTelevisionDevice = rememberIsTelevisionDevice()
LaunchedEffect(Unit) {
runCatching { focusRequester.requestFocus() }
@@ -65,24 +69,25 @@ fun CreateGroupDialog(
},
properties = DialogProperties(usePlatformDefaultWidth = false)
) {
- Surface(
- modifier = Modifier.fillMaxWidth(0.42f),
- shape = RoundedCornerShape(24.dp),
- colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)
- ) {
- Column(
- modifier = Modifier
- .background(
- Brush.verticalGradient(
- listOf(
- Primary.copy(alpha = 0.08f),
- Color.Transparent
+ val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
+ Surface(
+ modifier = resolvedModifier,
+ shape = RoundedCornerShape(24.dp),
+ colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)
+ ) {
+ Column(
+ modifier = Modifier
+ .background(
+ Brush.verticalGradient(
+ listOf(
+ Primary.copy(alpha = 0.08f),
+ Color.Transparent
+ )
)
)
- )
- .padding(28.dp),
- verticalArrangement = Arrangement.spacedBy(16.dp)
- ) {
+ .padding(28.dp),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
Text(
text = stringResource(R.string.add_group_create_new_btn),
style = MaterialTheme.typography.headlineMedium,
@@ -158,6 +163,23 @@ fun CreateGroupDialog(
Text(stringResource(R.string.add_group_create))
}
}
+ }
+ }
+ }
+
+ if (isTelevisionDevice) {
+ dialogContent(Modifier.fillMaxWidth(0.42f))
+ } else {
+ BoxWithConstraints(
+ modifier = Modifier.fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ val dialogModifier = when {
+ maxWidth < 700.dp -> Modifier.fillMaxWidth(0.9f)
+ maxWidth < 1280.dp -> Modifier.fillMaxWidth(0.58f)
+ else -> Modifier.fillMaxWidth(0.42f)
+ }
+ dialogContent(dialogModifier)
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
index ce61b13d..b6909527 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
@@ -2,6 +2,7 @@ package com.streamvault.app.ui.components.dialogs
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
@@ -13,6 +14,7 @@ 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.graphics.Brush
import androidx.compose.ui.graphics.Color
@@ -27,6 +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.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.theme.ErrorColor
import com.streamvault.app.ui.theme.OnSurface
import com.streamvault.app.ui.theme.OnSurfaceDim
@@ -40,6 +43,7 @@ fun DeleteGroupDialog(
onConfirmDelete: () -> Unit
) {
var canInteract by remember { mutableStateOf(false) }
+ val isTelevisionDevice = rememberIsTelevisionDevice()
LaunchedEffect(Unit) {
delay(500)
canInteract = true
@@ -51,24 +55,25 @@ fun DeleteGroupDialog(
onDismissRequest = safeDismiss,
properties = DialogProperties(usePlatformDefaultWidth = false)
) {
- Surface(
- modifier = Modifier.fillMaxWidth(0.38f),
- shape = RoundedCornerShape(24.dp),
- colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)
- ) {
- Column(
- modifier = Modifier
- .background(
- Brush.verticalGradient(
- listOf(
- ErrorColor.copy(alpha = 0.10f),
- Color.Transparent
+ val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
+ Surface(
+ modifier = resolvedModifier,
+ shape = RoundedCornerShape(24.dp),
+ colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)
+ ) {
+ Column(
+ modifier = Modifier
+ .background(
+ Brush.verticalGradient(
+ listOf(
+ ErrorColor.copy(alpha = 0.10f),
+ Color.Transparent
+ )
)
)
- )
- .padding(28.dp),
- verticalArrangement = Arrangement.spacedBy(14.dp)
- ) {
+ .padding(28.dp),
+ verticalArrangement = Arrangement.spacedBy(14.dp)
+ ) {
Text(
text = stringResource(R.string.home_delete_group_title),
style = MaterialTheme.typography.headlineMedium,
@@ -102,6 +107,23 @@ fun DeleteGroupDialog(
Text(stringResource(R.string.home_delete_group_confirm))
}
}
+ }
+ }
+ }
+
+ if (isTelevisionDevice) {
+ dialogContent(Modifier.fillMaxWidth(0.38f))
+ } else {
+ BoxWithConstraints(
+ modifier = Modifier.fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ val dialogModifier = when {
+ maxWidth < 700.dp -> Modifier.fillMaxWidth(0.9f)
+ maxWidth < 1280.dp -> Modifier.fillMaxWidth(0.56f)
+ else -> Modifier.fillMaxWidth(0.38f)
+ }
+ dialogContent(dialogModifier)
}
}
}
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 3526014a..aa85ed70 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
@@ -19,6 +19,7 @@ import androidx.compose.ui.graphics.Color
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.app.ui.theme.ErrorColor
import com.streamvault.app.ui.theme.FocusBorder
import com.streamvault.app.ui.theme.Primary
@@ -45,6 +46,7 @@ fun PinDialog(
var pin by remember { mutableStateOf("") }
var canInteract by remember { mutableStateOf(false) }
val firstKeyFocusRequester = remember { FocusRequester() }
+ val isTelevisionDevice = rememberIsTelevisionDevice()
LaunchedEffect(Unit) {
firstKeyFocusRequester.requestFocusSafely(tag = "PinDialog", target = "PIN keypad")
@@ -65,112 +67,126 @@ fun PinDialog(
onDismissRequest = { if (canInteract) onDismissRequest() },
properties = DialogProperties(usePlatformDefaultWidth = false)
) {
- Box(
- modifier = Modifier
- .width(360.dp)
- .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)
+ val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
+ Box(
+ modifier = resolvedModifier
+ .background(SurfaceElevated, RoundedCornerShape(16.dp))
+ .border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(16.dp))
+ .padding(24.dp),
+ contentAlignment = Alignment.Center
) {
- Text(
- text = title ?: stringResource(R.string.pin_dialog_title),
- style = MaterialTheme.typography.titleLarge,
- color = Color.White
- )
-
- // PIN dot indicators
- Row(
- horizontalArrangement = Arrangement.spacedBy(16.dp),
- verticalAlignment = Alignment.CenterVertically
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(20.dp)
) {
- 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
+ text = title ?: stringResource(R.string.pin_dialog_title),
+ style = MaterialTheme.typography.titleLarge,
+ color = Color.White
)
- }
- // D-pad numeric keypad: 1–9, then [blank] 0 [⌫]
- val keys = listOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "⌫")
- 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 = {
- if (!canInteract) return@Button
- if (key == "⌫") {
- if (pin.isNotEmpty()) pin = pin.dropLast(1)
- } else if (pin.length < 4) {
- pin += key
- }
- },
- modifier = Modifier
- .fillMaxWidth()
- .then(if (isFirst) Modifier.focusRequester(firstKeyFocusRequester) else Modifier),
- 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
- )
+ 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", "⌫")
+ 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 = {
+ if (!canInteract) return@Button
+ if (key == "⌫") {
+ if (pin.isNotEmpty()) pin = pin.dropLast(1)
+ } else if (pin.length < 4) {
+ pin += key
+ }
+ },
+ modifier = Modifier
+ .fillMaxWidth()
+ .then(if (isFirst) Modifier.focusRequester(firstKeyFocusRequester) else Modifier),
+ 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
+ )
+ }
}
}
}
}
}
}
+
+ Button(
+ onClick = { if (canInteract) onDismissRequest() },
+ 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))
+ }
}
+ }
+ }
- // Cancel
- Button(
- onClick = { if (canInteract) onDismissRequest() },
- 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)
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
index 5a576e68..706b30de 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.components.dialogs
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
@@ -16,6 +17,7 @@ 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 kotlinx.coroutines.delay
import androidx.compose.ui.graphics.Brush
@@ -29,6 +31,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.app.ui.design.AppColors
import com.streamvault.app.ui.design.FocusSpec
@@ -43,52 +46,110 @@ fun PremiumDialog(
footer: @Composable RowScope.() -> Unit = {}
) {
var canInteract by remember { mutableStateOf(false) }
+ val isTelevisionDevice = rememberIsTelevisionDevice()
LaunchedEffect(Unit) { delay(500); canInteract = true }
Dialog(
onDismissRequest = { if (canInteract) onDismissRequest() },
properties = DialogProperties(usePlatformDefaultWidth = false)
) {
- Surface(
- modifier = modifier.fillMaxWidth(widthFraction),
- shape = RoundedCornerShape(28.dp),
- colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated)
- ) {
- Column(
- modifier = Modifier
- .background(
- Brush.verticalGradient(
- colors = listOf(
- AppColors.BrandMuted.copy(alpha = 0.18f),
- AppColors.SurfaceElevated,
- AppColors.Surface
+ if (isTelevisionDevice) {
+ Surface(
+ modifier = modifier.fillMaxWidth(widthFraction),
+ shape = RoundedCornerShape(28.dp),
+ colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated)
+ ) {
+ Column(
+ modifier = Modifier
+ .background(
+ Brush.verticalGradient(
+ colors = listOf(
+ AppColors.BrandMuted.copy(alpha = 0.18f),
+ AppColors.SurfaceElevated,
+ AppColors.Surface
+ )
)
)
- )
- .padding(28.dp),
- verticalArrangement = Arrangement.spacedBy(18.dp)
- ) {
- Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
- Text(
- text = title,
- style = MaterialTheme.typography.headlineMedium,
- color = AppColors.TextPrimary
- )
- if (!subtitle.isNullOrBlank()) {
+ .padding(28.dp),
+ verticalArrangement = Arrangement.spacedBy(18.dp)
+ ) {
+ Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text(
- text = subtitle,
- style = MaterialTheme.typography.bodyMedium,
- color = AppColors.TextSecondary
+ text = title,
+ style = MaterialTheme.typography.headlineMedium,
+ color = AppColors.TextPrimary
)
+ if (!subtitle.isNullOrBlank()) {
+ Text(
+ text = subtitle,
+ style = MaterialTheme.typography.bodyMedium,
+ color = AppColors.TextSecondary
+ )
+ }
}
+
+ Column(verticalArrangement = Arrangement.spacedBy(12.dp), content = content)
+
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(10.dp, androidx.compose.ui.Alignment.End),
+ content = footer
+ )
}
+ }
+ } else {
+ BoxWithConstraints(
+ modifier = Modifier.fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ val resolvedWidthFraction = when {
+ maxWidth < 700.dp -> 0.9f
+ maxWidth < 1000.dp -> maxOf(widthFraction, 0.62f)
+ else -> widthFraction
+ }
+
+ Surface(
+ modifier = modifier.fillMaxWidth(resolvedWidthFraction),
+ shape = RoundedCornerShape(28.dp),
+ colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated)
+ ) {
+ Column(
+ modifier = Modifier
+ .background(
+ Brush.verticalGradient(
+ colors = listOf(
+ AppColors.BrandMuted.copy(alpha = 0.18f),
+ AppColors.SurfaceElevated,
+ AppColors.Surface
+ )
+ )
+ )
+ .padding(28.dp),
+ verticalArrangement = Arrangement.spacedBy(18.dp)
+ ) {
+ Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+ Text(
+ text = title,
+ style = MaterialTheme.typography.headlineMedium,
+ color = AppColors.TextPrimary
+ )
+ if (!subtitle.isNullOrBlank()) {
+ Text(
+ text = subtitle,
+ style = MaterialTheme.typography.bodyMedium,
+ color = AppColors.TextSecondary
+ )
+ }
+ }
- Column(verticalArrangement = Arrangement.spacedBy(12.dp), content = content)
+ Column(verticalArrangement = Arrangement.spacedBy(12.dp), content = content)
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.spacedBy(10.dp, androidx.compose.ui.Alignment.End),
- content = footer
- )
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(10.dp, androidx.compose.ui.Alignment.End),
+ content = footer
+ )
+ }
+ }
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
index 84108194..f711c66f 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
@@ -4,6 +4,7 @@ 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.fillMaxWidth
@@ -37,6 +38,7 @@ import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
+import com.streamvault.app.device.rememberIsTelevisionDevice
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@@ -56,6 +58,7 @@ fun ProgramHistoryDialog(
) {
val focusRequester = remember { FocusRequester() }
var canInteract by remember { mutableStateOf(false) }
+ val isTelevisionDevice = rememberIsTelevisionDevice()
val locale = Locale.getDefault()
val zoneId = remember { ZoneId.systemDefault() }
val timeFormat = remember(locale) { DateTimeFormatter.ofPattern("HH:mm", locale) }
@@ -68,15 +71,13 @@ fun ProgramHistoryDialog(
}
Dialog(onDismissRequest = { if (canInteract) onDismiss() }) {
- Surface(
- shape = RoundedCornerShape(16.dp),
- colors = SurfaceDefaults.colors(containerColor = MaterialTheme.colorScheme.surface),
- modifier = Modifier
- .width(450.dp)
- .heightIn(max = 600.dp)
- .padding(16.dp)
- ) {
- Column(modifier = Modifier.padding(24.dp)) {
+ val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
+ Surface(
+ shape = RoundedCornerShape(16.dp),
+ colors = SurfaceDefaults.colors(containerColor = MaterialTheme.colorScheme.surface),
+ modifier = resolvedModifier
+ ) {
+ Column(modifier = Modifier.padding(24.dp)) {
Row(
modifier = Modifier
.fillMaxWidth()
@@ -180,6 +181,37 @@ fun ProgramHistoryDialog(
}
}
}
+ }
+ }
+ }
+
+ if (isTelevisionDevice) {
+ dialogContent(
+ Modifier
+ .width(450.dp)
+ .heightIn(max = 600.dp)
+ .padding(16.dp)
+ )
+ } else {
+ BoxWithConstraints(
+ modifier = Modifier.fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ val dialogModifier = when {
+ maxWidth < 700.dp -> Modifier
+ .fillMaxWidth(0.9f)
+ .heightIn(max = 600.dp)
+ .padding(16.dp)
+ maxWidth < 1280.dp -> Modifier
+ .fillMaxWidth(0.58f)
+ .heightIn(max = 650.dp)
+ .padding(16.dp)
+ else -> Modifier
+ .width(450.dp)
+ .heightIn(max = 600.dp)
+ .padding(16.dp)
+ }
+ dialogContent(dialogModifier)
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
index 0a4ca1c9..619e32e0 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,6 +19,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
@@ -41,6 +43,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.ui.design.requestFocusSafely
import com.streamvault.app.ui.design.FocusSpec
import com.streamvault.app.R
+import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.theme.FocusBorder
import com.streamvault.app.ui.theme.OnSurface
import com.streamvault.app.ui.theme.OnSurfaceDim
@@ -58,6 +61,7 @@ fun RenameGroupDialog(
var canInteract by remember { mutableStateOf(false) }
val focusRequester = remember { FocusRequester() }
val keyboardController = LocalSoftwareKeyboardController.current
+ val isTelevisionDevice = rememberIsTelevisionDevice()
LaunchedEffect(Unit) {
focusRequester.requestFocusSafely(tag = "RenameGroupDialog", target = "Rename group field")
@@ -75,24 +79,25 @@ fun RenameGroupDialog(
},
properties = DialogProperties(usePlatformDefaultWidth = false)
) {
- Surface(
- modifier = Modifier.fillMaxWidth(0.42f),
- shape = RoundedCornerShape(24.dp),
- colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)
- ) {
- Column(
- modifier = Modifier
- .background(
- Brush.verticalGradient(
- listOf(
- Primary.copy(alpha = 0.08f),
- Color.Transparent
+ val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
+ Surface(
+ modifier = resolvedModifier,
+ shape = RoundedCornerShape(24.dp),
+ colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)
+ ) {
+ Column(
+ modifier = Modifier
+ .background(
+ Brush.verticalGradient(
+ listOf(
+ Primary.copy(alpha = 0.08f),
+ Color.Transparent
+ )
)
)
- )
- .padding(28.dp),
- verticalArrangement = Arrangement.spacedBy(16.dp)
- ) {
+ .padding(28.dp),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
Text(
text = stringResource(R.string.category_options_rename),
style = MaterialTheme.typography.headlineMedium,
@@ -187,6 +192,23 @@ fun RenameGroupDialog(
Text(stringResource(R.string.add_group_rename))
}
}
+ }
+ }
+ }
+
+ if (isTelevisionDevice) {
+ dialogContent(Modifier.fillMaxWidth(0.42f))
+ } else {
+ BoxWithConstraints(
+ modifier = Modifier.fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ val dialogModifier = when {
+ maxWidth < 700.dp -> Modifier.fillMaxWidth(0.9f)
+ maxWidth < 1280.dp -> Modifier.fillMaxWidth(0.58f)
+ else -> Modifier.fillMaxWidth(0.42f)
+ }
+ dialogContent(dialogModifier)
}
}
}
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 4036acd4..0aac319a 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
@@ -32,6 +32,7 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
@@ -302,6 +303,8 @@ fun SeriesPosterCard(series: Series, modifier: Modifier = Modifier) {
@Composable
fun EpisodeRowCard(episode: Episode, modifier: Modifier = Modifier) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val previewWidth = if (screenWidth < 700.dp) 124.dp else 164.dp
Box(
modifier = modifier
.fillMaxWidth()
@@ -312,7 +315,7 @@ fun EpisodeRowCard(episode: Episode, modifier: Modifier = Modifier) {
Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically) {
Box(
modifier = Modifier
- .width(164.dp)
+ .width(previewWidth)
.aspectRatio(16f / 9f)
.clip(RoundedCornerShape(12.dp))
.background(AppColors.SurfaceEmphasis),
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 51b1d077..ad8dd1dd 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
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
@@ -27,6 +28,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
+import com.streamvault.app.device.rememberIsTelevisionDevice
import androidx.tv.material3.Border
import androidx.tv.material3.Button
import androidx.tv.material3.ButtonDefaults
@@ -61,22 +63,45 @@ fun LibraryBrowseScaffold(
modifier = modifier,
header = header
) {
- Row(modifier = Modifier.fillMaxSize()) {
- Column(
- modifier = Modifier
- .width(312.dp)
- .fillMaxHeight()
- ) {
- railContent()
- }
- Spacer(modifier = Modifier.width(spacing.lg))
- Column(
- modifier = Modifier
- .weight(1f)
- .fillMaxHeight(),
- verticalArrangement = Arrangement.spacedBy(spacing.lg)
- ) {
- content()
+ BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val useStackedLayout = !isTelevisionDevice && maxWidth < 900.dp
+ if (useStackedLayout) {
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.spacedBy(spacing.md)
+ ) {
+ Column(modifier = Modifier.fillMaxWidth()) {
+ railContent()
+ }
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .weight(1f),
+ verticalArrangement = Arrangement.spacedBy(spacing.lg)
+ ) {
+ content()
+ }
+ }
+ } else {
+ Row(modifier = Modifier.fillMaxSize()) {
+ Column(
+ modifier = Modifier
+ .width(312.dp)
+ .fillMaxHeight()
+ ) {
+ railContent()
+ }
+ Spacer(modifier = Modifier.width(spacing.lg))
+ Column(
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxHeight(),
+ verticalArrangement = Arrangement.spacedBy(spacing.lg)
+ ) {
+ content()
+ }
+ }
}
}
}
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 ecacf695..737b4967 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
@@ -2,6 +2,7 @@ package com.streamvault.app.ui.components.shell
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.PaddingValues
import androidx.compose.foundation.layout.Row
@@ -27,6 +28,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.res.stringResource
+import com.streamvault.app.device.rememberIsTelevisionDevice
import androidx.tv.material3.Border
import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
@@ -215,49 +217,58 @@ fun VodCategoryPickerDialog(
)
}
} else {
- LazyColumn(
- modifier = Modifier.height(420.dp),
- verticalArrangement = Arrangement.spacedBy(8.dp)
- ) {
- items(filteredCategories, key = { it.name }) { category ->
- Surface(
- onClick = {
- category.onClick()
- onDismiss()
- },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = SurfaceElevated,
- focusedContainerColor = SurfaceHighlight
- ),
- border = ClickableSurfaceDefaults.border(
- focusedBorder = Border(
- border = BorderStroke(2.dp, FocusBorder),
- shape = RoundedCornerShape(14.dp)
- )
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
- ) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 16.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
+ BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val listHeight = when {
+ maxWidth < 700.dp -> 300.dp
+ !isTelevisionDevice && maxWidth < 1280.dp -> 360.dp
+ else -> 420.dp
+ }
+
+ LazyColumn(
+ modifier = Modifier.height(listHeight),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ items(filteredCategories, key = { it.name }) { category ->
+ Surface(
+ onClick = {
+ category.onClick()
+ onDismiss()
+ },
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = SurfaceElevated,
+ focusedContainerColor = SurfaceHighlight
+ ),
+ border = ClickableSurfaceDefaults.border(
+ focusedBorder = Border(
+ border = BorderStroke(2.dp, FocusBorder),
+ shape = RoundedCornerShape(14.dp)
+ )
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
- Text(
- text = category.name,
- style = MaterialTheme.typography.bodyLarge,
- color = TextPrimary,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- modifier = Modifier.weight(1f)
- )
- Text(
- text = category.count.toString(),
- style = MaterialTheme.typography.labelMedium,
- color = OnSurfaceDim
- )
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 12.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = category.name,
+ style = MaterialTheme.typography.bodyLarge,
+ color = TextPrimary,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.weight(1f)
+ )
+ Text(
+ text = category.count.toString(),
+ style = MaterialTheme.typography.labelMedium,
+ color = OnSurfaceDim
+ )
+ }
}
}
}
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 4ac25be6..c7e6e610 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
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.dashboard
import androidx.compose.foundation.background
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.PaddingValues
import androidx.compose.foundation.layout.Row
@@ -31,6 +32,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -44,6 +46,7 @@ import androidx.tv.material3.SurfaceDefaults
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.app.navigation.Routes
import com.streamvault.app.ui.components.CategoryRow
@@ -210,6 +213,13 @@ private fun DashboardHero(
onOpenSavedLibrary: () -> Unit,
onFeatureAction: () -> Unit
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val heroHeight = when {
+ screenWidth < 700.dp -> 176.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 196.dp
+ else -> 220.dp
+ }
Box(
modifier = Modifier
.fillMaxWidth()
@@ -222,13 +232,13 @@ private fun DashboardHero(
contentScale = ContentScale.Crop,
modifier = Modifier
.fillMaxWidth()
- .height(220.dp)
+ .height(heroHeight)
.clip(RoundedCornerShape(28.dp))
)
Box(
modifier = Modifier
.fillMaxWidth()
- .height(220.dp)
+ .height(heroHeight)
.clip(RoundedCornerShape(28.dp))
.background(
Brush.horizontalGradient(
@@ -248,7 +258,7 @@ private fun DashboardHero(
subtitle = feature.summary.ifBlank { stringResource(R.string.dashboard_subtitle, providerName) },
modifier = Modifier
.fillMaxWidth()
- .height(220.dp),
+ .height(heroHeight),
footer = {
Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
@@ -354,6 +364,13 @@ private fun DashboardShortcutCard(
shortcut: DashboardLiveShortcut,
onClick: () -> Unit
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val cardWidth = when {
+ screenWidth < 700.dp -> 148.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 160.dp
+ else -> 170.dp
+ }
val accentColor = when (shortcut.type) {
DashboardShortcutType.FAVORITES -> Color(0xFFFFC857)
DashboardShortcutType.RECENT -> Color(0xFF4FD1C5)
@@ -364,7 +381,7 @@ private fun DashboardShortcutCard(
Surface(
onClick = onClick,
modifier = Modifier
- .width(170.dp)
+ .width(cardWidth)
.height(76.dp),
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(16.dp)),
colors = ClickableSurfaceDefaults.colors(
@@ -606,10 +623,19 @@ private fun EmptyDashboard(
onAddProvider: () -> Unit,
onOpenSettings: () -> Unit
) {
- Box(
+ BoxWithConstraints(
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val contentModifier = if (maxWidth < 900.dp) {
+ Modifier.fillMaxWidth(0.9f)
+ } else if (!isTelevisionDevice && maxWidth < 1280.dp) {
+ Modifier.fillMaxWidth(0.76f)
+ } else {
+ Modifier.width(720.dp)
+ }
+
Surface(
shape = RoundedCornerShape(28.dp),
colors = SurfaceDefaults.colors(
@@ -617,8 +643,7 @@ private fun EmptyDashboard(
)
) {
Column(
- modifier = Modifier
- .width(720.dp)
+ modifier = contentModifier
.padding(horizontal = 32.dp, vertical = 28.dp),
verticalArrangement = Arrangement.spacedBy(16.dp),
horizontalAlignment = Alignment.Start
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 eb0eb1d3..08aa5e5d 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
@@ -6,6 +6,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
@@ -52,6 +53,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.device.rememberIsTelevisionDevice
import com.streamvault.app.navigation.Routes
import com.streamvault.app.ui.components.SearchInput
import com.streamvault.app.ui.components.SelectionChip
@@ -283,21 +285,35 @@ fun FullEpgScreen(
.clickable(onClick = { selectedProgram = null }, indication = null, interactionSource = remember { androidx.compose.foundation.interaction.MutableInteractionSource() }),
contentAlignment = Alignment.CenterEnd
) {
- Surface(
- modifier = Modifier
- .width(520.dp)
- .fillMaxHeight()
- .padding(vertical = 24.dp, horizontal = 24.dp),
- colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),
- shape = RoundedCornerShape(20.dp)
- ) {
- Column(
- modifier = Modifier
- .fillMaxSize()
- .verticalScroll(rememberScrollState())
- .padding(24.dp),
- verticalArrangement = Arrangement.spacedBy(18.dp)
+ BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val panelModifier = when {
+ maxWidth < 700.dp -> Modifier
+ .fillMaxWidth(0.9f)
+ .fillMaxHeight()
+ .padding(vertical = 24.dp, horizontal = 24.dp)
+ !isTelevisionDevice && maxWidth < 1280.dp -> Modifier
+ .fillMaxWidth(0.54f)
+ .fillMaxHeight()
+ .padding(vertical = 24.dp, horizontal = 24.dp)
+ else -> Modifier
+ .width(520.dp)
+ .fillMaxHeight()
+ .padding(vertical = 24.dp, horizontal = 24.dp)
+ }
+
+ Surface(
+ modifier = panelModifier,
+ colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),
+ shape = RoundedCornerShape(20.dp)
) {
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .verticalScroll(rememberScrollState())
+ .padding(24.dp),
+ verticalArrangement = Arrangement.spacedBy(18.dp)
+ ) {
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
Text(
text = program.title,
@@ -464,6 +480,7 @@ fun FullEpgScreen(
Text(stringResource(R.string.settings_cancel))
}
}
+ }
}
}
}
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 05de3566..79f01ec7 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
@@ -43,6 +43,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.onKeyEvent
import androidx.compose.ui.input.key.type
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@@ -771,6 +772,8 @@ private fun SavedHistoryRow(
items: List<SavedHistoryUiModel>,
onItemClick: (SavedHistoryUiModel) -> Unit
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val cardWidth = if (screenWidth < 700.dp) 180.dp else 250.dp
Column(
modifier = Modifier.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(8.dp)
@@ -800,7 +803,7 @@ private fun SavedHistoryRow(
focusedContentColor = OnSurface
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1.04f),
- modifier = Modifier.width(250.dp)
+ modifier = Modifier.width(cardWidth)
) {
Column(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 14.dp),
@@ -833,6 +836,8 @@ private fun SavedGroupManagementRow(
onGroupClick: (SavedGroupManagementUiModel) -> Unit,
onGroupLongClick: (SavedGroupManagementUiModel) -> Unit
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val cardWidth = if (screenWidth < 700.dp) 180.dp else 240.dp
Column(
modifier = Modifier.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(8.dp)
@@ -860,7 +865,7 @@ private fun SavedGroupManagementRow(
containerColor = Surface,
focusedContainerColor = SurfaceHighlight
),
- modifier = Modifier.width(240.dp)
+ modifier = Modifier.width(cardWidth)
) {
Column(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 14.dp),
@@ -1132,9 +1137,12 @@ private fun ReorderPanel(
) {
if (section == null) return
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val panelWidth = if (screenWidth < 700.dp) 180.dp else 250.dp
+
Column(
modifier = Modifier
- .width(250.dp)
+ .width(panelWidth)
.heightIn(max = 300.dp)
.background(
color = Surface.copy(alpha = 0.97f),
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 ec230567..17d5a003 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
@@ -20,6 +20,7 @@ import com.streamvault.app.ui.components.SearchInput
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.foundation.focusGroup
import androidx.compose.ui.input.key.*
@@ -37,6 +38,7 @@ import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.TextButton
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.LinearProgressIndicator
+import com.streamvault.app.device.rememberIsTelevisionDevice
import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import com.streamvault.app.ui.components.CategoryRow
@@ -122,6 +124,26 @@ fun HomeScreen(
val isReorderMode = uiState.isChannelReorderMode
val isProMode = uiState.liveTvChannelMode == LiveTvChannelMode.PRO
val isDenseMode = uiState.liveTvChannelMode != LiveTvChannelMode.COMFORTABLE
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val sidebarWidth = if (screenWidth < 900.dp) {
+ (screenWidth * 0.36f).coerceIn(188.dp, 220.dp)
+ } else if (!isTelevisionDevice && screenWidth < 1280.dp) {
+ (screenWidth * 0.28f).coerceIn(220.dp, 252.dp)
+ } else {
+ 272.dp
+ }
+ val channelSearchWidth = if (screenWidth < 900.dp) {
+ (screenWidth * 0.34f).coerceIn(170.dp, 220.dp)
+ } else if (!isTelevisionDevice && screenWidth < 1280.dp) {
+ (screenWidth * 0.28f).coerceIn(220.dp, 280.dp)
+ } else if (isProMode) {
+ 270.dp
+ } else if (isDenseMode) {
+ 300.dp
+ } else {
+ 340.dp
+ }
val channelRowHeight = when (uiState.liveTvChannelMode) {
LiveTvChannelMode.COMFORTABLE -> 92.dp
LiveTvChannelMode.COMPACT -> 54.dp
@@ -296,7 +318,7 @@ fun HomeScreen(
Row(modifier = Modifier.fillMaxSize()) {
Box(
modifier = Modifier
- .width(272.dp)
+ .width(sidebarWidth)
.fillMaxHeight()
.background(SurfaceElevated)
.padding(horizontal = 16.dp, vertical = 24.dp)
@@ -477,7 +499,7 @@ fun HomeScreen(
Column(
modifier = Modifier
- .width(272.dp)
+ .width(sidebarWidth)
.fillMaxHeight()
.background(SurfaceElevated.copy(alpha = 0.88f), RoundedCornerShape(20.dp))
.padding(top = 10.dp)
@@ -682,7 +704,7 @@ fun HomeScreen(
placeholder = stringResource(R.string.home_search_channels),
onSearch = { focusManager.clearFocus() },
focusRequester = channelSearchFocusRequester,
- modifier = Modifier.width(if (isProMode) 270.dp else if (isDenseMode) 300.dp else 340.dp),
+ modifier = Modifier.width(channelSearchWidth),
enabled = !isReorderMode
)
if (hasSplitChannels) {
@@ -1284,6 +1306,15 @@ fun ReorderSidePanel(
onSave: () -> Unit,
onCancel: () -> Unit
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val panelWidth = if (screenWidth < 900.dp) {
+ (screenWidth * 0.36f).coerceIn(188.dp, 220.dp)
+ } else if (!isTelevisionDevice && screenWidth < 1280.dp) {
+ (screenWidth * 0.28f).coerceIn(220.dp, 252.dp)
+ } else {
+ 272.dp
+ }
var draggingChannel by remember { mutableStateOf<Channel?>(null) }
// Focus requester to trap focus inside the panel
@@ -1296,7 +1327,7 @@ fun ReorderSidePanel(
Box(
modifier = Modifier
.fillMaxHeight()
- .width(272.dp)
+ .width(panelWidth)
.background(SurfaceElevated)
.padding(16.dp)
.focusRequester(panelFocusRequester)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
index 4fcc8ea1..efaebead 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
@@ -34,7 +34,9 @@ import androidx.compose.ui.input.key.onKeyEvent
import androidx.compose.ui.input.key.onPreviewKeyEvent
import com.streamvault.app.ui.components.SearchInput
import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.navigation.Routes
import com.streamvault.app.ui.components.CategoryRow
import com.streamvault.app.ui.components.ContinueWatchingRow
@@ -285,6 +287,19 @@ private fun MoviesVodContent(
onLoadMore: () -> Unit,
onDismissReorder: () -> Unit
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val favoriteCardWidth = when {
+ screenWidth < 700.dp -> 136.dp
+ !isTelevisionDevice && screenWidth < 900.dp -> 148.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 152.dp
+ else -> 160.dp
+ }
+ val loadingSectionHeight = when {
+ screenWidth < 700.dp -> 220.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 260.dp
+ else -> 300.dp
+ }
var showCategoryPicker by remember { mutableStateOf(false) }
val favoriteMovies = uiState.moviesByCategory[uiState.favoriteCategoryName].orEmpty()
val freshMovies = uiState.libraryLensRows[MovieLibraryLens.FRESH].orEmpty()
@@ -436,7 +451,7 @@ private fun MoviesVodContent(
if (isLocked) onProtectedMovieClick(movie) else onMovieClick(movie)
},
onLongClick = { onShowDialog(movie) },
- modifier = Modifier.width(160.dp)
+ modifier = Modifier.width(favoriteCardWidth)
)
}
}
@@ -637,7 +652,7 @@ private fun MoviesVodContent(
Box(
modifier = Modifier
.fillMaxWidth()
- .height(300.dp),
+ .height(loadingSectionHeight),
contentAlignment = Alignment.Center
) {
Column(
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 03e1a86c..121d8371 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
@@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.onKeyEvent
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.focus.onFocusChanged
@@ -36,6 +37,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.media3.common.util.UnstableApi
import androidx.tv.material3.*
+import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.theme.*
import com.streamvault.domain.model.DecoderMode
import com.streamvault.domain.model.StreamInfo
@@ -109,6 +111,22 @@ fun PlayerScreen(
viewModel: PlayerViewModel = hiltViewModel(),
multiViewViewModel: MultiViewViewModel = hiltViewModel()
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val sideOverlayWidth = if (screenWidth < 700.dp) {
+ (screenWidth * 0.62f).coerceIn(220.dp, 300.dp)
+ } else if (!isTelevisionDevice && screenWidth < 1280.dp) {
+ (screenWidth * 0.4f).coerceIn(320.dp, 420.dp)
+ } else {
+ 350.dp
+ }
+ val epgOverlayWidth = if (screenWidth < 700.dp) {
+ (screenWidth * 0.68f).coerceIn(240.dp, 320.dp)
+ } else if (!isTelevisionDevice && screenWidth < 1280.dp) {
+ (screenWidth * 0.46f).coerceIn(360.dp, 500.dp)
+ } else {
+ 400.dp
+ }
val mainActivity = LocalContext.current.findMainActivity()
val isInPictureInPictureMode = mainActivity
?.pictureInPictureModeFlow
@@ -767,7 +785,7 @@ fun PlayerScreen(
modifier = Modifier
.align(if (isRtl) Alignment.TopEnd else Alignment.TopStart)
.fillMaxHeight()
- .width(350.dp)
+ .width(sideOverlayWidth)
.focusGroup()
) {
ChannelListOverlay(
@@ -793,7 +811,7 @@ fun PlayerScreen(
modifier = Modifier
.align(if (isRtl) Alignment.TopEnd else Alignment.TopStart)
.fillMaxHeight()
- .width(350.dp)
+ .width(sideOverlayWidth)
.focusGroup()
) {
CategoryListOverlay(
@@ -815,7 +833,7 @@ fun PlayerScreen(
modifier = Modifier
.align(if (isRtl) Alignment.TopStart else Alignment.TopEnd)
.fillMaxHeight()
- .width(400.dp)
+ .width(epgOverlayWidth)
.focusGroup()
) {
EpgOverlay(
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 026e8b4c..2ebcfb08 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
@@ -48,6 +48,7 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
@@ -61,6 +62,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.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.rememberCrossfadeImageModel
import com.streamvault.app.ui.screens.player.NumericChannelInputState
import com.streamvault.app.ui.screens.player.SeekPreviewState
@@ -356,16 +358,33 @@ private fun PlayerTopBar(
onClose: () -> Unit,
modifier: Modifier = Modifier
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val topBarHeight = when {
+ screenWidth < 700.dp -> 100.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 116.dp
+ else -> 132.dp
+ }
+ val horizontalPadding = when {
+ screenWidth < 700.dp -> 18.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 24.dp
+ else -> 32.dp
+ }
+ val verticalPadding = when {
+ screenWidth < 700.dp -> 16.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 20.dp
+ else -> 24.dp
+ }
Box(
modifier = modifier
.fillMaxWidth()
- .height(132.dp)
+ .height(topBarHeight)
.background(
Brush.verticalGradient(
colors = listOf(Color.Black.copy(alpha = 0.8f), Color.Transparent)
)
)
- .padding(horizontal = 32.dp, vertical = 24.dp)
+ .padding(horizontal = horizontalPadding, vertical = verticalPadding)
) {
Row(
modifier = Modifier.fillMaxWidth(),
@@ -774,6 +793,41 @@ private fun PlayerVodInfo(
seekPreview: SeekPreviewState,
onSeekPreviewPositionChanged: (Long?) -> Unit
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val compactControls = screenWidth < 700.dp
+ val tabletControls = !isTelevisionDevice && screenWidth >= 700.dp && screenWidth < 1280.dp
+ val transportButtonSize = when {
+ compactControls -> 48.dp
+ tabletControls -> 52.dp
+ else -> 56.dp
+ }
+ val playButtonSize = when {
+ compactControls -> 60.dp
+ tabletControls -> 66.dp
+ else -> 72.dp
+ }
+ val playIconSize = when {
+ compactControls -> 28.dp
+ tabletControls -> 30.dp
+ else -> 34.dp
+ }
+ val seekPreviewWidth = when {
+ compactControls -> 180.dp
+ tabletControls -> 200.dp
+ else -> 220.dp
+ }
+ val outerSpacing = when {
+ compactControls -> 12.dp
+ tabletControls -> 14.dp
+ else -> 18.dp
+ }
+ val transportGroupHorizontalPadding = when {
+ compactControls -> 8.dp
+ tabletControls -> 9.dp
+ else -> 10.dp
+ }
+
val playbackLabel = stringResource(R.string.player_playback_label)
val actions = buildList {
add(
@@ -818,7 +872,13 @@ private fun PlayerVodInfo(
Row(
verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(14.dp)
+ horizontalArrangement = Arrangement.spacedBy(
+ when {
+ compactControls -> 10.dp
+ tabletControls -> 12.dp
+ else -> 14.dp
+ }
+ )
) {
PlayerMetaPill(
text = if (contentType == "MOVIE") {
@@ -849,7 +909,7 @@ private fun PlayerVodInfo(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 18.dp, vertical = 16.dp),
- horizontalArrangement = Arrangement.spacedBy(18.dp),
+ horizontalArrangement = Arrangement.spacedBy(outerSpacing),
verticalAlignment = Alignment.CenterVertically
) {
Surface(
@@ -857,14 +917,21 @@ private fun PlayerVodInfo(
colors = SurfaceDefaults.colors(containerColor = Color.Black.copy(alpha = 0.24f))
) {
Row(
- modifier = Modifier.padding(horizontal = 10.dp, vertical = 8.dp),
- horizontalArrangement = Arrangement.spacedBy(10.dp),
+ modifier = Modifier.padding(horizontal = transportGroupHorizontalPadding, vertical = 8.dp),
+ horizontalArrangement = Arrangement.spacedBy(
+ when {
+ compactControls -> 8.dp
+ tabletControls -> 9.dp
+ else -> 10.dp
+ }
+ ),
verticalAlignment = Alignment.CenterVertically
) {
PlayerTransportButton(
label = "\u23EA",
contentDescription = stringResource(R.string.player_rewind),
onClick = onSeekBackward,
+ buttonSize = transportButtonSize,
modifier = Modifier.focusProperties {
down = quickActionsFocusRequester
}
@@ -877,7 +944,7 @@ private fun PlayerVodInfo(
focusedContainerColor = Primary
),
modifier = Modifier
- .size(72.dp)
+ .size(playButtonSize)
.focusRequester(playButtonFocusRequester)
.focusProperties {
down = quickActionsFocusRequester
@@ -896,7 +963,7 @@ private fun PlayerVodInfo(
imageVector = Icons.Default.PlayArrow,
contentDescription = stringResource(R.string.player_play),
tint = Color.White,
- modifier = Modifier.size(34.dp)
+ modifier = Modifier.size(playIconSize)
)
}
}
@@ -905,6 +972,7 @@ private fun PlayerVodInfo(
label = "\u23E9",
contentDescription = stringResource(R.string.player_forward),
onClick = onSeekForward,
+ buttonSize = transportButtonSize,
modifier = Modifier.focusProperties {
down = quickActionsFocusRequester
}
@@ -919,7 +987,12 @@ private fun PlayerVodInfo(
AnimatedVisibility(visible = seekPreview.visible) {
PlayerSeekPreviewCard(
preview = seekPreview,
- modifier = Modifier.width(220.dp)
+ previewHeight = when {
+ compactControls -> 96.dp
+ tabletControls -> 106.dp
+ else -> 118.dp
+ },
+ modifier = Modifier.width(seekPreviewWidth)
)
}
@@ -1011,6 +1084,7 @@ private fun PlayerVodInfo(
@Composable
private fun PlayerSeekPreviewCard(
preview: SeekPreviewState,
+ previewHeight: androidx.compose.ui.unit.Dp = 118.dp,
modifier: Modifier = Modifier
) {
val artworkModel = rememberCrossfadeImageModel(preview.artworkUrl)
@@ -1024,7 +1098,7 @@ private fun PlayerSeekPreviewCard(
Box(
modifier = Modifier
.fillMaxWidth()
- .height(118.dp)
+ .height(previewHeight)
.clip(RoundedCornerShape(14.dp))
.background(Color.Black.copy(alpha = 0.38f)),
contentAlignment = Alignment.Center
@@ -1122,6 +1196,7 @@ private fun PlayerTransportButton(
label: String,
contentDescription: String,
onClick: () -> Unit,
+ buttonSize: androidx.compose.ui.unit.Dp = 56.dp,
modifier: Modifier = Modifier
) {
Surface(
@@ -1132,7 +1207,7 @@ private fun PlayerTransportButton(
focusedContainerColor = Color.White.copy(alpha = 0.3f)
),
modifier = modifier
- .size(56.dp)
+ .size(buttonSize)
.semantics { this.contentDescription = contentDescription }
) {
Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
index a82a75a3..d41a5d19 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
@@ -12,6 +12,7 @@ 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.ColumnScope
import androidx.compose.foundation.layout.PaddingValues
@@ -62,6 +63,7 @@ import androidx.tv.material3.Surface
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.app.ui.components.rememberCrossfadeImageModel
import com.streamvault.app.ui.components.shell.StatusPill
@@ -648,20 +650,34 @@ fun ChannelListOverlay(
.fillMaxSize()
.background(Color.Black.copy(alpha = 0.18f))
) {
- Box(
- modifier = Modifier
- .width(500.dp)
- .fillMaxWidth()
- .fillMaxHeight()
- .padding(20.dp)
- ) {
- PlayerOverlayPanel(modifier = Modifier.fillMaxSize()) {
- androidx.compose.foundation.lazy.LazyColumn(
- state = listState,
- modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(top = 8.dp, bottom = 24.dp),
- verticalArrangement = Arrangement.spacedBy(8.dp)
- ) {
+ BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val panelModifier = if (maxWidth < 700.dp) {
+ Modifier
+ .fillMaxWidth(0.9f)
+ .fillMaxHeight()
+ .padding(20.dp)
+ } else if (!isTelevisionDevice && maxWidth < 1280.dp) {
+ Modifier
+ .fillMaxWidth(0.5f)
+ .fillMaxHeight()
+ .padding(20.dp)
+ } else {
+ Modifier
+ .width(500.dp)
+ .fillMaxWidth()
+ .fillMaxHeight()
+ .padding(20.dp)
+ }
+
+ Box(modifier = panelModifier) {
+ PlayerOverlayPanel(modifier = Modifier.fillMaxSize()) {
+ androidx.compose.foundation.lazy.LazyColumn(
+ state = listState,
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(top = 8.dp, bottom = 24.dp),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
item {
Row(
modifier = Modifier
@@ -956,6 +972,7 @@ fun ChannelListOverlay(
style = MaterialTheme.typography.labelSmall,
color = Color.White.copy(alpha = 0.85f)
)
+ }
}
}
}
@@ -992,17 +1009,32 @@ fun EpgOverlay(
.fillMaxSize()
.background(Color.Black.copy(alpha = 0.18f))
) {
- PlayerOverlayPanel(
+ BoxWithConstraints(
modifier = Modifier
+ .fillMaxSize()
.align(Alignment.CenterEnd)
- .width(520.dp)
- .padding(24.dp)
) {
- androidx.compose.foundation.lazy.LazyColumn(
- state = listState,
- modifier = Modifier.fillMaxSize(),
- verticalArrangement = Arrangement.spacedBy(16.dp)
- ) {
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val panelModifier = if (maxWidth < 700.dp) {
+ Modifier
+ .fillMaxWidth(0.9f)
+ .padding(24.dp)
+ } else if (!isTelevisionDevice && maxWidth < 1280.dp) {
+ Modifier
+ .fillMaxWidth(0.54f)
+ .padding(24.dp)
+ } else {
+ Modifier
+ .width(520.dp)
+ .padding(24.dp)
+ }
+
+ PlayerOverlayPanel(modifier = panelModifier) {
+ androidx.compose.foundation.lazy.LazyColumn(
+ state = listState,
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
item {
Text(
text = stringResource(R.string.epg_title),
@@ -1198,6 +1230,7 @@ fun EpgOverlay(
}
}
}
+ }
}
}
}
@@ -1317,20 +1350,34 @@ fun CategoryListOverlay(
.fillMaxSize()
.background(Color.Black.copy(alpha = 0.18f))
) {
- Box(
- modifier = Modifier
- .width(500.dp)
- .fillMaxWidth()
- .fillMaxHeight()
- .padding(20.dp)
- ) {
- PlayerOverlayPanel(modifier = Modifier.fillMaxSize()) {
- androidx.compose.foundation.lazy.LazyColumn(
- state = listState,
- modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(top = 8.dp, bottom = 24.dp),
- verticalArrangement = Arrangement.spacedBy(6.dp)
- ) {
+ BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val panelModifier = if (maxWidth < 700.dp) {
+ Modifier
+ .fillMaxWidth(0.9f)
+ .fillMaxHeight()
+ .padding(20.dp)
+ } else if (!isTelevisionDevice && maxWidth < 1280.dp) {
+ Modifier
+ .fillMaxWidth(0.5f)
+ .fillMaxHeight()
+ .padding(20.dp)
+ } else {
+ Modifier
+ .width(500.dp)
+ .fillMaxWidth()
+ .fillMaxHeight()
+ .padding(20.dp)
+ }
+
+ Box(modifier = panelModifier) {
+ PlayerOverlayPanel(modifier = Modifier.fillMaxSize()) {
+ androidx.compose.foundation.lazy.LazyColumn(
+ state = listState,
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(top = 8.dp, bottom = 24.dp),
+ verticalArrangement = Arrangement.spacedBy(6.dp)
+ ) {
item {
Text(
text = stringResource(R.string.label_categories),
@@ -1405,6 +1452,7 @@ fun CategoryListOverlay(
}
}
}
+ }
}
}
}
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 1a357f89..ece3ae41 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
@@ -5,6 +5,7 @@ import androidx.compose.animation.core.tween
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.*
@@ -32,6 +33,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
+import com.streamvault.app.device.rememberIsTelevisionDevice
import androidx.compose.ui.platform.LocalContext
import com.streamvault.data.util.ProviderInputSanitizer
import kotlinx.coroutines.Dispatchers
@@ -184,7 +186,7 @@ fun ProviderSetupScreen(
// var selectedTab by remember { mutableStateOf(0) } - moved below to use state driven init? No, we need local state for editing.
// We already have the vars defined above.
- Box(
+ BoxWithConstraints(
modifier = Modifier
.fillMaxSize()
.background(
@@ -193,16 +195,23 @@ fun ProviderSetupScreen(
)
)
) {
- Row(
- modifier = Modifier
- .align(Alignment.Center)
- .fillMaxWidth()
- .padding(horizontal = 28.dp, vertical = 16.dp),
- horizontalArrangement = Arrangement.spacedBy(14.dp),
- verticalAlignment = Alignment.Top
- ) {
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val stackedLayout = !isTelevisionDevice && maxWidth < 900.dp
+ val tabletLayout = !isTelevisionDevice && maxWidth >= 900.dp && maxWidth < 1280.dp
+ val horizontalPadding = when {
+ stackedLayout -> 16.dp
+ tabletLayout -> 20.dp
+ else -> 28.dp
+ }
+ val formSpacing = when {
+ stackedLayout -> 12.dp
+ tabletLayout -> 12.dp
+ else -> 14.dp
+ }
+
+ val infoPanel: @Composable (Modifier) -> Unit = { modifier ->
Surface(
- modifier = Modifier.width(240.dp),
+ modifier = modifier,
shape = RoundedCornerShape(22.dp),
colors = SurfaceDefaults.colors(containerColor = Surface.copy(alpha = 0.92f))
) {
@@ -212,20 +221,13 @@ fun ProviderSetupScreen(
.padding(14.dp),
verticalArrangement = Arrangement.spacedBy(10.dp)
) {
- Text(
- text = if (uiState.isEditing) {
+ AppSectionHeader(
+ title = if (uiState.isEditing) {
stringResource(R.string.setup_edit_provider)
} else {
stringResource(R.string.setup_provider_title)
},
- style = MaterialTheme.typography.titleMedium,
- color = TextPrimary
- )
-
- Text(
- text = stringResource(R.string.setup_shell_subtitle),
- style = MaterialTheme.typography.bodySmall,
- color = OnSurfaceDim
+ subtitle = stringResource(R.string.setup_shell_subtitle)
)
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
@@ -253,9 +255,11 @@ fun ProviderSetupScreen(
)
}
}
+ }
+ val formPanel: @Composable (Modifier) -> Unit = { modifier ->
Surface(
- modifier = Modifier.weight(1f),
+ modifier = modifier,
shape = RoundedCornerShape(22.dp),
border = Border(
border = BorderStroke(1.dp, SurfaceHighlight),
@@ -371,11 +375,11 @@ fun ProviderSetupScreen(
onClick = { viewModel.updateM3uTab(0) },
onFocused = { viewModel.updateM3uTab(0) },
focusRequester = m3uUrlTabFocusRequester,
- onMoveUp = {
+ onMoveUp = {
providerNameFocusRequester.requestFocus()
true
},
- onMoveDown = {
+ onMoveDown = {
m3uValueFocusRequester.requestFocus()
true
}
@@ -386,11 +390,11 @@ fun ProviderSetupScreen(
onClick = { viewModel.updateM3uTab(1) },
onFocused = { viewModel.updateM3uTab(1) },
focusRequester = m3uFileTabFocusRequester,
- onMoveUp = {
+ onMoveUp = {
providerNameFocusRequester.requestFocus()
true
},
- onMoveDown = {
+ onMoveDown = {
m3uValueFocusRequester.requestFocus()
true
}
@@ -403,11 +407,11 @@ fun ProviderSetupScreen(
onValueChange = { m3uUrl = ProviderInputSanitizer.sanitizeUrlForEditing(it) },
label = stringResource(R.string.setup_m3u_hint),
focusRequester = m3uValueFocusRequester,
- onMoveUp = {
+ onMoveUp = {
m3uUrlTabFocusRequester.requestFocus()
true
},
- onMoveDown = {
+ onMoveDown = {
m3uSubmitFocusRequester.requestFocus()
true
}
@@ -424,11 +428,11 @@ fun ProviderSetupScreen(
emptySelectionHint = stringResource(R.string.setup_file_browse_hint),
onClick = { filePickerLauncher.launch(arrayOf("*/*")) },
focusRequester = m3uValueFocusRequester,
- onMoveUp = {
+ onMoveUp = {
m3uFileTabFocusRequester.requestFocus()
true
},
- onMoveDown = {
+ onMoveDown = {
m3uSubmitFocusRequester.requestFocus()
true
}
@@ -454,7 +458,7 @@ fun ProviderSetupScreen(
enabled = !uiState.isLoading,
onClick = { viewModel.addM3u(m3uUrl, name) },
focusRequester = m3uSubmitFocusRequester,
- onMoveUp = {
+ onMoveUp = {
m3uValueFocusRequester.requestFocus()
true
}
@@ -480,6 +484,33 @@ fun ProviderSetupScreen(
}
}
}
+
+ Box(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(horizontal = horizontalPadding, vertical = 16.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ if (stackedLayout) {
+ Column(
+ modifier = Modifier.fillMaxWidth(),
+ verticalArrangement = Arrangement.spacedBy(formSpacing),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ infoPanel(Modifier.fillMaxWidth())
+ formPanel(Modifier.fillMaxWidth())
+ }
+ } else {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(formSpacing),
+ verticalAlignment = Alignment.Top
+ ) {
+ infoPanel(Modifier.width(if (tabletLayout) 220.dp else 240.dp))
+ formPanel(Modifier.weight(1f))
+ }
+ }
+ }
}
if (uiState.syncProgress != null) {
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 f2ee9ca4..1d9e386b 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
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.series
import androidx.compose.foundation.background
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.PaddingValues
import androidx.compose.foundation.layout.Row
@@ -30,6 +31,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@@ -44,6 +46,7 @@ import androidx.tv.material3.SurfaceDefaults
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.rememberCrossfadeImageModel
import com.streamvault.app.ui.components.shell.ContentMetadataStrip
import com.streamvault.app.ui.components.shell.EpisodeRowCard
@@ -105,17 +108,31 @@ private fun SeriesDetailContent(
onEpisodeClick: (Episode) -> Unit,
onBack: () -> Unit
) {
- Box(
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ BoxWithConstraints(
modifier = Modifier
.fillMaxSize()
.background(AppColors.Canvas)
) {
+ val compactLayout = !isTelevisionDevice && maxWidth < 900.dp
+ val heroHeight = when {
+ maxWidth < 700.dp -> 220.dp
+ !isTelevisionDevice && maxWidth < 900.dp -> 280.dp
+ else -> 420.dp
+ }
+ val contentPadding = if (compactLayout) {
+ PaddingValues(horizontal = 16.dp, vertical = 20.dp)
+ } else {
+ PaddingValues(horizontal = 56.dp, vertical = 36.dp)
+ }
+ val posterWidth = if (compactLayout) 132.dp else 220.dp
+
AsyncImage(
model = rememberCrossfadeImageModel(series.backdropUrl ?: series.posterUrl),
contentDescription = series.name,
modifier = Modifier
.fillMaxWidth()
- .height(420.dp)
+ .height(heroHeight)
.align(Alignment.TopCenter),
contentScale = ContentScale.Crop
)
@@ -123,7 +140,7 @@ private fun SeriesDetailContent(
Box(
modifier = Modifier
.fillMaxWidth()
- .height(420.dp)
+ .height(heroHeight)
.background(
Brush.verticalGradient(
colors = listOf(
@@ -137,7 +154,7 @@ private fun SeriesDetailContent(
LazyColumn(
modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(horizontal = 56.dp, vertical = 36.dp),
+ contentPadding = contentPadding,
verticalArrangement = Arrangement.spacedBy(24.dp)
) {
item {
@@ -156,62 +173,120 @@ private fun SeriesDetailContent(
}
item {
- Row(
- horizontalArrangement = Arrangement.spacedBy(24.dp),
- verticalAlignment = Alignment.Bottom
- ) {
- Box(
- modifier = Modifier
- .width(220.dp)
- .aspectRatio(2f / 3f)
- .clip(RoundedCornerShape(24.dp))
- .background(AppColors.SurfaceElevated)
- ) {
- AsyncImage(
- model = rememberCrossfadeImageModel(series.posterUrl ?: series.backdropUrl),
- contentDescription = series.name,
- modifier = Modifier.fillMaxSize(),
- contentScale = ContentScale.Crop
- )
- }
+ if (compactLayout) {
+ Column(verticalArrangement = Arrangement.spacedBy(18.dp)) {
+ Box(
+ modifier = Modifier
+ .width(posterWidth)
+ .aspectRatio(2f / 3f)
+ .clip(RoundedCornerShape(24.dp))
+ .background(AppColors.SurfaceElevated)
+ ) {
+ AsyncImage(
+ model = rememberCrossfadeImageModel(series.posterUrl ?: series.backdropUrl),
+ contentDescription = series.name,
+ modifier = Modifier.fillMaxSize(),
+ contentScale = ContentScale.Crop
+ )
+ }
- Column(
- modifier = Modifier.fillMaxWidth(),
- verticalArrangement = Arrangement.spacedBy(18.dp)
- ) {
- Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
- StatusPill(label = stringResource(R.string.nav_series), containerColor = AppColors.BrandMuted)
- series.rating.takeIf { it > 0f }?.let {
- StatusPill(label = "RTG ${String.format("%.1f", it)}", containerColor = AppColors.Warning, contentColor = Color.Black)
+ Column(
+ modifier = Modifier.fillMaxWidth(),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
+ Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+ StatusPill(label = stringResource(R.string.nav_series), containerColor = AppColors.BrandMuted)
+ series.rating.takeIf { it > 0f }?.let {
+ StatusPill(label = "RTG ${String.format("%.1f", it)}", containerColor = AppColors.Warning, contentColor = Color.Black)
+ }
+ if (unwatchedEpisodeCount > 0) {
+ StatusPill(
+ label = stringResource(R.string.series_unwatched_badge, unwatchedEpisodeCount),
+ containerColor = AppColors.SurfaceEmphasis
+ )
+ }
}
- if (unwatchedEpisodeCount > 0) {
- StatusPill(
- label = stringResource(R.string.series_unwatched_badge, unwatchedEpisodeCount),
- containerColor = AppColors.SurfaceEmphasis
+ Text(
+ text = series.name,
+ style = MaterialTheme.typography.displayMedium,
+ color = AppColors.TextPrimary,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis
+ )
+ ContentMetadataStrip(
+ values = listOf(
+ series.releaseDate.orEmpty(),
+ series.genre.orEmpty(),
+ selectedSeason?.name.orEmpty()
)
- }
+ )
+ Text(
+ text = series.plot ?: stringResource(R.string.series_plot_fallback),
+ style = MaterialTheme.typography.bodyLarge,
+ color = AppColors.TextSecondary,
+ maxLines = 5,
+ overflow = TextOverflow.Ellipsis
+ )
}
- Text(
- text = series.name,
- style = MaterialTheme.typography.displayMedium,
- color = AppColors.TextPrimary,
- maxLines = 2,
- overflow = TextOverflow.Ellipsis
- )
- ContentMetadataStrip(
- values = listOf(
- series.releaseDate.orEmpty(),
- series.genre.orEmpty(),
- selectedSeason?.name.orEmpty()
+ }
+ } else {
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(24.dp),
+ verticalAlignment = Alignment.Bottom
+ ) {
+ Box(
+ modifier = Modifier
+ .width(posterWidth)
+ .aspectRatio(2f / 3f)
+ .clip(RoundedCornerShape(24.dp))
+ .background(AppColors.SurfaceElevated)
+ ) {
+ AsyncImage(
+ model = rememberCrossfadeImageModel(series.posterUrl ?: series.backdropUrl),
+ contentDescription = series.name,
+ modifier = Modifier.fillMaxSize(),
+ contentScale = ContentScale.Crop
)
- )
- Text(
- text = series.plot ?: stringResource(R.string.series_plot_fallback),
- style = MaterialTheme.typography.bodyLarge,
- color = AppColors.TextSecondary,
- maxLines = 5,
- overflow = TextOverflow.Ellipsis
- )
+ }
+
+ Column(
+ modifier = Modifier.fillMaxWidth(),
+ verticalArrangement = Arrangement.spacedBy(18.dp)
+ ) {
+ Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+ StatusPill(label = stringResource(R.string.nav_series), containerColor = AppColors.BrandMuted)
+ series.rating.takeIf { it > 0f }?.let {
+ StatusPill(label = "RTG ${String.format("%.1f", it)}", containerColor = AppColors.Warning, contentColor = Color.Black)
+ }
+ if (unwatchedEpisodeCount > 0) {
+ StatusPill(
+ label = stringResource(R.string.series_unwatched_badge, unwatchedEpisodeCount),
+ containerColor = AppColors.SurfaceEmphasis
+ )
+ }
+ }
+ Text(
+ text = series.name,
+ style = MaterialTheme.typography.displayMedium,
+ color = AppColors.TextPrimary,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis
+ )
+ ContentMetadataStrip(
+ values = listOf(
+ series.releaseDate.orEmpty(),
+ series.genre.orEmpty(),
+ selectedSeason?.name.orEmpty()
+ )
+ )
+ Text(
+ text = series.plot ?: stringResource(R.string.series_plot_fallback),
+ style = MaterialTheme.typography.bodyLarge,
+ color = AppColors.TextSecondary,
+ maxLines = 5,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
index f7613b1f..f1c841c2 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
@@ -35,7 +35,9 @@ import androidx.compose.ui.input.key.onKeyEvent
import androidx.compose.ui.input.key.onPreviewKeyEvent
import com.streamvault.app.ui.components.SearchInput
import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.navigation.Routes
import com.streamvault.app.ui.components.CategoryRow
import com.streamvault.app.ui.components.ContinueWatchingRow
@@ -283,6 +285,19 @@ private fun SeriesVodContent(
onLoadMore: () -> Unit,
onDismissReorder: () -> Unit
) {
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val isTelevisionDevice = rememberIsTelevisionDevice()
+ val favoriteCardWidth = when {
+ screenWidth < 700.dp -> 136.dp
+ !isTelevisionDevice && screenWidth < 900.dp -> 148.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 152.dp
+ else -> 160.dp
+ }
+ val loadingSectionHeight = when {
+ screenWidth < 700.dp -> 220.dp
+ !isTelevisionDevice && screenWidth < 1280.dp -> 260.dp
+ else -> 300.dp
+ }
var showCategoryPicker by remember { mutableStateOf(false) }
val favoriteSeries = uiState.seriesByCategory[uiState.favoriteCategoryName].orEmpty()
val freshSeries = uiState.libraryLensRows[SeriesLibraryLens.FRESH].orEmpty()
@@ -422,7 +437,7 @@ private fun SeriesVodContent(
isLocked = isLocked,
onClick = { if (isLocked) onProtectedSeriesClick(series.id) else onSeriesClick(series.id) },
onLongClick = { onShowDialog(series) },
- modifier = Modifier.width(160.dp)
+ modifier = Modifier.width(favoriteCardWidth)
)
}
}
@@ -623,7 +638,7 @@ private fun SeriesVodContent(
Box(
modifier = Modifier
.fillMaxWidth()
- .height(300.dp),
+ .height(loadingSectionHeight),
contentAlignment = Alignment.Center
) {
Column(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
index 92e68772..b36856c7 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
@@ -934,52 +934,70 @@ private fun PremiumSelectionDialog(
onDismiss: () -> Unit,
content: @Composable ColumnScope.() -> Unit
) {
+ val isTelevisionDevice = com.streamvault.app.device.rememberIsTelevisionDevice()
Dialog(onDismissRequest = onDismiss) {
- androidx.compose.material3.Surface(
- shape = RoundedCornerShape(14.dp),
- color = SurfaceElevated,
- modifier = Modifier
- .fillMaxWidth(0.62f)
- .border(1.dp, Primary.copy(alpha = 0.4f), RoundedCornerShape(14.dp))
- ) {
- Column(
- modifier = Modifier.padding(18.dp),
- verticalArrangement = Arrangement.spacedBy(8.dp)
+ val dialogContent: @Composable (Modifier) -> Unit = { resolvedModifier ->
+ androidx.compose.material3.Surface(
+ shape = RoundedCornerShape(14.dp),
+ color = SurfaceElevated,
+ modifier = resolvedModifier
+ .border(1.dp, Primary.copy(alpha = 0.4f), RoundedCornerShape(14.dp))
) {
- Text(
- text = title,
- style = MaterialTheme.typography.titleMedium,
- color = Primary
- )
- HorizontalDivider(color = Color.White.copy(alpha = 0.1f))
Column(
- verticalArrangement = Arrangement.spacedBy(6.dp),
- modifier = Modifier.padding(top = 6.dp)
- ) {
- content()
- }
- Row(
- modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
- horizontalArrangement = Arrangement.End
+ modifier = Modifier.padding(18.dp),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
) {
- Surface(
- onClick = onDismiss,
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(6.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Primary.copy(alpha = 0.2f),
- focusedContainerColor = Primary.copy(alpha = 0.4f)
- )
+ Text(
+ text = title,
+ style = MaterialTheme.typography.titleMedium,
+ color = Primary
+ )
+ HorizontalDivider(color = Color.White.copy(alpha = 0.1f))
+ Column(
+ verticalArrangement = Arrangement.spacedBy(6.dp),
+ modifier = Modifier.padding(top = 6.dp)
) {
- Text(
- text = stringResource(R.string.settings_cancel),
- style = MaterialTheme.typography.labelMedium,
- color = Primary,
- modifier = Modifier.padding(horizontal = 14.dp, vertical = 9.dp)
- )
+ content()
+ }
+ Row(
+ modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
+ horizontalArrangement = Arrangement.End
+ ) {
+ Surface(
+ onClick = onDismiss,
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(6.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = Primary.copy(alpha = 0.2f),
+ focusedContainerColor = Primary.copy(alpha = 0.4f)
+ )
+ ) {
+ Text(
+ text = stringResource(R.string.settings_cancel),
+ style = MaterialTheme.typography.labelMedium,
+ color = Primary,
+ modifier = Modifier.padding(horizontal = 14.dp, vertical = 9.dp)
+ )
+ }
}
}
}
}
+
+ if (isTelevisionDevice) {
+ dialogContent(Modifier.fillMaxWidth(0.62f))
+ } else {
+ BoxWithConstraints(
+ modifier = Modifier.fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ val dialogWidthFraction = when {
+ maxWidth < 700.dp -> 0.92f
+ maxWidth < 1000.dp -> 0.78f
+ else -> 0.62f
+ }
+ dialogContent(Modifier.fillMaxWidth(dialogWidthFraction))
+ }
+ }
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt
index fc47f280..87a2d3d8 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@@ -60,6 +61,12 @@ fun ParentalControlGroupScreen(
viewModel: ParentalControlGroupViewModel = hiltViewModel()
) {
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+ val screenWidth = LocalConfiguration.current.screenWidthDp.dp
+ val searchWidth = if (screenWidth < 700.dp) {
+ (screenWidth * 0.58f).coerceIn(180.dp, 260.dp)
+ } else {
+ 420.dp
+ }
val backButtonFocusRequester = remember { FocusRequester() }
val searchFocusRequester = remember { FocusRequester() }
val focusManager = androidx.compose.ui.platform.LocalFocusManager.current
@@ -97,7 +104,7 @@ fun ParentalControlGroupScreen(
placeholder = stringResource(R.string.parental_group_search),
onSearch = { focusManager.clearFocus() },
focusRequester = searchFocusRequester,
- modifier = Modifier.width(420.dp)
+ modifier = Modifier.width(searchWidth)
)
}
}