Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

refactor(live): extract Home quick filters

David Nashash05693eb914f9
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
index cf25cca9..ad67ec9b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
@@ -2,7 +2,6 @@ package com.streamvault.app.ui.screens.home
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.foundation.basicMarquee
-import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.PaddingValues
@@ -20,8 +19,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import com.streamvault.core.ui.components.SearchInput
-import com.streamvault.feature.live.presentation.components.LiveSelectionChip
-import com.streamvault.feature.live.presentation.components.LiveSelectionChipRow
+import com.streamvault.feature.live.presentation.components.LiveQuickFiltersPanel
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.FocusRequester
@@ -95,8 +93,6 @@ import com.streamvault.player.PlayerSurfaceResizeMode
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
-import com.streamvault.core.ui.interaction.TvClickableSurface
-import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.app.ui.remote.LiveBrowseRemoteShortcutHandler
import com.streamvault.app.ui.remote.dispatchLiveBrowseRemoteShortcut
import com.streamvault.app.ui.remote.remoteColorButtonForKeyCode
@@ -112,8 +108,6 @@ private sealed interface FocusedRemoteShortcutTarget {
data class ChannelTarget(val channel: Channel) : FocusedRemoteShortcutTarget
}
-private const val HOME_ALL_FILTER_KEY = "__all_categories__"
-
// ׳’ג€ג‚¬׳’ג€ג‚¬ Screen ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬
@@ -693,9 +687,6 @@ fun HomeScreen(
) {
// Sticky Header Part
Column(modifier = Modifier.padding(horizontal = 10.dp)) {
- var showQuickFiltersDrawer by rememberSaveable(uiState.savedCategoryFilters) {
- mutableStateOf(false)
- }
Row(
modifier = Modifier
.fillMaxWidth()
@@ -741,160 +732,43 @@ fun HomeScreen(
LiveTvQuickFilterVisibilityMode.ALWAYS_VISIBLE -> true
}
if (shouldShowQuickFiltersControl) {
- val activeSavedFilter = uiState.activeCategoryFilter
+ val activeFilter = uiState.activeCategoryFilter
val filterSubtitle = when {
- uiState.categorySearchQuery.isBlank() -> {
- stringResource(R.string.home_quick_filters_showing_all)
- }
- activeSavedFilter != null -> {
- stringResource(
- R.string.home_quick_filters_active,
- activeSavedFilter
- )
- }
- else -> {
- stringResource(
- R.string.home_quick_filters_manual_search,
- uiState.categorySearchQuery
- )
- }
- }
- TvClickableSurface(
- onClick = { if (!isReorderMode) showQuickFiltersDrawer = !showQuickFiltersDrawer },
- enabled = !isReorderMode,
- modifier = Modifier
- .fillMaxWidth()
- .padding(bottom = 10.dp),
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = SurfaceElevated,
- focusedContainerColor = SurfaceHighlight.copy(alpha = 0.9f)
- ),
- border = ClickableSurfaceDefaults.border(
- focusedBorder = Border(
- border = BorderStroke(2.dp, Primary.copy(alpha = 0.85f)),
- shape = RoundedCornerShape(12.dp)
- )
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
- ) {
- Column(
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 12.dp, vertical = 10.dp),
- verticalArrangement = Arrangement.spacedBy(2.dp)
- ) {
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Text(
- text = stringResource(R.string.home_quick_filters_button),
- style = MaterialTheme.typography.labelLarge,
- color = OnSurface
- )
- Text(
- text = if (showQuickFiltersDrawer) {
- stringResource(R.string.home_quick_filters_hide)
- } else {
- stringResource(R.string.home_quick_filters_show)
- },
- style = MaterialTheme.typography.labelMedium,
- color = Primary
- )
- }
- Text(
- text = filterSubtitle,
- style = MaterialTheme.typography.bodySmall,
- color = OnSurfaceDim
- )
- }
- }
- if (showQuickFiltersDrawer) {
- Column(
- modifier = Modifier
- .fillMaxWidth()
- .padding(bottom = 8.dp),
- verticalArrangement = Arrangement.spacedBy(8.dp)
- ) {
- if (uiState.hiddenLiveCategories.isNotEmpty()) {
- TvButton(
- onClick = { showHiddenCategoriesDialog = true },
- enabled = !isReorderMode,
- modifier = Modifier.fillMaxWidth()
- ) {
- Text(
- text = stringResource(
- R.string.live_quick_filter_hidden_categories,
- uiState.hiddenLiveCategories.size
- )
- )
- }
- }
- if (hiddenChannelsLiveTv.isNotEmpty()) {
- TvButton(
- onClick = { showHiddenChannelsDialog = true },
- enabled = !isReorderMode,
- modifier = Modifier.fillMaxWidth()
- ) {
- Text(
- text = stringResource(
- R.string.live_quick_filter_hidden_channels,
- hiddenChannelsLiveTv.size
- )
- )
- }
- }
- TvButton(
- onClick = { showAddQuickFilterDialog = true },
- enabled = !isReorderMode,
- modifier = Modifier.fillMaxWidth()
- ) {
- Text(stringResource(R.string.home_quick_filters_add_chip))
- }
- }
- if (uiState.savedCategoryFilters.isNotEmpty() || uiState.categorySearchQuery.isNotBlank()) {
- LiveSelectionChipRow(
- title = stringResource(R.string.home_quick_filters_title),
- chips = buildList {
- add(
- LiveSelectionChip(
- key = HOME_ALL_FILTER_KEY,
- label = stringResource(R.string.home_quick_filters_all)
- )
- )
- addAll(
- uiState.savedCategoryFilters.map { filter ->
- LiveSelectionChip(key = filter, label = filter)
- }
- )
- },
- selectedKey = uiState.activeCategoryFilter ?: HOME_ALL_FILTER_KEY.takeIf {
- uiState.categorySearchQuery.isBlank()
- },
- onChipSelected = { filter ->
- if (!isReorderMode) {
- if (filter == HOME_ALL_FILTER_KEY) {
- viewModel.clearCategorySearchQuery()
- } else {
- viewModel.applySavedCategoryFilter(filter)
- }
- showQuickFiltersDrawer = false
- }
- },
- modifier = Modifier.padding(bottom = 10.dp),
- contentPadding = PaddingValues(horizontal = 0.dp)
- )
- } else {
- Text(
- text = stringResource(R.string.home_quick_filters_empty),
- style = MaterialTheme.typography.bodySmall,
- color = OnSurfaceDim,
- modifier = Modifier.padding(start = 4.dp, bottom = 10.dp)
- )
- }
+ uiState.categorySearchQuery.isBlank() -> stringResource(R.string.home_quick_filters_showing_all)
+ activeFilter != null -> stringResource(
+ R.string.home_quick_filters_active,
+ activeFilter
+ )
+ else -> stringResource(
+ R.string.home_quick_filters_manual_search,
+ uiState.categorySearchQuery
+ )
}
+ LiveQuickFiltersPanel(
+ savedFilters = uiState.savedCategoryFilters,
+ categorySearchQuery = uiState.categorySearchQuery,
+ activeFilter = activeFilter,
+ hiddenCategoriesButtonLabel = uiState.hiddenLiveCategories
+ .takeIf { it.isNotEmpty() }
+ ?.let { stringResource(R.string.live_quick_filter_hidden_categories, it.size) },
+ hiddenChannelsButtonLabel = hiddenChannelsLiveTv
+ .takeIf { it.isNotEmpty() }
+ ?.let { stringResource(R.string.live_quick_filter_hidden_channels, it.size) },
+ buttonTitle = stringResource(R.string.home_quick_filters_button),
+ chipTitle = stringResource(R.string.home_quick_filters_title),
+ showLabel = stringResource(R.string.home_quick_filters_show),
+ hideLabel = stringResource(R.string.home_quick_filters_hide),
+ filterSubtitle = filterSubtitle,
+ allLabel = stringResource(R.string.home_quick_filters_all),
+ emptyLabel = stringResource(R.string.home_quick_filters_empty),
+ addChipLabel = stringResource(R.string.home_quick_filters_add_chip),
+ isReorderMode = isReorderMode,
+ onShowHiddenCategories = { showHiddenCategoriesDialog = true },
+ onShowHiddenChannels = { showHiddenChannelsDialog = true },
+ onAddFilter = { showAddQuickFilterDialog = true },
+ onAllSelected = viewModel::clearCategorySearchQuery,
+ onSavedFilterSelected = viewModel::applySavedCategoryFilter
+ )
}
}
diff --git a/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md b/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md
index f360d5ec..d47eb788 100644
--- a/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md
+++ b/docs/COMPOSE_REDUCTION_PHASE5_TRANSITIONAL_DEPENDENCIES.md
@@ -129,8 +129,8 @@ The `:feature:live` module itself depends only on `:core:navigation`, `:core:ui`
feature-to-feature imports. Home and Guide ViewModels are being moved behind
the live boundary incrementally: `HomeViewModel`, the sidebar/preview surface,
the loading/preview host supporting composables, the live source switcher, Home
-quick-filter chip row, Home reorder top bar, and Home channel row surface are
-now feature-owned while the Home screen/dialog composition remains in `:app`.
+quick-filter panel/chip row, Home reorder top bar, and Home channel row surface
+are now feature-owned while the Home screen/dialog composition remains in `:app`.
The source switcher receives localized labels from the app at the current
composition boundary. Live-owned
presentation primitives, `HomeUiState`, `HomePreviewUiState`, and Guide
diff --git a/docs/superpowers/plans/2026-08-28-live-feature-extraction.md b/docs/superpowers/plans/2026-08-28-live-feature-extraction.md
index 28f87c3c..6383ec8e 100644
--- a/docs/superpowers/plans/2026-08-28-live-feature-extraction.md
+++ b/docs/superpowers/plans/2026-08-28-live-feature-extraction.md
@@ -19,8 +19,8 @@ claim the Live slice or Phase 5 complete.
Status update (2026-08-29): `HomeViewModel`, the sidebar/preview surface, the
loading/preview host supporting composables, the live source switcher, Home
-quick-filter chip row, Home reorder top bar, and Home channel row surface are
-now feature-owned
+quick-filter panel/chip row, Home reorder top bar, and Home channel row surface
+are now feature-owned
and their feature checks are green. Home screen/dialog composition, the
remaining live cards/rows, complete locale resource migration, and acceptance
gates remain open.
@@ -655,11 +655,13 @@ Run `HomeScreenBehaviorTest`; expected missing-screen failure.
Move `HomeScreen.kt`, `HomeScreenDialogs.kt`, and `HomeSidebarComponents.kt`. Replace app navigation strings with typed `AppDestination`, app shell with `CoreAppScreenScaffold`/`UiDestination`, device/time helpers with Core UI, and direct MultiView composables with `LiveMultiViewPlannerContent`.
The first screen wiring checkpoint is complete: Home now calls the
-feature-owned `LiveSourceSwitcher`, `LiveSelectionChipRow`,
-`LiveReorderTopBar`, and `LiveChannelRowSurface`, passing app-localized
-labels/title formatting/accessibility text through explicit presentation
-parameters. The remaining app-owned live cards and shell/dialog composition still require
-compatibility seams before the full Home move.
+feature-owned `LiveSourceSwitcher`, `LiveQuickFiltersPanel` (including its
+`LiveSelectionChipRow`), `LiveReorderTopBar`, and `LiveChannelRowSurface`,
+passing app-localized labels/title formatting/accessibility text through
+explicit presentation parameters. The quick-filter key/selection rules are
+covered by `LiveQuickFiltersTest`. The remaining app-owned live cards and
+shell/dialog composition still require compatibility seams before the full
+Home move.
Preserve planner callback order:
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersPanel.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersPanel.kt
new file mode 100644
index 00000000..9e079ddc
--- /dev/null
+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersPanel.kt
@@ -0,0 +1,166 @@
+package com.streamvault.feature.live.presentation.components
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+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.unit.dp
+import androidx.tv.material3.Border
+import androidx.tv.material3.ClickableSurfaceDefaults
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+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
+
+const val LIVE_ALL_CATEGORY_FILTER_KEY = "__all_categories__"
+
+fun liveQuickFilterKeys(savedFilters: List<String>): List<String> = buildList {
+ add(LIVE_ALL_CATEGORY_FILTER_KEY)
+ addAll(savedFilters)
+}
+
+fun liveQuickFilterSelection(activeFilter: String?, categorySearchQuery: String): String? =
+ activeFilter ?: LIVE_ALL_CATEGORY_FILTER_KEY.takeIf { categorySearchQuery.isBlank() }
+
+@Composable
+fun LiveQuickFiltersPanel(
+ savedFilters: List<String>,
+ categorySearchQuery: String,
+ activeFilter: String?,
+ hiddenCategoriesButtonLabel: String?,
+ hiddenChannelsButtonLabel: String?,
+ buttonTitle: String,
+ chipTitle: String,
+ showLabel: String,
+ hideLabel: String,
+ filterSubtitle: String,
+ allLabel: String,
+ emptyLabel: String,
+ addChipLabel: String,
+ isReorderMode: Boolean,
+ onShowHiddenCategories: () -> Unit,
+ onShowHiddenChannels: () -> Unit,
+ onAddFilter: () -> Unit,
+ onAllSelected: () -> Unit,
+ onSavedFilterSelected: (String) -> Unit,
+ modifier: Modifier = Modifier,
+) {
+ var showDrawer by rememberSaveable(savedFilters) { mutableStateOf(false) }
+ val hasFilterContent = savedFilters.isNotEmpty() || categorySearchQuery.isNotBlank()
+
+ TvClickableSurface(
+ onClick = { if (!isReorderMode) showDrawer = !showDrawer },
+ enabled = !isReorderMode,
+ modifier = modifier
+ .fillMaxWidth()
+ .padding(bottom = 10.dp),
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = SurfaceElevated,
+ focusedContainerColor = SurfaceHighlight.copy(alpha = 0.9f)
+ ),
+ border = ClickableSurfaceDefaults.border(
+ focusedBorder = Border(
+ border = BorderStroke(2.dp, Primary.copy(alpha = 0.85f)),
+ shape = RoundedCornerShape(12.dp)
+ )
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
+ ) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 12.dp, vertical = 10.dp),
+ verticalArrangement = Arrangement.spacedBy(2.dp)
+ ) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(text = buttonTitle, style = MaterialTheme.typography.labelLarge, color = OnSurface)
+ Text(
+ text = if (showDrawer) hideLabel else showLabel,
+ style = MaterialTheme.typography.labelMedium,
+ color = Primary
+ )
+ }
+ Text(
+ text = filterSubtitle,
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ }
+ }
+
+ if (!showDrawer) return
+
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(bottom = 8.dp),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ hiddenCategoriesButtonLabel?.let { label ->
+ TvButton(
+ onClick = onShowHiddenCategories,
+ enabled = !isReorderMode,
+ modifier = Modifier.fillMaxWidth()
+ ) { Text(text = label) }
+ }
+ hiddenChannelsButtonLabel?.let { label ->
+ TvButton(
+ onClick = onShowHiddenChannels,
+ enabled = !isReorderMode,
+ modifier = Modifier.fillMaxWidth()
+ ) { Text(text = label) }
+ }
+ TvButton(
+ onClick = onAddFilter,
+ enabled = !isReorderMode,
+ modifier = Modifier.fillMaxWidth()
+ ) { Text(text = addChipLabel) }
+
+ if (hasFilterContent) {
+ LiveSelectionChipRow(
+ title = chipTitle,
+ chips = buildList {
+ add(LiveSelectionChip(LIVE_ALL_CATEGORY_FILTER_KEY, allLabel))
+ addAll(savedFilters.map { filter -> LiveSelectionChip(filter, filter) })
+ },
+ selectedKey = liveQuickFilterSelection(activeFilter, categorySearchQuery),
+ onChipSelected = { key ->
+ if (!isReorderMode) {
+ if (key == LIVE_ALL_CATEGORY_FILTER_KEY) onAllSelected() else onSavedFilterSelected(key)
+ showDrawer = false
+ }
+ },
+ modifier = Modifier.padding(bottom = 10.dp),
+ contentPadding = PaddingValues(horizontal = 0.dp)
+ )
+ } else {
+ Text(
+ text = emptyLabel,
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim,
+ modifier = Modifier.padding(start = 4.dp, bottom = 10.dp)
+ )
+ }
+ }
+}
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersTest.kt
new file mode 100644
index 00000000..67bbed73
--- /dev/null
+++ b/feature/live/src/test/java/com/streamvault/feature/live/presentation/components/LiveQuickFiltersTest.kt
@@ -0,0 +1,23 @@
+package com.streamvault.feature.live.presentation.components
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class LiveQuickFiltersTest {
+ @Test
+ fun `chip keys keep all filter first and preserve saved filter order`() {
+ assertThat(liveQuickFilterKeys(listOf("Sports", "News")))
+ .containsExactly(LIVE_ALL_CATEGORY_FILTER_KEY, "Sports", "News")
+ .inOrder()
+ }
+
+ @Test
+ fun `selection uses all filter only when search is blank`() {
+ assertThat(liveQuickFilterSelection(activeFilter = null, categorySearchQuery = ""))
+ .isEqualTo(LIVE_ALL_CATEGORY_FILTER_KEY)
+ assertThat(liveQuickFilterSelection(activeFilter = null, categorySearchQuery = "sports"))
+ .isNull()
+ assertThat(liveQuickFilterSelection(activeFilter = "Sports", categorySearchQuery = "sports"))
+ .isEqualTo("Sports")
+ }
+}