Skip to content

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

Add classic split VOD browser mode

David Nashashd644c0713e47
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt
new file mode 100644
index 00000000..f578db32
--- /dev/null
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt
@@ -0,0 +1,160 @@
+package com.streamvault.app.ui.components.shell
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
+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.Surface
+import androidx.tv.material3.Text
+import com.streamvault.app.ui.design.AppColors
+import com.streamvault.app.ui.design.FocusSpec
+
+data class VodClassicCategoryOption(
+ val key: String,
+ val label: String,
+ val count: Int,
+ val isSelected: Boolean,
+ val onClick: () -> Unit,
+ val onLongClick: (() -> Unit)? = null
+)
+
+@Composable
+fun VodClassicSplitLayout(
+ railTitle: String,
+ railSearchValue: String,
+ onRailSearchValueChange: (String) -> Unit,
+ railSearchPlaceholder: String,
+ categories: List<VodClassicCategoryOption>,
+ modifier: Modifier = Modifier,
+ content: @Composable () -> Unit
+) {
+ Row(
+ modifier = modifier.fillMaxSize(),
+ horizontalArrangement = Arrangement.spacedBy(20.dp)
+ ) {
+ CategoryRailPanel(
+ title = railTitle,
+ searchValue = railSearchValue,
+ onSearchValueChange = onRailSearchValueChange,
+ searchPlaceholder = railSearchPlaceholder,
+ modifier = Modifier
+ .width(320.dp)
+ .fillMaxHeight(),
+ contentPadding = PaddingValues(bottom = 24.dp)
+ ) {
+ items(categories, key = { it.key }) { category ->
+ Surface(
+ onClick = category.onClick,
+ onLongClick = category.onLongClick,
+ modifier = Modifier.fillMaxWidth(),
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (category.isSelected) AppColors.Brand.copy(alpha = 0.22f) else AppColors.SurfaceElevated,
+ focusedContainerColor = AppColors.SurfaceEmphasis,
+ contentColor = if (category.isSelected) AppColors.BrandStrong else AppColors.TextPrimary,
+ focusedContentColor = AppColors.TextPrimary
+ ),
+ border = ClickableSurfaceDefaults.border(
+ focusedBorder = Border(
+ border = BorderStroke(FocusSpec.BorderWidth, AppColors.Focus),
+ shape = RoundedCornerShape(14.dp)
+ )
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = FocusSpec.FocusedScale)
+ ) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 14.dp, vertical = 12.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = category.label,
+ style = MaterialTheme.typography.titleSmall,
+ color = if (category.isSelected) AppColors.BrandStrong else AppColors.TextPrimary,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.weight(1f)
+ )
+ Spacer(modifier = Modifier.width(12.dp))
+ Text(
+ text = category.count.toString(),
+ style = MaterialTheme.typography.bodySmall,
+ color = AppColors.TextSecondary
+ )
+ }
+ }
+ }
+ }
+
+ Box(
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxHeight()
+ .background(AppColors.Canvas, RoundedCornerShape(28.dp))
+ .padding(horizontal = 18.dp, vertical = 18.dp)
+ ) {
+ content()
+ }
+ }
+}
+
+@Composable
+fun VodClassicContentHeader(
+ title: String,
+ subtitle: String,
+ actions: List<VodActionChip>,
+ modifier: Modifier = Modifier
+) {
+ Column(
+ modifier = modifier.fillMaxWidth(),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ Text(
+ text = title,
+ style = MaterialTheme.typography.headlineSmall,
+ color = AppColors.TextPrimary,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
+ )
+ if (subtitle.isNotBlank()) {
+ Text(
+ text = subtitle,
+ style = MaterialTheme.typography.bodySmall,
+ color = AppColors.TextSecondary,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
+ VodActionChipRow(
+ actions = actions,
+ modifier = Modifier
+ .fillMaxWidth()
+ .widthIn(max = 900.dp)
+ )
+ }
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/model/VodViewMode.kt b/app/src/main/java/com/streamvault/app/ui/model/VodViewMode.kt
new file mode 100644
index 00000000..f19b74c4
--- /dev/null
+++ b/app/src/main/java/com/streamvault/app/ui/model/VodViewMode.kt
@@ -0,0 +1,11 @@
+package com.streamvault.app.ui.model
+
+enum class VodViewMode(val storageValue: String) {
+ MODERN("modern"),
+ CLASSIC("classic");
+
+ companion object {
+ fun fromStorage(value: String?): VodViewMode =
+ entries.firstOrNull { it.storageValue.equals(value, ignoreCase = true) } ?: MODERN
+ }
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
index dc7f3c51..897adae0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
@@ -74,8 +74,12 @@ import com.streamvault.app.ui.components.shell.VodActionChipRow
import com.streamvault.app.ui.components.shell.VodCategoryOption
import com.streamvault.app.ui.components.shell.VodCategoryPickerDialog
import com.streamvault.app.ui.components.shell.VodBrowseOptionsDialog
+import com.streamvault.app.ui.components.shell.VodClassicCategoryOption
+import com.streamvault.app.ui.components.shell.VodClassicContentHeader
+import com.streamvault.app.ui.components.shell.VodClassicSplitLayout
import com.streamvault.app.ui.components.shell.VodHeroStrip
import com.streamvault.app.ui.components.shell.VodSectionHeader
+import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.app.ui.screens.vod.HandleVodUserMessage
import com.streamvault.app.ui.screens.vod.ProtectedVodPinDialog
import com.streamvault.app.ui.screens.vod.VodBrowseDefaults
@@ -347,6 +351,29 @@ private fun MoviesVodContent(
)
}
+ if (uiState.vodViewMode == VodViewMode.CLASSIC) {
+ MoviesVodClassicContent(
+ uiState = uiState,
+ selectedFilterType = selectedFilterType,
+ onSelectedFilterTypeChange = onSelectedFilterTypeChange,
+ selectedSortBy = selectedSortBy,
+ onSelectedSortByChange = onSelectedSortByChange,
+ searchQuery = searchQuery,
+ onSearchQueryChange = onSearchQueryChange,
+ onMovieClick = onMovieClick,
+ onProtectedMovieClick = onProtectedMovieClick,
+ onShowDialog = onShowDialog,
+ onShowCategoryOptions = onShowCategoryOptions,
+ onSelectCategory = onSelectCategory,
+ onSelectFullLibraryBrowse = onSelectFullLibraryBrowse,
+ onOpenContinueWatching = onOpenContinueWatching,
+ onOpenFresh = onOpenFresh,
+ onLoadMore = onLoadMore,
+ onDismissReorder = onDismissReorder
+ )
+ return
+ }
+
if (uiState.selectedCategory == null) {
androidx.compose.foundation.lazy.LazyColumn(
modifier = Modifier.fillMaxSize(),
@@ -710,6 +737,270 @@ private fun MoviesVodContent(
}
}
+@Composable
+private fun MoviesVodClassicContent(
+ uiState: MoviesUiState,
+ selectedFilterType: LibraryFilterType,
+ onSelectedFilterTypeChange: (LibraryFilterType) -> Unit,
+ selectedSortBy: LibrarySortBy,
+ onSelectedSortByChange: (LibrarySortBy) -> Unit,
+ searchQuery: String,
+ onSearchQueryChange: (String) -> Unit,
+ onMovieClick: (Movie) -> Unit,
+ onProtectedMovieClick: (Movie) -> Unit,
+ onShowDialog: (Movie) -> Unit,
+ onShowCategoryOptions: (String) -> Unit,
+ onSelectCategory: (String?) -> Unit,
+ onSelectFullLibraryBrowse: () -> Unit,
+ onOpenContinueWatching: () -> Unit,
+ onOpenFresh: () -> Unit,
+ onLoadMore: () -> Unit,
+ onDismissReorder: () -> Unit
+) {
+ val allLabel = stringResource(R.string.vod_classic_all)
+ val continueLabel = stringResource(R.string.vod_classic_continue_watching)
+ val recentLabel = stringResource(R.string.vod_classic_recently_added)
+ var categoryQuery by rememberSaveable { mutableStateOf("") }
+ var showBrowseOptions by rememberSaveable(uiState.selectedCategory) { mutableStateOf(false) }
+ var showSearchBar by rememberSaveable(uiState.selectedCategory) { mutableStateOf(searchQuery.isNotBlank()) }
+ val baseMovies = uiState.selectedCategoryItems
+ val filteredGridMovies = remember(baseMovies, uiState.isReorderMode, uiState.filteredMovies) {
+ if (uiState.isReorderMode) uiState.filteredMovies else baseMovies
+ }
+ var draggingMovie by remember { mutableStateOf<Movie?>(null) }
+
+ LaunchedEffect(uiState.vodViewMode, uiState.selectedCategory, uiState.isReorderMode) {
+ if (uiState.vodViewMode == VodViewMode.CLASSIC && uiState.selectedCategory == null && !uiState.isReorderMode) {
+ onSelectFullLibraryBrowse()
+ }
+ }
+
+ if (showBrowseOptions) {
+ VodBrowseOptionsDialog(
+ title = stringResource(R.string.nav_movies),
+ filterTitle = stringResource(R.string.library_filter_title),
+ filterChips = movieFilterChips(),
+ selectedFilterKey = selectedFilterType.name,
+ onFilterSelected = { key ->
+ LibraryFilterType.entries.firstOrNull { it.name == key }?.let(onSelectedFilterTypeChange)
+ },
+ sortTitle = stringResource(R.string.library_sort_title),
+ sortChips = movieSortChips(),
+ selectedSortKey = selectedSortBy.name,
+ onSortSelected = { key ->
+ LibrarySortBy.entries.firstOrNull { it.name == key }?.let(onSelectedSortByChange)
+ },
+ onDismiss = { showBrowseOptions = false }
+ )
+ }
+
+ val selectedKey = when {
+ uiState.selectedCategory == uiState.favoriteCategoryName -> "favorites"
+ uiState.selectedCategory == uiState.fullLibraryCategoryName && selectedFilterType == LibraryFilterType.IN_PROGRESS -> "continue"
+ uiState.selectedCategory == uiState.fullLibraryCategoryName && selectedFilterType == LibraryFilterType.RECENTLY_UPDATED -> "recent"
+ uiState.selectedCategory == null || uiState.selectedCategory == uiState.fullLibraryCategoryName -> "all"
+ else -> "category:${uiState.selectedCategory}"
+ }
+ val continueCount = remember(uiState.continueWatching) {
+ uiState.continueWatching.map { it.contentId }.distinct().size
+ }
+ val recentCount = uiState.libraryLensRows[MovieLibraryLens.FRESH]?.size ?: 0
+ val railOptions = remember(
+ uiState.categoryNames,
+ uiState.categoryCounts,
+ uiState.favoriteCategoryName,
+ uiState.selectedCategory,
+ selectedFilterType,
+ categoryQuery,
+ continueCount,
+ recentCount,
+ uiState.libraryCount
+ ) {
+ buildList {
+ add(
+ VodClassicCategoryOption(
+ key = "all",
+ label = allLabel,
+ count = uiState.libraryCount,
+ isSelected = selectedKey == "all",
+ onClick = onSelectFullLibraryBrowse
+ )
+ )
+ add(
+ VodClassicCategoryOption(
+ key = "favorites",
+ label = uiState.favoriteCategoryName,
+ count = uiState.categoryCounts[uiState.favoriteCategoryName] ?: 0,
+ isSelected = selectedKey == "favorites",
+ onClick = { onSelectCategory(uiState.favoriteCategoryName) }
+ )
+ )
+ add(
+ VodClassicCategoryOption(
+ key = "continue",
+ label = continueLabel,
+ count = continueCount,
+ isSelected = selectedKey == "continue",
+ onClick = onOpenContinueWatching
+ )
+ )
+ add(
+ VodClassicCategoryOption(
+ key = "recent",
+ label = recentLabel,
+ count = recentCount,
+ isSelected = selectedKey == "recent",
+ onClick = onOpenFresh
+ )
+ )
+ uiState.categoryNames
+ .filterNot { it == uiState.favoriteCategoryName }
+ .forEach { name ->
+ add(
+ VodClassicCategoryOption(
+ key = "category:$name",
+ label = name,
+ count = uiState.categoryCounts[name] ?: 0,
+ isSelected = selectedKey == "category:$name",
+ onClick = { onSelectCategory(name) },
+ onLongClick = { onShowCategoryOptions(name) }
+ )
+ )
+ }
+ }.filter { option ->
+ categoryQuery.isBlank() || option.label.contains(categoryQuery.trim(), ignoreCase = true)
+ }
+ }
+
+ VodClassicSplitLayout(
+ railTitle = stringResource(R.string.nav_movies),
+ railSearchValue = categoryQuery,
+ onRailSearchValueChange = { categoryQuery = it },
+ railSearchPlaceholder = stringResource(R.string.vod_classic_category_search),
+ categories = railOptions
+ ) {
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.spacedBy(14.dp)
+ ) {
+ VodClassicContentHeader(
+ title = when {
+ selectedKey == "all" -> allLabel
+ selectedKey == "continue" -> continueLabel
+ selectedKey == "recent" -> recentLabel
+ else -> uiState.selectedCategory ?: allLabel
+ },
+ subtitle = stringResource(
+ R.string.vod_classic_results_count,
+ uiState.selectedCategoryTotalCount.takeIf { it > 0 } ?: filteredGridMovies.size
+ ),
+ actions = buildList {
+ add(
+ VodActionChip(
+ key = "search_toggle",
+ label = if (showSearchBar) "Hide Search" else "Search",
+ onClick = { showSearchBar = !showSearchBar }
+ )
+ )
+ add(
+ VodActionChip(
+ key = "browse_options",
+ label = "Filters & Sort",
+ onClick = { showBrowseOptions = true }
+ )
+ )
+ }
+ )
+
+ if (showSearchBar) {
+ SearchInput(
+ value = searchQuery,
+ onValueChange = onSearchQueryChange,
+ placeholder = stringResource(R.string.movies_search_placeholder),
+ onSearch = {},
+ modifier = Modifier.fillMaxWidth()
+ )
+ }
+
+ LazyVerticalGrid(
+ columns = GridCells.Adaptive(minSize = 148.dp),
+ modifier = Modifier
+ .fillMaxWidth()
+ .weight(1f)
+ .onPreviewKeyEvent { event ->
+ if (uiState.isReorderMode && event.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) {
+ if (event.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_BACK) {
+ draggingMovie = null
+ onDismissReorder()
+ true
+ } else false
+ } else false
+ },
+ contentPadding = PaddingValues(bottom = 24.dp),
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ verticalArrangement = Arrangement.spacedBy(14.dp)
+ ) {
+ if (uiState.isLoadingSelectedCategory) {
+ item(span = { GridItemSpan(maxLineSpan) }) {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(320.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ CircularProgressIndicator(color = Color.White)
+ }
+ }
+ } else if (filteredGridMovies.isEmpty()) {
+ item(span = { GridItemSpan(maxLineSpan) }) {
+ AppMessageState(
+ title = stringResource(R.string.movies_no_found),
+ subtitle = stringResource(R.string.vod_classic_empty_category)
+ )
+ }
+ } else {
+ gridItems(filteredGridMovies, key = { it.id }) { movie ->
+ val isLocked = (movie.isAdult || movie.isUserProtected) && uiState.parentalControlLevel == 1
+ val isDraggingThis = draggingMovie == movie
+ MovieCard(
+ movie = movie,
+ isLocked = isLocked,
+ isReorderMode = uiState.isReorderMode,
+ isDragging = isDraggingThis,
+ onClick = {
+ if (uiState.isReorderMode) {
+ draggingMovie = if (isDraggingThis) null else movie
+ } else if (isLocked) {
+ onProtectedMovieClick(movie)
+ } else {
+ onMovieClick(movie)
+ }
+ },
+ onLongClick = {
+ if (!uiState.isReorderMode) onShowDialog(movie)
+ }
+ )
+ }
+
+ if (!uiState.isReorderMode && uiState.canLoadMoreSelectedCategory) {
+ item(span = { GridItemSpan(maxLineSpan) }) {
+ LoadMoreCard(
+ label = stringResource(
+ R.string.library_load_more,
+ uiState.selectedCategoryLoadedCount,
+ uiState.selectedCategoryTotalCount
+ ),
+ onClick = onLoadMore,
+ modifier = Modifier.padding(top = 8.dp)
+ )
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
@Composable
private fun movieLibraryLensLabel(lens: MovieLibraryLens): String =
when (lens) {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
index 9f56b5f3..9074b327 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.movies
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.streamvault.data.preferences.PreferencesRepository
+import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.app.ui.model.applyProviderCategoryDisplayPreferences
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.CategorySortMode
@@ -186,6 +187,12 @@ class MoviesViewModel @Inject constructor(
}
}
+ viewModelScope.launch {
+ preferencesRepository.vodViewMode.collectLatest { mode ->
+ _uiState.update { it.copy(vodViewMode = VodViewMode.fromStorage(mode)) }
+ }
+ }
+
viewModelScope.launch {
providerRepository.getActiveProvider()
.filterNotNull()
@@ -1066,6 +1073,7 @@ data class MoviesUiState(
val searchQuery: String = "",
val selectedLibraryFilterType: LibraryFilterType = LibraryFilterType.ALL,
val selectedLibrarySortBy: LibrarySortBy = LibrarySortBy.LIBRARY,
+ val vodViewMode: VodViewMode = VodViewMode.MODERN,
val continueWatching: List<PlaybackHistory> = emptyList(),
val isLoading: Boolean = true,
val parentalControlLevel: Int = 0,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
index 5740166d..58e60898 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
@@ -74,8 +74,12 @@ import com.streamvault.app.ui.components.shell.VodActionChipRow
import com.streamvault.app.ui.components.shell.VodCategoryOption
import com.streamvault.app.ui.components.shell.VodCategoryPickerDialog
import com.streamvault.app.ui.components.shell.VodBrowseOptionsDialog
+import com.streamvault.app.ui.components.shell.VodClassicCategoryOption
+import com.streamvault.app.ui.components.shell.VodClassicContentHeader
+import com.streamvault.app.ui.components.shell.VodClassicSplitLayout
import com.streamvault.app.ui.components.shell.VodHeroStrip
import com.streamvault.app.ui.components.shell.VodSectionHeader
+import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.app.ui.screens.vod.HandleVodUserMessage
import com.streamvault.app.ui.screens.vod.ProtectedVodPinDialog
import com.streamvault.app.ui.screens.vod.VodBrowseDefaults
@@ -345,6 +349,29 @@ private fun SeriesVodContent(
)
}
+ if (uiState.vodViewMode == VodViewMode.CLASSIC) {
+ SeriesVodClassicContent(
+ uiState = uiState,
+ selectedFilterType = selectedFilterType,
+ onSelectedFilterTypeChange = onSelectedFilterTypeChange,
+ selectedSortBy = selectedSortBy,
+ onSelectedSortByChange = onSelectedSortByChange,
+ searchQuery = searchQuery,
+ onSearchQueryChange = onSearchQueryChange,
+ onSeriesClick = onSeriesClick,
+ onProtectedSeriesClick = onProtectedSeriesClick,
+ onShowDialog = onShowDialog,
+ onShowCategoryOptions = onShowCategoryOptions,
+ onSelectCategory = onSelectCategory,
+ onSelectFullLibraryBrowse = onSelectFullLibraryBrowse,
+ onOpenContinueWatching = onOpenContinueWatching,
+ onOpenFresh = onOpenFresh,
+ onLoadMore = onLoadMore,
+ onDismissReorder = onDismissReorder
+ )
+ return
+ }
+
if (uiState.selectedCategory == null) {
androidx.compose.foundation.lazy.LazyColumn(
modifier = Modifier.fillMaxSize(),
@@ -696,6 +723,270 @@ private fun SeriesVodContent(
}
}
+@Composable
+private fun SeriesVodClassicContent(
+ uiState: SeriesUiState,
+ selectedFilterType: LibraryFilterType,
+ onSelectedFilterTypeChange: (LibraryFilterType) -> Unit,
+ selectedSortBy: LibrarySortBy,
+ onSelectedSortByChange: (LibrarySortBy) -> Unit,
+ searchQuery: String,
+ onSearchQueryChange: (String) -> Unit,
+ onSeriesClick: (Long) -> Unit,
+ onProtectedSeriesClick: (Long) -> Unit,
+ onShowDialog: (Series) -> Unit,
+ onShowCategoryOptions: (String) -> Unit,
+ onSelectCategory: (String?) -> Unit,
+ onSelectFullLibraryBrowse: () -> Unit,
+ onOpenContinueWatching: () -> Unit,
+ onOpenFresh: () -> Unit,
+ onLoadMore: () -> Unit,
+ onDismissReorder: () -> Unit
+) {
+ val allLabel = stringResource(R.string.vod_classic_all)
+ val continueLabel = stringResource(R.string.vod_classic_continue_watching)
+ val recentLabel = stringResource(R.string.vod_classic_recently_added)
+ var categoryQuery by rememberSaveable { mutableStateOf("") }
+ var showBrowseOptions by rememberSaveable(uiState.selectedCategory) { mutableStateOf(false) }
+ var showSearchBar by rememberSaveable(uiState.selectedCategory) { mutableStateOf(searchQuery.isNotBlank()) }
+ val baseSeries = uiState.selectedCategoryItems
+ val filteredGridSeries = remember(baseSeries, uiState.isReorderMode, uiState.filteredSeries) {
+ if (uiState.isReorderMode) uiState.filteredSeries else baseSeries
+ }
+ var draggingSeries by remember { mutableStateOf<Series?>(null) }
+
+ LaunchedEffect(uiState.vodViewMode, uiState.selectedCategory, uiState.isReorderMode) {
+ if (uiState.vodViewMode == VodViewMode.CLASSIC && uiState.selectedCategory == null && !uiState.isReorderMode) {
+ onSelectFullLibraryBrowse()
+ }
+ }
+
+ if (showBrowseOptions) {
+ VodBrowseOptionsDialog(
+ title = stringResource(R.string.nav_series),
+ filterTitle = stringResource(R.string.library_filter_title),
+ filterChips = seriesFilterChips(),
+ selectedFilterKey = selectedFilterType.name,
+ onFilterSelected = { key ->
+ LibraryFilterType.entries.firstOrNull { it.name == key }?.let(onSelectedFilterTypeChange)
+ },
+ sortTitle = stringResource(R.string.library_sort_title),
+ sortChips = seriesSortChips(),
+ selectedSortKey = selectedSortBy.name,
+ onSortSelected = { key ->
+ LibrarySortBy.entries.firstOrNull { it.name == key }?.let(onSelectedSortByChange)
+ },
+ onDismiss = { showBrowseOptions = false }
+ )
+ }
+
+ val selectedKey = when {
+ uiState.selectedCategory == uiState.favoriteCategoryName -> "favorites"
+ uiState.selectedCategory == uiState.fullLibraryCategoryName && selectedFilterType == LibraryFilterType.IN_PROGRESS -> "continue"
+ uiState.selectedCategory == uiState.fullLibraryCategoryName && selectedFilterType == LibraryFilterType.RECENTLY_UPDATED -> "recent"
+ uiState.selectedCategory == null || uiState.selectedCategory == uiState.fullLibraryCategoryName -> "all"
+ else -> "category:${uiState.selectedCategory}"
+ }
+ val continueCount = remember(uiState.continueWatching) {
+ uiState.continueWatching.map { it.seriesId ?: it.contentId }.distinct().size
+ }
+ val recentCount = uiState.libraryLensRows[SeriesLibraryLens.FRESH]?.size ?: 0
+ val railOptions = remember(
+ uiState.categoryNames,
+ uiState.categoryCounts,
+ uiState.favoriteCategoryName,
+ uiState.selectedCategory,
+ selectedFilterType,
+ categoryQuery,
+ continueCount,
+ recentCount,
+ uiState.libraryCount
+ ) {
+ buildList {
+ add(
+ VodClassicCategoryOption(
+ key = "all",
+ label = allLabel,
+ count = uiState.libraryCount,
+ isSelected = selectedKey == "all",
+ onClick = onSelectFullLibraryBrowse
+ )
+ )
+ add(
+ VodClassicCategoryOption(
+ key = "favorites",
+ label = uiState.favoriteCategoryName,
+ count = uiState.categoryCounts[uiState.favoriteCategoryName] ?: 0,
+ isSelected = selectedKey == "favorites",
+ onClick = { onSelectCategory(uiState.favoriteCategoryName) }
+ )
+ )
+ add(
+ VodClassicCategoryOption(
+ key = "continue",
+ label = continueLabel,
+ count = continueCount,
+ isSelected = selectedKey == "continue",
+ onClick = onOpenContinueWatching
+ )
+ )
+ add(
+ VodClassicCategoryOption(
+ key = "recent",
+ label = recentLabel,
+ count = recentCount,
+ isSelected = selectedKey == "recent",
+ onClick = onOpenFresh
+ )
+ )
+ uiState.categoryNames
+ .filterNot { it == uiState.favoriteCategoryName }
+ .forEach { name ->
+ add(
+ VodClassicCategoryOption(
+ key = "category:$name",
+ label = name,
+ count = uiState.categoryCounts[name] ?: 0,
+ isSelected = selectedKey == "category:$name",
+ onClick = { onSelectCategory(name) },
+ onLongClick = { onShowCategoryOptions(name) }
+ )
+ )
+ }
+ }.filter { option ->
+ categoryQuery.isBlank() || option.label.contains(categoryQuery.trim(), ignoreCase = true)
+ }
+ }
+
+ VodClassicSplitLayout(
+ railTitle = stringResource(R.string.nav_series),
+ railSearchValue = categoryQuery,
+ onRailSearchValueChange = { categoryQuery = it },
+ railSearchPlaceholder = stringResource(R.string.vod_classic_category_search),
+ categories = railOptions
+ ) {
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.spacedBy(14.dp)
+ ) {
+ VodClassicContentHeader(
+ title = when {
+ selectedKey == "all" -> allLabel
+ selectedKey == "continue" -> continueLabel
+ selectedKey == "recent" -> recentLabel
+ else -> uiState.selectedCategory ?: allLabel
+ },
+ subtitle = stringResource(
+ R.string.vod_classic_results_count,
+ uiState.selectedCategoryTotalCount.takeIf { it > 0 } ?: filteredGridSeries.size
+ ),
+ actions = buildList {
+ add(
+ VodActionChip(
+ key = "search_toggle",
+ label = if (showSearchBar) "Hide Search" else "Search",
+ onClick = { showSearchBar = !showSearchBar }
+ )
+ )
+ add(
+ VodActionChip(
+ key = "browse_options",
+ label = "Filters & Sort",
+ onClick = { showBrowseOptions = true }
+ )
+ )
+ }
+ )
+
+ if (showSearchBar) {
+ SearchInput(
+ value = searchQuery,
+ onValueChange = onSearchQueryChange,
+ placeholder = stringResource(R.string.series_search_placeholder),
+ onSearch = {},
+ modifier = Modifier.fillMaxWidth()
+ )
+ }
+
+ LazyVerticalGrid(
+ columns = GridCells.Adaptive(minSize = 148.dp),
+ modifier = Modifier
+ .fillMaxWidth()
+ .weight(1f)
+ .onPreviewKeyEvent { event ->
+ if (uiState.isReorderMode && event.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) {
+ if (event.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_BACK) {
+ draggingSeries = null
+ onDismissReorder()
+ true
+ } else false
+ } else false
+ },
+ contentPadding = PaddingValues(bottom = 24.dp),
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ verticalArrangement = Arrangement.spacedBy(14.dp)
+ ) {
+ if (uiState.isLoadingSelectedCategory) {
+ item(span = { GridItemSpan(maxLineSpan) }) {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(320.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ CircularProgressIndicator(color = Color.White)
+ }
+ }
+ } else if (filteredGridSeries.isEmpty()) {
+ item(span = { GridItemSpan(maxLineSpan) }) {
+ AppMessageState(
+ title = stringResource(R.string.series_no_found),
+ subtitle = stringResource(R.string.vod_classic_empty_category)
+ )
+ }
+ } else {
+ gridItems(filteredGridSeries, key = { it.id }) { series ->
+ val isLocked = (series.isAdult || series.isUserProtected) && uiState.parentalControlLevel == 1
+ val isDraggingThis = draggingSeries == series
+ SeriesCard(
+ series = series,
+ isLocked = isLocked,
+ isReorderMode = uiState.isReorderMode,
+ isDragging = isDraggingThis,
+ onClick = {
+ if (uiState.isReorderMode) {
+ draggingSeries = if (isDraggingThis) null else series
+ } else if (isLocked) {
+ onProtectedSeriesClick(series.id)
+ } else {
+ onSeriesClick(series.id)
+ }
+ },
+ onLongClick = {
+ if (!uiState.isReorderMode) onShowDialog(series)
+ }
+ )
+ }
+
+ if (!uiState.isReorderMode && uiState.canLoadMoreSelectedCategory) {
+ item(span = { GridItemSpan(maxLineSpan) }) {
+ LoadMoreCard(
+ label = stringResource(
+ R.string.library_load_more,
+ uiState.selectedCategoryLoadedCount,
+ uiState.selectedCategoryTotalCount
+ ),
+ onClick = onLoadMore,
+ modifier = Modifier.padding(top = 8.dp)
+ )
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
@Composable
private fun seriesLibraryLensLabel(lens: SeriesLibraryLens): String =
when (lens) {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
index d5944fcf..8da1aae3 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.series
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.streamvault.app.ui.model.applyProviderCategoryDisplayPreferences
+import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.data.preferences.PreferencesRepository
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.CategorySortMode
@@ -184,6 +185,12 @@ class SeriesViewModel @Inject constructor(
}
}
+ viewModelScope.launch {
+ preferencesRepository.vodViewMode.collectLatest { mode ->
+ _uiState.update { it.copy(vodViewMode = VodViewMode.fromStorage(mode)) }
+ }
+ }
+
viewModelScope.launch {
providerRepository.getActiveProvider()
.filterNotNull()
@@ -1074,6 +1081,7 @@ data class SeriesUiState(
val searchQuery: String = "",
val selectedLibraryFilterType: LibraryFilterType = LibraryFilterType.ALL,
val selectedLibrarySortBy: LibrarySortBy = LibrarySortBy.LIBRARY,
+ val vodViewMode: VodViewMode = VodViewMode.MODERN,
val continueWatching: List<PlaybackHistory> = emptyList(),
val isLoading: Boolean = true,
val parentalControlLevel: Int = 0,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
index d8f36255..595b0fa6 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
@@ -39,6 +39,7 @@ import com.streamvault.app.ui.components.TvEmptyState
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.app.ui.model.LiveTvChannelMode
+import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.app.ui.theme.*
import com.streamvault.domain.manager.BackupConflictStrategy
import com.streamvault.domain.model.Category
@@ -126,6 +127,7 @@ fun SettingsScreen(
var showLevelDialog by rememberSaveable { mutableStateOf(false) }
var showLanguageDialog by rememberSaveable { mutableStateOf(false) }
var showLiveTvModeDialog by rememberSaveable { mutableStateOf(false) }
+ var showVodViewModeDialog by rememberSaveable { mutableStateOf(false) }
var showPlaybackSpeedDialog by rememberSaveable { mutableStateOf(false) }
var showAudioLanguageDialog by rememberSaveable { mutableStateOf(false) }
var showSubtitleSizeDialog by rememberSaveable { mutableStateOf(false) }
@@ -497,6 +499,11 @@ fun SettingsScreen(
value = stringResource(uiState.liveTvChannelMode.labelResId()),
onClick = { showLiveTvModeDialog = true }
)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_vod_view_mode),
+ value = stringResource(uiState.vodViewMode.labelResId()),
+ onClick = { showVodViewModeDialog = true }
+ )
ClickableSettingsRow(
label = stringResource(R.string.settings_default_playback_speed),
value = playbackSpeedLabel,
@@ -706,6 +713,17 @@ fun SettingsScreen(
)
}
+ if (showVodViewModeDialog) {
+ VodViewModeDialog(
+ selectedMode = uiState.vodViewMode,
+ onDismiss = { showVodViewModeDialog = false },
+ onModeSelected = { mode ->
+ viewModel.setVodViewMode(mode)
+ showVodViewModeDialog = false
+ }
+ )
+ }
+
if (showPlaybackSpeedDialog) {
val speedOptions = remember { listOf(0.5f, 0.75f, 1f, 1.25f, 1.5f, 2f) }
PremiumSelectionDialog(
@@ -1968,6 +1986,57 @@ private fun SettingsSectionHeader(
}
}
+@Composable
+private fun VodViewModeDialog(
+ selectedMode: VodViewMode,
+ onDismiss: () -> Unit,
+ onModeSelected: (VodViewMode) -> Unit
+) {
+ PremiumDialog(
+ title = stringResource(R.string.settings_vod_view_mode),
+ subtitle = stringResource(R.string.settings_vod_view_mode_subtitle),
+ onDismissRequest = onDismiss,
+ widthFraction = 0.52f,
+ content = {
+ Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+ VodViewMode.entries.forEach { mode ->
+ Surface(
+ onClick = { onModeSelected(mode) },
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (mode == selectedMode) Primary.copy(alpha = 0.18f) else SurfaceElevated,
+ focusedContainerColor = Primary.copy(alpha = 0.28f)
+ ),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Column(
+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 14.dp),
+ verticalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
+ Text(
+ text = stringResource(mode.labelResId()),
+ style = MaterialTheme.typography.titleSmall,
+ color = if (mode == selectedMode) Primary else OnBackground
+ )
+ Text(
+ text = stringResource(mode.descriptionResId()),
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ }
+ }
+ }
+ }
+ },
+ footer = {
+ PremiumDialogFooterButton(
+ label = stringResource(R.string.settings_cancel),
+ onClick = onDismiss
+ )
+ }
+ )
+}
+
@Composable
private fun SettingsRow(label: String, value: String) {
Surface(
@@ -2682,3 +2751,13 @@ private fun LiveTvChannelMode.descriptionResId(): Int = when (this) {
LiveTvChannelMode.PRO -> R.string.settings_live_tv_mode_pro_desc
}
+private fun VodViewMode.labelResId(): Int = when (this) {
+ VodViewMode.MODERN -> R.string.settings_vod_view_mode_modern
+ VodViewMode.CLASSIC -> R.string.settings_vod_view_mode_classic
+}
+
+private fun VodViewMode.descriptionResId(): Int = when (this) {
+ VodViewMode.MODERN -> R.string.settings_vod_view_mode_modern_desc
+ VodViewMode.CLASSIC -> R.string.settings_vod_view_mode_classic_desc
+}
+
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
index 47344fc9..969e9ff0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope
import com.streamvault.app.R
import com.streamvault.app.tvinput.TvInputChannelSyncManager
import com.streamvault.app.ui.model.LiveTvChannelMode
+import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.data.preferences.PreferencesRepository
import com.streamvault.data.sync.SyncManager
import com.streamvault.data.sync.SyncRepairSection
@@ -69,7 +70,8 @@ private data class SettingsPreferenceSnapshot(
val lastSpeedTestRecommendedHeight: Int?,
val lastSpeedTestEstimated: Boolean,
val isIncognitoMode: Boolean,
- val liveTvChannelMode: LiveTvChannelMode
+ val liveTvChannelMode: LiveTvChannelMode,
+ val vodViewMode: VodViewMode
)
@HiltViewModel
@@ -122,7 +124,8 @@ class SettingsViewModel @Inject constructor(
lastSpeedTestRecommendedHeight = null,
lastSpeedTestEstimated = false,
isIncognitoMode = false,
- liveTvChannelMode = LiveTvChannelMode.COMPACT
+ liveTvChannelMode = LiveTvChannelMode.COMPACT,
+ vodViewMode = VodViewMode.MODERN
)
}.combine(preferencesRepository.appLanguage) { snapshot, language ->
snapshot.copy(appLanguage = language)
@@ -154,6 +157,8 @@ class SettingsViewModel @Inject constructor(
snapshot.copy(isIncognitoMode = incognito)
}.combine(preferencesRepository.liveTvChannelMode) { snapshot, liveTvChannelMode ->
snapshot.copy(liveTvChannelMode = LiveTvChannelMode.fromStorage(liveTvChannelMode))
+ }.combine(preferencesRepository.vodViewMode) { snapshot, vodViewMode ->
+ snapshot.copy(vodViewMode = VodViewMode.fromStorage(vodViewMode))
}.collect { snapshot ->
_uiState.update {
it.copy(
@@ -179,7 +184,8 @@ class SettingsViewModel @Inject constructor(
)
},
isIncognitoMode = snapshot.isIncognitoMode,
- liveTvChannelMode = snapshot.liveTvChannelMode
+ liveTvChannelMode = snapshot.liveTvChannelMode,
+ vodViewMode = snapshot.vodViewMode
)
}
}
@@ -336,6 +342,12 @@ class SettingsViewModel @Inject constructor(
}
}
+ fun setVodViewMode(mode: VodViewMode) {
+ viewModelScope.launch {
+ preferencesRepository.setVodViewMode(mode.storageValue)
+ }
+ }
+
fun setCategorySortMode(type: ContentType, mode: CategorySortMode) {
val providerId = _uiState.value.activeProviderId ?: return
viewModelScope.launch {
@@ -762,6 +774,7 @@ data class SettingsUiState(
val recordingStorageState: RecordingStorageState = RecordingStorageState(),
val isIncognitoMode: Boolean = false,
val liveTvChannelMode: LiveTvChannelMode = LiveTvChannelMode.COMFORTABLE,
+ val vodViewMode: VodViewMode = VodViewMode.MODERN,
val categorySortModes: Map<ContentType, CategorySortMode> = emptyMap(),
val hiddenCategories: List<Category> = emptyList()
)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e0c3af80..e718ebba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -314,6 +314,19 @@
<string name="settings_live_tv_mode_compact_desc">Denser channel list with direct single-click playback.</string>
<string name="settings_live_tv_mode_pro">Pro</string>
<string name="settings_live_tv_mode_pro_desc">Dense channel list plus embedded preview and EPG. First click previews, second click plays.</string>
+ <string name="settings_vod_view_mode">VOD layout</string>
+ <string name="settings_vod_view_mode_subtitle">Choose between the modern shelves view and a classic split layout.</string>
+ <string name="settings_vod_view_mode_modern">Modern</string>
+ <string name="settings_vod_view_mode_modern_desc">Shelf-based browsing with featured rows and category previews.</string>
+ <string name="settings_vod_view_mode_classic">Classic</string>
+ <string name="settings_vod_view_mode_classic_desc">Category list on the left with a stacked poster grid on the right.</string>
+ <string name="vod_classic_categories_title">Categories</string>
+ <string name="vod_classic_category_search">Search in categories</string>
+ <string name="vod_classic_all">All</string>
+ <string name="vod_classic_continue_watching">Continue Watching</string>
+ <string name="vod_classic_recently_added">Recently Added</string>
+ <string name="vod_classic_results_count">%1$d items</string>
+ <string name="vod_classic_empty_category">No titles found in this section.</string>
<string name="settings_decoder_mode">Decoder Mode</string>
<string name="settings_decoder_auto">Auto (HW preferred)</string>
<string name="settings_buffer_duration">Buffer Duration</string>
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 02272ef8..691938ac 100644
--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
@@ -59,6 +59,7 @@ class PreferencesRepository @Inject constructor(
val DEFAULT_CATEGORY_ID = longPreferencesKey("default_category_id")
val APP_LANGUAGE = stringPreferencesKey("app_language")
val LIVE_TV_CHANNEL_MODE = stringPreferencesKey("live_tv_channel_mode")
+ val VOD_VIEW_MODE = stringPreferencesKey("vod_view_mode")
val GUIDE_DENSITY = stringPreferencesKey("guide_density")
val GUIDE_CHANNEL_MODE = stringPreferencesKey("guide_channel_mode")
val GUIDE_FAVORITES_ONLY = intPreferencesKey("guide_favorites_only")
@@ -471,6 +472,16 @@ class PreferencesRepository @Inject constructor(
}
}
+ val vodViewMode: Flow<String?> = context.dataStore.data.map { preferences ->
+ preferences[PreferencesKeys.VOD_VIEW_MODE]
+ }
+
+ suspend fun setVodViewMode(mode: String) {
+ context.dataStore.edit { preferences ->
+ preferences[PreferencesKeys.VOD_VIEW_MODE] = mode
+ }
+ }
+
val guideDensity: Flow<String?> = context.dataStore.data.map { preferences ->
preferences[PreferencesKeys.GUIDE_DENSITY]
}