StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat: add cinematic VOD controls and chapter sheets
David Nashashee1e18792412
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.ktnew file mode 100644index 00000000..3d7d81f2--- /dev/null+++ b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlayGoldenTest.kt@@ -0,0 +1,119 @@+package com.streamvault.feature.playback.player++import androidx.compose.runtime.remember+import androidx.compose.ui.focus.FocusRequester+import androidx.compose.ui.test.junit4.createComposeRule+import androidx.compose.ui.test.onNodeWithContentDescription+import androidx.test.ext.junit.runners.AndroidJUnit4+import com.streamvault.core.ui.theme.StreamVaultTheme+import com.streamvault.player.PlayerChapter+import org.junit.Rule+import org.junit.Test+import org.junit.runner.RunWith++@RunWith(AndroidJUnit4::class)+class VodPlayerControlsOverlayGoldenTest {++ @get:Rule+ val composeRule = createComposeRule()++ @Test+ fun chapterAwareOverlay_exposesVideoFirstActions() {+ composeRule.setContent {+ StreamVaultTheme {+ val focusRequester = remember { FocusRequester() }+ VodPlayerControlsOverlay(+ visible = true,+ title = "The Long Night",+ overlayState = buildVodOverlayState(+ contentType = "MOVIE",+ isCatchUpPlayback = false,+ chapters = listOf(+ PlayerChapter(1, "Opening", 0L, 60_000L),+ PlayerChapter(2, "The flooded station", 60_000L, null)+ ),+ currentPositionMs = 72_000L,+ showEpisodesAction = false,+ subtitleTrackCount = 1,+ audioTrackCount = 1,+ videoQualityCount = 1,+ showExternalPlayerAction = false,+ isCastConnected = false+ ),+ isPlaying = true,+ currentPositionMs = 72_000L,+ durationMs = 150_000L,+ seekPreview = SeekPreviewState(),+ playButtonFocusRequester = focusRequester,+ onClose = {},+ onTogglePlayPause = {},+ onSeekBackward = {},+ onSeekForward = {},+ onSeekPreviousChapter = {},+ onSeekNextChapter = {},+ onOpenChapters = {},+ onOpenEpisodes = {},+ onOpenSubtitleTracks = {},+ onOpenAudioTracks = {},+ onOpenSettings = {},+ onSeekToPosition = {},+ onSetScrubbingMode = {},+ onSeekPreviewPositionChanged = {},+ onUserInteraction = {}+ )+ }+ }++ composeRule.onNodeWithContentDescription("VOD playback controls").assertExists()+ composeRule.onNodeWithContentDescription("Chapters").assertExists()+ composeRule.onNodeWithContentDescription("Next chapter").assertExists()+ }++ @Test+ fun noChapters_hidesChapterAction() {+ composeRule.setContent {+ StreamVaultTheme {+ val focusRequester = remember { FocusRequester() }+ VodPlayerControlsOverlay(+ visible = true,+ title = "A movie",+ overlayState = buildVodOverlayState(+ contentType = "MOVIE",+ isCatchUpPlayback = false,+ chapters = emptyList(),+ currentPositionMs = 0L,+ showEpisodesAction = false,+ subtitleTrackCount = 0,+ audioTrackCount = 0,+ videoQualityCount = 0,+ showExternalPlayerAction = false,+ isCastConnected = false+ ),+ isPlaying = false,+ currentPositionMs = 0L,+ durationMs = 150_000L,+ seekPreview = SeekPreviewState(),+ playButtonFocusRequester = focusRequester,+ onClose = {},+ onTogglePlayPause = {},+ onSeekBackward = {},+ onSeekForward = {},+ onSeekPreviousChapter = {},+ onSeekNextChapter = {},+ onOpenChapters = {},+ onOpenEpisodes = {},+ onOpenSubtitleTracks = {},+ onOpenAudioTracks = {},+ onOpenSettings = {},+ onSeekToPosition = {},+ onSetScrubbingMode = {},+ onSeekPreviewPositionChanged = {},+ onUserInteraction = {}+ )+ }+ }++ composeRule.onNodeWithContentDescription("VOD playback controls").assertExists()+ composeRule.onNodeWithContentDescription("Chapters").assertDoesNotExist()+ }+}diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerBackNavigationPolicy.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerBackNavigationPolicy.ktindex a6735cf6..5203d642 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerBackNavigationPolicy.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerBackNavigationPolicy.kt@@ -13,6 +13,8 @@ internal enum class PlayerBackAction {CLOSE_PROGRAM_HISTORY,CLOSE_SPLIT_DIALOG,CLOSE_EPISODE_PICKER,+ CLOSE_CHAPTER_SELECTION,+ CLOSE_PLAYBACK_SETTINGS,CLOSE_SPEED_SELECTION,CLOSE_AUDIO_VIDEO_OFFSET_DIALOG,CLOSE_STOP_PLAYBACK_TIMER,@@ -33,6 +35,8 @@ internal data class PlayerBackNavigationState(val showProgramHistory: Boolean = false,val showSplitDialog: Boolean = false,val showEpisodePicker: Boolean = false,+ val showChapterSelection: Boolean = false,+ val showPlaybackSettings: Boolean = false,val showSpeedSelection: Boolean = false,val showAudioVideoOffsetDialog: Boolean = false,val showStopPlaybackTimerDialog: Boolean = false,@@ -54,6 +58,8 @@ internal fun playerBackAction(state: PlayerBackNavigationState): PlayerBackActiostate.showProgramHistory -> PlayerBackAction.CLOSE_PROGRAM_HISTORYstate.showSplitDialog -> PlayerBackAction.CLOSE_SPLIT_DIALOGstate.showEpisodePicker -> PlayerBackAction.CLOSE_EPISODE_PICKER+ state.showChapterSelection -> PlayerBackAction.CLOSE_CHAPTER_SELECTION+ state.showPlaybackSettings -> PlayerBackAction.CLOSE_PLAYBACK_SETTINGSstate.showSpeedSelection -> PlayerBackAction.CLOSE_SPEED_SELECTIONstate.showAudioVideoOffsetDialog -> PlayerBackAction.CLOSE_AUDIO_VIDEO_OFFSET_DIALOGstate.showStopPlaybackTimerDialog -> PlayerBackAction.CLOSE_STOP_PLAYBACK_TIMERdiff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerControlsOverlayHost.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerControlsOverlayHost.ktindex 7774d172..8e272382 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerControlsOverlayHost.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerControlsOverlayHost.kt@@ -8,6 +8,7 @@ import androidx.compose.animation.core.tweenimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box+import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.size@@ -70,6 +71,11 @@ internal fun PlayerControlsOverlayHost(onOpenIdleStandbyTimer: () -> Unit,onOpenAudioVideoSync: () -> Unit,onOpenEpisodes: () -> Unit,+ onOpenChapters: () -> Unit = {},+ onOpenPlaybackSettings: () -> Unit = {},+ showChapterSheet: Boolean = false,+ showPlaybackSettingsSheet: Boolean = false,+ onDismissVodSheet: () -> Unit = {},onOpenSplitScreen: () -> Unit,onEnterPictureInPicture: () -> Unit,onRunRecordingAction: (() -> Unit) -> Unit,@@ -77,6 +83,7 @@ internal fun PlayerControlsOverlayHost() {val currentPosition by playerEngine.currentPosition.collectAsStateWithLifecycle()val duration by playerEngine.duration.collectAsStateWithLifecycle()+ val chapters by playerEngine.chapters.collectAsStateWithLifecycle()val currentProgram by viewModel.currentProgram.collectAsStateWithLifecycle()val playbackTitle by viewModel.playbackTitle.collectAsStateWithLifecycle()val currentSeries by viewModel.currentSeries.collectAsStateWithLifecycle()@@ -99,70 +106,158 @@ internal fun PlayerControlsOverlayHost(val canOpenEpisodePicker = contentType == "SERIES_EPISODE" &¤tSeriesSeasons?.any { it.episodes.isNotEmpty() } == true- PlayerControlsOverlay(- visible = visible,- title = playbackTitle.ifBlank { title },+ val isCastConnected = castConnectionState == CastConnectionState.CONNECTED+ val vodOverlayState = buildVodOverlayState(contentType = contentType,isCatchUpPlayback = isCatchUpPlayback,- isPlaying = isPlaying,- currentProgram = currentProgram,- currentChannel = currentChannel,- currentChannelName = currentChannelName,- displayChannelNumber = displayChannelNumber,- currentPosition = currentPosition,- duration = duration,- aspectRatioLabel = aspectRatioLabel,+ chapters = chapters,+ currentPositionMs = currentPosition,+ showEpisodesAction = canOpenEpisodePicker,subtitleTrackCount = availableSubtitleTracks.size,- liveTranslationAvailable = liveTranslationAvailable,audioTrackCount = availableAudioTracks.size,videoQualityCount = availableVideoQualities.size,- currentRecordingStatus = currentChannelRecording?.status,- isMuted = isMuted,- playbackSpeed = playbackSpeed,- mediaTitle = mediaTitle,- sleepTimerUiState = sleepTimerUiState,- timeshiftUiState = timeshiftUiState,- playButtonFocusRequester = playButtonFocusRequester,- quickActionsFocusRequester = quickActionsFocusRequester,- modifier = modifier,- onClose = viewModel::toggleControls,- onTogglePlayPause = { if (isPlaying) viewModel.pause() else viewModel.play() },- onSeekBackward = viewModel::seekBackward,- onSeekForward = viewModel::seekForward,- onRestartProgram = viewModel::restartCurrentProgram,- onOpenArchive = onOpenArchive,- onStartRecording = { onRunRecordingAction(viewModel::startManualRecording) },- onStopRecording = viewModel::stopCurrentRecording,- onScheduleRecording = { onRunRecordingAction(viewModel::scheduleRecording) },- onScheduleDailyRecording = { onRunRecordingAction(viewModel::scheduleDailyRecording) },- onScheduleWeeklyRecording = { onRunRecordingAction(viewModel::scheduleWeeklyRecording) },- onToggleAspectRatio = viewModel::toggleAspectRatio,- onOpenSubtitleTracks = onOpenSubtitleTracks,- onOpenAudioTracks = onOpenAudioTracks,- onOpenVideoTracks = onOpenVideoTracks,- onOpenPlaybackSpeed = onOpenPlaybackSpeed,- onOpenStopPlaybackTimer = onOpenStopPlaybackTimer,- onOpenIdleStandbyTimer = onOpenIdleStandbyTimer,- onOpenAudioVideoSync = onOpenAudioVideoSync,audioVideoSyncEnabled = audioVideoSyncEnabled,- showEpisodesAction = canOpenEpisodePicker,- onOpenEpisodes = onOpenEpisodes,- onOpenSplitScreen = onOpenSplitScreen,- onEnterPictureInPicture = onEnterPictureInPicture,- onToggleMute = viewModel::toggleMute,- isCastConnected = castConnectionState == CastConnectionState.CONNECTED,- onCast = { viewModel.castCurrentMedia(onOpenCastRouteChooser) },- onStopCasting = viewModel::stopCasting,- onSeekToLiveEdge = viewModel::seekToLiveEdge,- onSeekToPosition = viewModel::seekTo,- onSetScrubbingMode = viewModel::setScrubbingMode,- seekPreview = seekPreview,- onSeekPreviewPositionChanged = viewModel::updateSeekPreview,- onUserInteraction = {- viewModel.notifyUserActivity()- viewModel.refreshControlsAutoHide()- }+ showExternalPlayerAction = false,+ isCastConnected = isCastConnected)++ if (vodOverlayState.isVod) {+ VodPlayerControlsOverlay(+ visible = visible,+ title = playbackTitle.ifBlank { title },+ overlayState = vodOverlayState,+ isPlaying = isPlaying,+ currentPositionMs = currentPosition,+ durationMs = duration,+ seekPreview = seekPreview,+ playButtonFocusRequester = playButtonFocusRequester,+ onClose = viewModel::toggleControls,+ onTogglePlayPause = { if (isPlaying) viewModel.pause() else viewModel.play() },+ onSeekBackward = viewModel::seekBackward,+ onSeekForward = viewModel::seekForward,+ onSeekPreviousChapter = {+ vodOverlayState.previousChapterTargetMs?.let(viewModel::seekTo)+ },+ onSeekNextChapter = {+ vodOverlayState.nextChapterTargetMs?.let(viewModel::seekTo)+ },+ onOpenChapters = onOpenChapters,+ onOpenEpisodes = onOpenEpisodes,+ onOpenSubtitleTracks = onOpenSubtitleTracks,+ onOpenAudioTracks = onOpenAudioTracks,+ onOpenSettings = onOpenPlaybackSettings,+ onSeekToPosition = viewModel::seekTo,+ onSetScrubbingMode = viewModel::setScrubbingMode,+ onSeekPreviewPositionChanged = viewModel::updateSeekPreview,+ onUserInteraction = {+ viewModel.notifyUserActivity()+ viewModel.refreshControlsAutoHide()+ },+ modifier = modifier+ )++ if (showChapterSheet) {+ VodChapterSheet(+ chapters = vodOverlayState.chapters,+ selectedChapterIndex = vodOverlayState.currentChapter?.index,+ onSelectChapter = { chapter ->+ viewModel.seekTo(chapter.startTimeMs)+ onDismissVodSheet()+ },+ onDismiss = onDismissVodSheet,+ modifier = Modifier.fillMaxSize()+ )+ }+ if (showPlaybackSettingsSheet) {+ VodPlaybackSettingsSheet(+ state = vodOverlayState,+ onOpenSubtitleTracks = onOpenSubtitleTracks,+ onOpenAudioTracks = onOpenAudioTracks,+ onOpenVideoTracks = onOpenVideoTracks,+ onOpenPlaybackSpeed = onOpenPlaybackSpeed,+ onOpenStopPlaybackTimer = onOpenStopPlaybackTimer,+ onOpenIdleStandbyTimer = onOpenIdleStandbyTimer,+ onOpenAudioVideoSync = onOpenAudioVideoSync,+ onToggleAspectRatio = viewModel::toggleAspectRatio,+ onToggleMute = viewModel::toggleMute,+ onEnterPictureInPicture = onEnterPictureInPicture,+ onOpenExternalPlayer = {},+ onOpenEpisodes = onOpenEpisodes,+ onOpenSplitScreen = onOpenSplitScreen,+ onCast = { viewModel.castCurrentMedia(onOpenCastRouteChooser) },+ onStopCasting = viewModel::stopCasting,+ isMuted = isMuted,+ isCastConnected = isCastConnected,+ onDismiss = onDismissVodSheet,+ modifier = Modifier.fillMaxSize()+ )+ }+ } else {+ PlayerControlsOverlay(+ visible = visible,+ title = playbackTitle.ifBlank { title },+ contentType = contentType,+ isCatchUpPlayback = isCatchUpPlayback,+ isPlaying = isPlaying,+ currentProgram = currentProgram,+ currentChannel = currentChannel,+ currentChannelName = currentChannelName,+ displayChannelNumber = displayChannelNumber,+ currentPosition = currentPosition,+ duration = duration,+ aspectRatioLabel = aspectRatioLabel,+ subtitleTrackCount = availableSubtitleTracks.size,+ liveTranslationAvailable = liveTranslationAvailable,+ audioTrackCount = availableAudioTracks.size,+ videoQualityCount = availableVideoQualities.size,+ currentRecordingStatus = currentChannelRecording?.status,+ isMuted = isMuted,+ playbackSpeed = playbackSpeed,+ mediaTitle = mediaTitle,+ sleepTimerUiState = sleepTimerUiState,+ timeshiftUiState = timeshiftUiState,+ playButtonFocusRequester = playButtonFocusRequester,+ quickActionsFocusRequester = quickActionsFocusRequester,+ modifier = modifier,+ onClose = viewModel::toggleControls,+ onTogglePlayPause = { if (isPlaying) viewModel.pause() else viewModel.play() },+ onSeekBackward = viewModel::seekBackward,+ onSeekForward = viewModel::seekForward,+ onRestartProgram = viewModel::restartCurrentProgram,+ onOpenArchive = onOpenArchive,+ onStartRecording = { onRunRecordingAction(viewModel::startManualRecording) },+ onStopRecording = viewModel::stopCurrentRecording,+ onScheduleRecording = { onRunRecordingAction(viewModel::scheduleRecording) },+ onScheduleDailyRecording = { onRunRecordingAction(viewModel::scheduleDailyRecording) },+ onScheduleWeeklyRecording = { onRunRecordingAction(viewModel::scheduleWeeklyRecording) },+ onToggleAspectRatio = viewModel::toggleAspectRatio,+ onOpenSubtitleTracks = onOpenSubtitleTracks,+ onOpenAudioTracks = onOpenAudioTracks,+ onOpenVideoTracks = onOpenVideoTracks,+ onOpenPlaybackSpeed = onOpenPlaybackSpeed,+ onOpenStopPlaybackTimer = onOpenStopPlaybackTimer,+ onOpenIdleStandbyTimer = onOpenIdleStandbyTimer,+ onOpenAudioVideoSync = onOpenAudioVideoSync,+ audioVideoSyncEnabled = audioVideoSyncEnabled,+ showEpisodesAction = canOpenEpisodePicker,+ onOpenEpisodes = onOpenEpisodes,+ onOpenSplitScreen = onOpenSplitScreen,+ onEnterPictureInPicture = onEnterPictureInPicture,+ onToggleMute = viewModel::toggleMute,+ isCastConnected = isCastConnected,+ onCast = { viewModel.castCurrentMedia(onOpenCastRouteChooser) },+ onStopCasting = viewModel::stopCasting,+ onSeekToLiveEdge = viewModel::seekToLiveEdge,+ onSeekToPosition = viewModel::seekTo,+ onSetScrubbingMode = viewModel::setScrubbingMode,+ seekPreview = seekPreview,+ onSeekPreviewPositionChanged = viewModel::updateSeekPreview,+ onUserInteraction = {+ viewModel.notifyUserActivity()+ viewModel.refreshControlsAutoHide()+ }+ )+ }}@Composablediff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerModalState.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerModalState.ktindex bf5bd58b..436a1f75 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerModalState.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerModalState.kt@@ -12,6 +12,8 @@ internal sealed interface PlayerModal {data object ProgramHistory : PlayerModaldata object Split : PlayerModaldata object EpisodePicker : PlayerModal+ data object ChapterSelection : PlayerModal+ data object PlaybackSettings : PlayerModal}/*** UI-owned modal state for the player screen.@@ -49,6 +51,12 @@ internal data class PlayerModalState(val showEpisodePicker: Booleanget() = active is PlayerModal.EpisodePicker+ val showChapterSelection: Boolean+ get() = active is PlayerModal.ChapterSelection++ val showPlaybackSettings: Boolean+ get() = active is PlayerModal.PlaybackSettings+val hasVisibleModal: Booleanget() = active != nulldiff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.ktindex 490beabc..435d2ba9 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt@@ -373,6 +373,8 @@ fun PlayerScreen(showProgramHistory = modalState.showProgramHistory,showSplitDialog = modalState.showSplitDialog,showEpisodePicker = modalState.showEpisodePicker,+ showChapterSelection = modalState.showChapterSelection,+ showPlaybackSettings = modalState.showPlaybackSettings,showSpeedSelection = modalState.showSpeedSelection,showAudioVideoOffsetDialog = modalState.showAudioVideoOffsetDialog,showStopPlaybackTimerDialog = modalState.showStopPlaybackTimerDialog,@@ -393,6 +395,8 @@ fun PlayerScreen(PlayerBackAction.CLOSE_PROGRAM_HISTORY -> modalState = modalState.dismiss()PlayerBackAction.CLOSE_SPLIT_DIALOG -> modalState = modalState.dismiss()PlayerBackAction.CLOSE_EPISODE_PICKER -> modalState = modalState.dismiss()+ PlayerBackAction.CLOSE_CHAPTER_SELECTION -> modalState = modalState.dismiss()+ PlayerBackAction.CLOSE_PLAYBACK_SETTINGS -> modalState = modalState.dismiss()PlayerBackAction.CLOSE_SPEED_SELECTION -> modalState = modalState.dismiss()PlayerBackAction.CLOSE_AUDIO_VIDEO_OFFSET_DIALOG -> {modalState = modalState.dismiss()@@ -726,6 +730,11 @@ fun PlayerScreen(onOpenIdleStandbyTimer = { modalState = modalState.open(PlayerModal.IdleStandbyTimer) },onOpenAudioVideoSync = { modalState = modalState.open(PlayerModal.AudioVideoOffset) },onOpenEpisodes = { modalState = modalState.open(PlayerModal.EpisodePicker) },+ onOpenChapters = { modalState = modalState.open(PlayerModal.ChapterSelection) },+ onOpenPlaybackSettings = { modalState = modalState.open(PlayerModal.PlaybackSettings) },+ showChapterSheet = modalState.showChapterSelection,+ showPlaybackSettingsSheet = modalState.showPlaybackSettings,+ onDismissVodSheet = { modalState = modalState.dismiss() },onOpenSplitScreen = { modalState = modalState.open(PlayerModal.Split) },onEnterPictureInPicture = enterPictureInPicture,onRunRecordingAction = notificationPermissionGate::runRecordingAction,diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodChapterSheet.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodChapterSheet.ktnew file mode 100644index 00000000..553bcca9--- /dev/null+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodChapterSheet.kt@@ -0,0 +1,156 @@+package com.streamvault.feature.playback.player++import androidx.compose.foundation.background+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.Spacer+import androidx.compose.foundation.layout.fillMaxHeight+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.PlayArrow+import androidx.compose.runtime.Composable+import androidx.compose.ui.Alignment+import androidx.compose.ui.Modifier+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.semantics.contentDescription+import androidx.compose.ui.semantics.semantics+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.unit.dp+import androidx.tv.material3.Icon+import androidx.tv.material3.MaterialTheme+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.player.PlayerChapter++@Composable+internal fun VodChapterSheet(+ chapters: List<PlayerChapter>,+ selectedChapterIndex: Int?,+ onSelectChapter: (PlayerChapter) -> Unit,+ onDismiss: () -> Unit,+ modifier: Modifier = Modifier+) {+ Box(+ modifier = modifier+ .fillMaxSize()+ .background(Color.Black.copy(alpha = 0.72f))+ ) {+ Surface(+ modifier = Modifier+ .align(Alignment.CenterEnd)+ .fillMaxHeight()+ .widthIn(min = 360.dp, max = 520.dp),+ colors = SurfaceDefaults.colors(containerColor = Color(0xFF111216))+ ) {+ Column(+ modifier = Modifier+ .fillMaxSize()+ .padding(horizontal = 28.dp, vertical = 22.dp),+ verticalArrangement = Arrangement.spacedBy(18.dp)+ ) {+ Row(verticalAlignment = Alignment.CenterVertically) {+ Column(modifier = Modifier.weight(1f)) {+ Text(+ text = "Chapters",+ style = MaterialTheme.typography.headlineSmall,+ color = Color.White,+ fontWeight = FontWeight.SemiBold+ )+ Text(+ text = "${chapters.size} chapters",+ style = MaterialTheme.typography.bodySmall,+ color = Color.White.copy(alpha = 0.64f)+ )+ }+ TvIconButton(+ onClick = onDismiss,+ modifier = Modifier.semantics { contentDescription = "Close chapters" }+ ) {+ Icon(imageVector = Icons.Default.Close, contentDescription = null)+ }+ }++ LazyColumn(+ modifier = Modifier.fillMaxWidth(),+ verticalArrangement = Arrangement.spacedBy(8.dp)+ ) {+ items(chapters, key = PlayerChapter::index) { chapter ->+ val selected = chapter.index == selectedChapterIndex+ TvClickableSurface(+ onClick = { onSelectChapter(chapter) },+ modifier = Modifier+ .fillMaxWidth()+ .semantics {+ contentDescription = if (selected) {+ "Chapter ${chapter.index}, selected"+ } else {+ "Chapter ${chapter.index}"+ }+ }+ ) {+ Row(+ modifier = Modifier+ .fillMaxWidth()+ .background(+ if (selected) Color.White.copy(alpha = 0.12f) else Color.Transparent+ )+ .padding(horizontal = 16.dp, vertical = 14.dp),+ verticalAlignment = Alignment.CenterVertically+ ) {+ if (selected) {+ Icon(+ imageVector = Icons.Default.PlayArrow,+ contentDescription = null,+ tint = MaterialTheme.colorScheme.primary+ )+ } else {+ Spacer(modifier = Modifier.width(24.dp))+ }+ Spacer(modifier = Modifier.width(10.dp))+ Column(modifier = Modifier.weight(1f)) {+ Text(+ text = chapter.title,+ style = MaterialTheme.typography.titleMedium,+ color = Color.White,+ maxLines = 1,+ overflow = TextOverflow.Ellipsis+ )+ Text(+ text = formatVodDuration(chapter.startTimeMs),+ style = MaterialTheme.typography.bodySmall,+ color = Color.White.copy(alpha = 0.64f)+ )+ }+ }+ }+ }+ }+ }+ }+ }+}++internal fun formatVodDuration(durationMs: Long): String {+ val totalSeconds = durationMs.coerceAtLeast(0L) / 1_000L+ val hours = totalSeconds / 3_600L+ val minutes = (totalSeconds % 3_600L) / 60L+ val seconds = totalSeconds % 60L+ return if (hours > 0L) {+ "%d:%02d:%02d".format(hours, minutes, seconds)+ } else {+ "%d:%02d".format(minutes, seconds)+ }+}diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodOverlayState.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodOverlayState.ktindex bbf95f3a..409ad0c8 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodOverlayState.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodOverlayState.kt@@ -14,6 +14,7 @@ internal data class VodOverlayState(val showSubtitleAction: Boolean,val showAudioAction: Boolean,val showVideoQualityAction: Boolean,+ val showAudioVideoSyncAction: Boolean,val showExternalPlayerAction: Boolean,val showSettingsAction: Boolean)@@ -27,6 +28,7 @@ internal fun buildVodOverlayState(subtitleTrackCount: Int,audioTrackCount: Int,videoQualityCount: Int,+ audioVideoSyncEnabled: Boolean = false,showExternalPlayerAction: Boolean,isCastConnected: Boolean): VodOverlayState {@@ -49,6 +51,7 @@ internal fun buildVodOverlayState(showSubtitleAction = isVod && subtitleTrackCount > 0,showAudioAction = isVod && audioTrackCount > 0,showVideoQualityAction = isVod && videoQualityCount > 0,+ showAudioVideoSyncAction = isVod && audioVideoSyncEnabled && !isCastConnected,showExternalPlayerAction = isVod && showExternalPlayerAction,showSettingsAction = isVod)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.ktnew file mode 100644index 00000000..7df774d5--- /dev/null+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlaybackSettingsSheet.kt@@ -0,0 +1,161 @@+package com.streamvault.feature.playback.player++import androidx.compose.foundation.background+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.Spacer+import androidx.compose.foundation.layout.fillMaxHeight+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.runtime.Composable+import androidx.compose.ui.Alignment+import androidx.compose.ui.Modifier+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.semantics.contentDescription+import androidx.compose.ui.semantics.semantics+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.unit.dp+import androidx.tv.material3.Icon+import androidx.tv.material3.MaterialTheme+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++internal data class VodSettingsAction(+ val id: String,+ val label: String,+ val enabled: Boolean = true,+ val onClick: () -> Unit+)++@Composable+internal fun VodPlaybackSettingsSheet(+ state: VodOverlayState,+ onOpenSubtitleTracks: () -> Unit,+ onOpenAudioTracks: () -> Unit,+ onOpenVideoTracks: () -> Unit,+ onOpenPlaybackSpeed: () -> Unit,+ onOpenStopPlaybackTimer: () -> Unit,+ onOpenIdleStandbyTimer: () -> Unit,+ onOpenAudioVideoSync: () -> Unit,+ onToggleAspectRatio: () -> Unit,+ onToggleMute: () -> Unit,+ onEnterPictureInPicture: () -> Unit,+ onOpenExternalPlayer: () -> Unit,+ onOpenEpisodes: () -> Unit,+ onOpenSplitScreen: () -> Unit,+ onCast: () -> Unit,+ onStopCasting: () -> Unit,+ isMuted: Boolean,+ isCastConnected: Boolean,+ onDismiss: () -> Unit,+ modifier: Modifier = Modifier+) {+ val actions = buildList {+ if (state.showSubtitleAction) add(VodSettingsAction("subtitles", "Subtitles", onClick = onOpenSubtitleTracks))+ if (state.showAudioAction) add(VodSettingsAction("audio", "Audio", onClick = onOpenAudioTracks))+ if (state.showVideoQualityAction) add(VodSettingsAction("quality", "Video quality", onClick = onOpenVideoTracks))+ add(VodSettingsAction("speed", "Playback speed", onClick = onOpenPlaybackSpeed))+ add(VodSettingsAction("stop_timer", "Stop playback timer", onClick = onOpenStopPlaybackTimer))+ add(VodSettingsAction("idle_timer", "Idle standby timer", onClick = onOpenIdleStandbyTimer))+ add(VodSettingsAction("aspect", "Aspect ratio", onClick = onToggleAspectRatio))+ add(VodSettingsAction("mute", if (isMuted) "Unmute" else "Mute", onClick = onToggleMute))+ add(VodSettingsAction("pip", "Picture in picture", onClick = onEnterPictureInPicture))+ if (state.showEpisodesAction) add(VodSettingsAction("episodes", "Episodes", onClick = onOpenEpisodes))+ if (state.showExternalPlayerAction) {+ add(VodSettingsAction("external", "Open in external player", onClick = onOpenExternalPlayer))+ }+ add(VodSettingsAction("split_screen", "Split screen", onClick = onOpenSplitScreen))+ add(+ VodSettingsAction(+ id = "cast",+ label = if (isCastConnected) "Stop casting" else "Cast",+ onClick = if (isCastConnected) onStopCasting else onCast+ )+ )+ if (state.showAudioVideoSyncAction) {+ add(VodSettingsAction("av_sync", "A/V sync", onClick = onOpenAudioVideoSync))+ }+ }++ Box(+ modifier = modifier+ .fillMaxSize()+ .background(Color.Black.copy(alpha = 0.72f))+ ) {+ Surface(+ modifier = Modifier+ .align(Alignment.CenterEnd)+ .fillMaxHeight()+ .widthIn(min = 360.dp, max = 520.dp),+ colors = SurfaceDefaults.colors(containerColor = Color(0xFF111216))+ ) {+ Column(+ modifier = Modifier+ .fillMaxSize()+ .padding(horizontal = 28.dp, vertical = 22.dp),+ verticalArrangement = Arrangement.spacedBy(18.dp)+ ) {+ Row(verticalAlignment = Alignment.CenterVertically) {+ Icon(+ imageVector = Icons.Default.Settings,+ contentDescription = null,+ tint = MaterialTheme.colorScheme.primary+ )+ Spacer(modifier = Modifier.width(12.dp))+ Text(+ text = "Playback settings",+ modifier = Modifier.weight(1f),+ style = MaterialTheme.typography.headlineSmall,+ color = Color.White,+ fontWeight = FontWeight.SemiBold+ )+ TvIconButton(+ onClick = onDismiss,+ modifier = Modifier.semantics { contentDescription = "Close playback settings" }+ ) {+ Icon(imageVector = Icons.Default.Close, contentDescription = null)+ }+ }+ LazyColumn(+ modifier = Modifier.fillMaxWidth(),+ verticalArrangement = Arrangement.spacedBy(8.dp)+ ) {+ items(actions, key = VodSettingsAction::id) { action ->+ TvClickableSurface(+ onClick = action.onClick,+ enabled = action.enabled,+ modifier = Modifier+ .fillMaxWidth()+ .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+ )+ }+ }+ }+ }+ }+ }+}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.ktnew file mode 100644index 00000000..937a95b2--- /dev/null+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodPlayerControlsOverlay.kt@@ -0,0 +1,245 @@+package com.streamvault.feature.playback.player++import androidx.compose.animation.AnimatedVisibility+import androidx.compose.animation.fadeIn+import androidx.compose.animation.fadeOut+import androidx.compose.foundation.background+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.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.ClosedCaption+import androidx.compose.material.icons.filled.MenuBook+import androidx.compose.material.icons.filled.Settings+import androidx.compose.material.icons.filled.Tv+import androidx.compose.runtime.Composable+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+import androidx.compose.ui.semantics.semantics+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.unit.dp+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++@Composable+internal fun VodPlayerControlsOverlay(+ visible: Boolean,+ title: String,+ overlayState: VodOverlayState,+ isPlaying: Boolean,+ currentPositionMs: Long,+ durationMs: Long,+ seekPreview: SeekPreviewState,+ playButtonFocusRequester: FocusRequester,+ onClose: () -> Unit,+ onTogglePlayPause: () -> Unit,+ onSeekBackward: () -> Unit,+ onSeekForward: () -> Unit,+ onSeekPreviousChapter: () -> Unit,+ onSeekNextChapter: () -> Unit,+ onOpenChapters: () -> Unit,+ onOpenEpisodes: () -> Unit,+ onOpenSubtitleTracks: () -> Unit,+ onOpenAudioTracks: () -> Unit,+ onOpenSettings: () -> Unit,+ onSeekToPosition: (Long) -> Unit,+ onSetScrubbingMode: (Boolean) -> Unit,+ onSeekPreviewPositionChanged: (Long?) -> Unit,+ onUserInteraction: () -> Unit,+ modifier: Modifier = Modifier+) {+ AnimatedVisibility(+ visible = visible,+ enter = fadeIn(),+ exit = fadeOut(),+ modifier = modifier+ ) {+ Box(+ modifier = Modifier+ .fillMaxSize()+ .semantics { contentDescription = "VOD playback controls" }+ ) {+ Box(+ modifier = Modifier+ .fillMaxSize()+ .background(+ Brush.verticalGradient(+ colors = listOf(+ Color.Transparent,+ Color.Transparent,+ Color.Black.copy(alpha = 0.92f)+ )+ )+ )+ )++ Column(+ modifier = Modifier+ .align(Alignment.BottomCenter)+ .fillMaxWidth()+ .padding(horizontal = 42.dp, vertical = 28.dp),+ verticalArrangement = Arrangement.spacedBy(14.dp)+ ) {+ Row(verticalAlignment = Alignment.Bottom) {+ Column(modifier = Modifier.weight(1f)) {+ Text(+ text = title,+ style = MaterialTheme.typography.headlineSmall,+ color = Color.White,+ fontWeight = FontWeight.SemiBold,+ maxLines = 1,+ overflow = TextOverflow.Ellipsis+ )+ overlayState.currentChapter?.let { chapter ->+ Text(+ text = "Chapter ${chapter.index} · ${chapter.title}",+ style = MaterialTheme.typography.bodyMedium,+ color = Color.White.copy(alpha = 0.72f),+ maxLines = 1,+ overflow = TextOverflow.Ellipsis+ )+ }+ }+ Column(horizontalAlignment = Alignment.End) {+ Text(+ text = formatVodDuration(currentPositionMs),+ style = MaterialTheme.typography.labelLarge,+ color = Color.White+ )+ Text(+ text = "-${formatVodDuration((durationMs - currentPositionMs).coerceAtLeast(0L))}",+ style = MaterialTheme.typography.labelSmall,+ color = Color.White.copy(alpha = 0.64f)+ )+ }+ }++ VodTimeline(+ chapters = overlayState.chapters,+ currentChapter = overlayState.currentChapter,+ currentPositionMs = currentPositionMs,+ durationMs = durationMs,+ onSeekToPosition = onSeekToPosition,+ onSetScrubbingMode = onSetScrubbingMode,+ onSeekPreviewPositionChanged = onSeekPreviewPositionChanged+ )++ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.Center+ ) {+ VodTransportControls(+ isPlaying = isPlaying,+ playButtonFocusRequester = playButtonFocusRequester,+ canSeekPreviousChapter = overlayState.previousChapterTargetMs != null,+ canSeekNextChapter = overlayState.nextChapterTargetMs != null,+ onSeekPreviousChapter = onSeekPreviousChapter,+ onSeekBackward = onSeekBackward,+ onTogglePlayPause = onTogglePlayPause,+ onSeekForward = onSeekForward,+ onSeekNextChapter = onSeekNextChapter+ )+ }++ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.spacedBy(10.dp),+ verticalAlignment = Alignment.CenterVertically+ ) {+ if (overlayState.showChapterAction) {+ VodActionButton(+ icon = Icons.Default.MenuBook,+ label = "Chapters",+ onClick = onOpenChapters+ )+ }+ if (overlayState.showEpisodesAction) {+ VodActionButton(+ icon = Icons.Default.Tv,+ label = "Episodes",+ onClick = onOpenEpisodes+ )+ }+ Spacer(modifier = Modifier.weight(1f))+ if (overlayState.showSubtitleAction) {+ VodActionButton(+ icon = Icons.Default.ClosedCaption,+ label = "Subtitles",+ onClick = onOpenSubtitleTracks+ )+ }+ if (overlayState.showAudioAction) {+ VodActionButton(+ icon = Icons.Default.Audiotrack,+ label = "Audio",+ onClick = onOpenAudioTracks+ )+ }+ if (overlayState.showSettingsAction) {+ TvIconButton(+ onClick = onOpenSettings,+ modifier = Modifier.semantics { contentDescription = "Settings" }+ ) {+ Icon(imageVector = Icons.Default.Settings, contentDescription = null)+ }+ }+ TvIconButton(+ onClick = onClose,+ modifier = Modifier.semantics { contentDescription = "Close controls" }+ ) {+ Text(text = "×", style = MaterialTheme.typography.headlineSmall, color = Color.White)+ }+ }+ }++ if (seekPreview.visible) {+ Text(+ text = formatVodDuration(seekPreview.positionMs),+ modifier = Modifier+ .align(Alignment.BottomCenter)+ .padding(bottom = 190.dp)+ .clip(RoundedCornerShape(10.dp))+ .background(Color.Black.copy(alpha = 0.72f))+ .padding(horizontal = 14.dp, vertical = 8.dp),+ color = Color.White,+ style = MaterialTheme.typography.labelLarge+ )+ }+ }+ }+}++@Composable+private fun VodActionButton(+ icon: androidx.compose.ui.graphics.vector.ImageVector,+ label: String,+ onClick: () -> Unit+) {+ TvButton(+ 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.ktnew file mode 100644index 00000000..79e19e6b--- /dev/null+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTimeline.kt@@ -0,0 +1,81 @@+package com.streamvault.feature.playback.player++import androidx.compose.foundation.Canvas+import androidx.compose.foundation.layout.Box+import androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.height+import androidx.compose.material3.Slider+import androidx.compose.material3.SliderDefaults+import androidx.compose.runtime.Composable+import androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableFloatStateOf+import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.remember+import androidx.compose.runtime.setValue+import androidx.compose.ui.Modifier+import androidx.compose.ui.geometry.Offset+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.semantics.contentDescription+import androidx.compose.ui.semantics.semantics+import androidx.compose.ui.unit.dp+import com.streamvault.player.PlayerChapter++@Composable+internal fun VodTimeline(+ chapters: List<PlayerChapter>,+ currentChapter: PlayerChapter?,+ currentPositionMs: Long,+ durationMs: Long,+ onSeekToPosition: (Long) -> Unit,+ onSetScrubbingMode: (Boolean) -> Unit,+ onSeekPreviewPositionChanged: (Long?) -> Unit,+ modifier: Modifier = Modifier+) {+ val safeDurationMs = durationMs.coerceAtLeast(1L)+ var scrubFraction by remember { mutableFloatStateOf(0f) }+ var isScrubbing by remember { mutableStateOf(false) }+ val currentFraction = currentPositionMs.coerceIn(0L, safeDurationMs).toFloat() / safeDurationMs+ val value = if (isScrubbing) scrubFraction else currentFraction++ Box(+ modifier = modifier+ .fillMaxWidth()+ .height(40.dp)+ .semantics { contentDescription = "VOD timeline" }+ ) {+ Canvas(modifier = Modifier.matchParentSize()) {+ val trackY = size.height / 2f+ chapters.forEach { chapter ->+ val markerFraction = (chapter.startTimeMs.toFloat() / safeDurationMs).coerceIn(0f, 1f)+ val isCurrent = chapter.index == currentChapter?.index+ drawCircle(+ color = if (isCurrent) Color.White else Color.White.copy(alpha = 0.72f),+ radius = if (isCurrent) 5.dp.toPx() else 3.dp.toPx(),+ center = Offset(size.width * markerFraction, trackY)+ )+ }+ }+ Slider(+ value = value,+ onValueChange = { fraction ->+ scrubFraction = fraction+ isScrubbing = true+ onSetScrubbingMode(true)+ onSeekPreviewPositionChanged((fraction * safeDurationMs).toLong())+ },+ onValueChangeFinished = {+ val positionMs = (scrubFraction * safeDurationMs).toLong().coerceIn(0L, safeDurationMs)+ onSetScrubbingMode(false)+ onSeekPreviewPositionChanged(null)+ onSeekToPosition(positionMs)+ isScrubbing = false+ },+ modifier = Modifier.matchParentSize(),+ colors = SliderDefaults.colors(+ thumbColor = Color.White,+ activeTrackColor = Color.White,+ inactiveTrackColor = Color.White.copy(alpha = 0.24f)+ )+ )+ }+}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.ktnew file mode 100644index 00000000..e9788188--- /dev/null+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTransportControls.kt@@ -0,0 +1,96 @@+package com.streamvault.feature.playback.player++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.Pause+import androidx.compose.material.icons.filled.PlayArrow+import androidx.compose.material.icons.filled.Replay+import androidx.compose.material.icons.filled.SkipNext+import androidx.compose.material.icons.filled.SkipPrevious+import androidx.compose.runtime.Composable+import androidx.compose.ui.Alignment+import androidx.compose.ui.Modifier+import androidx.compose.ui.focus.FocusRequester+import androidx.compose.ui.focus.focusRequester+import androidx.compose.ui.semantics.contentDescription+import androidx.compose.ui.semantics.semantics+import androidx.compose.ui.unit.dp+import androidx.tv.material3.Icon+import androidx.tv.material3.MaterialTheme+import androidx.tv.material3.Text+import com.streamvault.core.ui.interaction.TvIconButton++@Composable+internal fun VodTransportControls(+ isPlaying: Boolean,+ playButtonFocusRequester: FocusRequester,+ canSeekPreviousChapter: Boolean,+ canSeekNextChapter: Boolean,+ onSeekPreviousChapter: () -> Unit,+ onSeekBackward: () -> Unit,+ onTogglePlayPause: () -> Unit,+ onSeekForward: () -> Unit,+ onSeekNextChapter: () -> Unit,+ modifier: Modifier = Modifier+) {+ Row(+ modifier = modifier,+ horizontalArrangement = Arrangement.spacedBy(10.dp),+ verticalAlignment = Alignment.CenterVertically+ ) {+ VodTransportButton(+ icon = Icons.Default.SkipPrevious,+ label = "Previous chapter",+ enabled = canSeekPreviousChapter,+ onClick = onSeekPreviousChapter+ )+ VodTransportButton(+ icon = Icons.Default.Replay,+ label = "Rewind 10 seconds",+ onClick = onSeekBackward+ )+ TvIconButton(+ onClick = onTogglePlayPause,+ modifier = Modifier+ .focusRequester(playButtonFocusRequester)+ .semantics { contentDescription = if (isPlaying) "Pause" else "Play" }+ .padding(2.dp)+ ) {+ Icon(+ imageVector = if (isPlaying) Icons.Default.Pause else Icons.Default.PlayArrow,+ contentDescription = null,+ tint = MaterialTheme.colorScheme.onPrimary+ )+ }+ VodTransportButton(+ icon = Icons.Default.FastForward,+ label = "Forward 10 seconds",+ onClick = onSeekForward+ )+ VodTransportButton(+ icon = Icons.Default.SkipNext,+ label = "Next chapter",+ enabled = canSeekNextChapter,+ onClick = onSeekNextChapter+ )+ }+}++@Composable+private fun VodTransportButton(+ icon: androidx.compose.ui.graphics.vector.ImageVector,+ label: String,+ enabled: Boolean = true,+ onClick: () -> Unit+) {+ TvIconButton(+ onClick = onClick,+ enabled = enabled,+ modifier = Modifier.semantics { contentDescription = label }+ ) {+ Icon(imageVector = icon, contentDescription = null)+ }+}diff --git a/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerBackNavigationPolicyTest.kt b/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerBackNavigationPolicyTest.ktindex fc837084..224ad2af 100644--- a/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerBackNavigationPolicyTest.kt+++ b/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerBackNavigationPolicyTest.kt@@ -52,6 +52,26 @@ class PlayerBackNavigationPolicyTest {assertThat(playerBackAction(state)).isEqualTo(PlayerBackAction.CLOSE_LIVE_OVERLAYS)}+ @Test+ fun `chapter sheet closes before controls`() {+ val state = PlayerBackNavigationState(+ showChapterSelection = true,+ showControls = true+ )++ assertThat(playerBackAction(state)).isEqualTo(PlayerBackAction.CLOSE_CHAPTER_SELECTION)+ }++ @Test+ fun `playback settings close before controls`() {+ val state = PlayerBackNavigationState(+ showPlaybackSettings = true,+ showControls = true+ )++ assertThat(playerBackAction(state)).isEqualTo(PlayerBackAction.CLOSE_PLAYBACK_SETTINGS)+ }+@Testfun `empty player state navigates back`() {assertThat(playerBackAction(PlayerBackNavigationState()))diff --git a/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerModalStateTest.kt b/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerModalStateTest.ktindex 065617bb..ce8f9774 100644--- a/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerModalStateTest.kt+++ b/feature/playback/src/test/java/com/streamvault/feature/playback/player/PlayerModalStateTest.kt@@ -65,4 +65,15 @@ class PlayerModalStateTest {assertThat(state.active).isNull()assertThat(state.hasVisibleModal).isFalse()}++ @Test+ fun `chapter and playback settings sheets are exclusive`() {+ val chapterState = PlayerModalState().open(PlayerModal.ChapterSelection)+ val settingsState = chapterState.open(PlayerModal.PlaybackSettings)++ assertThat(chapterState.showChapterSelection).isTrue()+ assertThat(chapterState.showPlaybackSettings).isFalse()+ assertThat(settingsState.showChapterSelection).isFalse()+ assertThat(settingsState.showPlaybackSettings).isTrue()+ }}