feat: add skip segment functionality to player

2026-07-24 03:36:51 +00:00 · 2026-04-26 12:21:52 +02:00
parent 9906d473c5
commit 522c8273d5
13 changed files with 263 additions and 56 deletions
--- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt
+++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt
@@ -689,6 +689,7 @@ private fun OverlayHost(
            onSeek = { _ -> },
            onSeekRelative = { _ -> },
            onSeekLiveEdge = {},
+            onSkipSegment = {},
            onNext = {},
            onPrevious = {},
            onOpenAudioPanel = {},
@@ -804,6 +805,7 @@ private fun TrackPanelHost(
                onSeek = { _ -> },
                onSeekRelative = { _ -> },
                onSeekLiveEdge = {},
+                onSkipSegment = {},
                onNext = {},
                onPrevious = {},
                onOpenAudioPanel = {
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.SkipNext
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -50,6 +51,7 @@ import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
 import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker
 import hu.bbara.purefin.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.ui.screen.player.components.TvIconButton
 import hu.bbara.purefin.ui.screen.player.components.TvPlayerControlsOverlay
 import hu.bbara.purefin.ui.screen.player.components.TvPlayerLoadingErrorEndCard
 import hu.bbara.purefin.ui.screen.player.components.TvTrackPanelType
@@ -116,6 +118,7 @@ fun TvPlayerScreen(
    val qualityButtonFocusRequester = remember { FocusRequester() }
    val audioButtonFocusRequester = remember { FocusRequester() }
    val subtitlesButtonFocusRequester = remember { FocusRequester() }
+    val skipButtonFocusRequester = remember { FocusRequester() }
    val expandPlaylist: () -> Unit = {
        if (!isPlaylistExpanded) {
            isPlaylistExpanded = true
@@ -158,6 +161,10 @@ fun TvPlayerScreen(
        viewModel.seekToLiveEdge()
        showTvControls()
    }
+    val skipSegmentAndShowControls: () -> Unit = {
+        viewModel.skipActiveSegment()
+        showTvControls()
+    }
    val nextAndShowControls: () -> Unit = {
        viewModel.next(TV_CONTROLS_AUTO_HIDE_MS)
    }
@@ -177,6 +184,10 @@ fun TvPlayerScreen(
        if (controlsVisible) {
            controlsFocusRequester.requestFocus()
        } else {
+            uiState.activeSkippableSegmentEndMs?.let {
+                skipButtonFocusRequester.requestFocus()
+                return@LaunchedEffect
+            }
            hiddenControlFocusRequester.requestFocus()
        }
    }
@@ -251,8 +262,10 @@ fun TvPlayerScreen(
                .align(Alignment.Center)
        )

+        val playerControlsVisible =
+            controlsVisible || isPlaylistExpanded || trackPanelType != null || uiState.isEnded || uiState.error != null
        AnimatedVisibility(
-            visible = controlsVisible || isPlaylistExpanded || trackPanelType != null || uiState.isEnded || uiState.error != null,
+            visible = playerControlsVisible,
            enter = fadeIn(),
            exit = fadeOut()
        ) {
@@ -268,6 +281,7 @@ fun TvPlayerScreen(
                onSeek = seekAndShowControls,
                onSeekRelative = seekByAndShowControls,
                onSeekLiveEdge = seekToLiveEdgeAndShowControls,
+                onSkipSegment = skipSegmentAndShowControls,
                onNext = nextAndShowControls,
                onPrevious = previousAndShowControls,
                onOpenAudioPanel = { trackPanelType = TvTrackPanelType.AUDIO },
@@ -285,6 +299,24 @@ fun TvPlayerScreen(
            )
        }

+        AnimatedVisibility(
+            visible = !playerControlsVisible && uiState.activeSkippableSegmentEndMs != null,
+            enter = fadeIn(),
+            exit = fadeOut(),
+            modifier = Modifier
+                .align(Alignment.BottomEnd)
+                .padding(end = 24.dp, bottom = 24.dp)
+        ) {
+            TvIconButton(
+                icon = Icons.Outlined.SkipNext,
+                contentDescription = "Skip segment",
+                onClick = skipSegmentAndShowControls,
+                size = 64,
+                label = "Skip",
+                modifier = Modifier.focusRequester(skipButtonFocusRequester)
+            )
+        }
+
        TvPlayerLoadingErrorEndCard(
            modifier = Modifier.align(Alignment.Center),
            uiState = uiState,
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvIconButton.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvIconButton.kt
@@ -5,13 +5,17 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -28,6 +32,7 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.semantics.disabled
 import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp

@Composable
@@ -37,6 +42,7 @@ internal fun TvIconButton(
    onClick: () -> Unit,
    size: Int = 52,
    enabled: Boolean = true,
+    label: String? = null,
    modifier: Modifier = Modifier
 ) {
    val scheme = MaterialTheme.colorScheme
@@ -57,7 +63,7 @@ internal fun TvIconButton(
                scaleY = scale
            }
            .alpha(if (enabled) 1f else 0.4f)
-            .widthIn(min = size.dp)
+            .widthIn(min = if (label == null) size.dp else 104.dp)
            .height(size.dp)
            .border(
                width = if (isFocused) 2.dp else 0.dp,
@@ -79,11 +85,32 @@ internal fun TvIconButton(
            .clickable(enabled = enabled) { onClick() },
        contentAlignment = Alignment.Center
    ) {
-        Icon(
-            imageVector = icon,
-            contentDescription = contentDescription,
-            tint = scheme.onBackground,
-            modifier = Modifier.padding(8.dp)
-        )
+        if (label == null) {
+            Icon(
+                imageVector = icon,
+                contentDescription = contentDescription,
+                tint = scheme.onBackground,
+                modifier = Modifier.padding(8.dp)
+            )
+        } else {
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(6.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.padding(horizontal = 16.dp)
+            ) {
+                Icon(
+                    imageVector = icon,
+                    contentDescription = contentDescription,
+                    tint = scheme.onBackground,
+                    modifier = Modifier.size(28.dp)
+                )
+                Text(
+                    text = label,
+                    color = scheme.onBackground,
+                    style = MaterialTheme.typography.labelLarge,
+                    fontWeight = FontWeight.SemiBold
+                )
+            }
+        }
    }
 }
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt
@@ -65,6 +65,7 @@ internal fun TvPlayerControlsOverlay(
    onSeek: (Long) -> Unit,
    onSeekRelative: (Long) -> Unit,
    onSeekLiveEdge: () -> Unit,
+    onSkipSegment: () -> Unit,
    onNext: () -> Unit,
    onPrevious: () -> Unit,
    onOpenAudioPanel: () -> Unit,
@@ -110,6 +111,7 @@ internal fun TvPlayerControlsOverlay(
            onSeek = onSeek,
            onSeekRelative = onSeekRelative,
            onSeekLiveEdge = onSeekLiveEdge,
+            onSkipSegment = onSkipSegment,
            onNext = onNext,
            onPrevious = onPrevious,
            onOpenAudioPanel = onOpenAudioPanel,
@@ -172,6 +174,7 @@ private fun TvPlayerBottomSection(
    onSeek: (Long) -> Unit,
    onSeekRelative: (Long) -> Unit,
    onSeekLiveEdge: () -> Unit,
+    onSkipSegment: () -> Unit,
    onNext: () -> Unit,
    onPrevious: () -> Unit,
    onOpenAudioPanel: () -> Unit,
@@ -215,6 +218,24 @@ private fun TvPlayerBottomSection(
            horizontalArrangement = Arrangement.SpaceBetween,
            verticalAlignment = Alignment.CenterVertically
        ) {
+            if (uiState.activeSkippableSegmentEndMs != null) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 4.dp),
+                    horizontalArrangement = Arrangement.End
+                ) {
+                    TvIconButton(
+                        icon = Icons.Outlined.SkipNext,
+                        contentDescription = "Skip segment",
+                        onClick = onSkipSegment,
+                        size = 64,
+                        label = "Skip",
+                        modifier = expandPlaylistModifier
+                    )
+                }
+                Spacer(modifier = Modifier.height(6.dp))
+            }
            Text(
                text = formatTime(uiState.positionMs),
                color = scheme.onSurface,