Skip to content

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

feat: update playback components for improved UI and functionality

David Nashash38048e98e891
diff --git a/feature/playback/build.gradle.kts b/feature/playback/build.gradle.kts
index 4f0c0c22..c2c58489 100644
--- a/feature/playback/build.gradle.kts
+++ b/feature/playback/build.gradle.kts
@@ -26,6 +26,7 @@ android {
defaultConfig {
minSdk = 25
+ testOptions.targetSdk = 36
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlayGoldenTest.kt b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlayGoldenTest.kt
index 34c4117e..ab63753a 100644
--- a/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlayGoldenTest.kt
+++ b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlayGoldenTest.kt
@@ -1,6 +1,8 @@
package com.streamvault.feature.playback.player
import androidx.compose.runtime.remember
+import androidx.compose.foundation.layout.width
+import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.assertHasClickAction
@@ -90,12 +92,13 @@ class VodPlayerControlsOverlayGoldenTest {
}
@Test
- fun noChapters_hidesChapterAction() {
+ fun narrowOverlay_keepsSettingsAndCloseVisible_withoutChapters() {
composeRule.setContent {
StreamVaultTheme {
val focusRequester = remember { FocusRequester() }
VodPlayerControlsOverlay(
visible = true,
+ modifier = Modifier.width(360.dp),
title = "A movie",
overlayState = buildVodOverlayState(
contentType = "MOVIE",
@@ -103,8 +106,8 @@ class VodPlayerControlsOverlayGoldenTest {
chapters = emptyList(),
currentPositionMs = 0L,
showEpisodesAction = false,
- subtitleTrackCount = 0,
- audioTrackCount = 0,
+ subtitleTrackCount = 1,
+ audioTrackCount = 1,
videoQualityCount = 0,
showExternalPlayerAction = false,
isCastConnected = false
@@ -135,5 +138,7 @@ class VodPlayerControlsOverlayGoldenTest {
composeRule.onNodeWithContentDescription("VOD playback controls").assertExists()
composeRule.onNodeWithContentDescription("Chapters").assertDoesNotExist()
+ composeRule.onNodeWithContentDescription("Playback settings").assertIsDisplayed()
+ composeRule.onNodeWithContentDescription("Close controls").assertIsDisplayed()
}
}
diff --git a/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/overlay/PlayerOverlayGoldenTest.kt b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/overlay/PlayerOverlayGoldenTest.kt
index 4be1976d..e98419b9 100644
--- a/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/overlay/PlayerOverlayGoldenTest.kt
+++ b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/overlay/PlayerOverlayGoldenTest.kt
@@ -10,6 +10,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.assertHasClickAction
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertTopPositionInRootIsEqualTo
+import androidx.compose.ui.test.assertLeftPositionInRootIsEqualTo
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.performSemanticsAction
@@ -85,7 +86,7 @@ class PlayerOverlayGoldenTest {
}
@Test
- fun channelInfoOverlay_placesBackButtonInPanelHeader() {
+ fun channelInfoOverlay_placesBackButtonAtTopLeft() {
var backButtonClicks = 0
composeRule.setContent {
StreamVaultTheme {
@@ -126,7 +127,8 @@ class PlayerOverlayGoldenTest {
composeRule.onNodeWithContentDescription("Back to menu")
.assertIsDisplayed()
.assertHasClickAction()
- .assertTopPositionInRootIsEqualTo(30.dp)
+ .assertTopPositionInRootIsEqualTo(24.dp)
+ .assertLeftPositionInRootIsEqualTo(24.dp)
.performSemanticsAction(SemanticsActions.OnClick)
assertThat(backButtonClicks).isEqualTo(1)
}
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLiveOverlayHost.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLiveOverlayHost.kt
index 1e56ebb4..aebec643 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLiveOverlayHost.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLiveOverlayHost.kt
@@ -4,9 +4,7 @@ import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.focusGroup
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.fillMaxHeight
@@ -165,8 +163,8 @@ internal fun BoxScope.PlayerLiveOverlayHost(
AnimatedVisibility(
visible = showChannelInfoOverlay,
- enter = slideInVertically(initialOffsetY = { it }) + fadeIn(),
- exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(),
+ enter = fadeIn(),
+ exit = fadeOut(),
modifier = Modifier
.align(Alignment.BottomCenter)
.fillMaxWidth()
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodControlButton.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodControlButton.kt
new file mode 100644
index 00000000..2c276399
--- /dev/null
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodControlButton.kt
@@ -0,0 +1,35 @@
+package com.streamvault.feature.playback.player
+
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.IconButtonDefaults
+import com.streamvault.core.ui.interaction.TvIconButton
+
+/** Quiet video chrome with a high-contrast remote focus state. */
+@Composable
+internal fun VodControlButton(
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+ content: @Composable BoxScope.() -> Unit
+) {
+ TvIconButton(
+ onClick = onClick,
+ enabled = enabled,
+ modifier = modifier.size(44.dp),
+ colors = IconButtonDefaults.colors(
+ containerColor = Color.White.copy(alpha = 0.08f),
+ contentColor = Color.White,
+ focusedContainerColor = Color.White,
+ focusedContentColor = Color(0xFF10151D),
+ disabledContainerColor = Color.Transparent,
+ disabledContentColor = Color.White.copy(alpha = 0.25f)
+ ),
+ scale = IconButtonDefaults.scale(focusedScale = 1.06f),
+ content = content
+ )
+}
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlaybackSettingsSheet.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlaybackSettingsSheet.kt
index e2c58f1c..901f6477 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlaybackSettingsSheet.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlaybackSettingsSheet.kt
@@ -11,12 +11,17 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.*
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.tv.material3.ClickableSurfaceDefaults
+import androidx.tv.material3.LocalContentColor
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
@@ -37,7 +42,6 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.core.ui.interaction.TvClickableSurface
-import com.streamvault.core.ui.interaction.TvIconButton
import com.streamvault.feature.playback.R
internal data class VodSettingsAction(
@@ -105,20 +109,20 @@ internal fun VodPlaybackSettingsSheet(
Box(
modifier = modifier
.fillMaxSize()
- .background(Color.Black.copy(alpha = 0.72f))
+ .background(Color.Black.copy(alpha = 0.32f))
) {
Surface(
modifier = Modifier
.align(Alignment.CenterEnd)
.fillMaxHeight()
- .widthIn(min = 360.dp, max = 520.dp),
- colors = SurfaceDefaults.colors(containerColor = Color(0xFF111216))
+ .width(360.dp),
+ colors = SurfaceDefaults.colors(containerColor = Color(0xFF10151D))
) {
Column(
modifier = Modifier
.fillMaxSize()
- .padding(horizontal = 28.dp, vertical = 22.dp),
- verticalArrangement = Arrangement.spacedBy(18.dp)
+ .padding(horizontal = 20.dp, vertical = 20.dp),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
@@ -130,11 +134,11 @@ internal fun VodPlaybackSettingsSheet(
Text(
text = stringResource(R.string.player_playback_settings),
modifier = Modifier.weight(1f),
- style = MaterialTheme.typography.headlineSmall,
+ style = MaterialTheme.typography.titleLarge,
color = Color.White,
fontWeight = FontWeight.SemiBold
)
- TvIconButton(
+ VodControlButton(
onClick = onDismiss,
modifier = Modifier.semantics { contentDescription = closeLabel }
) {
@@ -143,12 +147,21 @@ internal fun VodPlaybackSettingsSheet(
}
LazyColumn(
modifier = Modifier.fillMaxWidth(),
- verticalArrangement = Arrangement.spacedBy(8.dp)
+ contentPadding = PaddingValues(vertical = 4.dp),
+ verticalArrangement = Arrangement.spacedBy(4.dp)
) {
items(actions, key = VodSettingsAction::id) { action ->
TvClickableSurface(
onClick = action.onClick,
enabled = action.enabled,
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(10.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = Color.White.copy(alpha = 0.035f),
+ contentColor = Color(0xFFDCE3ED),
+ focusedContainerColor = Color(0xFFDFEBFA),
+ focusedContentColor = Color(0xFF10151D)
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
modifier = Modifier
.fillMaxWidth()
.then(
@@ -160,16 +173,33 @@ internal fun VodPlaybackSettingsSheet(
)
.semantics { contentDescription = action.label }
) {
- Text(
- text = action.label,
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 18.dp, vertical = 15.dp),
- style = MaterialTheme.typography.titleMedium,
- color = Color.White,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis
- )
+ Row(
+ modifier = Modifier.fillMaxWidth().heightIn(min = 48.dp)
+ .padding(horizontal = 12.dp, vertical = 10.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ Icon(
+ imageVector = vodSettingsIcon(action.id, isMuted),
+ contentDescription = null,
+ modifier = Modifier.size(20.dp),
+ tint = LocalContentColor.current.copy(alpha = 0.8f)
+ )
+ Text(
+ text = action.label,
+ modifier = Modifier.weight(1f),
+ style = MaterialTheme.typography.bodyMedium,
+ color = LocalContentColor.current,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis
+ )
+ Icon(
+ imageVector = Icons.Default.ChevronRight,
+ contentDescription = null,
+ modifier = Modifier.size(16.dp),
+ tint = LocalContentColor.current.copy(alpha = 0.45f)
+ )
+ }
}
}
}
@@ -177,3 +207,21 @@ internal fun VodPlaybackSettingsSheet(
}
}
}
+
+private fun vodSettingsIcon(id: String, isMuted: Boolean): ImageVector = when (id) {
+ "subtitles" -> Icons.Default.ClosedCaption
+ "audio" -> Icons.Default.Audiotrack
+ "quality" -> Icons.Default.HighQuality
+ "speed" -> Icons.Default.Speed
+ "stop_timer" -> Icons.Default.Timer
+ "idle_timer" -> Icons.Default.Bedtime
+ "aspect" -> Icons.Default.AspectRatio
+ "mute" -> if (isMuted) Icons.Default.VolumeOff else Icons.Default.VolumeUp
+ "pip" -> Icons.Default.PictureInPictureAlt
+ "episodes" -> Icons.Default.VideoLibrary
+ "external" -> Icons.Default.OpenInNew
+ "split_screen" -> Icons.Default.ViewWeek
+ "cast" -> Icons.Default.Cast
+ "av_sync" -> Icons.Default.Sync
+ else -> Icons.Default.Settings
+}
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlay.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlay.kt
index 35892a19..74dc07d7 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlay.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlay.kt
@@ -8,15 +8,16 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Audiotrack
+import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.ClosedCaption
import androidx.compose.material.icons.filled.MenuBook
import androidx.compose.material.icons.filled.Settings
@@ -26,7 +27,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.semantics.contentDescription
@@ -38,11 +38,10 @@ import androidx.compose.ui.res.stringResource
import androidx.tv.material3.Icon
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
-import com.streamvault.core.ui.interaction.TvButton
-import com.streamvault.core.ui.interaction.TvIconButton
import com.streamvault.feature.playback.R
import com.streamvault.feature.playback.player.overlay.PlayerBackButton
+@OptIn(ExperimentalLayoutApi::class)
@Composable
internal fun VodPlayerControlsOverlay(
visible: Boolean,
@@ -113,14 +112,14 @@ internal fun VodPlayerControlsOverlay(
modifier = Modifier
.align(Alignment.BottomCenter)
.fillMaxWidth()
- .padding(horizontal = 42.dp, vertical = 28.dp),
- verticalArrangement = Arrangement.spacedBy(14.dp)
+ .padding(horizontal = 32.dp, vertical = 18.dp),
+ verticalArrangement = Arrangement.spacedBy(6.dp)
) {
Row(verticalAlignment = Alignment.Bottom) {
Column(modifier = Modifier.weight(1f)) {
Text(
text = title,
- style = MaterialTheme.typography.headlineSmall,
+ style = MaterialTheme.typography.titleLarge,
color = Color.White,
fontWeight = FontWeight.SemiBold,
maxLines = 1,
@@ -160,9 +159,10 @@ internal fun VodPlayerControlsOverlay(
onSeekPreviewPositionChanged = onSeekPreviewPositionChanged
)
- Row(
+ FlowRow(
modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.Center
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
) {
VodTransportControls(
isPlaying = isPlaying,
@@ -175,13 +175,7 @@ internal fun VodPlayerControlsOverlay(
onSeekForward = onSeekForward,
onSeekNextChapter = onSeekNextChapter
)
- }
-
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.spacedBy(10.dp),
- verticalAlignment = Alignment.CenterVertically
- ) {
+ Spacer(modifier = Modifier.weight(1f))
if (overlayState.showChapterAction) {
VodActionButton(
icon = Icons.Default.MenuBook,
@@ -196,7 +190,6 @@ internal fun VodPlayerControlsOverlay(
onClick = onOpenEpisodes
)
}
- Spacer(modifier = Modifier.weight(1f))
if (overlayState.showSubtitleAction) {
VodActionButton(
icon = Icons.Default.ClosedCaption,
@@ -212,18 +205,18 @@ internal fun VodPlayerControlsOverlay(
)
}
if (overlayState.showSettingsAction) {
- TvIconButton(
+ VodControlButton(
onClick = onOpenSettings,
modifier = Modifier.semantics { contentDescription = settingsLabel }
) {
Icon(imageVector = Icons.Default.Settings, contentDescription = null)
}
}
- TvIconButton(
+ VodControlButton(
onClick = onClose,
modifier = Modifier.semantics { contentDescription = closeLabel }
) {
- Text(text = "×", style = MaterialTheme.typography.headlineSmall, color = Color.White)
+ Icon(imageVector = Icons.Default.Close, contentDescription = null)
}
}
}
@@ -233,7 +226,7 @@ internal fun VodPlayerControlsOverlay(
text = formatVodDuration(seekPreview.positionMs),
modifier = Modifier
.align(Alignment.BottomCenter)
- .padding(bottom = 190.dp)
+ .padding(bottom = 162.dp)
.clip(RoundedCornerShape(10.dp))
.background(Color.Black.copy(alpha = 0.72f))
.padding(horizontal = 14.dp, vertical = 8.dp),
@@ -251,12 +244,10 @@ private fun VodActionButton(
label: String,
onClick: () -> Unit
) {
- TvButton(
+ VodControlButton(
onClick = onClick,
modifier = Modifier.semantics { contentDescription = label }
) {
Icon(imageVector = icon, contentDescription = null)
- Spacer(modifier = Modifier.width(8.dp))
- Text(text = label)
}
}
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTimeline.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTimeline.kt
index 80a501d8..ab76d8ea 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTimeline.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTimeline.kt
@@ -1,6 +1,10 @@
package com.streamvault.feature.playback.player
import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@@ -22,6 +26,7 @@ import androidx.compose.ui.res.stringResource
import com.streamvault.feature.playback.R
import com.streamvault.player.PlayerChapter
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun VodTimeline(
chapters: List<PlayerChapter>,
@@ -43,7 +48,7 @@ internal fun VodTimeline(
Box(
modifier = modifier
.fillMaxWidth()
- .height(40.dp)
+ .height(32.dp)
.semantics { contentDescription = timelineDescription }
) {
Canvas(modifier = Modifier.matchParentSize()) {
@@ -74,6 +79,21 @@ internal fun VodTimeline(
isScrubbing = false
},
modifier = Modifier.matchParentSize(),
+ thumb = {
+ Box(Modifier.size(12.dp).background(Color.White, CircleShape))
+ },
+ track = { sliderState ->
+ SliderDefaults.Track(
+ sliderState = sliderState,
+ modifier = Modifier.height(4.dp),
+ thumbTrackGapSize = 0.dp,
+ drawStopIndicator = null,
+ colors = SliderDefaults.colors(
+ activeTrackColor = Color.White,
+ inactiveTrackColor = Color.White.copy(alpha = 0.28f)
+ )
+ )
+ },
colors = SliderDefaults.colors(
thumbColor = Color.White,
activeTrackColor = Color.White,
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTransportControls.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTransportControls.kt
index d7560dea..94c0fb61 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTransportControls.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTransportControls.kt
@@ -4,10 +4,10 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.FastForward
+import androidx.compose.material.icons.filled.Forward10
import androidx.compose.material.icons.filled.Pause
import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.Replay
+import androidx.compose.material.icons.filled.Replay10
import androidx.compose.material.icons.filled.SkipNext
import androidx.compose.material.icons.filled.SkipPrevious
import androidx.compose.runtime.Composable
@@ -20,9 +20,6 @@ import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
import androidx.compose.ui.res.stringResource
import androidx.tv.material3.Icon
-import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.Text
-import com.streamvault.core.ui.interaction.TvIconButton
import com.streamvault.feature.playback.R
@Composable
@@ -40,7 +37,7 @@ internal fun VodTransportControls(
) {
Row(
modifier = modifier,
- horizontalArrangement = Arrangement.spacedBy(10.dp),
+ horizontalArrangement = Arrangement.spacedBy(6.dp),
verticalAlignment = Alignment.CenterVertically
) {
VodTransportButton(
@@ -50,11 +47,11 @@ internal fun VodTransportControls(
onClick = onSeekPreviousChapter
)
VodTransportButton(
- icon = Icons.Default.Replay,
+ icon = Icons.Default.Replay10,
label = stringResource(R.string.player_rewind_10_seconds),
onClick = onSeekBackward
)
- TvIconButton(
+ VodControlButton(
onClick = onTogglePlayPause,
modifier = Modifier
.focusRequester(playButtonFocusRequester)
@@ -64,11 +61,11 @@ internal fun VodTransportControls(
Icon(
imageVector = if (isPlaying) Icons.Default.Pause else Icons.Default.PlayArrow,
contentDescription = null,
- tint = MaterialTheme.colorScheme.onPrimary
+ tint = androidx.tv.material3.LocalContentColor.current
)
}
VodTransportButton(
- icon = Icons.Default.FastForward,
+ icon = Icons.Default.Forward10,
label = stringResource(R.string.player_forward_10_seconds),
onClick = onSeekForward
)
@@ -88,7 +85,7 @@ private fun VodTransportButton(
enabled: Boolean = true,
onClick: () -> Unit
) {
- TvIconButton(
+ VodControlButton(
onClick = onClick,
enabled = enabled,
modifier = Modifier.semantics { contentDescription = label }
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerBackButton.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerBackButton.kt
index 862ab681..956e99c4 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerBackButton.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerBackButton.kt
@@ -1,12 +1,15 @@
package com.streamvault.feature.playback.player.overlay
import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
+import androidx.compose.ui.Alignment
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
@@ -69,31 +72,30 @@ internal fun PlayerBackButton(
true
})
},
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
+ shape = ClickableSurfaceDefaults.shape(CircleShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = AppColors.SurfaceEmphasis.copy(alpha = 0.86f),
+ containerColor = Color.Black.copy(alpha = 0.36f),
contentColor = Color.White,
- focusedContainerColor = AppColors.Brand,
- focusedContentColor = AppColors.OnPrimary
+ focusedContainerColor = Color.White,
+ focusedContentColor = Color(0xFF10151D)
),
border = ClickableSurfaceDefaults.border(
- border = Border(
- border = BorderStroke(1.dp, AppColors.Outline.copy(alpha = 0.8f)),
- shape = RoundedCornerShape(14.dp)
- ),
+ border = Border.None,
focusedBorder = Border(
border = BorderStroke(2.dp, AppColors.Focus),
- shape = RoundedCornerShape(14.dp)
+ shape = CircleShape
)
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
glow = ClickableSurfaceDefaults.glow(focusedGlow = Glow.None)
) {
- Icon(
- imageVector = Icons.AutoMirrored.Filled.ArrowBack,
- contentDescription = null,
- tint = LocalContentColor.current,
- modifier = Modifier.size(24.dp)
- )
+ Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+ Icon(
+ imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+ contentDescription = null,
+ tint = LocalContentColor.current,
+ modifier = Modifier.size(24.dp)
+ )
+ }
}
}
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerChannelInfoOverlay.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerChannelInfoOverlay.kt
index 74ec486d..74ec0f39 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerChannelInfoOverlay.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/overlay/PlayerChannelInfoOverlay.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
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.Row
import androidx.compose.foundation.layout.Spacer
@@ -170,7 +171,7 @@ fun ChannelInfoOverlay(
}
}
- Column(modifier = Modifier.fillMaxWidth()) {
+ ChannelInfoOverlayFrame(showBackButton, onBackToMenu, onOverlayInteracted) {
PlayerOverlayPanel(
modifier = Modifier
.fillMaxWidth()
@@ -189,9 +190,6 @@ fun ChannelInfoOverlay(
horizontalArrangement = Arrangement.spacedBy(10.dp),
verticalAlignment = Alignment.CenterVertically
) {
- if (showBackButton) {
- PlayerBackButton(onClick = onBackToMenu)
- }
if (currentChannel != null) {
Box(
modifier = Modifier
@@ -705,6 +703,28 @@ fun ChannelInfoOverlay(
}
}
+@Composable
+private fun ChannelInfoOverlayFrame(
+ showBackButton: Boolean,
+ onBackToMenu: () -> Unit,
+ onOverlayInteracted: () -> Unit,
+ content: @Composable ColumnScope.() -> Unit
+) {
+ Box(modifier = Modifier.fillMaxSize()) {
+ if (showBackButton) {
+ PlayerBackButton(
+ onClick = onBackToMenu,
+ modifier = Modifier.align(Alignment.TopStart).padding(24.dp)
+ .onFocusChanged { if (it.isFocused) onOverlayInteracted() }
+ )
+ }
+ Column(
+ modifier = Modifier.align(Alignment.BottomCenter).fillMaxWidth(),
+ content = content
+ )
+ }
+}
+
private enum class ChannelInfoPanel {
LIVE_DVR,
RECORD,