Skip to content

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

feat(live): add optional category sidebar auto-hide

David Nashashed497f158f37
diff --git a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
index ddadab41..09d2fc45 100644
--- a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
+++ b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
@@ -216,6 +216,7 @@ class BackupManagerImpl @Inject constructor(
put("liveTvCategoryFilters", preferencesRepository.liveTvCategoryFilters.first().joinToString("\n"))
put("liveTvQuickFilterVisibility", preferencesRepository.liveTvQuickFilterVisibility.first() ?: "always")
put("liveTvChannelMode", preferencesRepository.liveTvChannelMode.first().orEmpty())
+ put("liveTvAutoHideCategories", preferencesRepository.liveTvAutoHideCategories.first().toString())
put("showLiveSourceSwitcher", preferencesRepository.showLiveSourceSwitcher.first().toString())
put("showFavoritesCategory", preferencesRepository.showFavoritesCategory.first().toString())
put("showAllChannelsCategory", preferencesRepository.showAllChannelsCategory.first().toString())
@@ -3150,6 +3151,7 @@ class BackupManagerImpl @Inject constructor(
put("liveTvCategoryFilters", preferencesRepository.liveTvCategoryFilters.first().joinToString("\n"))
put("liveTvQuickFilterVisibility", preferencesRepository.liveTvQuickFilterVisibility.first() ?: "always")
put("liveTvChannelMode", preferencesRepository.liveTvChannelMode.first().orEmpty())
+ put("liveTvAutoHideCategories", preferencesRepository.liveTvAutoHideCategories.first().toString())
put("showLiveSourceSwitcher", preferencesRepository.showLiveSourceSwitcher.first().toString())
put("showFavoritesCategory", preferencesRepository.showFavoritesCategory.first().toString())
put("showAllChannelsCategory", preferencesRepository.showAllChannelsCategory.first().toString())
@@ -3632,6 +3634,8 @@ class BackupManagerImpl @Inject constructor(
?.let { preferencesRepository.setLiveTvQuickFilterVisibility(it) }
prefs["liveTvChannelMode"]?.takeIf { it.isNotBlank() }
?.let { preferencesRepository.setLiveTvChannelMode(it) }
+ prefs["liveTvAutoHideCategories"]?.toBooleanStrictOrNull()
+ ?.let { preferencesRepository.setLiveTvAutoHideCategories(it) }
prefs["showLiveSourceSwitcher"]?.toBooleanStrictOrNull()
?.let { preferencesRepository.setShowLiveSourceSwitcher(it) }
prefs["showFavoritesCategory"]?.toBooleanStrictOrNull()
diff --git a/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt b/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
index d08135db..15b03a70 100644
--- a/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
+++ b/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
@@ -13,7 +13,7 @@ internal object PreferenceBackupRegistry {
"last_active_provider_id", "active_live_source_type", "active_live_source_id",
"default_view_mode", "parental_control_level", "parental_pin_hash", "parental_pin_salt",
"default_category_id", "app_language", "app_landing_destination", "app_top_level_destinations",
- "app_home_dashboard_shelves", "app_time_format", "live_tv_channel_mode",
+ "app_home_dashboard_shelves", "app_time_format", "live_tv_channel_mode", "live_tv_auto_hide_categories",
"show_live_source_switcher", "show_favorites_category", "show_all_channels_category",
"show_recent_channels_category", "live_tv_category_filters", "live_tv_quick_filter_visibility",
"hide_decorative_live_rows", "live_channel_numbering_mode", "live_channel_grouping_mode",
@@ -89,6 +89,7 @@ internal object PreferenceBackupRegistry {
"parentalControlLevel", "parentalPinHash", "parentalPinSalt", "appLanguage", "appTimeFormat",
"defaultViewMode", "appLandingDestination", "appTopLevelDestinations", "appHomeDashboardShelves",
"remoteShortcutPreferences", "liveTvCategoryFilters", "liveTvQuickFilterVisibility", "liveTvChannelMode",
+ "liveTvAutoHideCategories",
"showLiveSourceSwitcher", "showFavoritesCategory", "showAllChannelsCategory", "showRecentChannelsCategory",
"hideDecorativeLiveRows", "liveChannelNumberingMode", "liveChannelGroupingMode", "groupedChannelLabelMode",
"liveVariantPreferenceMode", "vodViewMode", "vodInfiniteScroll", "vodPortalSearch", "vodCategoryLoadMode",
diff --git a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
index 519f2bd0..f5a8f656 100644
--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
@@ -193,6 +193,7 @@ class PreferencesRepository @Inject constructor(
val APP_HOME_DASHBOARD_SHELVES = stringPreferencesKey("app_home_dashboard_shelves")
val APP_TIME_FORMAT = stringPreferencesKey("app_time_format")
val LIVE_TV_CHANNEL_MODE = stringPreferencesKey("live_tv_channel_mode")
+ val LIVE_TV_AUTO_HIDE_CATEGORIES = booleanPreferencesKey("live_tv_auto_hide_categories")
val SHOW_LIVE_SOURCE_SWITCHER = booleanPreferencesKey("show_live_source_switcher")
val SHOW_FAVORITES_CATEGORY = booleanPreferencesKey("show_favorites_category")
val SHOW_ALL_CHANNELS_CATEGORY = booleanPreferencesKey("show_all_channels_category")
@@ -1599,6 +1600,16 @@ class PreferencesRepository @Inject constructor(
}
}
+ override val liveTvAutoHideCategories: Flow<Boolean> = context.dataStore.data.map { preferences ->
+ preferences[PreferencesKeys.LIVE_TV_AUTO_HIDE_CATEGORIES] ?: false
+ }
+
+ override suspend fun setLiveTvAutoHideCategories(enabled: Boolean) {
+ context.dataStore.edit { preferences ->
+ preferences[PreferencesKeys.LIVE_TV_AUTO_HIDE_CATEGORIES] = enabled
+ }
+ }
+
override val showLiveSourceSwitcher: Flow<Boolean> = context.dataStore.data.map { preferences ->
preferences[PreferencesKeys.SHOW_LIVE_SOURCE_SWITCHER] ?: false
}
diff --git a/domain/src/main/java/com/streamvault/domain/settings/SettingsPreferences.kt b/domain/src/main/java/com/streamvault/domain/settings/SettingsPreferences.kt
index af1fec47..05f5c28b 100644
--- a/domain/src/main/java/com/streamvault/domain/settings/SettingsPreferences.kt
+++ b/domain/src/main/java/com/streamvault/domain/settings/SettingsPreferences.kt
@@ -303,6 +303,10 @@ interface SettingsPreferences {
suspend fun setLiveTvChannelMode(mode: String)
+ val liveTvAutoHideCategories: Flow<Boolean>
+
+ suspend fun setLiveTvAutoHideCategories(enabled: Boolean)
+
val showLiveSourceSwitcher: Flow<Boolean>
suspend fun setShowLiveSourceSwitcher(enabled: Boolean)
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/HomeViewModel.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/HomeViewModel.kt
index c5053187..ff6fe920 100644
--- a/feature/live/src/main/java/com/streamvault/feature/live/home/HomeViewModel.kt
+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/HomeViewModel.kt
@@ -366,6 +366,14 @@ class HomeViewModel @Inject constructor(
}
}
+ viewModelScope.launch {
+ preferencesRepository.liveTvAutoHideCategories
+ .distinctUntilChanged()
+ .collectLatest { enabled ->
+ _uiState.update { it.copy(liveTvAutoHideCategories = enabled) }
+ }
+ }
+
viewModelScope.launch {
preferencesRepository.liveTvCategoryFilters.collectLatest { filters ->
_uiState.update { state ->
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategoryListHost.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategoryListHost.kt
index 6827991f..1bf6bc9d 100644
--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategoryListHost.kt
+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveCategoryListHost.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
@@ -15,9 +16,11 @@ fun LiveCategoryListHost(
categories: List<Category>,
categoryFocusRequesters: MutableMap<Long, FocusRequester>,
itemContent: @Composable (category: Category, focusRequester: FocusRequester) -> Unit,
+ state: LazyListState,
modifier: Modifier = Modifier
) {
LazyColumn(
+ state = state,
modifier = modifier.fillMaxWidth(),
contentPadding = PaddingValues(bottom = 16.dp)
) {
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelResultsHeader.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelResultsHeader.kt
index 2f76b5b3..42e961ae 100644
--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelResultsHeader.kt
+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveChannelResultsHeader.kt
@@ -6,7 +6,16 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandHorizontally
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkHorizontally
+import androidx.compose.animation.core.tween
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -15,9 +24,11 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Icon
import androidx.tv.material3.Text
import com.streamvault.core.ui.components.SearchInput
import com.streamvault.core.ui.components.shell.ContentMetadataStrip
+import com.streamvault.core.ui.interaction.TvIconButton
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
@@ -37,6 +48,9 @@ fun LiveChannelResultsHeader(
channelSearchFocusRequester: FocusRequester,
channelSearchWidth: Dp,
isReorderMode: Boolean,
+ showCategoriesButton: Boolean = false,
+ onShowCategories: () -> Unit = {},
+ showCategoriesContentDescription: String = "",
modifier: Modifier = Modifier
) {
Column(
@@ -85,14 +99,37 @@ fun LiveChannelResultsHeader(
} else {
ContentMetadataStrip(values = metadataValues)
}
- SearchInput(
- value = channelSearchQuery,
- onValueChange = { if (!isReorderMode) onChannelSearchQueryChanged(it) },
- placeholder = searchPlaceholder,
- onSearch = {},
- focusRequester = channelSearchFocusRequester,
- modifier = Modifier.width(channelSearchWidth),
- enabled = !isReorderMode
- )
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ AnimatedVisibility(
+ visible = showCategoriesButton,
+ enter = fadeIn(tween(150)) + expandHorizontally(),
+ exit = fadeOut(tween(100)) + shrinkHorizontally()
+ ) {
+ TvIconButton(
+ onClick = onShowCategories,
+ modifier = Modifier.size(40.dp)
+ ) {
+ Icon(
+ imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+ contentDescription = showCategoriesContentDescription
+ )
+ }
+ }
+ SearchInput(
+ value = channelSearchQuery,
+ onValueChange = { if (!isReorderMode) onChannelSearchQueryChanged(it) },
+ placeholder = searchPlaceholder,
+ onSearch = {},
+ focusRequester = channelSearchFocusRequester,
+ modifier = Modifier
+ .weight(1f, fill = false)
+ .widthIn(min = 0.dp, max = channelSearchWidth),
+ enabled = !isReorderMode
+ )
+ }
}
}
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHomeScreen.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHomeScreen.kt
index b334e9ae..703359e1 100644
--- a/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHomeScreen.kt
+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/LiveHomeScreen.kt
@@ -31,7 +31,13 @@ import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.TextButton
import com.streamvault.core.ui.device.rememberIsTelevisionDevice
import androidx.compose.animation.Crossfade
+import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandHorizontally
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkHorizontally
+import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LifecycleEventEffect
import com.streamvault.feature.live.presentation.components.LiveChannelProgressTicker
@@ -53,6 +59,7 @@ import com.streamvault.feature.live.presentation.components.LiveReorderTopBar
import com.streamvault.feature.live.presentation.home.liveHomeLayoutMetrics
import com.streamvault.feature.live.presentation.home.isLiveHomeCategoryLocked
import com.streamvault.feature.live.presentation.home.isLiveHomeChannelLocked
+import com.streamvault.feature.live.presentation.home.shouldCollapseLiveCategorySidebar
import com.streamvault.core.ui.design.FocusRestoreHost
import com.streamvault.core.ui.design.requestFocusSafely
import androidx.activity.compose.BackHandler
@@ -139,6 +146,9 @@ fun LiveHomeScreen(
var showAddQuickFilterDialog by rememberSaveable { mutableStateOf(false) }
var showHiddenCategoriesDialog by rememberSaveable { mutableStateOf(false) }
var showHiddenChannelsDialog by rememberSaveable { mutableStateOf(false) }
+ var isCategorySidebarHidden by rememberSaveable { mutableStateOf(false) }
+ var sidebarRevealNonce by remember { mutableStateOf(0) }
+ var pendingCategoryContentJumpCategoryId by rememberSaveable { mutableStateOf<Long?>(null) }
// Parental Control State
var showPinDialog by rememberSaveable { mutableStateOf(false) }
@@ -147,6 +157,13 @@ fun LiveHomeScreen(
var pendingUnlockChannel by remember { mutableStateOf<Channel?>(null) }
var pendingLockToggleCategory by remember { mutableStateOf<Category?>(null) }
val scope = rememberCoroutineScope()
+
+ fun revealCategorySidebar() {
+ isCategorySidebarHidden = false
+ pendingCategoryContentJumpCategoryId = null
+ sidebarRevealNonce++
+ }
+
LaunchedEffect(initialCategoryId) {
viewModel.setPreferredInitialCategory(initialCategoryId)
}
@@ -195,6 +212,16 @@ fun LiveHomeScreen(
}
}
+ BackHandler(enabled = isCategorySidebarHidden && !hasOverlay) {
+ revealCategorySidebar()
+ }
+
+ LaunchedEffect(uiState.liveTvAutoHideCategories) {
+ if (!uiState.liveTvAutoHideCategories && isCategorySidebarHidden) {
+ revealCategorySidebar()
+ }
+ }
+
LiveHomeDialogsHost(
uiState = uiState,
viewModel = viewModel,
@@ -328,6 +355,7 @@ fun LiveHomeScreen(
val channelSearchFocusRequester = remember { FocusRequester() }
val categoryFocusRequesters = remember { mutableMapOf<Long, FocusRequester>() }
val channelFocusRequesters = remember { mutableMapOf<Long, FocusRequester>() }
+ val categoryListState = rememberLazyListState()
val visibleCategories = remember(uiState.categories, uiState.categorySearchQuery) {
uiState.categories
.asSequence()
@@ -370,7 +398,6 @@ fun LiveHomeScreen(
var preferredRestoreTarget by rememberSaveable { mutableStateOf(FocusRestoreTarget.CHANNEL.name) }
var pendingRestoreTarget by remember { mutableStateOf<FocusRestoreTarget?>(null) }
var focusRestoreNonce by rememberSaveable { mutableStateOf(0) }
- var pendingCategoryContentJumpCategoryId by rememberSaveable { mutableStateOf<Long?>(null) }
var focusedRemoteShortcutTarget by remember { mutableStateOf<FocusedRemoteShortcutTarget?>(null) }
fun requestChannelFocus(channelId: Long?): Boolean {
@@ -408,6 +435,18 @@ fun LiveHomeScreen(
return focusedImmediately
}
+ fun collapseCategorySidebarForSelection(isLocked: Boolean = false): Boolean {
+ val shouldCollapse = shouldCollapseLiveCategorySidebar(
+ autoHideCategories = uiState.liveTvAutoHideCategories,
+ isLocked = isLocked,
+ isReorderMode = isReorderMode
+ )
+ if (shouldCollapse) {
+ isCategorySidebarHidden = true
+ }
+ return shouldCollapse
+ }
+
val displayedCategory = uiState.selectedCategory?.takeIf { !isCategoryLocked(it) }
val hasBlockedCategorySearch =
uiState.categorySearchQuery.isNotBlank() &&
@@ -443,6 +482,37 @@ fun LiveHomeScreen(
pendingCategoryContentJumpCategoryId = null
}
+ LaunchedEffect(sidebarRevealNonce, visibleCategories) {
+ if (sidebarRevealNonce == 0 || isCategorySidebarHidden) return@LaunchedEffect
+
+ val targetCategoryId = lastFocusedCategoryId
+ ?.takeIf { categoryId -> visibleCategories.any { it.id == categoryId } }
+ ?: (unlockedVisibleCategories.firstOrNull() ?: visibleCategories.firstOrNull())?.id
+ val targetIndex = targetCategoryId?.let { categoryId ->
+ visibleCategories.indexOfFirst { it.id == categoryId }
+ } ?: -1
+ if (targetIndex >= 0) {
+ kotlinx.coroutines.delay(80)
+ categoryListState.animateScrollToItem(targetIndex)
+ }
+
+ var restored = requestCategoryFocus(targetCategoryId)
+ if (!restored) {
+ kotlinx.coroutines.delay(100)
+ restored = requestCategoryFocus(targetCategoryId)
+ }
+ if (!restored) {
+ val fallbackCategoryId = (unlockedVisibleCategories.firstOrNull() ?: visibleCategories.firstOrNull())?.id
+ if (fallbackCategoryId != targetCategoryId) {
+ val fallbackIndex = visibleCategories.indexOfFirst { it.id == fallbackCategoryId }
+ if (fallbackIndex >= 0) {
+ categoryListState.animateScrollToItem(fallbackIndex)
+ }
+ requestCategoryFocus(fallbackCategoryId)
+ }
+ }
+ }
+
LaunchedEffect(uiState.categories, uiState.selectedCategory?.id, uiState.parentalControlLevel, isReorderMode) {
if (isReorderMode) return@LaunchedEffect
val selectedCategory = uiState.selectedCategory ?: return@LaunchedEffect
@@ -511,6 +581,8 @@ fun LiveHomeScreen(
}.getOrDefault(FocusRestoreTarget.CHANNEL)
pendingRestoreTarget = when {
+ isCategorySidebarHidden && canRestoreChannel -> FocusRestoreTarget.CHANNEL
+ isCategorySidebarHidden -> null
restoreTarget == FocusRestoreTarget.CATEGORY && canRestoreCategory -> FocusRestoreTarget.CATEGORY
canRestoreChannel -> FocusRestoreTarget.CHANNEL
canRestoreCategory -> FocusRestoreTarget.CATEGORY
@@ -563,6 +635,8 @@ fun LiveHomeScreen(
visibleCategories.any { it.id == lastFocusedCategoryId }
pendingRestoreTarget = when {
+ isCategorySidebarHidden && canRestoreChannel -> FocusRestoreTarget.CHANNEL
+ isCategorySidebarHidden -> null
restoreTarget == FocusRestoreTarget.CATEGORY && canRestoreCategory -> FocusRestoreTarget.CATEGORY
canRestoreChannel -> FocusRestoreTarget.CHANNEL
canRestoreCategory -> FocusRestoreTarget.CATEGORY
@@ -631,14 +705,19 @@ fun LiveHomeScreen(
val categorySearchFocusRequester = remember { FocusRequester() }
val focusManager = LocalFocusManager.current
- Column(
- modifier = Modifier
- .width(sidebarWidth)
- .fillMaxHeight()
- .background(SurfaceElevated.copy(alpha = 0.88f), RoundedCornerShape(20.dp))
- .padding(top = 10.dp)
- .focusGroup()
+ AnimatedVisibility(
+ visible = !isCategorySidebarHidden,
+ enter = fadeIn(tween(150)) + expandHorizontally(),
+ exit = fadeOut(tween(100)) + shrinkHorizontally()
) {
+ Column(
+ modifier = Modifier
+ .width(sidebarWidth)
+ .fillMaxHeight()
+ .background(SurfaceElevated.copy(alpha = 0.88f), RoundedCornerShape(20.dp))
+ .padding(top = 10.dp)
+ .focusGroup()
+ ) {
LiveCategorySidebarHeader(
title = stringResource(R.string.home_categories_title),
currentSource = uiState.activeLiveSource,
@@ -687,6 +766,7 @@ fun LiveHomeScreen(
LiveCategoryListHost(
categories = visibleCategories,
categoryFocusRequesters = categoryFocusRequesters,
+ state = categoryListState,
itemContent = { category, categoryFocusRequester ->
val isLocked = isCategoryLocked(category)
@@ -702,7 +782,9 @@ fun LiveHomeScreen(
pendingUnlockCategory = category
showPinDialog = true
} else {
+ val collapsed = collapseCategorySidebarForSelection()
viewModel.selectCategory(category)
+ pendingCategoryContentJumpCategoryId = category.id.takeIf { collapsed }
}
},
onLongClick = {
@@ -718,14 +800,17 @@ fun LiveHomeScreen(
pendingCategoryContentJumpCategoryId = null
false
} else if (uiState.selectedCategory?.id != category.id) {
- pendingCategoryContentJumpCategoryId = category.id
+ val collapsed = collapseCategorySidebarForSelection()
+ pendingCategoryContentJumpCategoryId = category.id.takeIf { collapsed }
viewModel.selectCategory(category)
true
} else if (uiState.isLoading) {
- pendingCategoryContentJumpCategoryId = category.id
+ val collapsed = collapseCategorySidebarForSelection()
+ pendingCategoryContentJumpCategoryId = category.id.takeIf { collapsed }
true
} else if (uiState.filteredChannels.isNotEmpty()) {
pendingCategoryContentJumpCategoryId = null
+ collapseCategorySidebarForSelection()
requestChannelFocusFromCategory()
} else {
pendingCategoryContentJumpCategoryId = null
@@ -747,6 +832,7 @@ fun LiveHomeScreen(
)
}
)
+ }
}
// Content - Channel Grid / Pro Preview
@@ -793,7 +879,10 @@ fun LiveHomeScreen(
searchPlaceholder = stringResource(R.string.home_search_channels),
channelSearchFocusRequester = channelSearchFocusRequester,
channelSearchWidth = channelSearchWidth,
- isReorderMode = isReorderMode
+ isReorderMode = isReorderMode,
+ showCategoriesButton = isCategorySidebarHidden,
+ onShowCategories = ::revealCategorySidebar,
+ showCategoriesContentDescription = stringResource(R.string.home_show_categories)
)
Crossfade(
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/home/HomeUiState.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/home/HomeUiState.kt
index 12b9260b..0fd30174 100644
--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/home/HomeUiState.kt
+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/home/HomeUiState.kt
@@ -54,6 +54,7 @@ data class HomeUiState(
val isChannelReorderMode: Boolean = false,
val reorderCategory: Category? = null,
val liveTvChannelMode: LiveTvChannelMode = LiveTvChannelMode.PRO,
+ val liveTvAutoHideCategories: Boolean = false,
val errorMessage: String? = null,
val multiviewChannelCount: Int = 0,
val multiviewSlotCapacity: Int = 4
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/home/LiveCategorySidebarPolicy.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/home/LiveCategorySidebarPolicy.kt
new file mode 100644
index 00000000..db3b6410
--- /dev/null
+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/home/LiveCategorySidebarPolicy.kt
@@ -0,0 +1,7 @@
+package com.streamvault.feature.live.presentation.home
+
+internal fun shouldCollapseLiveCategorySidebar(
+ autoHideCategories: Boolean = false,
+ isLocked: Boolean = false,
+ isReorderMode: Boolean = false
+): Boolean = autoHideCategories && !isLocked && !isReorderMode
diff --git a/feature/live/src/main/res/values/strings.xml b/feature/live/src/main/res/values/strings.xml
index 28e58f74..b4dd85c2 100644
--- a/feature/live/src/main/res/values/strings.xml
+++ b/feature/live/src/main/res/values/strings.xml
@@ -94,6 +94,7 @@
<string name="home_add_first_provider_subtitle">Set up a provider to load live channels, movies, series, and guide data.</string>
<string name="home_all_channels">All Channels</string>
<string name="home_categories_title">Categories</string>
+ <string name="home_show_categories">Show categories</string>
<string name="home_loading_categories">Loading categories...</string>
<string name="home_loading_channels">Loading channels...</string>
<string name="home_no_channels_found">No channels found in this category</string>
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/home/HomeViewModelTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/home/HomeViewModelTest.kt
index caada322..a8055a54 100644
--- a/feature/live/src/test/java/com/streamvault/feature/live/home/HomeViewModelTest.kt
+++ b/feature/live/src/test/java/com/streamvault/feature/live/home/HomeViewModelTest.kt
@@ -93,6 +93,7 @@ class HomeViewModelTest {
whenever(preferencesRepository.defaultCategoryId).thenReturn(flowOf(null))
whenever(preferencesRepository.getLastLiveCategoryId(any())).thenReturn(flowOf(null))
whenever(preferencesRepository.liveTvChannelMode).thenReturn(flowOf("COMPACT"))
+ whenever(preferencesRepository.liveTvAutoHideCategories).thenReturn(flowOf(false))
whenever(preferencesRepository.liveTvCategoryFilters).thenReturn(flowOf(emptyList()))
whenever(preferencesRepository.liveTvQuickFilterVisibility).thenReturn(flowOf(null))
whenever(preferencesRepository.showRecentChannelsCategory).thenReturn(flowOf(true))
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/presentation/home/HomeUiStateTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/presentation/home/HomeUiStateTest.kt
index 1ac74d00..e6e389c9 100644
--- a/feature/live/src/test/java/com/streamvault/feature/live/presentation/home/HomeUiStateTest.kt
+++ b/feature/live/src/test/java/com/streamvault/feature/live/presentation/home/HomeUiStateTest.kt
@@ -12,6 +12,7 @@ class HomeUiStateTest {
assertThat(state.isLoading).isTrue()
assertThat(state.isCategoriesLoading).isTrue()
assertThat(state.liveTvChannelMode).isEqualTo(LiveTvChannelMode.PRO)
+ assertThat(state.liveTvAutoHideCategories).isFalse()
assertThat(state.multiviewChannelCount).isEqualTo(0)
assertThat(state.multiviewSlotCapacity).isEqualTo(4)
}
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/presentation/home/LiveCategorySidebarPolicyTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/presentation/home/LiveCategorySidebarPolicyTest.kt
new file mode 100644
index 00000000..aa45b3d9
--- /dev/null
+++ b/feature/live/src/test/java/com/streamvault/feature/live/presentation/home/LiveCategorySidebarPolicyTest.kt
@@ -0,0 +1,36 @@
+package com.streamvault.feature.live.presentation.home
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class LiveCategorySidebarPolicyTest {
+ @Test
+ fun `auto-hide is disabled by default`() {
+ assertThat(shouldCollapseLiveCategorySidebar()).isFalse()
+ }
+
+ @Test
+ fun `enabled auto-hide collapses for normal category selection`() {
+ assertThat(
+ shouldCollapseLiveCategorySidebar(
+ autoHideCategories = true
+ )
+ ).isTrue()
+ }
+
+ @Test
+ fun `locked and reorder selections do not collapse the sidebar`() {
+ assertThat(
+ shouldCollapseLiveCategorySidebar(
+ autoHideCategories = true,
+ isLocked = true
+ )
+ ).isFalse()
+ assertThat(
+ shouldCollapseLiveCategorySidebar(
+ autoHideCategories = true,
+ isReorderMode = true
+ )
+ ).isFalse()
+ }
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBrowsingSection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBrowsingSection.kt
index cdc4d84b..e692b529 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBrowsingSection.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBrowsingSection.kt
@@ -80,6 +80,19 @@ public fun LazyListScope.settingsBrowsingSection(
value = stringResource(uiState.liveTvChannelMode.labelResId()),
onClick = { onShowLiveTvModeDialogChange(true) }
)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_live_tv_auto_hide_categories),
+ value = stringResource(
+ if (uiState.liveTvAutoHideCategories) {
+ R.string.settings_live_tv_auto_hide_categories_on
+ } else {
+ R.string.settings_live_tv_auto_hide_categories_off
+ }
+ ),
+ checked = uiState.liveTvAutoHideCategories,
+ onCheckedChange = viewModel::setLiveTvAutoHideCategories,
+ indent = 24.dp
+ )
ClickableSettingsRow(
label = stringResource(R.string.settings_top_navigation),
value = topNavigationSummaryLabel,
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceModels.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceModels.kt
index 64e7e738..5beb8cbf 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceModels.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceModels.kt
@@ -93,6 +93,7 @@ data class SettingsPreferenceSnapshot(
val useXtreamTextClassification: Boolean,
val xtreamBase64TextCompatibility: Boolean,
val liveTvChannelMode: LiveTvChannelMode,
+ val liveTvAutoHideCategories: Boolean,
val showLiveSourceSwitcher: Boolean,
val showFavoritesCategory: Boolean,
val showAllChannelsCategory: Boolean,
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapper.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapper.kt
index ff40ae2d..66d94c3f 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapper.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapper.kt
@@ -60,6 +60,7 @@ fun SettingsUiState.applyPreferenceSnapshot(
useXtreamTextClassification = snapshot.useXtreamTextClassification,
xtreamBase64TextCompatibility = snapshot.xtreamBase64TextCompatibility,
liveTvChannelMode = snapshot.liveTvChannelMode,
+ liveTvAutoHideCategories = snapshot.liveTvAutoHideCategories,
showLiveSourceSwitcher = snapshot.showLiveSourceSwitcher,
showFavoritesCategory = snapshot.showFavoritesCategory,
showAllChannelsCategory = snapshot.showAllChannelsCategory,
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsStateBindings.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsStateBindings.kt
index 93af8e70..b6a25fee 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsStateBindings.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsStateBindings.kt
@@ -91,6 +91,7 @@ fun observeSettingsPreferenceSnapshot(
useXtreamTextClassification = true,
xtreamBase64TextCompatibility = false,
liveTvChannelMode = LiveTvChannelMode.PRO,
+ liveTvAutoHideCategories = false,
showLiveSourceSwitcher = false,
showFavoritesCategory = true,
showAllChannelsCategory = true,
@@ -216,6 +217,8 @@ fun observeSettingsPreferenceSnapshot(
snapshot.copy(xtreamBase64TextCompatibility = compatibilityEnabled)
}.combine(preferencesRepository.liveTvChannelMode) { snapshot, liveTvChannelMode ->
snapshot.copy(liveTvChannelMode = LiveTvChannelMode.fromStorage(liveTvChannelMode))
+ }.combine(preferencesRepository.liveTvAutoHideCategories) { snapshot, liveTvAutoHideCategories ->
+ snapshot.copy(liveTvAutoHideCategories = liveTvAutoHideCategories)
}.combine(preferencesRepository.showLiveSourceSwitcher) { snapshot, showLiveSourceSwitcher ->
snapshot.copy(showLiveSourceSwitcher = showLiveSourceSwitcher)
}.combine(preferencesRepository.showFavoritesCategory) { snapshot, showFavoritesCategory ->
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsUiStateModel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsUiStateModel.kt
index 40971dc6..37f3990b 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsUiStateModel.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsUiStateModel.kt
@@ -145,6 +145,7 @@ data class SettingsUiState(
val useXtreamTextClassification: Boolean = true,
val xtreamBase64TextCompatibility: Boolean = false,
val liveTvChannelMode: LiveTvChannelMode = LiveTvChannelMode.PRO,
+ val liveTvAutoHideCategories: Boolean = false,
val showLiveSourceSwitcher: Boolean = false,
val showFavoritesCategory: Boolean = true,
val showAllChannelsCategory: Boolean = true,
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt
index bcee0cfb..89e4979b 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt
@@ -507,6 +507,12 @@ class SettingsViewModel @Inject constructor(
}
}
+ fun setLiveTvAutoHideCategories(enabled: Boolean) {
+ viewModelScope.launch {
+ preferencesRepository.setLiveTvAutoHideCategories(enabled)
+ }
+ }
+
fun setShowLiveSourceSwitcher(enabled: Boolean) {
viewModelScope.launch {
preferencesRepository.setShowLiveSourceSwitcher(enabled)
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index e64d7e9c..62d4781f 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -355,6 +355,9 @@
<string name="settings_set_pin">Set PIN</string>
<string name="settings_live_tv_channel_mode">Live TV Channel Mode</string>
<string name="settings_live_tv_channel_mode_subtitle">Choose how the Live TV browser should present channels and whether it should preview before playback.</string>
+ <string name="settings_live_tv_auto_hide_categories">Auto-hide categories</string>
+ <string name="settings_live_tv_auto_hide_categories_on">On</string>
+ <string name="settings_live_tv_auto_hide_categories_off">Off</string>
<string name="settings_live_tv_quick_filter_visibility">Quick Filter Visibility</string>
<string name="settings_live_tv_quick_filter_visibility_subtitle">Choose when the Live TV quick-filter control should appear under category search.</string>
<string name="settings_live_tv_mode_comfortable">Comfortable</string>
diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapperTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapperTest.kt
index b9947fa2..476e9eeb 100644
--- a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapperTest.kt
+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsPreferenceSnapshotMapperTest.kt
@@ -40,6 +40,7 @@ class SettingsPreferenceSnapshotMapperTest {
)
assertThat(mappedState.appUpdate.isUpdateAvailable).isTrue()
+ assertThat(mappedState.liveTvAutoHideCategories).isFalse()
}
private fun cachedReleaseSnapshot() = SettingsPreferenceSnapshot(
@@ -93,6 +94,7 @@ class SettingsPreferenceSnapshotMapperTest {
useXtreamTextClassification = true,
xtreamBase64TextCompatibility = false,
liveTvChannelMode = LiveTvChannelMode.PRO,
+ liveTvAutoHideCategories = false,
showLiveSourceSwitcher = false,
showFavoritesCategory = true,
showAllChannelsCategory = true,