StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat(catalog): move browse presentation
David Nashash91782978a372
diff --git a/app/src/main/java/com/streamvault/app/navigation/graph/CatalogGraph.kt b/app/src/main/java/com/streamvault/app/navigation/graph/CatalogGraph.ktindex 98c162b2..2c019b28 100644--- a/app/src/main/java/com/streamvault/app/navigation/graph/CatalogGraph.kt+++ b/app/src/main/java/com/streamvault/app/navigation/graph/CatalogGraph.kt@@ -11,11 +11,15 @@ import com.streamvault.app.navigation.CatalogDetailNavigationActionsimport com.streamvault.app.navigation.toLivePlayerRequestimport com.streamvault.app.navigation.toPlayerNavigationRequestimport com.streamvault.app.ui.screens.movies.MovieDetailScreen-import com.streamvault.app.ui.screens.movies.MoviesScreenimport com.streamvault.app.ui.screens.search.SearchScreenimport com.streamvault.app.ui.screens.series.SeriesDetailScreen-import com.streamvault.app.ui.screens.series.SeriesScreen-import com.streamvault.app.ui.screens.vod.VodScreen+import com.streamvault.feature.catalog.api.CatalogNavigationChrome+import com.streamvault.feature.catalog.api.CatalogScaffoldContent+import com.streamvault.feature.catalog.presentation.movies.MoviesScreen+import com.streamvault.feature.catalog.presentation.series.SeriesScreen+import com.streamvault.feature.catalog.presentation.vod.VodScreen+import com.streamvault.app.ui.components.shell.AppNavigationChrome+import com.streamvault.app.ui.components.shell.AppScreenScaffoldimport com.streamvault.core.navigation.AppDestinationimport com.streamvault.core.navigation.NavigationActionsimport com.streamvault.core.navigation.NavigationOptions@@ -36,10 +40,10 @@ internal fun NavGraphBuilder.registerCatalogGraph(history.toPlayerNavigationRequest().copy(returnDestination = AppDestination.Movies))},- onNavigate = { route ->- AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)- },- currentRoute = AppRoutePatterns.MOVIES+ scaffold = catalogAppScaffold(+ currentRoute = AppRoutePatterns.MOVIES,+ onNavigate = { route -> AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested) }+ ))}@@ -54,10 +58,10 @@ internal fun NavGraphBuilder.registerCatalogGraph(NavigationOptions(launchSingleTop = true))},- onNavigate = { route ->- AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)- },- currentRoute = AppRoutePatterns.SERIES+ scaffold = catalogAppScaffold(+ currentRoute = AppRoutePatterns.SERIES,+ onNavigate = { route -> AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested) }+ ))}@@ -69,10 +73,10 @@ internal fun NavGraphBuilder.registerCatalogGraph(onSeriesClick = { series ->catalogDetailActions.openSeriesDetail(series, AppDestination.Vod)},- onNavigate = { route ->- AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)- },- currentRoute = AppRoutePatterns.VOD+ scaffold = catalogAppScaffold(+ currentRoute = AppRoutePatterns.VOD,+ onNavigate = { route -> AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested) }+ ))}@@ -164,3 +168,23 @@ internal fun NavGraphBuilder.registerCatalogGraph()}}++private fun catalogAppScaffold(+ currentRoute: String,+ onNavigate: (String) -> Unit+): CatalogScaffoldContent = { _, title, subtitle, chrome, topBarVisible, compactHeader, showScreenHeader, content ->+ AppScreenScaffold(+ currentRoute = currentRoute,+ onNavigate = onNavigate,+ title = title,+ subtitle = subtitle,+ navigationChrome = when (chrome) {+ CatalogNavigationChrome.Rail -> AppNavigationChrome.Rail+ CatalogNavigationChrome.TopBar -> AppNavigationChrome.TopBar+ },+ topBarVisible = topBarVisible,+ compactHeader = compactHeader,+ showScreenHeader = showScreenHeader,+ content = content+ )+}diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesScreen.ktsimilarity index 95%rename from app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesScreen.ktindex d51553a6..751b5d54 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesScreen.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.movies+package com.streamvault.feature.catalog.presentation.moviesimport androidx.activity.compose.BackHandlerimport androidx.compose.foundation.layout.*@@ -38,16 +38,15 @@ import com.streamvault.core.ui.components.SearchInputimport androidx.compose.ui.platform.LocalFocusManagerimport androidx.compose.ui.platform.LocalConfigurationimport androidx.compose.ui.platform.LocalSoftwareKeyboardController-import com.streamvault.app.device.rememberIsTelevisionDevice-import com.streamvault.app.navigation.Routes-import com.streamvault.app.ui.components.CategoryRow-import com.streamvault.app.ui.components.ContinueWatchingRow-import com.streamvault.app.ui.components.MovieCard-import com.streamvault.app.ui.components.SelectionChip-import com.streamvault.app.ui.components.SelectionChipRow-import com.streamvault.app.ui.components.SavedCategoryContextCard-import com.streamvault.app.ui.components.SavedCategoryShortcut-import com.streamvault.app.ui.components.SavedCategoryShortcutsRow+import com.streamvault.core.ui.device.rememberIsTelevisionDevice+import com.streamvault.feature.catalog.presentation.components.CategoryRow+import com.streamvault.feature.catalog.presentation.components.ContinueWatchingRow+import com.streamvault.feature.catalog.presentation.components.MovieCard+import com.streamvault.feature.catalog.presentation.components.SelectionChip+import com.streamvault.feature.catalog.presentation.components.SelectionChipRow+import com.streamvault.feature.catalog.presentation.components.SavedCategoryContextCard+import com.streamvault.feature.catalog.presentation.components.SavedCategoryShortcut+import com.streamvault.feature.catalog.presentation.components.SavedCategoryShortcutsRowimport com.streamvault.core.ui.theme.*import com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.LibraryFilterType@@ -56,40 +55,40 @@ import com.streamvault.domain.model.Movieimport com.streamvault.domain.model.PlaybackHistoryimport kotlinx.coroutines.launchimport androidx.compose.ui.res.stringResource-import com.streamvault.app.R+import com.streamvault.feature.catalog.Rimport androidx.compose.ui.text.input.TextFieldValueimport androidx.compose.foundation.border-import com.streamvault.app.ui.components.ReorderTopBar-import com.streamvault.app.ui.components.dialogs.DeleteGroupDialog+import com.streamvault.feature.catalog.presentation.components.ReorderTopBar+import com.streamvault.feature.catalog.presentation.components.dialogs.DeleteGroupDialogimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.SnackbarHostimport androidx.compose.material3.SnackbarHostState-import com.streamvault.app.ui.components.shell.BrowseSearchLaunchCard+import com.streamvault.feature.catalog.presentation.components.BrowseSearchLaunchCardimport com.streamvault.core.ui.components.shell.LoadMoreCard-import com.streamvault.app.ui.components.shell.InfiniteScrollEffect-import com.streamvault.app.ui.components.shell.AppNavigationChrome+import com.streamvault.feature.catalog.presentation.components.InfiniteScrollEffect+import com.streamvault.feature.catalog.api.CatalogNavigationChrome+import com.streamvault.feature.catalog.api.CatalogScaffoldContentimport com.streamvault.core.ui.components.shell.AppMessageState-import com.streamvault.app.ui.components.shell.AppScreenScaffoldimport androidx.tv.material3.Border-import com.streamvault.app.ui.components.dialogs.RenameGroupDialog-import com.streamvault.app.ui.components.shell.VodActionChip-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.feature.catalog.presentation.components.dialogs.RenameGroupDialog+import com.streamvault.feature.catalog.presentation.components.VodActionChip+import com.streamvault.feature.catalog.presentation.components.VodActionChipRow+import com.streamvault.feature.catalog.presentation.components.VodCategoryOption+import com.streamvault.feature.catalog.presentation.components.VodCategoryPickerDialog+import com.streamvault.feature.catalog.presentation.components.VodBrowseOptionsDialog+import com.streamvault.feature.catalog.presentation.components.VodClassicCategoryOption+import com.streamvault.feature.catalog.presentation.components.VodClassicContentHeader+import com.streamvault.feature.catalog.presentation.components.VodClassicSplitLayout+import com.streamvault.feature.catalog.presentation.components.VodHeroStrip+import com.streamvault.feature.catalog.presentation.components.VodSectionHeaderimport com.streamvault.core.ui.design.FocusRestoreHostimport com.streamvault.core.ui.design.requestFocusSafelyimport com.streamvault.domain.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-import com.streamvault.app.ui.screens.vod.vodActiveFilterSortDetail+import com.streamvault.feature.catalog.presentation.vod.HandleVodUserMessage+import com.streamvault.feature.catalog.presentation.vod.ProtectedVodPinDialog+import com.streamvault.feature.catalog.presentation.vod.VodBrowseDefaults+import com.streamvault.feature.catalog.presentation.vod.vodActiveFilterSortDetailimport kotlinx.coroutines.delay@OptIn(ExperimentalFoundationApi::class)@@ -97,8 +96,7 @@ import kotlinx.coroutines.delayfun MoviesScreen(onMovieClick: (Movie) -> Unit,onContinueWatchingPlay: (PlaybackHistory) -> Unit,- onNavigate: (String) -> Unit,- currentRoute: String,+ scaffold: CatalogScaffoldContent,viewModel: MoviesViewModel = hiltViewModel()) {remember(viewModel) {@@ -153,14 +151,14 @@ fun MoviesScreen(initialContentFocusRequester.requestFocusSafely(tag = "MoviesScreen", target = "Initial movies content")}) {- AppScreenScaffold(- currentRoute = currentRoute,- onNavigate = onNavigate,- title = stringResource(R.string.nav_movies),- subtitle = null,- navigationChrome = AppNavigationChrome.TopBar,- compactHeader = true,- showScreenHeader = false+ scaffold(+ com.streamvault.core.navigation.AppDestination.Movies,+ stringResource(R.string.nav_movies),+ null,+ CatalogNavigationChrome.TopBar,+ true,+ true,+ false) {if (uiState.isReorderMode && uiState.reorderCategory != null) {ReorderTopBar(@@ -271,7 +269,7 @@ fun MoviesScreen(if (uiState.showDialog && uiState.selectedMovieForDialog != null) {val movie = uiState.selectedMovieForDialog!!- com.streamvault.app.ui.components.dialogs.AddToGroupDialog(+ com.streamvault.feature.catalog.presentation.components.dialogs.AddToGroupDialog(contentTitle = movie.name,groups = uiState.categories.filter { it.isVirtual && it.id != VodBrowseDefaults.FAVORITES_SENTINEL_ID },isFavorite = movie.isFavorite,@@ -291,7 +289,7 @@ fun MoviesScreen(if (uiState.selectedCategoryForOptions != null) {val category = uiState.selectedCategoryForOptions!!- com.streamvault.app.ui.components.dialogs.CategoryOptionsDialog(+ com.streamvault.feature.catalog.presentation.components.dialogs.CategoryOptionsDialog(category = category,onDismissRequest = { viewModel.dismissCategoryOptions() },isPinned = category.id in uiState.pinnedCategoryIds,@@ -1365,3 +1363,4 @@ private fun movieSortChips(): List<SelectionChip> {}+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.ktsimilarity index 98%rename from app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.ktindex 11312a90..7eecf5d4 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.movies+package com.streamvault.feature.catalog.presentation.moviesimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope@@ -27,22 +27,22 @@ import com.streamvault.domain.usecase.ContinueWatchingResultimport com.streamvault.domain.usecase.ContinueWatchingScopeimport com.streamvault.domain.usecase.GetContinueWatchingimport com.streamvault.domain.usecase.GetCustomCategories-import com.streamvault.app.ui.screens.vod.createVodGroup-import com.streamvault.app.ui.screens.vod.incrementVodSelectedCategoryLoadLimit-import com.streamvault.app.ui.screens.vod.buildVodPreviewCatalog-import com.streamvault.app.ui.screens.vod.buildVodSearchCatalog-import com.streamvault.app.ui.screens.vod.loadVodReorderItems-import com.streamvault.app.ui.screens.vod.matchesVodGroupMembership-import com.streamvault.app.ui.screens.vod.moveVodItemDown-import com.streamvault.app.ui.screens.vod.moveVodItemUp-import com.streamvault.app.ui.screens.vod.selectVodCategory-import com.streamvault.app.ui.screens.vod.saveVodReorder-import com.streamvault.app.ui.screens.vod.setVodLibraryFilterType-import com.streamvault.app.ui.screens.vod.setVodLibrarySortBy-import com.streamvault.app.ui.screens.vod.setVodSearchQuery-import com.streamvault.app.ui.screens.vod.setVodFavorite-import com.streamvault.app.ui.screens.vod.updateVodGroupMembership-import com.streamvault.app.ui.screens.vod.VodBrowseDefaults+import com.streamvault.feature.catalog.presentation.vod.createVodGroup+import com.streamvault.feature.catalog.presentation.vod.incrementVodSelectedCategoryLoadLimit+import com.streamvault.feature.catalog.presentation.vod.buildVodPreviewCatalog+import com.streamvault.feature.catalog.presentation.vod.buildVodSearchCatalog+import com.streamvault.feature.catalog.presentation.vod.loadVodReorderItems+import com.streamvault.feature.catalog.presentation.vod.matchesVodGroupMembership+import com.streamvault.feature.catalog.presentation.vod.moveVodItemDown+import com.streamvault.feature.catalog.presentation.vod.moveVodItemUp+import com.streamvault.feature.catalog.presentation.vod.selectVodCategory+import com.streamvault.feature.catalog.presentation.vod.saveVodReorder+import com.streamvault.feature.catalog.presentation.vod.setVodLibraryFilterType+import com.streamvault.feature.catalog.presentation.vod.setVodLibrarySortBy+import com.streamvault.feature.catalog.presentation.vod.setVodSearchQuery+import com.streamvault.feature.catalog.presentation.vod.setVodFavorite+import com.streamvault.feature.catalog.presentation.vod.updateVodGroupMembership+import com.streamvault.feature.catalog.presentation.vod.VodBrowseDefaultsimport com.streamvault.domain.playback.isPlaybackCompleteimport dagger.hilt.android.lifecycle.HiltViewModelimport javax.inject.Inject@@ -1488,3 +1488,4 @@ data class MoviesUiState(val filteredMovies: List<Movie> = emptyList(),val errorMessage: String? = null)+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesScreen.ktsimilarity index 95%rename from app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesScreen.ktindex 3cf150d3..b4b458ec 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesScreen.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.series+package com.streamvault.feature.catalog.presentation.seriesimport androidx.activity.compose.BackHandlerimport androidx.compose.foundation.layout.*@@ -40,16 +40,15 @@ import com.streamvault.core.ui.components.SearchInputimport androidx.compose.ui.platform.LocalFocusManagerimport androidx.compose.ui.platform.LocalConfigurationimport androidx.compose.ui.platform.LocalSoftwareKeyboardController-import com.streamvault.app.device.rememberIsTelevisionDevice-import com.streamvault.app.navigation.Routes-import com.streamvault.app.ui.components.CategoryRow-import com.streamvault.app.ui.components.ContinueWatchingRow-import com.streamvault.app.ui.components.SavedCategoryContextCard-import com.streamvault.app.ui.components.SavedCategoryShortcut-import com.streamvault.app.ui.components.SavedCategoryShortcutsRow-import com.streamvault.app.ui.components.SelectionChip-import com.streamvault.app.ui.components.SelectionChipRow-import com.streamvault.app.ui.components.SeriesCard+import com.streamvault.core.ui.device.rememberIsTelevisionDevice+import com.streamvault.feature.catalog.presentation.components.CategoryRow+import com.streamvault.feature.catalog.presentation.components.ContinueWatchingRow+import com.streamvault.feature.catalog.presentation.components.SavedCategoryContextCard+import com.streamvault.feature.catalog.presentation.components.SavedCategoryShortcut+import com.streamvault.feature.catalog.presentation.components.SavedCategoryShortcutsRow+import com.streamvault.feature.catalog.presentation.components.SelectionChip+import com.streamvault.feature.catalog.presentation.components.SelectionChipRow+import com.streamvault.feature.catalog.presentation.components.SeriesCardimport com.streamvault.core.ui.theme.*import com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.LibraryFilterType@@ -57,39 +56,39 @@ import com.streamvault.domain.model.LibrarySortByimport com.streamvault.domain.model.Seriesimport kotlinx.coroutines.launchimport androidx.compose.ui.res.stringResource-import com.streamvault.app.R+import com.streamvault.feature.catalog.Rimport androidx.compose.foundation.borderimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.SnackbarHostimport androidx.compose.material3.SnackbarHostState-import com.streamvault.app.ui.components.ReorderTopBar-import com.streamvault.app.ui.components.dialogs.DeleteGroupDialog-import com.streamvault.app.ui.components.dialogs.RenameGroupDialog-import com.streamvault.app.ui.components.shell.BrowseHeroPanel-import com.streamvault.app.ui.components.shell.BrowseSearchLaunchCard+import com.streamvault.feature.catalog.presentation.components.ReorderTopBar+import com.streamvault.feature.catalog.presentation.components.dialogs.DeleteGroupDialog+import com.streamvault.feature.catalog.presentation.components.dialogs.RenameGroupDialog+import com.streamvault.feature.catalog.presentation.components.BrowseHeroPanel+import com.streamvault.feature.catalog.presentation.components.BrowseSearchLaunchCardimport com.streamvault.core.ui.components.shell.LoadMoreCard-import com.streamvault.app.ui.components.shell.InfiniteScrollEffect-import com.streamvault.app.ui.components.shell.AppNavigationChrome+import com.streamvault.feature.catalog.presentation.components.InfiniteScrollEffect+import com.streamvault.feature.catalog.api.CatalogNavigationChrome+import com.streamvault.feature.catalog.api.CatalogScaffoldContentimport com.streamvault.core.ui.components.shell.AppMessageState-import com.streamvault.app.ui.components.shell.AppScreenScaffold-import com.streamvault.app.ui.components.shell.VodActionChip-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.feature.catalog.presentation.components.VodActionChip+import com.streamvault.feature.catalog.presentation.components.VodActionChipRow+import com.streamvault.feature.catalog.presentation.components.VodCategoryOption+import com.streamvault.feature.catalog.presentation.components.VodCategoryPickerDialog+import com.streamvault.feature.catalog.presentation.components.VodBrowseOptionsDialog+import com.streamvault.feature.catalog.presentation.components.VodClassicCategoryOption+import com.streamvault.feature.catalog.presentation.components.VodClassicContentHeader+import com.streamvault.feature.catalog.presentation.components.VodClassicSplitLayout+import com.streamvault.feature.catalog.presentation.components.VodHeroStrip+import com.streamvault.feature.catalog.presentation.components.VodSectionHeaderimport com.streamvault.core.ui.design.FocusRestoreHostimport com.streamvault.core.ui.design.requestFocusSafelyimport com.streamvault.domain.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-import com.streamvault.app.ui.screens.vod.vodActiveFilterSortDetail+import com.streamvault.feature.catalog.presentation.vod.HandleVodUserMessage+import com.streamvault.feature.catalog.presentation.vod.ProtectedVodPinDialog+import com.streamvault.feature.catalog.presentation.vod.VodBrowseDefaults+import com.streamvault.feature.catalog.presentation.vod.vodActiveFilterSortDetailimport kotlinx.coroutines.delay@OptIn(ExperimentalFoundationApi::class)@@ -97,8 +96,7 @@ import kotlinx.coroutines.delayfun SeriesScreen(onSeriesClick: (Series) -> Unit,onSeriesIdClick: (Long) -> Unit,- onNavigate: (String) -> Unit,- currentRoute: String,+ scaffold: CatalogScaffoldContent,viewModel: SeriesViewModel = hiltViewModel()) {remember(viewModel) {@@ -153,14 +151,14 @@ fun SeriesScreen(initialContentFocusRequester.requestFocusSafely(tag = "SeriesScreen", target = "Initial series content")}) {- AppScreenScaffold(- currentRoute = currentRoute,- onNavigate = onNavigate,- title = stringResource(R.string.nav_series),- subtitle = null,- navigationChrome = AppNavigationChrome.TopBar,- compactHeader = true,- showScreenHeader = false+ scaffold(+ com.streamvault.core.navigation.AppDestination.Series,+ stringResource(R.string.nav_series),+ null,+ CatalogNavigationChrome.TopBar,+ true,+ true,+ false) {if (uiState.isReorderMode && uiState.reorderCategory != null) {ReorderTopBar(@@ -271,7 +269,7 @@ fun SeriesScreen(if (uiState.showDialog && uiState.selectedSeriesForDialog != null) {val series = uiState.selectedSeriesForDialog!!- com.streamvault.app.ui.components.dialogs.AddToGroupDialog(+ com.streamvault.feature.catalog.presentation.components.dialogs.AddToGroupDialog(contentTitle = series.name,groups = uiState.categories.filter { it.isVirtual && it.id != VodBrowseDefaults.FAVORITES_SENTINEL_ID },isFavorite = series.isFavorite,@@ -299,7 +297,7 @@ fun SeriesScreen(if (uiState.selectedCategoryForOptions != null) {val category = uiState.selectedCategoryForOptions!!- com.streamvault.app.ui.components.dialogs.CategoryOptionsDialog(+ com.streamvault.feature.catalog.presentation.components.dialogs.CategoryOptionsDialog(category = category,onDismissRequest = { viewModel.dismissCategoryOptions() },isPinned = category.id in uiState.pinnedCategoryIds,@@ -1374,3 +1372,4 @@ private fun seriesSortChips(): List<SelectionChip> {private fun Series.rawSeriesIdsForNavigation(): List<Long> =variants.map { it.rawSeriesId }.ifEmpty { listOf(selectedVariantId ?: id) }+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.ktsimilarity index 97%rename from app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.ktindex e9282eec..e7acdc3c 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.series+package com.streamvault.feature.catalog.presentation.seriesimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope@@ -27,23 +27,23 @@ import com.streamvault.domain.usecase.ContinueWatchingResultimport com.streamvault.domain.usecase.ContinueWatchingScopeimport com.streamvault.domain.usecase.GetContinueWatchingimport com.streamvault.domain.usecase.GetCustomCategories-import com.streamvault.app.ui.screens.vod.createVodGroup-import com.streamvault.app.ui.screens.vod.incrementVodSelectedCategoryLoadLimit-import com.streamvault.app.ui.screens.vod.buildVodPreviewCatalog-import com.streamvault.app.ui.screens.vod.buildVodSearchCatalog-import com.streamvault.app.ui.screens.vod.loadVodReorderItems-import com.streamvault.app.ui.screens.vod.markVodFavorites-import com.streamvault.app.ui.screens.vod.matchesVodGroupMembership-import com.streamvault.app.ui.screens.vod.moveVodItemDown-import com.streamvault.app.ui.screens.vod.moveVodItemUp-import com.streamvault.app.ui.screens.vod.selectVodCategory-import com.streamvault.app.ui.screens.vod.saveVodReorder-import com.streamvault.app.ui.screens.vod.setVodLibraryFilterType-import com.streamvault.app.ui.screens.vod.setVodLibrarySortBy-import com.streamvault.app.ui.screens.vod.setVodSearchQuery-import com.streamvault.app.ui.screens.vod.setVodFavorite-import com.streamvault.app.ui.screens.vod.updateVodGroupMembership-import com.streamvault.app.ui.screens.vod.VodBrowseDefaults+import com.streamvault.feature.catalog.presentation.vod.createVodGroup+import com.streamvault.feature.catalog.presentation.vod.incrementVodSelectedCategoryLoadLimit+import com.streamvault.feature.catalog.presentation.vod.buildVodPreviewCatalog+import com.streamvault.feature.catalog.presentation.vod.buildVodSearchCatalog+import com.streamvault.feature.catalog.presentation.vod.loadVodReorderItems+import com.streamvault.feature.catalog.presentation.vod.markVodFavorites+import com.streamvault.feature.catalog.presentation.vod.matchesVodGroupMembership+import com.streamvault.feature.catalog.presentation.vod.moveVodItemDown+import com.streamvault.feature.catalog.presentation.vod.moveVodItemUp+import com.streamvault.feature.catalog.presentation.vod.selectVodCategory+import com.streamvault.feature.catalog.presentation.vod.saveVodReorder+import com.streamvault.feature.catalog.presentation.vod.setVodLibraryFilterType+import com.streamvault.feature.catalog.presentation.vod.setVodLibrarySortBy+import com.streamvault.feature.catalog.presentation.vod.setVodSearchQuery+import com.streamvault.feature.catalog.presentation.vod.setVodFavorite+import com.streamvault.feature.catalog.presentation.vod.updateVodGroupMembership+import com.streamvault.feature.catalog.presentation.vod.VodBrowseDefaultsimport dagger.hilt.android.lifecycle.HiltViewModelimport javax.inject.Injectimport kotlinx.coroutines.ExperimentalCoroutinesApi@@ -1490,3 +1490,4 @@ data class SeriesUiState(val filteredSeries: List<Series> = emptyList(),val errorMessage: String? = null)+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodBrowseStateHelpers.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodBrowseStateHelpers.ktsimilarity index 95%rename from app/src/main/java/com/streamvault/app/ui/screens/vod/VodBrowseStateHelpers.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodBrowseStateHelpers.ktindex 68dfe4c4..f2f6697d 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodBrowseStateHelpers.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodBrowseStateHelpers.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.vod+package com.streamvault.feature.catalog.presentation.vodimport com.streamvault.domain.model.LibraryFilterTypeimport com.streamvault.domain.model.LibrarySortBy@@ -86,7 +86,7 @@ inline fun <State> setVodLibrarySortBy(/*** Returns a compact summary label for the currently active filter and/or sort- * (e.g. "Favorites · Rating"), or null when both are at their defaults.+ * (e.g. "Favorites ֲ· Rating"), or null when both are at their defaults.* This is used to decorate the "Filter & Sort" action chip so the user can* tell at a glance that a non-default browse mode is in effect.*/@@ -107,5 +107,5 @@ fun vodActiveFilterSortDetail(filter: LibraryFilterType, sort: LibrarySortBy): SLibrarySortBy.RATING -> "Rating"LibrarySortBy.WATCH_COUNT -> "Recent Activity"}- return listOfNotNull(filterLabel, sortLabel).joinToString(" · ").ifEmpty { null }-}\ No newline at end of file+ return listOfNotNull(filterLabel, sortLabel).joinToString(" ֲ· ").ifEmpty { null }+}diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodCatalogBuilders.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodCatalogBuilders.ktsimilarity index 98%rename from app/src/main/java/com/streamvault/app/ui/screens/vod/VodCatalogBuilders.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodCatalogBuilders.ktindex c0c146da..7542ea36 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodCatalogBuilders.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodCatalogBuilders.kt@@ -1,8 +1,8 @@-package com.streamvault.app.ui.screens.vod+package com.streamvault.feature.catalog.presentation.vodimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.Favorite-import com.streamvault.app.ui.screens.vod.matchesVodGroupMembership+import com.streamvault.feature.catalog.presentation.vod.matchesVodGroupMembershipdata class VodCatalogSnapshot<Item>(val grouped: Map<String, List<Item>>,@@ -187,3 +187,4 @@ fun <Item> markVodFavorites(): List<Item> = items.map { item ->copyWithFavorite(item, itemIds(item).any { rawItemId -> rawItemId in globalFavoriteIds })}+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodFavoriteHelpers.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodFavoriteHelpers.ktsimilarity index 97%rename from app/src/main/java/com/streamvault/app/ui/screens/vod/VodFavoriteHelpers.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodFavoriteHelpers.ktindex 3691264a..351b7b50 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodFavoriteHelpers.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodFavoriteHelpers.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.vod+package com.streamvault.feature.catalog.presentation.vodimport com.streamvault.domain.model.ContentTypeimport com.streamvault.domain.model.Result@@ -77,3 +77,4 @@ suspend fun createVodGroup(favoriteRepository: FavoriteRepository): Result<VirtualGroup> =favoriteRepository.createGroup(providerId, name, contentType = contentType)+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodReorderHelpers.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodReorderHelpers.ktsimilarity index 97%rename from app/src/main/java/com/streamvault/app/ui/screens/vod/VodReorderHelpers.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodReorderHelpers.ktindex c00aa319..9dd1b1ad 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodReorderHelpers.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodReorderHelpers.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.vod+package com.streamvault.feature.catalog.presentation.vodimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.ContentType@@ -84,3 +84,4 @@ private fun <Item> List<Item>.orderByIds(val positions = ids.withIndex().associate { it.value to it.index }return sortedBy { item -> positions[itemId(item)] ?: Int.MAX_VALUE }}+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreen.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodScreen.ktsimilarity index 92%rename from app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreen.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodScreen.ktindex 1c03308e..01652e02 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreen.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodScreen.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.vod+package com.streamvault.feature.catalog.presentation.vodimport androidx.activity.compose.BackHandlerimport androidx.compose.foundation.layout.Arrangement@@ -30,22 +30,22 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.app.R-import com.streamvault.app.ui.components.MovieCard+import com.streamvault.feature.catalog.R+import com.streamvault.feature.catalog.presentation.components.MovieCardimport com.streamvault.core.ui.components.SearchInput-import com.streamvault.app.ui.components.SelectionChip-import com.streamvault.app.ui.components.SeriesCard+import com.streamvault.feature.catalog.presentation.components.SelectionChip+import com.streamvault.feature.catalog.presentation.components.SeriesCardimport com.streamvault.core.ui.components.shell.AppMessageState-import com.streamvault.app.ui.components.shell.AppNavigationChrome-import com.streamvault.app.ui.components.shell.AppScreenScaffold-import com.streamvault.app.ui.components.shell.InfiniteScrollEffect+import com.streamvault.feature.catalog.api.CatalogNavigationChrome+import com.streamvault.feature.catalog.api.CatalogScaffoldContent+import com.streamvault.feature.catalog.presentation.components.InfiniteScrollEffectimport com.streamvault.core.ui.components.shell.LoadMoreCard-import com.streamvault.app.ui.components.shell.VodActionChip-import com.streamvault.app.ui.components.shell.VodActionChipRow-import com.streamvault.app.ui.components.shell.VodBrowseOptionsDialog-import com.streamvault.app.ui.components.shell.VodCategoryOption-import com.streamvault.app.ui.components.shell.VodCategoryPickerDialog-import com.streamvault.app.ui.components.shell.VodSectionHeader+import com.streamvault.feature.catalog.presentation.components.VodActionChip+import com.streamvault.feature.catalog.presentation.components.VodActionChipRow+import com.streamvault.feature.catalog.presentation.components.VodBrowseOptionsDialog+import com.streamvault.feature.catalog.presentation.components.VodCategoryOption+import com.streamvault.feature.catalog.presentation.components.VodCategoryPickerDialog+import com.streamvault.feature.catalog.presentation.components.VodSectionHeaderimport com.streamvault.domain.model.VodViewModeimport com.streamvault.domain.model.LibraryFilterTypeimport com.streamvault.domain.model.LibrarySortBy@@ -57,20 +57,20 @@ import com.streamvault.domain.model.VodCatalogItemfun VodScreen(onMovieClick: (Movie) -> Unit,onSeriesClick: (Series) -> Unit,- onNavigate: (String) -> Unit,- currentRoute: String,+ scaffold: CatalogScaffoldContent,viewModel: VodViewModel = hiltViewModel()) {val state by viewModel.uiState.collectAsStateWithLifecycle()BackHandler(enabled = state.selectedCategory != null) { viewModel.selectCategory(null) }- AppScreenScaffold(- currentRoute = currentRoute,- onNavigate = onNavigate,- title = stringResource(R.string.nav_vod),- navigationChrome = AppNavigationChrome.TopBar,- compactHeader = true,- showScreenHeader = false+ scaffold(+ com.streamvault.core.navigation.AppDestination.Vod,+ stringResource(R.string.nav_vod),+ null,+ CatalogNavigationChrome.TopBar,+ true,+ true,+ false) {when {state.isLoading -> Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {@@ -400,3 +400,4 @@ private fun VodItemCard()}}+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreenCommon.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodScreenCommon.ktsimilarity index 94%rename from app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreenCommon.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodScreenCommon.ktindex 6296711a..f4c0d126 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodScreenCommon.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodScreenCommon.kt@@ -1,11 +1,11 @@-package com.streamvault.app.ui.screens.vod+package com.streamvault.feature.catalog.presentation.vodimport androidx.compose.material3.SnackbarHostStateimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.ui.res.stringResource-import com.streamvault.app.R+import com.streamvault.feature.catalog.Rimport com.streamvault.core.ui.components.dialogs.PinDialogimport kotlinx.coroutines.launch@@ -61,3 +61,4 @@ fun ProtectedVodPinDialog(error = error)}+diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodViewModel.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodViewModel.ktsimilarity index 99%rename from app/src/main/java/com/streamvault/app/ui/screens/vod/VodViewModel.ktrename to feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodViewModel.ktindex 991adbd5..e5c5cbb2 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodViewModel.kt+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/VodViewModel.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.vod+package com.streamvault.feature.catalog.presentation.vodimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope@@ -393,3 +393,4 @@ class VodViewModel @Inject constructor(else -> VodCategoryKind.UNKNOWN}}+diff --git a/feature/catalog/src/test/java/com/streamvault/feature/catalog/presentation/vod/CatalogVodHelpersTest.kt b/feature/catalog/src/test/java/com/streamvault/feature/catalog/presentation/vod/CatalogVodHelpersTest.ktnew file mode 100644index 00000000..a8699f94--- /dev/null+++ b/feature/catalog/src/test/java/com/streamvault/feature/catalog/presentation/vod/CatalogVodHelpersTest.kt@@ -0,0 +1,61 @@+package com.streamvault.feature.catalog.presentation.vod++import com.google.common.truth.Truth.assertThat+import com.streamvault.domain.model.LibraryFilterType+import com.streamvault.domain.model.LibrarySortBy+import kotlinx.coroutines.flow.MutableStateFlow+import org.junit.Test++class CatalogVodHelpersTest {+ @Test+ fun reorderMovement_preservesIdentityAndNoOpEdges() {+ val items = listOf("a", "b", "c")+ assertThat(moveVodItemUp(items, "b")).containsExactly("b", "a", "c").inOrder()+ assertThat(moveVodItemDown(items, "b")).containsExactly("a", "c", "b").inOrder()+ assertThat(moveVodItemUp(items, "a")).isEqualTo(items)+ assertThat(moveVodItemDown(items, "c")).isEqualTo(items)+ assertThat(moveVodItemDown(items, "missing")).isEqualTo(items)+ }++ @Test+ fun filterAndSortDetail_isNullOnlyAtDefaults() {+ assertThat(vodActiveFilterSortDetail(LibraryFilterType.ALL, LibrarySortBy.LIBRARY)).isNull()+ assertThat(vodActiveFilterSortDetail(LibraryFilterType.FAVORITES, LibrarySortBy.RATING))+ .isEqualTo("Favorites ֲ· Rating")+ assertThat(vodActiveFilterSortDetail(LibraryFilterType.UNWATCHED, LibrarySortBy.TITLE))+ .isEqualTo("Unwatched ֲ· A-Z")+ }++ @Test+ fun categorySelection_resetsPageAndCarriesCurrentFilterAndSort() {+ data class State(val category: String?, val filter: LibraryFilterType, val sort: LibrarySortBy, val loading: Boolean)+ val limit = MutableStateFlow(999)+ val filter = MutableStateFlow(LibraryFilterType.FAVORITES)+ val sort = MutableStateFlow(LibrarySortBy.RATING)+ val state = MutableStateFlow(State(null, LibraryFilterType.ALL, LibrarySortBy.LIBRARY, false))++ selectVodCategory("Drama", limit, filter, sort, state) { category, filterType, sortBy, loading ->+ copy(category = category, filter = filterType, sort = sortBy, loading = loading)+ }++ assertThat(limit.value).isEqualTo(VodBrowseDefaults.SELECTED_CATEGORY_PAGE_SIZE)+ assertThat(state.value).isEqualTo(State("Drama", LibraryFilterType.FAVORITES, LibrarySortBy.RATING, true))+ }++ @Test+ fun incrementLoadLimit_isSuppressedWhenNoMoreItems() {+ val limit = MutableStateFlow(VodBrowseDefaults.SELECTED_CATEGORY_PAGE_SIZE)+ incrementVodSelectedCategoryLoadLimit(canLoadMore = false, selectedCategoryLoadLimit = limit)+ assertThat(limit.value).isEqualTo(VodBrowseDefaults.SELECTED_CATEGORY_PAGE_SIZE)+ incrementVodSelectedCategoryLoadLimit(canLoadMore = true, selectedCategoryLoadLimit = limit)+ assertThat(limit.value).isEqualTo(VodBrowseDefaults.SELECTED_CATEGORY_PAGE_SIZE * 2)+ }++ @Test+ fun groupMembership_normalizesVirtualAndStoredIds() {+ assertThat(matchesVodGroupMembership(7L, -7L)).isTrue()+ assertThat(matchesVodGroupMembership(-7L, 7L)).isTrue()+ assertThat(matchesVodGroupMembership(null, 7L)).isFalse()+ assertThat(matchesVodGroupMembership(7L, 8L)).isFalse()+ }+}