Skip to content

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

feat: enhance player overlay with back button functionality and layout adjustments

David Nashash6aebebcc7e3f
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 56cc4778..34c4117e 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
@@ -4,11 +4,14 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertHeightIsEqualTo
import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertWidthIsEqualTo
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performSemanticsAction
import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.unit.dp
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat
import com.streamvault.core.ui.theme.StreamVaultTheme
@@ -78,6 +81,8 @@ class VodPlayerControlsOverlayGoldenTest {
composeRule.onNodeWithTag("player_back_button")
.assertIsDisplayed()
.assertHasClickAction()
+ .assertWidthIsEqualTo(44.dp)
+ .assertHeightIsEqualTo(44.dp)
.performSemanticsAction(SemanticsActions.OnClick)
composeRule.onNodeWithContentDescription("Chapters").assertExists()
composeRule.onNodeWithContentDescription("Next chapter").assertExists()
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 853a2e3a..4be1976d 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
@@ -7,11 +7,20 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.platform.testTag
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.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.performSemanticsAction
+import androidx.compose.ui.semantics.SemanticsActions
import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
import com.streamvault.core.ui.theme.StreamVaultTheme
+import com.streamvault.domain.model.Channel
import com.streamvault.player.PlayerError
import com.streamvault.player.TrackType
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -75,6 +84,53 @@ class PlayerOverlayGoldenTest {
composeRule.onNodeWithTag("golden").assertPlayerOverlayGolden("player_controls_overlay_vod")
}
+ @Test
+ fun channelInfoOverlay_placesBackButtonInPanelHeader() {
+ var backButtonClicks = 0
+ composeRule.setContent {
+ StreamVaultTheme {
+ ChannelInfoOverlay(
+ currentChannel = Channel(id = 4L, name = "Nickelodeon", number = 4),
+ displayChannelNumber = 4,
+ currentProgram = null,
+ nextProgram = null,
+ focusRequester = remember { FocusRequester() },
+ lastVisitedCategoryName = null,
+ onDismiss = {},
+ onOverlayInteracted = {},
+ onOpenFullEpg = {},
+ onOpenLastGroup = {},
+ currentRecordingStatus = null,
+ onStartRecording = {},
+ onStopRecording = {},
+ onScheduleRecording = {},
+ onScheduleDailyRecording = {},
+ onScheduleWeeklyRecording = {},
+ onRestartProgram = {},
+ onOpenArchive = {},
+ onToggleAspectRatio = {},
+ onToggleDiagnostics = {},
+ onTogglePlayPause = {},
+ onSeekBackward = {},
+ onSeekForward = {},
+ onSeekToLiveEdge = {},
+ isPlaying = true,
+ currentAspectRatio = "Original",
+ isDiagnosticsEnabled = false,
+ showBackButton = true,
+ onBackToMenu = { backButtonClicks++ }
+ )
+ }
+ }
+
+ composeRule.onNodeWithContentDescription("Back to menu")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ .assertTopPositionInRootIsEqualTo(30.dp)
+ .performSemanticsAction(SemanticsActions.OnClick)
+ assertThat(backButtonClicks).isEqualTo(1)
+ }
+
@Test
fun playerNoticeBanner_matchesGolden() {
composeRule.setContent {
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 99c5b33d..862ab681 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,5 +1,6 @@
package com.streamvault.feature.playback.player.overlay
+import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
@@ -13,10 +14,13 @@ import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.onClick
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
+import androidx.tv.material3.Border
import androidx.tv.material3.ClickableSurfaceDefaults
+import androidx.tv.material3.Glow
import androidx.tv.material3.Icon
+import androidx.tv.material3.LocalContentColor
import com.streamvault.core.ui.interaction.TvClickableSurface
-import com.streamvault.core.ui.theme.Primary
+import com.streamvault.core.ui.design.AppColors
import com.streamvault.domain.model.PlayerBackButtonVisibility
import com.streamvault.feature.playback.R
@@ -56,7 +60,7 @@ internal fun PlayerBackButton(
TvClickableSurface(
onClick = onClick,
modifier = modifier
- .size(48.dp)
+ .size(44.dp)
.testTag("player_back_button")
.semantics {
contentDescription = backButtonDescription
@@ -65,16 +69,30 @@ internal fun PlayerBackButton(
true
})
},
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Black.copy(alpha = 0.42f),
- focusedContainerColor = Primary.copy(alpha = 0.9f)
- )
+ containerColor = AppColors.SurfaceEmphasis.copy(alpha = 0.86f),
+ contentColor = Color.White,
+ focusedContainerColor = AppColors.Brand,
+ focusedContentColor = AppColors.OnPrimary
+ ),
+ border = ClickableSurfaceDefaults.border(
+ border = Border(
+ border = BorderStroke(1.dp, AppColors.Outline.copy(alpha = 0.8f)),
+ shape = RoundedCornerShape(14.dp)
+ ),
+ focusedBorder = Border(
+ border = BorderStroke(2.dp, AppColors.Focus),
+ shape = RoundedCornerShape(14.dp)
+ )
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
+ glow = ClickableSurfaceDefaults.glow(focusedGlow = Glow.None)
) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
- tint = Color.White,
+ 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 f01892d5..74ec486d 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
@@ -171,58 +171,49 @@ fun ChannelInfoOverlay(
}
Column(modifier = Modifier.fillMaxWidth()) {
- if (showBackButton) {
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.Start
- ) {
- PlayerBackButton(
- onClick = onBackToMenu,
- modifier = Modifier.padding(start = 18.dp)
- )
- }
- }
-
PlayerOverlayPanel(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 40.dp, vertical = 16.dp)
- ) {
- Column(
- modifier = Modifier.fillMaxWidth(),
- verticalArrangement = Arrangement.spacedBy(8.dp)
) {
Column(
modifier = Modifier.fillMaxWidth(),
- verticalArrangement = Arrangement.spacedBy(4.dp)
+ verticalArrangement = Arrangement.spacedBy(8.dp)
) {
- Row(
+ Column(
modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.spacedBy(8.dp),
- verticalAlignment = Alignment.CenterVertically
+ verticalArrangement = Arrangement.spacedBy(4.dp)
) {
- if (currentChannel != null) {
- Box(
- modifier = Modifier
- .size(44.dp)
- .clip(RoundedCornerShape(12.dp))
- .border(1.dp, AppColors.Focus.copy(alpha = 0.05f), RoundedCornerShape(12.dp))
- ) {
- ChannelLogoBadge(
- channelName = currentChannel.name,
- logoUrl = currentChannel.logoUrl,
- backgroundColor = AppColors.SurfaceEmphasis.copy(alpha = 0.46f),
- contentPadding = PaddingValues(6.dp),
- textStyle = MaterialTheme.typography.labelLarge,
- textColor = AppColors.TextSecondary,
- modifier = Modifier.fillMaxSize()
- )
- }
- }
- Column(
- modifier = Modifier.weight(1f),
- verticalArrangement = Arrangement.spacedBy(4.dp)
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(10.dp),
+ verticalAlignment = Alignment.CenterVertically
) {
+ if (showBackButton) {
+ PlayerBackButton(onClick = onBackToMenu)
+ }
+ if (currentChannel != null) {
+ Box(
+ modifier = Modifier
+ .size(44.dp)
+ .clip(RoundedCornerShape(12.dp))
+ .border(1.dp, AppColors.Focus.copy(alpha = 0.05f), RoundedCornerShape(12.dp))
+ ) {
+ ChannelLogoBadge(
+ channelName = currentChannel.name,
+ logoUrl = currentChannel.logoUrl,
+ backgroundColor = AppColors.SurfaceEmphasis.copy(alpha = 0.46f),
+ contentPadding = PaddingValues(6.dp),
+ textStyle = MaterialTheme.typography.labelLarge,
+ textColor = AppColors.TextSecondary,
+ modifier = Modifier.fillMaxSize()
+ )
+ }
+ }
+ Column(
+ modifier = Modifier.weight(1f),
+ verticalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
Row(
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalAlignment = Alignment.CenterVertically