StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat(subtitles): enhance subtitle management with new settings and sources
David Nashash558096467ca8
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex afb72667..deee8e39 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -6,6 +6,9 @@ All notable product changes are recorded in this document.### Added+- Added OpenSubtitles search and subtitle downloads for VOD playback.+- Added loading local SRT subtitle files from the device during VOD playback.+- Added VOD subtitle settings for delay adjustment and reset, font size, and black background transparency, with an appearance preview and saved size and background preferences.- Added Previous and Next episode controls to the VOD overlay for series playback.- Added temporary automatic quality reduction for supported adaptive streams when decoding struggles, with gradual restoration and respect for manual quality choices.- Added AVC/H.264 fallback for eligible HEVC episodes, preserving playback position, audio, subtitles, and episode history.@@ -40,6 +43,7 @@ All notable product changes are recorded in this document.### Changed+- Improved the VOD UI with consistent subtitle, audio, and OpenSubtitles side panels matching playback settings, separate Sources and Settings tabs, immediate access to provider, online, and device subtitles, and clearer remote navigation and track selection.- Raised M3U admission ceilings to 500,000 entries and 400,000 live channels or movies per provider.- Reduced duplicate category requests and per-row identity database work during Stalker provider setup, preserving portal verification and stable catalog IDs.- Added direct Stalker live-row decoding and bounded ingestion with isolated authorization retries; incomplete responses cannot promote a full catalog, and bootstrap prefixes do not certify bulk catalog fidelity.diff --git a/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/VodTrackSelectionSheetTest.kt b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/VodTrackSelectionSheetTest.ktnew file mode 100644index 00000000..fdb6d8b8--- /dev/null+++ b/feature/playback/src/androidTest/java/com/streamvault/feature/playback/player/VodTrackSelectionSheetTest.kt@@ -0,0 +1,99 @@+package com.streamvault.feature.playback.player++import android.graphics.Bitmap+import androidx.compose.runtime.*+import androidx.compose.ui.test.*+import androidx.compose.ui.test.junit4.createComposeRule+import androidx.compose.ui.input.key.Key+import androidx.compose.ui.semantics.SemanticsActions+import androidx.test.ext.junit.runners.AndroidJUnit4+import androidx.test.platform.app.InstrumentationRegistry+import com.streamvault.core.ui.theme.StreamVaultTheme+import com.streamvault.player.PlayerTrack+import com.streamvault.player.TrackType+import org.junit.Assert.assertEquals+import org.junit.Rule+import org.junit.Test+import org.junit.runner.RunWith+import java.io.File++@RunWith(AndroidJUnit4::class)+@OptIn(ExperimentalTestApi::class)+class VodTrackSelectionSheetTest {+ @get:Rule val rule = createComposeRule()+ private val tracks = (1..30).map { PlayerTrack("$it", "Subtitle language $it", null, TrackType.TEXT, it == 1) }++ @Test fun sourcesRemainVisibleWithManyTracks_andSettingsApplyWithoutClosing() {+ var selected: String? = null+ var searches = 0+ var imports = 0+ var dismissals = 0+ rule.setContent {+ var scale by remember { mutableStateOf(1f) }+ var background by remember { mutableStateOf(0x80000000.toInt()) }+ var offset by remember { mutableStateOf(0) }+ StreamVaultTheme {+ VodTrackSelectionSheet(TrackType.TEXT, tracks, offset, scale, background, true,+ { dismissals++ }, { selected = it }, { searches++ }, { imports++ },+ { offset += it }, { offset = 0 }, { scale = it }, { background = (it * 255 / 100) shl 24 })+ }+ }+ rule.onNodeWithText("Provider subtitles").assertIsDisplayed()+ rule.onNodeWithText("Provider subtitles").assertIsFocused()+ capture("vod-subtitle-sources")+ rule.onNodeWithText("OpenSubtitles").assertIsDisplayed()+ rule.onNodeWithText("Provider subtitles").performKeyInput {+ pressKey(Key.DirectionDown)+ }+ rule.onNodeWithText("OpenSubtitles").assertIsFocused().performKeyInput {+ pressKey(Key.Enter)+ }+ rule.onNodeWithText("Load SRT from device").assertIsDisplayed().performSemanticsAction(SemanticsActions.OnClick) { it() }+ capture("vod-subtitle-sources")+ rule.onNodeWithText("Settings").performSemanticsAction(SemanticsActions.OnClick) { it() }+ capture("vod-subtitle-settings")+ rule.onNodeWithContentDescription("Increase Subtitle delay").performSemanticsAction(SemanticsActions.OnClick) { it() }+ rule.onNodeWithText("100 ms").assertExists()+ rule.onNodeWithContentDescription("Reset delay").performSemanticsAction(SemanticsActions.OnClick) { it() }+ rule.onNodeWithText("0 ms").assertExists()+ rule.onNodeWithContentDescription("Increase Font size").assertIsDisplayed().performSemanticsAction(SemanticsActions.OnClick) { it() }+ rule.onNodeWithText("125%").assertExists()+ rule.onNodeWithContentDescription("Increase Background opacity").assertIsDisplayed().performSemanticsAction(SemanticsActions.OnClick) { it() }+ rule.onNodeWithText("60%").assertExists()+ capture("vod-subtitle-appearance")+ rule.onNodeWithText("Sources").performSemanticsAction(SemanticsActions.OnClick) { it() }+ rule.onNodeWithText("Provider subtitles").performSemanticsAction(SemanticsActions.OnClick) { it() }+ rule.onNode(hasScrollToIndexAction()).performScrollToNode(hasText("Subtitle language 30"))+ rule.onNodeWithText("Subtitle language 30").performSemanticsAction(SemanticsActions.OnClick) { it() }+ assertEquals("30", selected)+ assertEquals(1, searches)+ assertEquals(1, imports)+ assertEquals(1, dismissals)+ }++ @Test fun audioSelection_showsSelectedTrack_andSelectsAnother() {+ var selected: String? = null+ val audio = listOf(PlayerTrack("en", "English · Stereo", "en", TrackType.AUDIO, true),+ PlayerTrack("he", "Hebrew · Stereo", "he", TrackType.AUDIO, false))+ rule.setContent {+ StreamVaultTheme {+ VodTrackSelectionSheet(TrackType.AUDIO, audio, 0, 1f, 0, false,+ {}, { selected = it }, {}, {}, {}, {}, {}, {})+ }+ }+ rule.onNodeWithText("English · Stereo").assertIsDisplayed()+ capture("vod-audio-tracks")+ rule.onNodeWithText("Hebrew · Stereo").performSemanticsAction(SemanticsActions.OnClick) { it() }+ assertEquals("he", selected)+ }++ private fun capture(name: String) {+ rule.waitForIdle()+ val instrumentation = InstrumentationRegistry.getInstrumentation()+ val directory = File(instrumentation.targetContext.filesDir, "vod-track-review").apply { mkdirs() }+ instrumentation.uiAutomation.takeScreenshot().let { bitmap ->+ File(directory, "$name.png").outputStream().use { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) }+ bitmap.recycle()+ }+ }+}diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerExternalSubtitleSearchDialog.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerExternalSubtitleSearchDialog.ktindex 256344c4..6c699833 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerExternalSubtitleSearchDialog.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerExternalSubtitleSearchDialog.kt@@ -1,17 +1,12 @@package com.streamvault.feature.playback.player-import androidx.compose.foundation.background-import androidx.compose.foundation.clickable+import androidx.compose.material.icons.filled.CloudDownloadimport androidx.compose.foundation.layout.Arrangement-import androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Row-import androidx.compose.foundation.layout.fillMaxHeight-import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.size-import androidx.compose.foundation.layout.widthInimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape@@ -26,15 +21,10 @@ import androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dp-import androidx.compose.ui.window.Dialog-import androidx.compose.ui.window.DialogPropertiesimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.tv.material3.Button-import androidx.tv.material3.ButtonDefaultsimport androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.MaterialTheme-import androidx.tv.material3.Surface-import androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.core.ui.design.requestFocusSafely@@ -71,193 +61,159 @@ internal fun PlayerExternalSubtitleSearchDialog(}}- Dialog(- onDismissRequest = dismissSearch,- properties = DialogProperties(usePlatformDefaultWidth = false),+ VodSelectionSheet(+ title = stringResource(R.string.player_subtitle_search_title),+ icon = androidx.compose.material.icons.Icons.Default.CloudDownload,+ onDismiss = dismissSearch,) {- Box(- modifier = Modifier.fillMaxSize().background(androidx.compose.ui.graphics.Color.Black.copy(alpha = 0.82f))- .clickable(onClick = dismissSearch),- contentAlignment = Alignment.Center,+ Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {+ Text(+ text = description,+ style = MaterialTheme.typography.bodyMedium,+ color = AppColors.TextSecondary,+ )+ }++ LazyColumn(+ modifier = Modifier.weight(1f).fillMaxWidth(),+ verticalArrangement = Arrangement.spacedBy(8.dp),) {- Surface(- modifier = Modifier.widthIn(min = 360.dp, max = 720.dp).fillMaxHeight(0.82f),- shape = RoundedCornerShape(24.dp),- colors = SurfaceDefaults.colors(containerColor = AppColors.SurfaceElevated),- ) {- Column(- modifier = Modifier.padding(28.dp),- verticalArrangement = Arrangement.spacedBy(16.dp),- ) {- Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {- Text(- text = stringResource(R.string.player_subtitle_search_title),- style = MaterialTheme.typography.headlineSmall,- color = AppColors.TextPrimary,+ if (state.account == null) {+ item {+ Row(+ modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp),+ horizontalArrangement = Arrangement.End,+ ) {+ Button(onClick = onOpenSettings) {+ Text(stringResource(R.string.player_subtitle_search_open_settings))+ }+ }+ }+ }+ if (state.isSearching) {+ item {+ Row(+ modifier = Modifier.fillMaxWidth().padding(16.dp),+ horizontalArrangement = Arrangement.spacedBy(12.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ androidx.compose.material3.CircularProgressIndicator(+ modifier = Modifier.size(24.dp),+ color = AppColors.Brand,+ strokeWidth = 2.dp,)Text(- text = description,+ text = stringResource(R.string.player_subtitle_search_loading),style = MaterialTheme.typography.bodyMedium,color = AppColors.TextSecondary,)}+ }+ }- LazyColumn(- modifier = Modifier.weight(1f).fillMaxWidth(),- verticalArrangement = Arrangement.spacedBy(8.dp),- ) {- if (state.account == null) {- item {- Row(- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp),- horizontalArrangement = Arrangement.End,- ) {- Button(onClick = onOpenSettings) {- Text(stringResource(R.string.player_subtitle_search_open_settings))- }- }- }- }- if (state.isSearching) {- item {- Row(- modifier = Modifier.fillMaxWidth().padding(16.dp),- horizontalArrangement = Arrangement.spacedBy(12.dp),- verticalAlignment = Alignment.CenterVertically,- ) {- androidx.compose.material3.CircularProgressIndicator(- modifier = Modifier.size(24.dp),- color = AppColors.Brand,- strokeWidth = 2.dp,- )- Text(- text = stringResource(R.string.player_subtitle_search_loading),- style = MaterialTheme.typography.bodyMedium,- color = AppColors.TextSecondary,- )- }- }- }-- state.errorMessage?.let { error ->- item {- Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {- Text(- text = error,- style = MaterialTheme.typography.bodyMedium,- color = MaterialTheme.colorScheme.error,- modifier = Modifier.padding(12.dp),- )- if (!state.isSearching && state.subtitles.isEmpty()) {- Button(onClick = viewModel::searchExternalSubtitles) {- Text(stringResource(R.string.player_subtitle_search_retry))- }- }- }- }- }-- if (!state.isSearching && state.errorMessage == null && state.subtitles.isEmpty()) {- item {- Text(- text = stringResource(R.string.player_subtitle_search_no_results),- style = MaterialTheme.typography.bodyMedium,- color = AppColors.TextSecondary,- modifier = Modifier.padding(16.dp),- )- }+ state.errorMessage?.let { error ->+ item {+ Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {+ Text(+ text = error,+ style = MaterialTheme.typography.bodyMedium,+ color = MaterialTheme.colorScheme.error,+ modifier = Modifier.padding(12.dp),+ )+ if (!state.isSearching && state.subtitles.isEmpty()) {+ Button(onClick = viewModel::searchExternalSubtitles) {+ Text(stringResource(R.string.player_subtitle_search_retry))}+ }+ }+ }+ }- state.appliedSubtitleName?.let { name ->- item {- Text(- text = stringResource(R.string.player_subtitle_search_applied, name),- style = MaterialTheme.typography.bodyMedium,- color = AppColors.Brand,- modifier = Modifier.padding(12.dp),- )- }- }+ if (!state.isSearching && state.errorMessage == null && state.subtitles.isEmpty()) {+ item {+ Text(+ text = stringResource(R.string.player_subtitle_search_no_results),+ style = MaterialTheme.typography.bodyMedium,+ color = AppColors.TextSecondary,+ modifier = Modifier.padding(16.dp),+ )+ }+ }- items(state.subtitles, key = { it.id }) { subtitle ->- val downloading = state.downloadingSubtitleId != null- TvClickableSurface(- onClick = { viewModel.downloadExternalSubtitle(subtitle.id) },- enabled = !downloading,- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),- colors = ClickableSurfaceDefaults.colors(- containerColor = AppColors.Surface,- focusedContainerColor = AppColors.SurfaceEmphasis,- ),- modifier = if (subtitle == state.subtitles.firstOrNull()) {- Modifier.focusRequester(firstResultFocusRequester)- } else {- Modifier- },- ) {- Row(- modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 14.dp),- horizontalArrangement = Arrangement.spacedBy(16.dp),- verticalAlignment = Alignment.CenterVertically,- ) {- Column(- modifier = Modifier.weight(1f),- verticalArrangement = Arrangement.spacedBy(4.dp),- ) {- Text(- text = subtitle.displayLanguage,- style = MaterialTheme.typography.titleMedium,- fontWeight = FontWeight.SemiBold,- color = AppColors.TextPrimary,- )- Text(- text = subtitle.releaseName.ifBlank {- stringResource(R.string.player_subtitle_search_release_unknown)- },- style = MaterialTheme.typography.bodySmall,- color = AppColors.TextSecondary,- maxLines = 2,- overflow = TextOverflow.Ellipsis,- )- Text(- text = stringResource(- R.string.player_subtitle_search_download_count,- NumberFormat.getIntegerInstance().format(subtitle.downloadCount),- ),- style = MaterialTheme.typography.labelSmall,- color = AppColors.TextSecondary,- )- }- if (state.downloadingSubtitleId == subtitle.id) {- androidx.compose.material3.CircularProgressIndicator(- modifier = Modifier.size(26.dp),- color = AppColors.Brand,- strokeWidth = 2.dp,- )- }- }- }- }- }+ state.appliedSubtitleName?.let { name ->+ item {+ Text(+ text = stringResource(R.string.player_subtitle_search_applied, name),+ style = MaterialTheme.typography.bodyMedium,+ color = AppColors.Brand,+ modifier = Modifier.padding(12.dp),+ )+ }+ }+ items(state.subtitles, key = { it.id }) { subtitle ->+ val downloading = state.downloadingSubtitleId != null+ TvClickableSurface(+ onClick = { viewModel.downloadExternalSubtitle(subtitle.id) },+ enabled = !downloading,+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(10.dp)),+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),+ colors = ClickableSurfaceDefaults.colors(+ containerColor = androidx.compose.ui.graphics.Color.White.copy(alpha = 0.035f),+ contentColor = androidx.compose.ui.graphics.Color(0xFFDCE3ED),+ focusedContainerColor = androidx.compose.ui.graphics.Color(0xFFDFEBFA),+ focusedContentColor = androidx.compose.ui.graphics.Color(0xFF10151D),+ ),+ modifier = if (subtitle == state.subtitles.firstOrNull()) {+ Modifier.focusRequester(firstResultFocusRequester)+ } else {+ Modifier+ },+ ) {Row(- modifier = Modifier.fillMaxWidth(),- horizontalArrangement = Arrangement.End,+ modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 14.dp),+ horizontalArrangement = Arrangement.spacedBy(16.dp),+ verticalAlignment = Alignment.CenterVertically,) {- Button(- onClick = {- dismissSearch()- },- colors = ButtonDefaults.colors(- containerColor = AppColors.Surface,- focusedContainerColor = AppColors.SurfaceEmphasis,- ),+ Column(+ modifier = Modifier.weight(1f),+ verticalArrangement = Arrangement.spacedBy(4.dp),) {- Text(stringResource(R.string.player_subtitle_search_close))+ Text(+ text = subtitle.displayLanguage,+ style = MaterialTheme.typography.titleMedium,+ fontWeight = FontWeight.SemiBold,+ color = androidx.tv.material3.LocalContentColor.current,+ )+ Text(+ text = subtitle.releaseName.ifBlank {+ stringResource(R.string.player_subtitle_search_release_unknown)+ },+ style = MaterialTheme.typography.bodySmall,+ color = androidx.tv.material3.LocalContentColor.current.copy(alpha = 0.65f),+ maxLines = 2,+ overflow = TextOverflow.Ellipsis,+ )+ Text(+ text = stringResource(+ R.string.player_subtitle_search_download_count,+ NumberFormat.getIntegerInstance().format(subtitle.downloadCount),+ ),+ style = MaterialTheme.typography.labelSmall,+ color = androidx.tv.material3.LocalContentColor.current.copy(alpha = 0.65f),+ )+ }+ if (state.downloadingSubtitleId == subtitle.id) {+ androidx.compose.material3.CircularProgressIndicator(+ modifier = Modifier.size(26.dp),+ color = AppColors.Brand,+ strokeWidth = 2.dp,+ )}}}}}+}}diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerModalHosts.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerModalHosts.ktindex 612e7b29..810248fe 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerModalHosts.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerModalHosts.kt@@ -107,7 +107,32 @@ internal fun PlayerControlsModalHost(val liveTranslationAvailable by viewModel.liveTranslationAvailable.collectAsStateWithLifecycle()val liveTranslationActive by viewModel.liveTranslationActive.collectAsStateWithLifecycle()val subtitleOffsetMs by viewModel.subtitleOffsetMs.collectAsStateWithLifecycle()- PlayerTrackSelectionDialog(+ if (viewModel.currentContentType != com.streamvault.domain.model.ContentType.LIVE &&+ showTrackSelection != TrackType.VIDEO) {+ val textScale by viewModel.subtitleTextScale.collectAsStateWithLifecycle()+ val backgroundColor by viewModel.subtitleBackgroundColor.collectAsStateWithLifecycle()+ VodTrackSelectionSheet(+ trackType = showTrackSelection,+ tracks = if (showTrackSelection == TrackType.TEXT) availableSubtitleTracks else availableAudioTracks,+ offsetMs = subtitleOffsetMs,+ textScale = textScale,+ backgroundColor = backgroundColor,+ onlineAvailable = onlineSubtitleSearchAvailable,+ onDismiss = onDismissModal,+ onSelectTrack = { id ->+ if (showTrackSelection == TrackType.TEXT) {+ viewModel.deactivateLiveTranslation()+ viewModel.selectSubtitleTrack(id)+ } else if (id != null) viewModel.selectAudioTrack(id)+ },+ onSearchOnline = onOpenSubtitleSearch,+ onLoadLocal = { onDismissModal(); onPickLocalSubtitle() },+ onAdjustOffset = viewModel::adjustSubtitleOffset,+ onResetOffset = viewModel::resetSubtitleOffset,+ onSetTextScale = viewModel::setSubtitleTextScale,+ onSetOpacity = viewModel::setSubtitleBackgroundOpacity,+ )+ } else PlayerTrackSelectionDialog(trackType = showTrackSelection,audioTracks = availableAudioTracks,subtitleTracks = availableSubtitleTracks,diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.ktindex d9842e97..8d47988d 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt@@ -274,6 +274,14 @@ fun PlayerViewModel.resetSubtitleOffset() {playerEngine.setSubtitleOffsetMs(0)}+internal fun PlayerViewModel.setSubtitleTextScale(scale: Float) {+ viewModelScope.launch { playerPreferencesCoordinator.setSubtitleTextScale(scale) }+}++internal fun PlayerViewModel.setSubtitleBackgroundOpacity(opacity: Int) {+ viewModelScope.launch { playerPreferencesCoordinator.setSubtitleBackgroundOpacity(opacity) }+}+fun PlayerViewModel.dismissAudioVideoOffsetPreview() {audioVideoOffsetPreviewMs.value = null}diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreferencesCoordinator.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreferencesCoordinator.ktindex 7528431a..28769df2 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreferencesCoordinator.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPreferencesCoordinator.kt@@ -121,6 +121,14 @@ class PlayerPreferencesCoordinator @Inject constructor(preferencesRepository.setPlayerPlaybackSpeed(speed)}+ internal suspend fun setSubtitleTextScale(scale: Float) {+ preferencesRepository.setPlayerSubtitleTextScale(scale.coerceIn(0.75f, 1.75f))+ }++ internal suspend fun setSubtitleBackgroundOpacity(opacity: Int) {+ preferencesRepository.setPlayerSubtitleBackgroundColor((opacity.coerceIn(0, 100) * 255 / 100) shl 24)+ }+internal suspend fun setGlobalVodTrackPreferences(preferences: VodTrackPreferences) {preferencesRepository.setGlobalVodTrackPreferences(preferences)}diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.ktindex eb102417..78c2053e 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt@@ -634,7 +634,8 @@ class PlayerViewModel @Inject constructor(PlayerSubtitleStyle(textScale = textScale,foregroundColorArgb = textColor,- backgroundColorArgb = backgroundColor+ backgroundColorArgb = backgroundColor,+ useEmbeddedStyles = false)}.combine(activePlayerEngineFlow) { style, engine -> engine to style }.collect { (engine, style) -> engine.setSubtitleStyle(style) }@@ -975,6 +976,10 @@ class PlayerViewModel @Inject constructor(val playbackSpeed: StateFlow<Float> = activeEngineState(1f) { it.playbackSpeed }val audioVideoSyncEnabled: StateFlow<Boolean> = activeEngineState(false) { it.audioVideoSyncEnabled }val subtitleOffsetMs: StateFlow<Int> = activeEngineState(0) { it.subtitleOffsetMs }+ internal val subtitleTextScale = playerPreferencesCoordinator.playerSubtitleTextScale+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), 1f)+ internal val subtitleBackgroundColor = playerPreferencesCoordinator.playerSubtitleBackgroundColor+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), 0x80000000.toInt())val preventStandbyDuringPlayback: StateFlow<Boolean> by lazy(LazyThreadSafetyMode.NONE) {playerPreferencesCoordinator.preventStandbyDuringPlaybackdiff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTrackSelectionSheet.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTrackSelectionSheet.ktnew file mode 100644index 00000000..80e02a6d--- /dev/null+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/VodTrackSelectionSheet.kt@@ -0,0 +1,252 @@+package com.streamvault.feature.playback.player++import androidx.compose.foundation.background+import androidx.compose.foundation.layout.*+import androidx.compose.foundation.lazy.LazyColumn+import androidx.compose.foundation.lazy.items+import androidx.compose.foundation.shape.RoundedCornerShape+import androidx.compose.material.icons.Icons+import androidx.compose.material.icons.automirrored.filled.ArrowBack+import androidx.compose.material.icons.filled.*+import androidx.compose.runtime.*+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.graphics.Color+import androidx.compose.ui.graphics.vector.ImageVector+import androidx.compose.ui.res.stringResource+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.unit.dp+import androidx.compose.ui.unit.sp+import androidx.compose.ui.window.Dialog+import androidx.compose.ui.window.DialogProperties+import androidx.tv.material3.*+import com.streamvault.core.ui.design.requestFocusSafely+import com.streamvault.core.ui.interaction.TvClickableSurface+import com.streamvault.feature.playback.R+import com.streamvault.player.PlayerTrack+import com.streamvault.player.SUBTITLE_OFFSET_STEP_MS+import com.streamvault.player.TrackType+import com.streamvault.player.SubtitleTrackSource+import kotlin.math.roundToInt++/** Shared chrome for the VOD settings, subtitle sources, and audio language choices. */+@Composable+internal fun VodSelectionSheet(+ title: String,+ icon: ImageVector,+ onDismiss: () -> Unit,+ content: @Composable ColumnScope.() -> Unit,+) {+ Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false)) {+ Box(Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.32f))) {+ Surface(+ modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight().width(400.dp),+ colors = SurfaceDefaults.colors(containerColor = Color(0xFF10151D)),+ ) {+ Column(Modifier.fillMaxSize().padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {+ Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) {+ Icon(icon, null, tint = MaterialTheme.colorScheme.primary)+ Text(title, Modifier.weight(1f), color = Color.White,+ style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.SemiBold)+ VodControlButton(onClick = onDismiss) {+ Icon(Icons.Default.Close, stringResource(R.string.player_subtitle_search_close))+ }+ }+ content()+ }+ }+ }+ }+}++@Composable+internal fun VodSelectionRow(+ title: String,+ detail: String? = null,+ icon: ImageVector = Icons.Default.ChevronRight,+ selected: Boolean = false,+ enabled: Boolean = true,+ modifier: Modifier = Modifier,+ onClick: () -> Unit,+) {+ TvClickableSurface(+ onClick = onClick, enabled = enabled, modifier = modifier.fillMaxWidth(),+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(10.dp)),+ colors = ClickableSurfaceDefaults.colors(+ containerColor = Color.White.copy(alpha = if (selected) 0.10f else 0.035f),+ contentColor = Color(0xFFDCE3ED),+ focusedContainerColor = Color(0xFFDFEBFA), focusedContentColor = Color(0xFF10151D),+ ),+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),+ ) {+ Row(Modifier.fillMaxWidth().heightIn(min = 52.dp).padding(12.dp),+ verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) {+ Icon(icon, null, Modifier.size(20.dp), tint = LocalContentColor.current.copy(alpha = 0.8f))+ Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {+ Text(title, color = LocalContentColor.current, style = MaterialTheme.typography.bodyMedium,+ maxLines = 2, overflow = TextOverflow.Ellipsis)+ if (detail != null) Text(detail, color = LocalContentColor.current.copy(alpha = 0.65f),+ style = MaterialTheme.typography.bodySmall, maxLines = 2, overflow = TextOverflow.Ellipsis)+ }+ Icon(if (selected) Icons.Default.Check else Icons.Default.ChevronRight, null,+ Modifier.size(18.dp), tint = LocalContentColor.current.copy(alpha = if (selected) 1f else 0.45f))+ }+ }+}++@Composable+internal fun VodTrackSelectionSheet(+ trackType: TrackType,+ tracks: List<PlayerTrack>,+ offsetMs: Int,+ textScale: Float,+ backgroundColor: Int,+ onlineAvailable: Boolean,+ onDismiss: () -> Unit,+ onSelectTrack: (String?) -> Unit,+ onSearchOnline: () -> Unit,+ onLoadLocal: () -> Unit,+ onAdjustOffset: (Int) -> Unit,+ onResetOffset: () -> Unit,+ onSetTextScale: (Float) -> Unit,+ onSetOpacity: (Int) -> Unit,+) {+ var settings by remember { mutableStateOf(false) }+ var provider by remember { mutableStateOf(false) }+ val subtitles = trackType == TrackType.TEXT+ val providerTracks = if (subtitles) tracks.filter { it.subtitleSource == SubtitleTrackSource.PROVIDER } else tracks+ val firstFocus = remember { FocusRequester() }+ VodSelectionSheet(+ title = stringResource(if (subtitles) R.string.player_track_subs else R.string.player_track_audio),+ icon = if (subtitles) Icons.Default.ClosedCaption else Icons.Default.Audiotrack,+ onDismiss = onDismiss,+ ) {+ LaunchedEffect(settings, provider) {+ // Wait until the dialog window has established its initial focus.+ withFrameNanos { }+ if (subtitles || tracks.isNotEmpty()) {+ firstFocus.requestFocusSafely("VodTrackSelectionSheet", "Active page first action")+ }+ }+ if (subtitles) {+ Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {+ VodSelectionRow(stringResource(R.string.vod_subtitle_sources), selected = !settings,+ icon = Icons.Default.ClosedCaption, modifier = Modifier.weight(1f)) { settings = false; provider = false }+ VodSelectionRow(stringResource(R.string.vod_subtitle_settings), selected = settings,+ icon = Icons.Default.Tune, modifier = Modifier.weight(1f)) { settings = true; provider = false }+ }+ }+ LazyColumn(Modifier.weight(1f).fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp),+ contentPadding = PaddingValues(vertical = 4.dp)) {+ when {+ subtitles && settings -> {+ item {+ Box(Modifier.fillMaxWidth().background(Color(0xFF202C3B), RoundedCornerShape(10.dp)).padding(20.dp),+ contentAlignment = Alignment.Center) {+ Text(stringResource(R.string.vod_subtitle_preview), color = Color.White,+ fontSize = (18 * textScale).sp,+ modifier = Modifier.background(Color(backgroundColor), RoundedCornerShape(3.dp)).padding(6.dp))+ }+ }+ item {+ SubtitleSettingStepper(+ stringResource(R.string.player_subtitle_delay_title), "$offsetMs ms", true, true,+ { onAdjustOffset(-SUBTITLE_OFFSET_STEP_MS) },+ { onAdjustOffset(SUBTITLE_OFFSET_STEP_MS) },+ firstButtonModifier = Modifier.focusRequester(firstFocus), onReset = onResetOffset,+ )+ Text(stringResource(R.string.player_subtitle_delay_hint), color = Color(0xFF9CAABD),+ style = MaterialTheme.typography.bodySmall, modifier = Modifier.padding(top = 6.dp))+ }+ item {+ SubtitleSettingStepper(stringResource(R.string.vod_subtitle_font_size),+ "${(textScale * 100).roundToInt()}%", textScale > 0.75f, textScale < 1.75f,+ { onSetTextScale((textScale - 0.25f).coerceAtLeast(0.75f)) },+ { onSetTextScale((textScale + 0.25f).coerceAtMost(1.75f)) })+ }+ item {+ val opacity = ((backgroundColor ushr 24) * 100f / 255).roundToInt()+ SubtitleSettingStepper(stringResource(R.string.vod_subtitle_background), "$opacity%",+ opacity > 0, opacity < 100,+ { onSetOpacity((opacity - 10).coerceAtLeast(0)) },+ { onSetOpacity((opacity + 10).coerceAtMost(100)) })+ Text(stringResource(R.string.vod_subtitle_background_hint), color = Color(0xFF9CAABD),+ style = MaterialTheme.typography.bodySmall, modifier = Modifier.padding(top = 6.dp))+ }+ }+ subtitles && !provider -> {+ item {+ VodSelectionRow(stringResource(R.string.vod_subtitle_provider),+ providerTracks.firstOrNull { it.isSelected }?.name ?: stringResource(R.string.vod_subtitle_provider_hint),+ Icons.Default.ClosedCaption, modifier = Modifier.focusRequester(firstFocus)) { provider = true }+ }+ item {+ VodSelectionRow(stringResource(R.string.vod_subtitle_online),+ stringResource(if (onlineAvailable) R.string.vod_subtitle_online_hint else R.string.vod_subtitle_online_unavailable),+ Icons.Default.CloudDownload, enabled = onlineAvailable, onClick = onSearchOnline)+ }+ item {+ VodSelectionRow(stringResource(R.string.player_subtitle_load_from_device),+ stringResource(R.string.vod_subtitle_device_hint), Icons.Default.FolderOpen, onClick = onLoadLocal)+ }+ item {+ VodSelectionRow(stringResource(R.string.player_track_off), selected = tracks.none { it.isSelected },+ icon = Icons.Default.SubtitlesOff) { onSelectTrack(null); onDismiss() }+ }+ items(tracks.filter { it.subtitleSource != SubtitleTrackSource.PROVIDER }, key = { it.id }) { track ->+ VodSelectionRow(track.name, selected = track.isSelected,+ icon = if (track.subtitleSource == SubtitleTrackSource.DEVICE) Icons.Default.FolderOpen else Icons.Default.CloudDownload) {+ onSelectTrack(track.id); onDismiss()+ }+ }+ }+ else -> {+ if (subtitles) item {+ VodSelectionRow(stringResource(R.string.vod_subtitle_back), icon = Icons.AutoMirrored.Filled.ArrowBack,+ modifier = Modifier.focusRequester(firstFocus)) { provider = false }+ }+ if (providerTracks.isEmpty()) item {+ Text(stringResource(R.string.vod_tracks_empty), color = Color(0xFF9CAABD), modifier = Modifier.padding(12.dp))+ }+ items(providerTracks, key = { it.id }) { track ->+ VodSelectionRow(track.name, selected = track.isSelected,+ icon = if (subtitles) Icons.Default.ClosedCaption else Icons.Default.Audiotrack,+ modifier = if (!subtitles && track == providerTracks.firstOrNull()) Modifier.focusRequester(firstFocus) else Modifier) {+ onSelectTrack(track.id); onDismiss()+ }+ }+ }+ }+ }+ }+}++@Composable+private fun SubtitleSettingStepper(+ label: String, value: String, canDecrease: Boolean, canIncrease: Boolean,+ onDecrease: () -> Unit, onIncrease: () -> Unit,+ firstButtonModifier: Modifier = Modifier,+ onReset: (() -> Unit)? = null,+) {+ Row(+ Modifier.fillMaxWidth().background(Color.White.copy(alpha = 0.035f), RoundedCornerShape(10.dp)).padding(12.dp),+ verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp),+ ) {+ Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) {+ Text(label, color = Color.White, style = MaterialTheme.typography.titleSmall)+ Text(value, color = Color(0xFF9CAABD), style = MaterialTheme.typography.bodyMedium)+ }+ VodControlButton(onDecrease, modifier = firstButtonModifier, enabled = canDecrease) {+ Icon(Icons.Default.Remove, stringResource(R.string.vod_subtitle_decrease_setting, label))+ }+ VodControlButton(onIncrease, enabled = canIncrease) {+ Icon(Icons.Default.Add, stringResource(R.string.vod_subtitle_increase_setting, label))+ }+ if (onReset != null) VodControlButton(onReset) {+ Icon(Icons.Default.Restore, stringResource(R.string.player_subtitle_delay_reset))+ }+ }+}diff --git a/feature/playback/src/main/res/values/vod_subtitle_strings.xml b/feature/playback/src/main/res/values/vod_subtitle_strings.xmlnew file mode 100644index 00000000..f968dda5--- /dev/null+++ b/feature/playback/src/main/res/values/vod_subtitle_strings.xml@@ -0,0 +1,18 @@+<resources>+ <string name="vod_subtitle_sources">Sources</string>+ <string name="vod_subtitle_settings">Settings</string>+ <string name="vod_subtitle_provider">Provider subtitles</string>+ <string name="vod_subtitle_provider_hint">Choose a subtitle track from this video</string>+ <string name="vod_subtitle_online">OpenSubtitles</string>+ <string name="vod_subtitle_online_hint">Find subtitles online</string>+ <string name="vod_subtitle_online_unavailable">Online search is unavailable for this video</string>+ <string name="vod_subtitle_device_hint">Choose an SRT file</string>+ <string name="vod_subtitle_back">Back to sources</string>+ <string name="vod_tracks_empty">No tracks available in this video</string>+ <string name="vod_subtitle_preview">This is a subtitle.</string>+ <string name="vod_subtitle_font_size">Font size</string>+ <string name="vod_subtitle_background">Background opacity</string>+ <string name="vod_subtitle_background_hint" formatted="false">0% transparent · 100% solid black</string>+ <string name="vod_subtitle_decrease_setting">Decrease %1$s</string>+ <string name="vod_subtitle_increase_setting">Increase %1$s</string>+</resources>diff --git a/player/src/main/java/com/streamvault/player/ExternalSubtitlePlayback.kt b/player/src/main/java/com/streamvault/player/ExternalSubtitlePlayback.ktindex 71207782..54d635e2 100644--- a/player/src/main/java/com/streamvault/player/ExternalSubtitlePlayback.kt+++ b/player/src/main/java/com/streamvault/player/ExternalSubtitlePlayback.kt@@ -40,6 +40,7 @@ internal fun buildExternalSubtitleConfiguration(language: String,label: String? = null): MediaItem.SubtitleConfiguration = MediaItem.SubtitleConfiguration.Builder(subtitleUri)+ .setId(if (label != null) DEVICE_SUBTITLE_TRACK_ID else ONLINE_SUBTITLE_TRACK_ID).setMimeType(MimeTypes.APPLICATION_SUBRIP).setLanguage(language).setLabel(label)diff --git a/player/src/main/java/com/streamvault/player/PlayerTrack.kt b/player/src/main/java/com/streamvault/player/PlayerTrack.ktindex d94c0aa0..9b43525a 100644--- a/player/src/main/java/com/streamvault/player/PlayerTrack.kt+++ b/player/src/main/java/com/streamvault/player/PlayerTrack.kt@@ -5,9 +5,15 @@ data class PlayerTrack(val name: String,val language: String?,val type: TrackType,- val isSelected: Boolean+ val isSelected: Boolean,+ val subtitleSource: SubtitleTrackSource = SubtitleTrackSource.PROVIDER,)+enum class SubtitleTrackSource { PROVIDER, ONLINE, DEVICE }++internal const val ONLINE_SUBTITLE_TRACK_ID = "streamvault-online-subtitle"+internal const val DEVICE_SUBTITLE_TRACK_ID = "streamvault-device-subtitle"+enum class TrackType {AUDIO,TEXT, // Subtitlesdiff --git a/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt b/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.ktindex 163bd6f9..ef75bfdc 100644--- a/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt+++ b/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt@@ -151,7 +151,12 @@ class PlayerTrackController(isText -> TrackType.TEXTelse -> TrackType.VIDEO},- isSelected = if (isVideo) selectedVideoTrackId == id else group.isTrackSelected(index)+ isSelected = if (isVideo) selectedVideoTrackId == id else group.isTrackSelected(index),+ subtitleSource = when (format.id) {+ com.streamvault.player.ONLINE_SUBTITLE_TRACK_ID -> com.streamvault.player.SubtitleTrackSource.ONLINE+ com.streamvault.player.DEVICE_SUBTITLE_TRACK_ID -> com.streamvault.player.SubtitleTrackSource.DEVICE+ else -> com.streamvault.player.SubtitleTrackSource.PROVIDER+ },)when {isAudio && group.isTrackSupported(index, false) -> audioTracks += trackdiff --git a/player/src/test/java/com/streamvault/player/ExternalSubtitlePlaybackTest.kt b/player/src/test/java/com/streamvault/player/ExternalSubtitlePlaybackTest.ktindex 2eddaa12..d19f5053 100644--- a/player/src/test/java/com/streamvault/player/ExternalSubtitlePlaybackTest.kt+++ b/player/src/test/java/com/streamvault/player/ExternalSubtitlePlaybackTest.kt@@ -53,6 +53,7 @@ class ExternalSubtitlePlaybackTest {assertThat(configuration.mimeType).isEqualTo(MimeTypes.APPLICATION_SUBRIP)assertThat(configuration.language).isEqualTo("he")assertThat(configuration.label).isEqualTo("episode.srt")+ assertThat(configuration.id).isEqualTo(DEVICE_SUBTITLE_TRACK_ID)assertThat(configuration.selectionFlags).isEqualTo(C.SELECTION_FLAG_DEFAULT)}@@ -63,6 +64,7 @@ class ExternalSubtitlePlaybackTest {language = "en")val dataSourceFactory = DataSource.Factory { ByteArrayDataSource(byteArrayOf()) }+ assertThat(configuration.id).isEqualTo(ONLINE_SUBTITLE_TRACK_ID)val source = buildExternalSubtitleMediaSource(dataSourceFactory, configuration)