StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor(live): extract epg match dialog
David Nashash95d40b963994
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.ktindex 8f0e0bdb..afec50ed 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt@@ -25,6 +25,8 @@ import com.streamvault.feature.live.presentation.epg.LiveGuidePreviewPaneimport com.streamvault.feature.live.presentation.epg.LiveGuideToolbarLabelsimport com.streamvault.feature.live.presentation.epg.LiveGuideToolbarRowimport com.streamvault.feature.live.presentation.epg.LiveGuideMessageState+import com.streamvault.feature.live.presentation.epg.LiveGuideEpgOverrideDialog+import com.streamvault.feature.live.presentation.epg.LiveGuideEpgOverrideLabelsimport com.streamvault.feature.live.presentation.epg.LiveGuideOptionsLabelsimport com.streamvault.feature.live.presentation.epg.LiveGuideOptionsOverlayimport com.streamvault.feature.live.presentation.epg.liveGuideOptionsDayStart@@ -877,9 +879,31 @@ fun FullEpgScreen(}}- if (overrideUiState.channel != null) {- EpgOverrideDialog(- state = overrideUiState,+ val overrideChannel = overrideUiState.channel+ if (overrideChannel != null) {+ LiveGuideEpgOverrideDialog(+ channel = overrideChannel,+ currentMapping = overrideUiState.currentMapping,+ searchQuery = overrideUiState.searchQuery,+ candidates = overrideUiState.candidates,+ isLoading = overrideUiState.isLoading,+ isSaving = overrideUiState.isSaving,+ error = overrideUiState.error,+ labels = LiveGuideEpgOverrideLabels(+ title = stringResource(R.string.epg_override_title),+ currentLabel = stringResource(R.string.epg_override_current_label),+ unknownValue = stringResource(R.string.epg_program_unknown_value),+ currentNone = stringResource(R.string.epg_override_current_none),+ currentManualFormat = stringResource(R.string.epg_override_current_manual),+ currentProviderFormat = stringResource(R.string.epg_override_current_provider),+ currentExternalFormat = stringResource(R.string.epg_override_current_external),+ searchPlaceholder = stringResource(R.string.epg_override_search_placeholder),+ noCandidates = stringResource(R.string.epg_override_no_candidates),+ noSearchResults = stringResource(R.string.epg_override_no_search_results),+ selectedBadge = stringResource(R.string.epg_override_selected_badge),+ clear = stringResource(R.string.epg_override_clear),+ cancel = stringResource(R.string.settings_cancel)+ ),onDismiss = viewModel::dismissEpgOverride,onQueryChange = viewModel::updateEpgOverrideSearch,onCandidateSelected = viewModel::applyEpgOverride,diff --git a/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md b/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.mdindex 7e0edf1c..3f1f11a4 100644--- a/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md+++ b/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md@@ -137,7 +137,8 @@ and hidden category/channel dialogs, the category options dialog, thequick-filter add dialog, delete-group dialog, rename-group dialog, M3U categoryorganizer dialog, M3U series-assignment dialogs, EPG search overlay, guidecategory picker, compact guide-program dialog, guide control rows, EPG preview-pane, guide toolbar, guide message state, and hero badge are now feature-owned+pane, guide toolbar, guide message state, hero badge, timeline header, grid+rows/cells, options overlay, and EPG-match dialog are now feature-ownedwhile the Home and EPGscreen/dialog composition remains in `:app` for the remaining app-specificdialogs.@@ -149,8 +150,8 @@ category options dialog, the quick-filter add dialog, the delete-group dialog,and the rename-group dialog, M3U category organizer dialog, and M3Useries-assignment dialogs, the EPG search overlay, guide category picker, andcompact guide-program dialog, guide control rows, EPG preview pane, guide-toolbar, guide message state, hero badge, stable EPG channel-key helper, and-timeline header are+toolbar, guide message state, hero badge, stable EPG channel-key helper,+timeline header, grid rows/cells, options overlay, and EPG-match dialog areindependent of app code;screen/resource moves, golden/runtime/performance gates, and legacy app cleanupremain open, so no live slice acceptance gate is claimed yet.diff --git a/docs/superpowers/plans/2026-08-28-live-feature-extraction.md b/docs/superpowers/plans/2026-08-28-live-feature-extraction.mdindex e5c326fa..91d7058f 100644--- a/docs/superpowers/plans/2026-08-28-live-feature-extraction.md+++ b/docs/superpowers/plans/2026-08-28-live-feature-extraction.md@@ -27,7 +27,8 @@ and hidden category/channel dialogs, the category options dialog, thequick-filter add dialog, delete-group dialog, rename-group dialog, M3U categoryorganizer dialog, M3U series-assignment dialogs, EPG search overlay, guidecategory picker, compact guide-program dialog, guide control rows, EPG preview-pane, guide toolbar, guide message state, hero badge, and timeline header are now feature-owned+pane, guide toolbar, guide message state, hero badge, timeline header, grid+rows/cells, options overlay, and EPG-match dialog are now feature-ownedand their feature checks are green. Home screen/dialog composition, theremaining live cards/rows, complete locale resource migration, and acceptancegates remain open.@@ -713,7 +714,10 @@ The hero badge owns rounded highlight styling and text overflow presentation;callers supply the text and optional accent. Stable EPG channel-key generationand timeline marker calculation are feature-owned and covered by focusedidentity/timeline tests. The timeline header owns marker rendering and-live-time presentation while the app supplies sizing and scroll state.+live-time presentation while the app supplies sizing and scroll state. Grid+rows/cells, options overlay, and EPG-match dialog likewise own their+presentation and focus behavior while the app supplies localized labels and+state/action callbacks.quick-filter key/selection rules are covered by `LiveQuickFiltersTest`. Theremaining app-owned live cards and shell/dialog composition still requirecompatibility seams before the full Home move.diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideDialog.ktsimilarity index 66%rename from app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.ktrename to feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideDialog.ktindex 21df309f..98116aaa 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideDialog.kt@@ -1,16 +1,10 @@-package com.streamvault.app.ui.screens.epg+package com.streamvault.feature.live.presentation.epg-import com.streamvault.feature.live.presentation.epg.LiveGuideSearchFieldimport androidx.compose.foundation.BorderStroke-import androidx.compose.foundation.background-import androidx.compose.foundation.clickableimport androidx.compose.foundation.focusGroupimport androidx.compose.foundation.layout.Arrangement-import androidx.compose.foundation.layout.Box-import androidx.compose.foundation.layout.BoxScopeimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Row-import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.heightIn@@ -22,19 +16,13 @@ import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.LinearProgressIndicatorimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffect-import androidx.compose.runtime.getValueimport androidx.compose.runtime.remember-import androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.focus.FocusRequesterimport androidx.compose.ui.focus.focusRequester-import androidx.compose.ui.graphics.Color-import androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dp-import androidx.compose.ui.window.Dialog-import androidx.compose.ui.window.DialogPropertiesimport androidx.tv.material3.Borderimport androidx.tv.material3.ButtonDefaultsimport androidx.tv.material3.ClickableSurfaceDefaults@@ -42,86 +30,93 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Text-import com.streamvault.app.R-import com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvButton+import com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.theme.FocusBorderimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDimimport com.streamvault.core.ui.theme.Primaryimport com.streamvault.core.ui.theme.SurfaceElevatedimport com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.domain.model.Channel+import com.streamvault.domain.model.ChannelEpgMappingimport com.streamvault.domain.model.EpgMatchTypeimport com.streamvault.domain.model.EpgOverrideCandidateimport com.streamvault.domain.model.EpgSourceType-@Composable-private fun GuideModalDialog(- onDismiss: () -> Unit,- contentAlignment: Alignment = Alignment.Center,- content: @Composable BoxScope.() -> Unit-) {- Dialog(- onDismissRequest = onDismiss,- properties = DialogProperties(- usePlatformDefaultWidth = false,- dismissOnBackPress = true,- dismissOnClickOutside = false- )- ) {- Box(- modifier = Modifier.fillMaxSize(),- contentAlignment = contentAlignment- ) {- Box(- modifier = Modifier- .matchParentSize()- .background(Color.Black.copy(alpha = 0.68f))- .clickable(- onClick = onDismiss,- indication = null,- interactionSource = remember { androidx.compose.foundation.interaction.MutableInteractionSource() }- )- )- content()- }+data class LiveGuideEpgOverrideLabels(+ val title: String,+ val currentLabel: String,+ val unknownValue: String,+ val currentNone: String,+ val currentManualFormat: String,+ val currentProviderFormat: String,+ val currentExternalFormat: String,+ val searchPlaceholder: String,+ val noCandidates: String,+ val noSearchResults: String,+ val selectedBadge: String,+ val clear: String,+ val cancel: String+)++private const val DESCRIPTOR_SEPARATOR = " \u05D2\u20AC\u00A2 "++internal fun liveGuideOverrideSummary(+ mapping: ChannelEpgMapping?,+ currentCandidate: EpgOverrideCandidate?,+ unknownValue: String,+ currentNone: String,+ currentManualFormat: String,+ currentProviderFormat: String,+ currentExternalFormat: String+): String {+ val currentDescriptor = currentCandidate?.let {+ "${it.displayName}$DESCRIPTOR_SEPARATOR${it.epgSourceName}$DESCRIPTOR_SEPARATOR${it.xmltvChannelId}"+ } ?: (mapping?.xmltvChannelId ?: unknownValue)+ return when {+ mapping == null || mapping.sourceType == EpgSourceType.NONE -> currentNone+ mapping.isManualOverride || mapping.matchType == EpgMatchType.MANUAL -> currentManualFormat.format(currentDescriptor)+ mapping.sourceType == EpgSourceType.PROVIDER -> currentProviderFormat.format(currentDescriptor)+ else -> currentExternalFormat.format(currentDescriptor)}}@Composable-internal fun EpgOverrideDialog(- state: EpgOverrideUiState,+fun LiveGuideEpgOverrideDialog(+ channel: Channel,+ currentMapping: ChannelEpgMapping?,+ searchQuery: String,+ candidates: List<EpgOverrideCandidate>,+ isLoading: Boolean,+ isSaving: Boolean,+ error: String?,+ labels: LiveGuideEpgOverrideLabels,onDismiss: () -> Unit,onQueryChange: (String) -> Unit,onCandidateSelected: (EpgOverrideCandidate) -> Unit,onClearOverride: () -> Unit) {- val channel = state.channel ?: return- val unknownValue = stringResource(R.string.epg_program_unknown_value)- val currentCandidate = remember(state.currentMapping, state.candidates) {- state.candidates.firstOrNull {- it.epgSourceId == state.currentMapping?.epgSourceId &&- it.xmltvChannelId == state.currentMapping?.xmltvChannelId+ val currentCandidate = remember(currentMapping, candidates) {+ candidates.firstOrNull {+ it.epgSourceId == currentMapping?.epgSourceId &&+ it.xmltvChannelId == currentMapping.xmltvChannelId}}- val currentDescriptor = currentCandidate?.let {- "${it.displayName} ג€¢ ${it.epgSourceName} ג€¢ ${it.xmltvChannelId}"- } ?: (state.currentMapping?.xmltvChannelId ?: unknownValue)- val currentSummary = when {- state.currentMapping == null || state.currentMapping.sourceType == EpgSourceType.NONE ->- stringResource(R.string.epg_override_current_none)- state.currentMapping.isManualOverride || state.currentMapping.matchType == EpgMatchType.MANUAL ->- stringResource(R.string.epg_override_current_manual, currentDescriptor)- state.currentMapping.sourceType == EpgSourceType.PROVIDER ->- stringResource(R.string.epg_override_current_provider, currentDescriptor)- else ->- stringResource(R.string.epg_override_current_external, currentDescriptor)- }+ val currentSummary = liveGuideOverrideSummary(+ mapping = currentMapping,+ currentCandidate = currentCandidate,+ unknownValue = labels.unknownValue,+ currentNone = labels.currentNone,+ currentManualFormat = labels.currentManualFormat,+ currentProviderFormat = labels.currentProviderFormat,+ currentExternalFormat = labels.currentExternalFormat+ )val searchFocusRequester = remember { FocusRequester() }LaunchedEffect(Unit) { searchFocusRequester.requestFocus() }- GuideModalDialog(onDismiss = onDismiss) {+ LiveGuideModalDialog(onDismiss = onDismiss) {Surface(modifier = Modifier.widthIn(min = 560.dp, max = 760.dp),colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),@@ -135,7 +130,7 @@ internal fun EpgOverrideDialog(verticalArrangement = Arrangement.spacedBy(14.dp)) {Text(- text = stringResource(R.string.epg_override_title),+ text = labels.title,style = MaterialTheme.typography.headlineSmall,color = OnSurface)@@ -146,7 +141,7 @@ internal fun EpgOverrideDialog()Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {Text(- text = stringResource(R.string.epg_override_current_label),+ text = labels.currentLabel,style = MaterialTheme.typography.labelMedium,color = Primary)@@ -156,14 +151,14 @@ internal fun EpgOverrideDialog(color = OnSurface)}- if (!state.error.isNullOrBlank()) {+ if (!error.isNullOrBlank()) {Text(- text = state.error,+ text = error,style = MaterialTheme.typography.bodySmall,color = MaterialTheme.colorScheme.error)}- if (state.isLoading || state.isSaving) {+ if (isLoading || isSaving) {LinearProgressIndicator(modifier = Modifier.fillMaxWidth()@@ -173,20 +168,16 @@ internal fun EpgOverrideDialog()}LiveGuideSearchField(- value = state.searchQuery,+ value = searchQuery,onValueChange = onQueryChange,- placeholder = stringResource(R.string.epg_override_search_placeholder),+ placeholder = labels.searchPlaceholder,modifier = Modifier.fillMaxWidth(),focusRequester = searchFocusRequester,- onSearch = { onQueryChange(it) }+ onSearch = onQueryChange)- if (state.candidates.isEmpty()) {+ if (candidates.isEmpty()) {Text(- text = if (state.searchQuery.isBlank()) {- stringResource(R.string.epg_override_no_candidates)- } else {- stringResource(R.string.epg_override_no_search_results)- },+ text = if (searchQuery.isBlank()) labels.noCandidates else labels.noSearchResults,style = MaterialTheme.typography.bodyMedium,color = OnSurfaceDim)@@ -199,16 +190,14 @@ internal fun EpgOverrideDialog(verticalArrangement = Arrangement.spacedBy(10.dp)) {items(- items = state.candidates,+ items = candidates,key = { candidate -> "${candidate.epgSourceId}:${candidate.xmltvChannelId}" }) { candidate ->- val isCurrent = state.currentMapping?.epgSourceId == candidate.epgSourceId &&- state.currentMapping?.xmltvChannelId == candidate.xmltvChannelId+ val isCurrent = currentMapping?.epgSourceId == candidate.epgSourceId &&+ currentMapping?.xmltvChannelId == candidate.xmltvChannelIdTvClickableSurface(onClick = {- if (!state.isSaving) {- onCandidateSelected(candidate)- }+ if (!isSaving) onCandidateSelected(candidate)},modifier = Modifier.fillMaxWidth(),scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),@@ -246,14 +235,14 @@ internal fun EpgOverrideDialog()if (isCurrent) {Text(- text = stringResource(R.string.epg_override_selected_badge),+ text = labels.selectedBadge,style = MaterialTheme.typography.labelSmall,color = Primary)}}Text(- text = "${candidate.epgSourceName} ג€¢ ${candidate.xmltvChannelId}",+ text = "${candidate.epgSourceName}$DESCRIPTOR_SEPARATOR${candidate.xmltvChannelId}",style = MaterialTheme.typography.bodySmall,color = OnSurfaceDim,maxLines = 2,@@ -265,10 +254,10 @@ internal fun EpgOverrideDialog(}}Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {- if (state.currentMapping?.isManualOverride == true) {+ if (currentMapping?.isManualOverride == true) {TvButton(onClick = onClearOverride,- enabled = !state.isSaving,+ enabled = !isSaving,modifier = Modifier.fillMaxWidth(),scale = ButtonDefaults.scale(focusedScale = 1f),colors = ButtonDefaults.colors(@@ -276,7 +265,7 @@ internal fun EpgOverrideDialog(contentColor = OnSurface)) {- Text(stringResource(R.string.epg_override_clear))+ Text(labels.clear)}}TvButton(@@ -284,16 +273,14 @@ internal fun EpgOverrideDialog(modifier = Modifier.fillMaxWidth(),scale = ButtonDefaults.scale(focusedScale = 1f),colors = ButtonDefaults.colors(- containerColor = Color.Transparent,+ containerColor = androidx.compose.ui.graphics.Color.Transparent,contentColor = OnSurface)) {- Text(stringResource(R.string.settings_cancel))+ Text(labels.cancel)}}}}}}--diff --git a/feature/live/src/test/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideTest.ktnew file mode 100644index 00000000..47760c89--- /dev/null+++ b/feature/live/src/test/java/com/streamvault/feature/live/presentation/epg/LiveGuideEpgOverrideTest.kt@@ -0,0 +1,56 @@+package com.streamvault.feature.live.presentation.epg++import com.google.common.truth.Truth.assertThat+import com.streamvault.domain.model.ChannelEpgMapping+import com.streamvault.domain.model.EpgMatchType+import com.streamvault.domain.model.EpgOverrideCandidate+import com.streamvault.domain.model.EpgSourceType+import org.junit.Test++class LiveGuideEpgOverrideTest {+ @Test+ fun `override summary reports no match when mapping is absent`() {+ assertThat(+ liveGuideOverrideSummary(+ mapping = null,+ currentCandidate = null,+ unknownValue = "Unknown",+ currentNone = "None",+ currentManualFormat = "Manual: %1\$s",+ currentProviderFormat = "Provider: %1\$s",+ currentExternalFormat = "External: %1\$s"+ )+ ).isEqualTo("None")+ }++ @Test+ fun `override summary reports manual mapping using the selected candidate`() {+ val mapping = ChannelEpgMapping(+ providerChannelId = 7L,+ providerId = 3L,+ sourceType = EpgSourceType.EXTERNAL,+ epgSourceId = 11L,+ xmltvChannelId = "news.xml",+ matchType = EpgMatchType.MANUAL,+ isManualOverride = true+ )+ val candidate = EpgOverrideCandidate(+ epgSourceId = 11L,+ epgSourceName = "External",+ xmltvChannelId = "news.xml",+ displayName = "News"+ )++ assertThat(+ liveGuideOverrideSummary(+ mapping = mapping,+ currentCandidate = candidate,+ unknownValue = "Unknown",+ currentNone = "None",+ currentManualFormat = "Manual: %1\$s",+ currentProviderFormat = "Provider: %1\$s",+ currentExternalFormat = "External: %1\$s"+ )+ ).startsWith("Manual: News")+ }+}