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 category picker
David Nashash169e9b195054
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 6d89677d..ba997e29 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@@ -9,6 +9,8 @@ import com.streamvault.feature.live.presentation.epg.LiveGuideNowProviderimport com.streamvault.feature.live.presentation.epg.currentLiveGuideNowimport com.streamvault.feature.live.presentation.epg.LiveGuideSearchOverlayimport com.streamvault.feature.live.presentation.epg.LiveGuideSearchOverlayLabels+import com.streamvault.feature.live.presentation.epg.LiveGuideCategoryPickerDialog+import com.streamvault.feature.live.presentation.epg.LiveGuideCategoryPickerLabelsimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable@@ -543,10 +545,21 @@ fun FullEpgScreen(}if (showCategoryPicker) {- GuideCategoryPickerDialog(+ LiveGuideCategoryPickerDialog(categories = uiState.categories,selectedCategoryId = uiState.selectedCategoryId,- parentalControlLevel = uiState.parentalControlLevel,+ labels = LiveGuideCategoryPickerLabels(+ title = stringResource(R.string.epg_filter_label),+ cancel = stringResource(R.string.settings_cancel),+ searchLabel = stringResource(R.string.epg_search_label),+ searchPlaceholder = stringResource(R.string.epg_search_placeholder),+ clearSearch = stringResource(R.string.epg_clear_search),+ parentalControl = stringResource(R.string.settings_parental_control),+ matchesCount = { count -> "$count matches" },+ channelCount = { count -> if (count == 1) "1 channel" else "$count channels" },+ jumpNow = stringResource(R.string.epg_jump_now)+ ),+ isCategoryLocked = { category -> isGuideCategoryLocked(category, uiState.parentalControlLevel) },onDismiss = { showCategoryPicker = false },onCategorySelected = { category ->showCategoryPicker = falsediff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.ktindex 333d9658..65a87e20 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt@@ -621,171 +621,4 @@ internal fun EpgOverrideDialog(}}-@Composable-internal fun GuideCategoryPickerDialog(- categories: List<Category>,- selectedCategoryId: Long,- parentalControlLevel: Int,- onDismiss: () -> Unit,- onCategorySelected: (Category) -> Unit-) {- var query by rememberSaveable { mutableStateOf("") }- var shouldFocusFirstCategory by rememberSaveable { mutableStateOf(true) }- val searchFocusRequester = remember { FocusRequester() }- val firstCategoryFocusRequester = remember { FocusRequester() }- val filteredCategories = remember(categories, query) {- val trimmed = query.trim()- val baseCategories = if (trimmed.isBlank()) {- categories- } else {- categories.filter { it.name.contains(trimmed, ignoreCase = true) }- }- val selectedCategory = baseCategories.firstOrNull { it.id == selectedCategoryId }- buildList {- if (selectedCategory != null) add(selectedCategory)- addAll(baseCategories.filterNot { it.id == selectedCategoryId })- }- }- GuideModalDialog(onDismiss = onDismiss) {- Surface(- modifier = Modifier- .fillMaxWidth(0.52f)- .fillMaxHeight(0.78f)- .focusGroup(),- colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),- shape = RoundedCornerShape(22.dp)- ) {- Column(- modifier = Modifier- .fillMaxSize()- .padding(20.dp),- verticalArrangement = Arrangement.spacedBy(14.dp)- ) {- Row(- modifier = Modifier.fillMaxWidth(),- horizontalArrangement = Arrangement.SpaceBetween,- verticalAlignment = Alignment.CenterVertically- ) {- Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {- Text(- text = stringResource(R.string.epg_filter_label),- style = MaterialTheme.typography.headlineSmall,- color = OnSurface- )- Text(- text = "${filteredCategories.size} matches",- style = MaterialTheme.typography.bodySmall,- color = OnSurfaceDim- )- }- LiveGuideShortcutChip(- label = stringResource(R.string.settings_cancel),- onClick = onDismiss- )- }-- LiveGuideProgramSearchRow(- query = query,- onQueryChange = { query = it },- onClear = { query = "" },- searchLabel = stringResource(R.string.epg_search_label),- searchPlaceholder = stringResource(R.string.epg_search_placeholder),- clearLabel = stringResource(R.string.epg_clear_search),- focusRequester = searchFocusRequester,- contentPadding = PaddingValues(0.dp),- showLabel = false,- onSearchFieldActivated = {- shouldFocusFirstCategory = false- }- )-- LazyColumn(- modifier = Modifier.fillMaxSize(),- verticalArrangement = Arrangement.spacedBy(10.dp)- ) {- itemsIndexed(- items = filteredCategories,- key = { index, category -> epgCategoryKey(category, index) }- ) { _, category ->- val isSelected = category.id == selectedCategoryId- val isLocked = isGuideCategoryLocked(category, parentalControlLevel)- TvClickableSurface(- onClick = { onCategorySelected(category) },- modifier = if (category.id == filteredCategories.firstOrNull()?.id) {- Modifier.focusRequester(firstCategoryFocusRequester)- } else {- Modifier- },- colors = ClickableSurfaceDefaults.colors(- containerColor = if (isSelected) Primary.copy(alpha = 0.18f) else SurfaceHighlight,- focusedContainerColor = if (isSelected) {- Primary.copy(alpha = 0.22f)- } else {- SurfaceHighlight- },- contentColor = if (isSelected) Primary else OnSurface,- focusedContentColor = if (isSelected) Primary else OnSurface- ),- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),- border = ClickableSurfaceDefaults.border(- focusedBorder = Border(- border = BorderStroke(2.dp, FocusBorder),- shape = RoundedCornerShape(14.dp)- )- )- ) {- Row(- modifier = Modifier- .fillMaxWidth()- .padding(horizontal = 16.dp, vertical = 14.dp),- horizontalArrangement = Arrangement.SpaceBetween,- verticalAlignment = Alignment.CenterVertically- ) {- Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {- Text(- text = category.name,- style = MaterialTheme.typography.titleMedium,- color = if (isSelected) Primary else OnSurface- )- if (isLocked) {- Text(- text = stringResource(R.string.settings_parental_control),- style = MaterialTheme.typography.bodySmall,- color = OnSurfaceDim- )- } else if (category.count > 0) {- Text(- text = "${category.count} channels",- style = MaterialTheme.typography.bodySmall,- color = OnSurfaceDim- )- }- }- if (isSelected) {- Text(- text = stringResource(R.string.epg_jump_now),- style = MaterialTheme.typography.labelLarge,- color = Primary- )- }- }- }- }- }- }- }- }-- LaunchedEffect(filteredCategories, shouldFocusFirstCategory) {- if (shouldFocusFirstCategory && filteredCategories.isNotEmpty()) {- firstCategoryFocusRequester.requestFocus()- shouldFocusFirstCategory = false- }- }-}--internal fun epgCategoryKey(category: Category, index: Int): String {- return "category:${category.id}:${category.name.trim()}:$index"-}diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/PlayerTransparentGuideOverlay.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/PlayerTransparentGuideOverlay.ktindex 106990a4..5f1ceac6 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/PlayerTransparentGuideOverlay.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/PlayerTransparentGuideOverlay.kt@@ -34,11 +34,12 @@ import com.streamvault.app.ui.screens.epg.CompactGuideProgramDialogimport com.streamvault.app.ui.screens.epg.EpgGridimport com.streamvault.app.ui.screens.epg.EpgUiStateimport com.streamvault.app.ui.screens.epg.EpgViewModel-import com.streamvault.app.ui.screens.epg.GuideCategoryPickerDialogimport com.streamvault.app.ui.screens.epg.GuideMessageStateimport com.streamvault.feature.live.presentation.epg.LiveGuideNowProviderimport com.streamvault.feature.live.presentation.epg.LiveGuideSearchOverlayimport com.streamvault.feature.live.presentation.epg.LiveGuideSearchOverlayLabels+import com.streamvault.feature.live.presentation.epg.LiveGuideCategoryPickerDialog+import com.streamvault.feature.live.presentation.epg.LiveGuideCategoryPickerLabelsimport com.streamvault.app.ui.screens.epg.GuideToolbarButtonimport com.streamvault.feature.live.presentation.epg.currentLiveGuideNowimport com.streamvault.app.ui.screens.epg.isGuideCategoryLocked@@ -254,10 +255,21 @@ fun PlayerTransparentGuideOverlay(}if (showCategoryPicker) {- GuideCategoryPickerDialog(+ LiveGuideCategoryPickerDialog(categories = uiState.categories,selectedCategoryId = selectedPickerCategoryId,- parentalControlLevel = uiState.parentalControlLevel,+ labels = LiveGuideCategoryPickerLabels(+ title = stringResource(R.string.epg_filter_label),+ cancel = stringResource(R.string.settings_cancel),+ searchLabel = stringResource(R.string.epg_search_label),+ searchPlaceholder = stringResource(R.string.epg_search_placeholder),+ clearSearch = stringResource(R.string.epg_clear_search),+ parentalControl = stringResource(R.string.settings_parental_control),+ matchesCount = { count -> "$count matches" },+ channelCount = { count -> if (count == 1) "1 channel" else "$count channels" },+ jumpNow = stringResource(R.string.epg_jump_now)+ ),+ isCategoryLocked = { category -> isGuideCategoryLocked(category, uiState.parentalControlLevel) },onDismiss = { showCategoryPicker = false },onCategorySelected = { category ->if (!isGuideCategoryLocked(category, uiState.parentalControlLevel)) {diff --git a/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md b/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.mdindex 28f42bcc..fbd4f2f7 100644--- a/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md+++ b/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md@@ -135,8 +135,8 @@ Home channel row surface, Home channel-results header, Home category sidebarheader, channel-content state host, channel-list host, and category-list hostand hidden category/channel dialogs, the category options dialog, thequick-filter add dialog, delete-group dialog, rename-group dialog, M3U category-organizer dialog, M3U series-assignment dialogs, and the EPG search overlay are-now feature-owned+organizer dialog, M3U series-assignment dialogs, EPG search overlay, and guide+category picker are now feature-ownedwhile the Home and EPGscreen/dialog composition remains in `:app` for the remaining app-specificdialogs.@@ -146,7 +146,7 @@ presentation primitives, `HomeUiState`, `HomePreviewUiState`, Guidemode/density/reminder presentation models, hidden collection dialogs, thecategory options dialog, the quick-filter add dialog, the delete-group dialog,and the rename-group dialog, M3U category organizer dialog, and M3U-series-assignment dialogs and the EPG search overlay are independent of app-code;+series-assignment dialogs, the EPG search overlay, and guide category picker+are independent 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 f8fa6e47..a869039f 100644--- a/docs/superpowers/plans/2026-08-28-live-feature-extraction.md+++ b/docs/superpowers/plans/2026-08-28-live-feature-extraction.md@@ -25,8 +25,8 @@ Home channel row surface, Home channel-results header, Home category sidebarheader, channel-content state host, channel-list host, and category-list hostand hidden category/channel dialogs, the category options dialog, thequick-filter add dialog, delete-group dialog, rename-group dialog, M3U category-organizer dialog, M3U series-assignment dialogs, and the EPG search overlay are-now feature-owned+organizer dialog, M3U series-assignment dialogs, EPG search overlay, and guide+category picker 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.@@ -694,6 +694,8 @@ The single-item and category-review series dialogs own draft normalization andassignment construction while the app retains repository mutations.The EPG search overlay owns modal/search presentation and focus behavior whileHome/Guide callers supply localized labels and query callbacks.+The guide category picker owns filtering, selected-first ordering, focus, and+row presentation while the app supplies lock policy and 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/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideCategoryPickerDialog.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideCategoryPickerDialog.ktnew file mode 100644index 00000000..89977bf8--- /dev/null+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/epg/LiveGuideCategoryPickerDialog.kt@@ -0,0 +1,264 @@+package com.streamvault.feature.live.presentation.epg++import androidx.compose.foundation.BorderStroke+import androidx.compose.foundation.background+import androidx.compose.foundation.clickable+import androidx.compose.foundation.focusGroup+import androidx.compose.foundation.interaction.MutableInteractionSource+import androidx.compose.foundation.layout.Arrangement+import androidx.compose.foundation.layout.Box+import androidx.compose.foundation.layout.BoxScope+import androidx.compose.foundation.layout.Column+import androidx.compose.foundation.layout.PaddingValues+import androidx.compose.foundation.layout.Row+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.lazy.LazyColumn+import androidx.compose.foundation.lazy.itemsIndexed+import androidx.compose.foundation.shape.RoundedCornerShape+import androidx.compose.runtime.Composable+import androidx.compose.runtime.LaunchedEffect+import androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.remember+import androidx.compose.runtime.saveable.rememberSaveable+import androidx.compose.runtime.setValue+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.unit.dp+import androidx.compose.ui.window.Dialog+import androidx.compose.ui.window.DialogProperties+import androidx.tv.material3.Border+import androidx.tv.material3.ClickableSurfaceDefaults+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.theme.FocusBorder+import com.streamvault.core.ui.theme.OnSurface+import com.streamvault.core.ui.theme.OnSurfaceDim+import com.streamvault.core.ui.theme.Primary+import com.streamvault.core.ui.theme.SurfaceElevated+import com.streamvault.core.ui.theme.SurfaceHighlight+import com.streamvault.domain.model.Category++data class LiveGuideCategoryPickerLabels(+ val title: String,+ val cancel: String,+ val searchLabel: String,+ val searchPlaceholder: String,+ val clearSearch: String,+ val parentalControl: String,+ val matchesCount: (Int) -> String,+ val channelCount: (Int) -> String,+ val jumpNow: String+)++@Composable+fun LiveGuideCategoryPickerDialog(+ categories: List<Category>,+ selectedCategoryId: Long,+ labels: LiveGuideCategoryPickerLabels,+ isCategoryLocked: (Category) -> Boolean,+ onDismiss: () -> Unit,+ onCategorySelected: (Category) -> Unit+) {+ var query by rememberSaveable { mutableStateOf("") }+ var shouldFocusFirstCategory by rememberSaveable { mutableStateOf(true) }+ val searchFocusRequester = remember { FocusRequester() }+ val firstCategoryFocusRequester = remember { FocusRequester() }+ val filteredCategories = remember(categories, query) {+ val trimmed = query.trim()+ val baseCategories = if (trimmed.isBlank()) {+ categories+ } else {+ categories.filter { it.name.contains(trimmed, ignoreCase = true) }+ }+ val selectedCategory = baseCategories.firstOrNull { it.id == selectedCategoryId }+ buildList {+ if (selectedCategory != null) add(selectedCategory)+ addAll(baseCategories.filterNot { it.id == selectedCategoryId })+ }+ }++ LiveGuideCategoryPickerModal(onDismiss = onDismiss) {+ Surface(+ modifier = Modifier+ .fillMaxWidth(0.52f)+ .fillMaxHeight(0.78f)+ .focusGroup(),+ colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),+ shape = RoundedCornerShape(22.dp)+ ) {+ Column(+ modifier = Modifier+ .fillMaxSize()+ .padding(20.dp),+ verticalArrangement = Arrangement.spacedBy(14.dp)+ ) {+ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.SpaceBetween,+ verticalAlignment = Alignment.CenterVertically+ ) {+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {+ Text(+ text = labels.title,+ style = MaterialTheme.typography.headlineSmall,+ color = OnSurface+ )+ Text(+ text = labels.matchesCount(filteredCategories.size),+ style = MaterialTheme.typography.bodySmall,+ color = OnSurfaceDim+ )+ }+ LiveGuideShortcutChip(+ label = labels.cancel,+ onClick = onDismiss+ )+ }++ LiveGuideProgramSearchRow(+ query = query,+ onQueryChange = { query = it },+ onClear = { query = "" },+ searchLabel = labels.searchLabel,+ searchPlaceholder = labels.searchPlaceholder,+ clearLabel = labels.clearSearch,+ focusRequester = searchFocusRequester,+ contentPadding = PaddingValues(0.dp),+ showLabel = false,+ onSearchFieldActivated = {+ shouldFocusFirstCategory = false+ }+ )++ LazyColumn(+ modifier = Modifier.fillMaxSize(),+ verticalArrangement = Arrangement.spacedBy(10.dp)+ ) {+ itemsIndexed(+ items = filteredCategories,+ key = { index, category -> liveGuideCategoryKey(category, index) }+ ) { _, category ->+ val isSelected = category.id == selectedCategoryId+ val isLocked = isCategoryLocked(category)+ TvClickableSurface(+ onClick = { onCategorySelected(category) },+ modifier = if (category.id == filteredCategories.firstOrNull()?.id) {+ Modifier.focusRequester(firstCategoryFocusRequester)+ } else {+ Modifier+ },+ colors = ClickableSurfaceDefaults.colors(+ containerColor = if (isSelected) Primary.copy(alpha = 0.18f) else SurfaceHighlight,+ focusedContainerColor = if (isSelected) {+ Primary.copy(alpha = 0.22f)+ } else {+ SurfaceHighlight+ },+ contentColor = if (isSelected) Primary else OnSurface,+ focusedContentColor = if (isSelected) Primary else OnSurface+ ),+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),+ border = ClickableSurfaceDefaults.border(+ focusedBorder = Border(+ border = BorderStroke(2.dp, FocusBorder),+ shape = RoundedCornerShape(14.dp)+ )+ )+ ) {+ Row(+ modifier = Modifier+ .fillMaxWidth()+ .padding(horizontal = 16.dp, vertical = 14.dp),+ horizontalArrangement = Arrangement.SpaceBetween,+ verticalAlignment = Alignment.CenterVertically+ ) {+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {+ Text(+ text = category.name,+ style = MaterialTheme.typography.titleMedium,+ color = if (isSelected) Primary else OnSurface+ )+ if (isLocked) {+ Text(+ text = labels.parentalControl,+ style = MaterialTheme.typography.bodySmall,+ color = OnSurfaceDim+ )+ } else if (category.count > 0) {+ Text(+ text = labels.channelCount(category.count),+ style = MaterialTheme.typography.bodySmall,+ color = OnSurfaceDim+ )+ }+ }+ if (isSelected) {+ Text(+ text = labels.jumpNow,+ style = MaterialTheme.typography.labelLarge,+ color = Primary+ )+ }+ }+ }+ }+ }+ }+ }+ }++ LaunchedEffect(filteredCategories, shouldFocusFirstCategory) {+ if (shouldFocusFirstCategory && filteredCategories.isNotEmpty()) {+ firstCategoryFocusRequester.requestFocus()+ shouldFocusFirstCategory = false+ }+ }+}++private fun liveGuideCategoryKey(category: Category, index: Int): String {+ return "category:${category.id}:${category.name.trim()}:$index"+}++@Composable+private fun LiveGuideCategoryPickerModal(+ 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 { MutableInteractionSource() }+ )+ )+ content()+ }+ }+}