Skip to content

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

Add customizable home dashboard shelves

David Nashash95f3e4b93d7b
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 44615d6d..e17f921f 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -23,6 +23,7 @@ jobs:
VERSION_NAME=$(sed -n 's/.*versionName = "\(.*\)".*/\1/p' app/build.gradle.kts | head -n 1)
VERSION_CODE=$(sed -n 's/.*versionCode = \([0-9][0-9]*\).*/\1/p' app/build.gradle.kts | head -n 1)
SHORT_SHA="${GITHUB_SHA::7}"
+ BETA_SEQUENCE=$(printf "%06d.%02d" "$GITHUB_RUN_NUMBER" "$GITHUB_RUN_ATTEMPT")
if [ -z "$VERSION_NAME" ] || [ -z "$VERSION_CODE" ]; then
echo "Failed to read app version from app/build.gradle.kts"
@@ -32,8 +33,9 @@ jobs:
echo "version_name=$VERSION_NAME" >> "$GITHUB_OUTPUT"
echo "version_code=$VERSION_CODE" >> "$GITHUB_OUTPUT"
echo "short_sha=$SHORT_SHA" >> "$GITHUB_OUTPUT"
- echo "beta_tag=v$VERSION_NAME-beta-$SHORT_SHA" >> "$GITHUB_OUTPUT"
- echo "apk_name=StreamVault-$VERSION_NAME-beta-$SHORT_SHA.apk" >> "$GITHUB_OUTPUT"
+ echo "beta_sequence=$BETA_SEQUENCE" >> "$GITHUB_OUTPUT"
+ echo "beta_tag=v$VERSION_NAME-beta.$BETA_SEQUENCE" >> "$GITHUB_OUTPUT"
+ echo "apk_name=StreamVault-$VERSION_NAME-beta.$BETA_SEQUENCE.apk" >> "$GITHUB_OUTPUT"
- name: Set up JDK 17
uses: actions/setup-java@v4
@@ -107,9 +109,11 @@ jobs:
run: |
VERSION_NAME=$(sed -n 's/.*versionName = "\(.*\)".*/\1/p' app/build.gradle.kts | head -n 1)
SHORT_SHA="${GITHUB_SHA::7}"
+ BETA_SEQUENCE=$(printf "%06d.%02d" "$GITHUB_RUN_NUMBER" "$GITHUB_RUN_ATTEMPT")
echo "version_name=$VERSION_NAME" >> "$GITHUB_OUTPUT"
echo "short_sha=$SHORT_SHA" >> "$GITHUB_OUTPUT"
- echo "beta_tag=v$VERSION_NAME-beta-$SHORT_SHA" >> "$GITHUB_OUTPUT"
+ echo "beta_sequence=$BETA_SEQUENCE" >> "$GITHUB_OUTPUT"
+ echo "beta_tag=v$VERSION_NAME-beta.$BETA_SEQUENCE" >> "$GITHUB_OUTPUT"
- name: Download beta APK artifact
uses: actions/download-artifact@v4
@@ -121,10 +125,11 @@ jobs:
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ steps.app_version.outputs.beta_tag }}
- name: StreamVault Beta ${{ steps.app_version.outputs.version_name }} (${{ steps.app_version.outputs.short_sha }})
+ name: StreamVault Beta ${{ steps.app_version.outputs.version_name }} build ${{ steps.app_version.outputs.beta_sequence }}
body: |
Automated beta build from `develop`.
+ Beta sequence: `${{ steps.app_version.outputs.beta_sequence }}`
Commit: `${{ github.sha }}`
files: |
dist/*.apk
diff --git a/app/src/main/java/com/streamvault/app/ui/components/ContinueWatchingRow.kt b/app/src/main/java/com/streamvault/app/ui/components/ContinueWatchingRow.kt
index 3ea486b8..2a44773f 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/ContinueWatchingRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/ContinueWatchingRow.kt
@@ -44,6 +44,7 @@ import com.streamvault.domain.model.PlaybackHistory
@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun ContinueWatchingRow(
+ title: String? = null,
items: List<PlaybackHistory>,
onItemClick: (PlaybackHistory) -> Unit,
modifier: Modifier = Modifier
@@ -59,7 +60,7 @@ fun ContinueWatchingRow(
verticalAlignment = Alignment.CenterVertically
) {
Text(
- text = stringResource(R.string.continue_watching_title),
+ text = title ?: stringResource(R.string.continue_watching_title),
style = MaterialTheme.typography.titleMedium,
color = TextPrimary
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardHomeShelves.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardHomeShelves.kt
new file mode 100644
index 00000000..4a5292d6
--- /dev/null
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardHomeShelves.kt
@@ -0,0 +1,24 @@
+package com.streamvault.app.ui.screens.dashboard
+
+import com.streamvault.domain.model.AppHomeDashboardShelf
+
+internal fun resolveVisibleDashboardShelves(
+ uiState: DashboardUiState
+): List<AppHomeDashboardShelf> = AppHomeDashboardShelf
+ .normalizeForStorage(uiState.homeDashboardShelves)
+ .filter(uiState::hasContentFor)
+
+internal fun DashboardUiState.hasContentFor(shelf: AppHomeDashboardShelf): Boolean = when (shelf) {
+ AppHomeDashboardShelf.FAVORITE_CHANNELS -> favoriteChannels.isNotEmpty()
+ AppHomeDashboardShelf.RECENT_CHANNELS -> recentChannels.isNotEmpty()
+ AppHomeDashboardShelf.LIVE_SHORTCUTS -> liveShortcuts.isNotEmpty()
+ AppHomeDashboardShelf.CONTINUE_WATCHING -> continueWatching.isNotEmpty()
+ AppHomeDashboardShelf.RECENT_MOVIES -> recentMovies.isNotEmpty()
+ AppHomeDashboardShelf.RECENT_SERIES -> recentSeries.isNotEmpty()
+ AppHomeDashboardShelf.FAVORITE_MOVIES -> favoriteMovies.isNotEmpty()
+ AppHomeDashboardShelf.FAVORITE_SERIES -> favoriteSeries.isNotEmpty()
+ AppHomeDashboardShelf.CONTINUE_WATCHING_MOVIES -> continueWatchingMovies.isNotEmpty()
+ AppHomeDashboardShelf.CONTINUE_WATCHING_SERIES -> continueWatchingSeriesItems.isNotEmpty()
+ AppHomeDashboardShelf.TOP_RATED_MOVIES -> topRatedMovies.isNotEmpty()
+ AppHomeDashboardShelf.RECOMMENDED_MOVIES -> recommendedMovies.isNotEmpty()
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
index 4c33e0ab..c1b59a5a 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
@@ -23,12 +23,14 @@ import androidx.compose.material3.SnackbarHostState
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.compose.runtime.collectAsState
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.compose.runtime.getValue
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -73,6 +75,7 @@ import com.streamvault.app.ui.design.AppColors.TextPrimary as OnBackground
import com.streamvault.app.ui.design.AppColors.TextPrimary as TextPrimary
import com.streamvault.app.ui.design.AppColors.TextTertiary as OnSurfaceDim
import com.streamvault.app.ui.design.AppColors.TextTertiary as TextTertiary
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Movie
import com.streamvault.domain.model.PlaybackHistory
@@ -103,6 +106,7 @@ fun DashboardScreen(
val scheduledChannelIds by viewModel.scheduledChannelIds.collectAsStateWithLifecycle()
val provider = uiState.provider
val snackbarHostState = remember { SnackbarHostState() }
+ var showHomeCustomizationDialog by remember { mutableStateOf(false) }
LaunchedEffect(uiState.userMessage) {
uiState.userMessage?.let { message ->
@@ -129,6 +133,24 @@ fun DashboardScreen(
return@AppScreenScaffold
}
val orderedSections = rememberDashboardSections(uiState)
+ val onContinueWatchingItemClick: (PlaybackHistory) -> Unit = { history ->
+ val rawSeriesId = history.seriesId ?: history.contentId
+ val presentedSeries = if (
+ history.contentType == com.streamvault.domain.model.ContentType.SERIES ||
+ history.contentType == com.streamvault.domain.model.ContentType.SERIES_EPISODE
+ ) {
+ uiState.continueWatchingSeries.firstOrNull { series ->
+ series.rawSeriesIdsForNavigation().contains(rawSeriesId)
+ }
+ } else {
+ null
+ }
+ if (presentedSeries != null) {
+ onSeriesClick(presentedSeries)
+ } else {
+ onPlaybackHistoryClick(history)
+ }
+ }
androidx.compose.foundation.lazy.LazyColumn(
modifier = Modifier.fillMaxSize(),
@@ -163,9 +185,9 @@ fun DashboardScreen(
)
}
}
- items(orderedSections, key = { it.name }) { section ->
+ items(orderedSections, key = { it.storageValue }) { section ->
when (section) {
- DashboardHomeSection.LIVE_SHORTCUTS -> DashboardShortcutRow(
+ AppHomeDashboardShelf.LIVE_SHORTCUTS -> DashboardShortcutRow(
title = stringResource(R.string.dashboard_live_shortcuts),
subtitle = stringResource(R.string.dashboard_live_shortcuts_subtitle),
shortcuts = uiState.liveShortcuts,
@@ -176,7 +198,7 @@ fun DashboardScreen(
}
)
- DashboardHomeSection.FAVORITE_CHANNELS -> FavoriteChannelsRow(
+ AppHomeDashboardShelf.FAVORITE_CHANNELS -> FavoriteChannelsRow(
title = stringResource(R.string.dashboard_favorite_channels),
channels = uiState.favoriteChannels,
onSeeAll = { onNavigate(Routes.liveTv(com.streamvault.domain.model.VirtualCategoryIds.FAVORITES)) },
@@ -185,7 +207,7 @@ fun DashboardScreen(
}
)
- DashboardHomeSection.RECENT_CHANNELS -> CategoryRow(
+ AppHomeDashboardShelf.RECENT_CHANNELS -> CategoryRow(
title = stringResource(R.string.dashboard_recent_channels),
items = uiState.recentChannels,
keySelector = { it.id },
@@ -199,26 +221,12 @@ fun DashboardScreen(
)
}
- DashboardHomeSection.CONTINUE_WATCHING -> ContinueWatchingRow(
+ AppHomeDashboardShelf.CONTINUE_WATCHING -> ContinueWatchingRow(
items = uiState.continueWatching,
- onItemClick = { history ->
- val rawSeriesId = history.seriesId ?: history.contentId
- val presentedSeries = if (history.contentType == com.streamvault.domain.model.ContentType.SERIES) {
- uiState.continueWatchingSeries.firstOrNull { series ->
- series.rawSeriesIdsForNavigation().contains(rawSeriesId)
- }
- } else {
- null
- }
- if (presentedSeries != null) {
- onSeriesClick(presentedSeries)
- } else {
- onPlaybackHistoryClick(history)
- }
- }
+ onItemClick = onContinueWatchingItemClick
)
- DashboardHomeSection.RECENT_MOVIES -> CategoryRow(
+ AppHomeDashboardShelf.RECENT_MOVIES -> CategoryRow(
title = stringResource(R.string.dashboard_recent_movies),
items = uiState.recentMovies,
keySelector = { it.id },
@@ -230,7 +238,7 @@ fun DashboardScreen(
)
}
- DashboardHomeSection.RECENT_SERIES -> CategoryRow(
+ AppHomeDashboardShelf.RECENT_SERIES -> CategoryRow(
title = stringResource(R.string.dashboard_recent_series),
items = uiState.recentSeries,
keySelector = { it.id },
@@ -242,6 +250,58 @@ fun DashboardScreen(
onClick = { onSeriesClick(series) }
)
}
+
+ AppHomeDashboardShelf.FAVORITE_MOVIES -> CategoryRow(
+ title = stringResource(R.string.dashboard_favorite_movies),
+ items = uiState.favoriteMovies,
+ keySelector = { it.id },
+ onSeeAll = { onNavigate(Routes.MOVIES) }
+ ) { movie ->
+ MovieCard(movie = movie, onClick = { onMovieClick(movie) })
+ }
+
+ AppHomeDashboardShelf.FAVORITE_SERIES -> CategoryRow(
+ title = stringResource(R.string.dashboard_favorite_series),
+ items = uiState.favoriteSeries,
+ keySelector = { it.id },
+ onSeeAll = { onNavigate(Routes.SERIES) }
+ ) { series ->
+ SeriesCard(
+ series = series,
+ subtitle = series.releaseDate ?: stringResource(R.string.dashboard_updated_series_badge),
+ onClick = { onSeriesClick(series) }
+ )
+ }
+
+ AppHomeDashboardShelf.CONTINUE_WATCHING_MOVIES -> ContinueWatchingRow(
+ title = stringResource(R.string.dashboard_continue_watching_movies),
+ items = uiState.continueWatchingMovies,
+ onItemClick = onPlaybackHistoryClick
+ )
+
+ AppHomeDashboardShelf.CONTINUE_WATCHING_SERIES -> ContinueWatchingRow(
+ title = stringResource(R.string.dashboard_continue_watching_series),
+ items = uiState.continueWatchingSeriesItems,
+ onItemClick = onContinueWatchingItemClick
+ )
+
+ AppHomeDashboardShelf.TOP_RATED_MOVIES -> CategoryRow(
+ title = stringResource(R.string.dashboard_top_rated_movies),
+ items = uiState.topRatedMovies,
+ keySelector = { it.id },
+ onSeeAll = { onNavigate(Routes.MOVIES) }
+ ) { movie ->
+ MovieCard(movie = movie, onClick = { onMovieClick(movie) })
+ }
+
+ AppHomeDashboardShelf.RECOMMENDED_MOVIES -> CategoryRow(
+ title = stringResource(R.string.dashboard_recommended_movies),
+ items = uiState.recommendedMovies,
+ keySelector = { it.id },
+ onSeeAll = { onNavigate(Routes.MOVIES) }
+ ) { movie ->
+ MovieCard(movie = movie, onClick = { onMovieClick(movie) })
+ }
}
}
}
@@ -254,6 +314,17 @@ fun DashboardScreen(
.padding(bottom = 16.dp)
)
}
+
+ if (showHomeCustomizationDialog) {
+ DashboardShelfCustomizationDialog(
+ currentShelves = uiState.homeDashboardShelves,
+ onDismiss = { showHomeCustomizationDialog = false },
+ onSave = { shelves ->
+ viewModel.setHomeDashboardShelves(shelves)
+ showHomeCustomizationDialog = false
+ }
+ )
+ }
}
@Composable
@@ -797,47 +868,26 @@ private fun EmptyDashboard(
@Composable
private fun rememberDashboardSections(
uiState: DashboardUiState
-): List<DashboardHomeSection> {
+): List<AppHomeDashboardShelf> {
return remember(
- uiState.feature.actionType,
+ uiState.homeDashboardShelves,
uiState.liveShortcuts,
uiState.favoriteChannels,
uiState.recentChannels,
uiState.continueWatching,
+ uiState.continueWatchingMovies,
+ uiState.continueWatchingSeriesItems,
+ uiState.favoriteMovies,
+ uiState.favoriteSeries,
uiState.recentMovies,
- uiState.recentSeries
+ uiState.recentSeries,
+ uiState.topRatedMovies,
+ uiState.recommendedMovies
) {
- val preferred = listOf(
- DashboardHomeSection.FAVORITE_CHANNELS,
- DashboardHomeSection.RECENT_CHANNELS,
- DashboardHomeSection.LIVE_SHORTCUTS,
- DashboardHomeSection.CONTINUE_WATCHING,
- DashboardHomeSection.RECENT_MOVIES,
- DashboardHomeSection.RECENT_SERIES
- )
-
- preferred.filter { section ->
- when (section) {
- DashboardHomeSection.LIVE_SHORTCUTS -> uiState.liveShortcuts.isNotEmpty()
- DashboardHomeSection.FAVORITE_CHANNELS -> uiState.favoriteChannels.isNotEmpty()
- DashboardHomeSection.RECENT_CHANNELS -> uiState.recentChannels.isNotEmpty()
- DashboardHomeSection.CONTINUE_WATCHING -> uiState.continueWatching.isNotEmpty()
- DashboardHomeSection.RECENT_MOVIES -> uiState.recentMovies.isNotEmpty()
- DashboardHomeSection.RECENT_SERIES -> uiState.recentSeries.isNotEmpty()
- }
- }
+ resolveVisibleDashboardShelves(uiState)
}
}
-private enum class DashboardHomeSection {
- LIVE_SHORTCUTS,
- FAVORITE_CHANNELS,
- RECENT_CHANNELS,
- CONTINUE_WATCHING,
- RECENT_MOVIES,
- RECENT_SERIES
-}
-
@Composable
private fun FavoriteChannelsRow(
title: String,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt
new file mode 100644
index 00000000..7c5aeeda
--- /dev/null
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt
@@ -0,0 +1,252 @@
+package com.streamvault.app.ui.screens.dashboard
+
+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.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.Border
+import androidx.tv.material3.ClickableSurfaceDefaults
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+import com.streamvault.app.R
+import com.streamvault.app.ui.components.dialogs.PremiumDialog
+import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.app.ui.design.FocusSpec
+import com.streamvault.app.ui.interaction.TvButton
+import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.app.ui.theme.OnSurface
+import com.streamvault.app.ui.theme.OnSurfaceDim
+import com.streamvault.app.ui.theme.Primary
+import com.streamvault.domain.model.AppHomeDashboardShelf
+
+@Composable
+internal fun DashboardShelfCustomizationDialog(
+ currentShelves: List<AppHomeDashboardShelf>,
+ onDismiss: () -> Unit,
+ onSave: (List<AppHomeDashboardShelf>) -> Unit
+) {
+ var draftShelves by remember(currentShelves) {
+ mutableStateOf(AppHomeDashboardShelf.normalizeForStorage(currentShelves))
+ }
+ val enabledShelves = remember(draftShelves) {
+ AppHomeDashboardShelf.normalizeForStorage(draftShelves)
+ }
+ val availableShelves = remember(enabledShelves) {
+ AppHomeDashboardShelf.catalogOrder.filterNot { it in enabledShelves }
+ }
+
+ PremiumDialog(
+ title = stringResource(R.string.settings_home_dashboard_dialog_title),
+ subtitle = stringResource(R.string.settings_home_dashboard_dialog_subtitle),
+ onDismissRequest = onDismiss,
+ widthFraction = 0.62f,
+ bodyHeightFraction = 0.72f,
+ content = {
+ DashboardShelfSectionTitle(stringResource(R.string.settings_home_dashboard_enabled_section))
+ if (enabledShelves.isEmpty()) {
+ Text(
+ text = stringResource(R.string.settings_home_dashboard_enabled_empty),
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim,
+ modifier = Modifier.padding(bottom = 10.dp)
+ )
+ }
+ enabledShelves.forEachIndexed { index, shelf ->
+ DashboardShelfCustomizationRow(
+ shelf = shelf,
+ isEnabled = true,
+ canMoveUp = index > 0,
+ canMoveDown = index < enabledShelves.lastIndex,
+ onPrimaryAction = {
+ draftShelves = enabledShelves.filterNot { it == shelf }
+ },
+ onMoveUp = {
+ draftShelves = enabledShelves.toMutableList().also { items ->
+ items[index] = items[index - 1]
+ items[index - 1] = shelf
+ }
+ },
+ onMoveDown = {
+ draftShelves = enabledShelves.toMutableList().also { items ->
+ items[index] = items[index + 1]
+ items[index + 1] = shelf
+ }
+ }
+ )
+ }
+
+ DashboardShelfSectionTitle(
+ text = stringResource(R.string.settings_home_dashboard_available_section),
+ modifier = Modifier.padding(top = 12.dp)
+ )
+ availableShelves.forEach { shelf ->
+ DashboardShelfCustomizationRow(
+ shelf = shelf,
+ isEnabled = false,
+ canMoveUp = false,
+ canMoveDown = false,
+ onPrimaryAction = {
+ draftShelves = enabledShelves + shelf
+ },
+ onMoveUp = {},
+ onMoveDown = {}
+ )
+ }
+ },
+ footer = {
+ PremiumDialogFooterButton(
+ label = stringResource(R.string.settings_cancel),
+ onClick = onDismiss
+ )
+ PremiumDialogFooterButton(
+ label = stringResource(R.string.settings_reset),
+ onClick = { draftShelves = AppHomeDashboardShelf.defaultOrder }
+ )
+ PremiumDialogFooterButton(
+ label = stringResource(R.string.action_save_order),
+ emphasized = true,
+ onClick = { onSave(enabledShelves) }
+ )
+ }
+ )
+}
+
+@Composable
+private fun DashboardShelfSectionTitle(
+ text: String,
+ modifier: Modifier = Modifier
+) {
+ Text(
+ text = text,
+ style = MaterialTheme.typography.titleSmall,
+ color = OnSurface,
+ modifier = modifier.padding(bottom = 8.dp)
+ )
+}
+
+@Composable
+private fun DashboardShelfCustomizationRow(
+ shelf: AppHomeDashboardShelf,
+ isEnabled: Boolean,
+ canMoveUp: Boolean,
+ canMoveDown: Boolean,
+ onPrimaryAction: () -> Unit,
+ onMoveUp: () -> Unit,
+ onMoveDown: () -> Unit
+) {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(bottom = 10.dp)
+ .background(Color.White.copy(alpha = 0.05f), RoundedCornerShape(16.dp))
+ .padding(horizontal = 14.dp, vertical = 12.dp)
+ ) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(
+ modifier = Modifier.weight(1f),
+ verticalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
+ Text(
+ text = stringResource(shelf.labelResId()),
+ style = MaterialTheme.typography.titleSmall,
+ color = OnSurface
+ )
+ Text(
+ text = stringResource(
+ if (isEnabled) R.string.settings_top_navigation_visible
+ else R.string.settings_top_navigation_hidden
+ ),
+ style = MaterialTheme.typography.bodySmall,
+ color = if (isEnabled) Primary else OnSurfaceDim
+ )
+ }
+ DashboardShelfActionChip(
+ label = stringResource(
+ if (isEnabled) R.string.settings_home_dashboard_remove
+ else R.string.settings_home_dashboard_add
+ ),
+ emphasized = isEnabled,
+ onClick = onPrimaryAction
+ )
+ if (isEnabled) {
+ Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+ TvButton(enabled = canMoveUp, onClick = onMoveUp) {
+ Text(stringResource(R.string.settings_top_navigation_move_up))
+ }
+ TvButton(enabled = canMoveDown, onClick = onMoveDown) {
+ Text(stringResource(R.string.settings_top_navigation_move_down))
+ }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun DashboardShelfActionChip(
+ label: String,
+ emphasized: Boolean,
+ onClick: () -> Unit
+) {
+ TvClickableSurface(
+ onClick = onClick,
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (emphasized) Primary.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.05f),
+ focusedContainerColor = if (emphasized) Primary.copy(alpha = 0.24f) else Color.White.copy(alpha = 0.1f),
+ contentColor = OnSurface,
+ focusedContentColor = OnSurface
+ ),
+ border = ClickableSurfaceDefaults.border(
+ border = Border(
+ border = BorderStroke(1.dp, Color.White.copy(alpha = 0.1f)),
+ shape = RoundedCornerShape(12.dp)
+ ),
+ focusedBorder = Border(
+ border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ shape = RoundedCornerShape(12.dp)
+ )
+ )
+ ) {
+ Text(
+ text = label,
+ style = MaterialTheme.typography.labelMedium,
+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp)
+ )
+ }
+}
+
+@Composable
+private fun AppHomeDashboardShelf.labelResId(): Int = when (this) {
+ AppHomeDashboardShelf.FAVORITE_CHANNELS -> R.string.dashboard_favorite_channels
+ AppHomeDashboardShelf.RECENT_CHANNELS -> R.string.dashboard_recent_channels
+ AppHomeDashboardShelf.LIVE_SHORTCUTS -> R.string.dashboard_live_shortcuts
+ AppHomeDashboardShelf.CONTINUE_WATCHING -> R.string.dashboard_continue_watching
+ AppHomeDashboardShelf.RECENT_MOVIES -> R.string.dashboard_recent_movies
+ AppHomeDashboardShelf.RECENT_SERIES -> R.string.dashboard_recent_series
+ AppHomeDashboardShelf.FAVORITE_MOVIES -> R.string.dashboard_favorite_movies
+ AppHomeDashboardShelf.FAVORITE_SERIES -> R.string.dashboard_favorite_series
+ AppHomeDashboardShelf.CONTINUE_WATCHING_MOVIES -> R.string.dashboard_continue_watching_movies
+ AppHomeDashboardShelf.CONTINUE_WATCHING_SERIES -> R.string.dashboard_continue_watching_series
+ AppHomeDashboardShelf.TOP_RATED_MOVIES -> R.string.dashboard_top_rated_movies
+ AppHomeDashboardShelf.RECOMMENDED_MOVIES -> R.string.dashboard_recommended_movies
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
index 75f95c2e..b5a5a7f1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
@@ -8,6 +8,7 @@ import com.streamvault.data.preferences.PreferencesRepository
import com.streamvault.data.sync.SyncManager
import com.streamvault.app.update.AppUpdateInstaller
import com.streamvault.domain.model.ActiveLiveSource
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.ContentType
@@ -171,6 +172,22 @@ class DashboardViewModel @Inject constructor(
.filter { !shouldHideVodFromHome(it, level) }
.take(MOVIE_SHELF_LIMIT)
}
+ val topRatedMovieShelf = combine(
+ movieRepository.getTopRatedPreview(provider.id, MOVIE_SHELF_LIMIT),
+ preferencesRepository.parentalControlLevel
+ ) { movies, level ->
+ movies
+ .filter { !shouldHideVodFromHome(it, level) }
+ .take(MOVIE_SHELF_LIMIT)
+ }
+ val recommendedMovieShelf = combine(
+ movieRepository.getRecommendations(provider.id, MOVIE_SHELF_LIMIT),
+ preferencesRepository.parentalControlLevel
+ ) { movies, level ->
+ movies
+ .filter { !shouldHideVodFromHome(it, level) }
+ .take(MOVIE_SHELF_LIMIT)
+ }
val seriesShelf = combine(
seriesRepository.getFreshPreview(provider.id, SERIES_SHELF_LIMIT),
preferencesRepository.parentalControlLevel
@@ -179,7 +196,7 @@ class DashboardViewModel @Inject constructor(
.filter { !shouldHideVodFromHome(it, level) }
.take(SERIES_SHELF_LIMIT)
}
- val contentShelves = combine(
+ val baseContentShelves = combine(
observeFavoriteChannels(liveProviderIds).onStart { emit(emptyList()) },
observeRecentChannels(liveProviderIds).onStart { emit(emptyList()) },
observeContinueWatching(liveProviderIds.toSet()).onStart { emit(ContinueWatchingShelf()) },
@@ -190,13 +207,37 @@ class DashboardViewModel @Inject constructor(
favoriteChannels = favoriteChannels,
recentChannels = recentChannels,
continueWatching = continueWatchingShelf.items,
+ continueWatchingSeries = continueWatchingShelf.series,
continueWatchingDegraded = continueWatchingShelf.isDegraded,
recentMovies = recentMovies,
recentSeries = recentSeries
)
}
+ val contentShelvesWithFavorites = combine(
+ baseContentShelves,
+ observeFavoriteMovies(liveProviderIds).onStart { emit(emptyList()) },
+ observeFavoriteSeries(liveProviderIds).onStart { emit(emptyList()) },
+ observeContinueWatchingByScope(liveProviderIds.toSet(), ContinueWatchingScope.MOVIES).onStart { emit(emptyList()) },
+ observeContinueWatchingByScope(liveProviderIds.toSet(), ContinueWatchingScope.SERIES).onStart { emit(emptyList()) }
+ ) { shelves, favoriteMovies, favoriteSeries, continueWatchingMovies, continueWatchingSeriesItems ->
+ shelves.copy(
+ favoriteMovies = favoriteMovies,
+ favoriteSeries = favoriteSeries,
+ continueWatchingMovies = continueWatchingMovies,
+ continueWatchingSeriesItems = continueWatchingSeriesItems
+ )
+ }
+ val contentShelves = contentShelvesWithFavorites
+ .combine(topRatedMovieShelf.onStart { emit(emptyList()) }) { shelves, topRatedMovies ->
+ shelves.copy(topRatedMovies = topRatedMovies)
+ }
+ .combine(recommendedMovieShelf.onStart { emit(emptyList()) }) { shelves, recommendedMovies ->
+ shelves.copy(
+ recommendedMovies = recommendedMovies
+ )
+ }
- return combine(
+ val baseSnapshot = combine(
contentShelves,
buildLiveContext(
providerIds = liveProviderIds,
@@ -214,20 +255,34 @@ class DashboardViewModel @Inject constructor(
liveChannelCount = liveChannelCount,
movieCount = movieCount,
seriesCount = seriesCount,
+ homeDashboardShelves = AppHomeDashboardShelf.defaultOrder,
updateNotice = null
)
+ }
+
+ return baseSnapshot.combine(
+ preferencesRepository.appHomeDashboardShelves.onStart { emit(AppHomeDashboardShelf.defaultOrder) }
+ ) { snapshot, homeDashboardShelves ->
+ snapshot.copy(homeDashboardShelves = homeDashboardShelves)
}.combine(observeUpdateNotice().onStart { emit(null) }) { snapshot, updateNotice ->
snapshot.copy(updateNotice = updateNotice)
}.combine(syncManager.syncStateForProvider(provider.id).onStart { emit(SyncState.Idle) }) { snapshot, syncState ->
DashboardUiState(
provider = provider,
+ homeDashboardShelves = snapshot.homeDashboardShelves,
favoriteChannels = snapshot.shelves.favoriteChannels,
recentChannels = snapshot.shelves.recentChannels,
continueWatching = snapshot.shelves.continueWatching,
continueWatchingSeries = snapshot.shelves.continueWatchingSeries,
+ continueWatchingMovies = snapshot.shelves.continueWatchingMovies,
+ continueWatchingSeriesItems = snapshot.shelves.continueWatchingSeriesItems,
continueWatchingDegraded = snapshot.shelves.continueWatchingDegraded,
+ favoriteMovies = snapshot.shelves.favoriteMovies,
+ favoriteSeries = snapshot.shelves.favoriteSeries,
recentMovies = snapshot.shelves.recentMovies,
recentSeries = snapshot.shelves.recentSeries,
+ topRatedMovies = snapshot.shelves.topRatedMovies,
+ recommendedMovies = snapshot.shelves.recommendedMovies,
lastLiveCategory = snapshot.liveContext.lastVisitedCategory,
liveShortcuts = snapshot.liveContext.shortcuts,
currentCombinedProfileId = combinedProfileId,
@@ -276,6 +331,38 @@ class DashboardViewModel @Inject constructor(
}
.flatMapLatest(::loadChannelsByOrderedIds)
+ private fun observeFavoriteMovies(providerIds: List<Long>): Flow<List<Movie>> =
+ observeFavorites(providerIds, ContentType.MOVIE)
+ .map { favorites ->
+ favorites
+ .filter { it.groupId == null }
+ .sortedBy { it.position }
+ .map { it.contentId }
+ .take(MOVIE_SHELF_LIMIT)
+ }
+ .flatMapLatest(::loadMoviesByOrderedIds)
+ .combine(preferencesRepository.parentalControlLevel) { movies, level ->
+ movies
+ .filter { !shouldHideVodFromHome(it, level) }
+ .take(MOVIE_SHELF_LIMIT)
+ }
+
+ private fun observeFavoriteSeries(providerIds: List<Long>): Flow<List<Series>> =
+ observeFavorites(providerIds, ContentType.SERIES)
+ .map { favorites ->
+ favorites
+ .filter { it.groupId == null }
+ .sortedBy { it.position }
+ .map { it.contentId }
+ .take(SERIES_SHELF_LIMIT)
+ }
+ .flatMapLatest(::loadSeriesByOrderedIds)
+ .combine(preferencesRepository.parentalControlLevel) { series, level ->
+ series
+ .filter { !shouldHideVodFromHome(it, level) }
+ .take(SERIES_SHELF_LIMIT)
+ }
+
private fun observeRecentChannels(providerIds: List<Long>): Flow<List<Channel>> =
combine(
preferencesRepository.showRecentChannelsCategory.flatMapLatest { show ->
@@ -321,6 +408,21 @@ class DashboardViewModel @Inject constructor(
}
}
+ private fun observeContinueWatchingByScope(
+ providerIds: Set<Long>,
+ scope: ContinueWatchingScope
+ ): Flow<List<PlaybackHistory>> =
+ getContinueWatching(
+ providerIds = providerIds,
+ limit = CONTINUE_WATCHING_LIMIT,
+ scope = scope
+ ).map { result ->
+ when (result) {
+ is ContinueWatchingResult.Items -> result.items
+ ContinueWatchingResult.Degraded -> emptyList()
+ }
+ }
+
private fun buildLiveContext(
providerIds: List<Long>,
lastVisitedProviderId: Long?
@@ -400,6 +502,12 @@ class DashboardViewModel @Inject constructor(
else -> favoriteRepository.getFavorites(providerIds, ContentType.LIVE)
}
+ private fun observeFavorites(providerIds: List<Long>, contentType: ContentType): Flow<List<Favorite>> = when (providerIds.size) {
+ 0 -> flowOf(emptyList())
+ 1 -> favoriteRepository.getFavorites(providerIds.first(), contentType)
+ else -> favoriteRepository.getFavorites(providerIds, contentType)
+ }
+
private fun observeRecentLiveIds(providerIds: List<Long>, limit: Int): Flow<List<Long>> = when (providerIds.size) {
0 -> flowOf(emptyList())
1 -> playbackHistoryRepository.getRecentlyWatchedByProvider(providerIds.first(), limit)
@@ -434,6 +542,34 @@ class DashboardViewModel @Inject constructor(
}
}
+ private fun loadMoviesByOrderedIds(ids: List<Long>): Flow<List<Movie>> {
+ if (ids.isEmpty()) return flowOf(emptyList())
+
+ return movieRepository.getMoviesByIds(ids).map { movies ->
+ movies.orderedByRequestedMovieIds(ids)
+ }
+ }
+
+ private fun loadSeriesByOrderedIds(ids: List<Long>): Flow<List<Series>> {
+ if (ids.isEmpty()) return flowOf(emptyList())
+
+ return seriesRepository.getSeriesByIds(ids).map { series ->
+ series.orderedByRequestedSeriesIds(ids)
+ }
+ }
+
+ private fun List<Movie>.orderedByRequestedMovieIds(requestedIds: List<Long>): List<Movie> {
+ if (requestedIds.isEmpty()) return emptyList()
+ val movieByRequestedId = buildMap<Long, Movie> {
+ [email protected] { movie ->
+ movie.rawMovieIdsForDashboard().forEach { rawMovieId ->
+ putIfAbsent(rawMovieId, movie)
+ }
+ }
+ }
+ return requestedIds.mapNotNull(movieByRequestedId::get).distinctBy { it.id }
+ }
+
private fun List<Series>.orderedByRequestedSeriesIds(requestedIds: List<Long>): List<Series> {
if (requestedIds.isEmpty()) return emptyList()
val seriesByRequestedId = buildMap<Long, Series> {
@@ -449,6 +585,9 @@ class DashboardViewModel @Inject constructor(
private fun Series.rawSeriesIdsForDashboard(): List<Long> =
variants.map { it.rawSeriesId }.ifEmpty { listOf(selectedVariantId ?: id) }
+ private fun Movie.rawMovieIdsForDashboard(): List<Long> =
+ variants.map { it.rawMovieId }.ifEmpty { listOf(id) }
+
private fun observeUpdateNotice(): Flow<DashboardUpdateNotice?> = combine(
preferencesRepository.cachedAppUpdateVersionName,
preferencesRepository.cachedAppUpdateVersionCode,
@@ -611,6 +750,20 @@ class DashboardViewModel @Inject constructor(
return 0
}
+ fun setHomeDashboardShelves(shelves: List<AppHomeDashboardShelf>) {
+ viewModelScope.launch {
+ preferencesRepository.setAppHomeDashboardShelves(
+ AppHomeDashboardShelf.normalizeForStorage(shelves)
+ )
+ }
+ }
+
+ fun resetHomeDashboardShelves() {
+ viewModelScope.launch {
+ preferencesRepository.setAppHomeDashboardShelves(AppHomeDashboardShelf.defaultOrder)
+ }
+ }
+
fun installDownloadedUpdate() {
viewModelScope.launch {
when (val result = appUpdateInstaller.installDownloadedUpdate()) {
@@ -648,9 +801,15 @@ private data class DashboardContentShelves(
val recentChannels: List<Channel>,
val continueWatching: List<PlaybackHistory>,
val continueWatchingSeries: List<Series> = emptyList(),
+ val continueWatchingMovies: List<PlaybackHistory> = emptyList(),
+ val continueWatchingSeriesItems: List<PlaybackHistory> = emptyList(),
val continueWatchingDegraded: Boolean = false,
+ val favoriteMovies: List<Movie> = emptyList(),
+ val favoriteSeries: List<Series> = emptyList(),
val recentMovies: List<Movie>,
- val recentSeries: List<Series>
+ val recentSeries: List<Series>,
+ val topRatedMovies: List<Movie> = emptyList(),
+ val recommendedMovies: List<Movie> = emptyList()
)
private data class DashboardSnapshot(
@@ -659,18 +818,26 @@ private data class DashboardSnapshot(
val liveChannelCount: Int,
val movieCount: Int,
val seriesCount: Int,
+ val homeDashboardShelves: List<AppHomeDashboardShelf>,
val updateNotice: DashboardUpdateNotice?
)
data class DashboardUiState(
val provider: Provider? = null,
+ val homeDashboardShelves: List<AppHomeDashboardShelf> = AppHomeDashboardShelf.defaultOrder,
val favoriteChannels: List<Channel> = emptyList(),
val recentChannels: List<Channel> = emptyList(),
val continueWatching: List<PlaybackHistory> = emptyList(),
val continueWatchingSeries: List<Series> = emptyList(),
+ val continueWatchingMovies: List<PlaybackHistory> = emptyList(),
+ val continueWatchingSeriesItems: List<PlaybackHistory> = emptyList(),
val continueWatchingDegraded: Boolean = false,
+ val favoriteMovies: List<Movie> = emptyList(),
+ val favoriteSeries: List<Series> = emptyList(),
val recentMovies: List<Movie> = emptyList(),
val recentSeries: List<Series> = emptyList(),
+ val topRatedMovies: List<Movie> = emptyList(),
+ val recommendedMovies: List<Movie> = emptyList(),
val lastLiveCategory: Category? = null,
val liveShortcuts: List<DashboardLiveShortcut> = emptyList(),
val feature: DashboardFeature = DashboardFeature(),
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
index 3e8e73be..aac4db24 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
@@ -51,6 +51,7 @@ internal fun LazyListScope.settingsBrowsingSection(
context: android.content.Context,
appLandingDestinationLabel: String,
topNavigationSummaryLabel: String,
+ homeDashboardSummaryLabel: String,
guideDefaultCategoryLabel: String,
timeFormatLabel: String,
appLanguageLabel: String,
@@ -62,6 +63,7 @@ internal fun LazyListScope.settingsBrowsingSection(
onShowGroupedChannelLabelDialogChange: (Boolean) -> Unit,
onShowLiveVariantPreferenceDialogChange: (Boolean) -> Unit,
onShowTopNavigationDialogChange: (Boolean) -> Unit,
+ onShowHomeDashboardDialogChange: (Boolean) -> Unit,
onShowLandingScreenDialogChange: (Boolean) -> Unit,
onShowGuideDefaultCategoryDialogChange: (Boolean) -> Unit,
onShowTimeFormatDialogChange: (Boolean) -> Unit,
@@ -83,6 +85,11 @@ internal fun LazyListScope.settingsBrowsingSection(
value = topNavigationSummaryLabel,
onClick = { onShowTopNavigationDialogChange(true) }
)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_customize_home),
+ value = homeDashboardSummaryLabel,
+ onClick = { onShowHomeDashboardDialogChange(true) }
+ )
ClickableSettingsRow(
label = stringResource(R.string.settings_default_landing_screen),
value = appLandingDestinationLabel,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsContentPane.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsContentPane.kt
index 95a045fe..0fe2ad11 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsContentPane.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsContentPane.kt
@@ -108,6 +108,7 @@ internal fun SettingsContentPane(
context = context,
appLandingDestinationLabel = screenLabels.appLandingDestinationLabel,
topNavigationSummaryLabel = screenLabels.topNavigationSummaryLabel,
+ homeDashboardSummaryLabel = screenLabels.homeDashboardSummaryLabel,
guideDefaultCategoryLabel = screenLabels.guideDefaultCategoryLabel,
timeFormatLabel = screenLabels.timeFormatLabel,
appLanguageLabel = screenLabels.appLanguageLabel,
@@ -119,6 +120,7 @@ internal fun SettingsContentPane(
onShowGroupedChannelLabelDialogChange = { dialogState.showGroupedChannelLabelDialog = it },
onShowLiveVariantPreferenceDialogChange = { dialogState.showLiveVariantPreferenceDialog = it },
onShowTopNavigationDialogChange = { dialogState.showTopNavigationDialog = it },
+ onShowHomeDashboardDialogChange = { dialogState.showHomeDashboardDialog = it },
onShowLandingScreenDialogChange = { dialogState.showLandingScreenDialog = it },
onShowGuideDefaultCategoryDialogChange = { dialogState.showGuideDefaultCategoryDialog = it },
onShowTimeFormatDialogChange = { dialogState.showTimeFormatDialog = it },
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceDialogs.kt
index e93441d3..aefe0c0c 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceDialogs.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource
import com.streamvault.app.R
+import com.streamvault.app.ui.screens.dashboard.DashboardShelfCustomizationDialog
import com.streamvault.domain.model.AppTimeFormat
import com.streamvault.domain.model.AppLandingDestination
import com.streamvault.domain.model.AppTopLevelDestination
@@ -21,6 +22,8 @@ internal fun SettingsPreferenceDialogs(
context: Context,
showTopNavigationDialog: Boolean,
onShowTopNavigationDialogChange: (Boolean) -> Unit,
+ showHomeDashboardDialog: Boolean,
+ onShowHomeDashboardDialogChange: (Boolean) -> Unit,
showLandingScreenDialog: Boolean,
onShowLandingScreenDialogChange: (Boolean) -> Unit,
showGuideDefaultCategoryDialog: Boolean,
@@ -119,6 +122,17 @@ internal fun SettingsPreferenceDialogs(
)
}
+ if (showHomeDashboardDialog) {
+ DashboardShelfCustomizationDialog(
+ currentShelves = uiState.appHomeDashboardShelves,
+ onDismiss = { onShowHomeDashboardDialogChange(false) },
+ onSave = { shelves ->
+ viewModel.setAppHomeDashboardShelves(shelves)
+ onShowHomeDashboardDialogChange(false)
+ }
+ )
+ }
+
if (showLandingScreenDialog) {
val availableLandingDestinations = remember(uiState.appTopLevelDestinations) {
AppTopLevelDestination.availableLandingDestinations(uiState.appTopLevelDestinations)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
index 94d85fb5..24c4ebb0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
@@ -6,6 +6,7 @@ import com.streamvault.app.ui.model.LiveTvChannelMode
import com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityMode
import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.domain.model.AppTimeFormat
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.AppLandingDestination
import com.streamvault.domain.model.AppTopLevelDestination
import com.streamvault.domain.model.AudioOutputPreference
@@ -46,6 +47,7 @@ internal data class SettingsPreferenceSnapshot(
val appLanguage: String,
val appLandingDestination: AppLandingDestination,
val appTopLevelDestinations: List<AppTopLevelDestination>,
+ val appHomeDashboardShelves: List<AppHomeDashboardShelf>,
val appTimeFormat: AppTimeFormat,
val preferredAudioLanguage: String,
val playerMediaSessionEnabled: Boolean,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
index 330d03cb..6ab1b1fb 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
@@ -10,6 +10,7 @@ internal fun SettingsUiState.applyPreferenceSnapshot(snapshot: SettingsPreferenc
appLanguage = snapshot.appLanguage,
appLandingDestination = snapshot.appLandingDestination,
appTopLevelDestinations = snapshot.appTopLevelDestinations,
+ appHomeDashboardShelves = snapshot.appHomeDashboardShelves,
appTimeFormat = snapshot.appTimeFormat,
preferredAudioLanguage = snapshot.preferredAudioLanguage,
playerMediaSessionEnabled = snapshot.playerMediaSessionEnabled,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogState.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogState.kt
index 6889ca1e..b4c40b66 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogState.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogState.kt
@@ -20,6 +20,7 @@ internal class SettingsScreenDialogState(
private val showGroupedChannelLabelDialogState: MutableState<Boolean>,
private val showLiveVariantPreferenceDialogState: MutableState<Boolean>,
private val showTopNavigationDialogState: MutableState<Boolean>,
+ private val showHomeDashboardDialogState: MutableState<Boolean>,
private val showLandingScreenDialogState: MutableState<Boolean>,
private val showVodViewModeDialogState: MutableState<Boolean>,
private val showVodDuplicateHandlingDialogState: MutableState<Boolean>,
@@ -80,6 +81,7 @@ internal class SettingsScreenDialogState(
var showGroupedChannelLabelDialog by showGroupedChannelLabelDialogState
var showLiveVariantPreferenceDialog by showLiveVariantPreferenceDialogState
var showTopNavigationDialog by showTopNavigationDialogState
+ var showHomeDashboardDialog by showHomeDashboardDialogState
var showLandingScreenDialog by showLandingScreenDialogState
var showVodViewModeDialog by showVodViewModeDialogState
var showVodDuplicateHandlingDialog by showVodDuplicateHandlingDialogState
@@ -208,6 +210,7 @@ internal fun rememberSettingsScreenDialogState(): SettingsScreenDialogState {
val showGroupedChannelLabelDialogState = rememberSaveable { mutableStateOf(false) }
val showLiveVariantPreferenceDialogState = rememberSaveable { mutableStateOf(false) }
val showTopNavigationDialogState = rememberSaveable { mutableStateOf(false) }
+ val showHomeDashboardDialogState = rememberSaveable { mutableStateOf(false) }
val showLandingScreenDialogState = rememberSaveable { mutableStateOf(false) }
val showVodViewModeDialogState = rememberSaveable { mutableStateOf(false) }
val showVodDuplicateHandlingDialogState = rememberSaveable { mutableStateOf(false) }
@@ -277,6 +280,7 @@ internal fun rememberSettingsScreenDialogState(): SettingsScreenDialogState {
showGroupedChannelLabelDialogState = showGroupedChannelLabelDialogState,
showLiveVariantPreferenceDialogState = showLiveVariantPreferenceDialogState,
showTopNavigationDialogState = showTopNavigationDialogState,
+ showHomeDashboardDialogState = showHomeDashboardDialogState,
showLandingScreenDialogState = showLandingScreenDialogState,
showVodViewModeDialogState = showVodViewModeDialogState,
showVodDuplicateHandlingDialogState = showVodDuplicateHandlingDialogState,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
index 81f5c27c..e50def94 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
@@ -174,6 +174,8 @@ internal fun SettingsScreenDialogs(
context = context,
showTopNavigationDialog = dialogState.showTopNavigationDialog,
onShowTopNavigationDialogChange = { dialogState.showTopNavigationDialog = it },
+ showHomeDashboardDialog = dialogState.showHomeDashboardDialog,
+ onShowHomeDashboardDialogChange = { dialogState.showHomeDashboardDialog = it },
showLandingScreenDialog = dialogState.showLandingScreenDialog,
onShowLandingScreenDialogChange = { dialogState.showLandingScreenDialog = it },
showGuideDefaultCategoryDialog = dialogState.showGuideDefaultCategoryDialog,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenState.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenState.kt
index bf2afeda..c02e663b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenState.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenState.kt
@@ -8,6 +8,7 @@ import com.streamvault.app.MainActivity
import com.streamvault.app.R
import com.streamvault.app.ui.time.createDateTimeFormat
import com.streamvault.app.util.OfficialBuildStatus
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.AppLandingDestination
import com.streamvault.domain.model.AppTopLevelDestination
import com.streamvault.domain.model.AppTimeFormat
@@ -20,6 +21,7 @@ internal data class SettingsScreenLabels(
val appLanguageLabel: String,
val appLandingDestinationLabel: String,
val topNavigationSummaryLabel: String,
+ val homeDashboardSummaryLabel: String,
val timeFormatLabel: String,
val preferredAudioLanguageLabel: String,
val playbackSpeedLabel: String,
@@ -66,6 +68,9 @@ internal fun rememberSettingsScreenLabels(
val topNavigationSummaryLabel = remember(uiState.appTopLevelDestinations, context) {
formatTopNavigationSummaryLabel(uiState.appTopLevelDestinations, context)
}
+ val homeDashboardSummaryLabel = remember(uiState.appHomeDashboardShelves, context) {
+ formatHomeDashboardSummaryLabel(uiState.appHomeDashboardShelves, context)
+ }
val timeFormatLabel = remember(uiState.appTimeFormat, context) {
formatAppTimeFormatLabel(uiState.appTimeFormat, context)
}
@@ -169,6 +174,7 @@ internal fun rememberSettingsScreenLabels(
appLanguageLabel = appLanguageLabel,
appLandingDestinationLabel = appLandingDestinationLabel,
topNavigationSummaryLabel = topNavigationSummaryLabel,
+ homeDashboardSummaryLabel = homeDashboardSummaryLabel,
timeFormatLabel = timeFormatLabel,
preferredAudioLanguageLabel = preferredAudioLanguageLabel,
playbackSpeedLabel = playbackSpeedLabel,
@@ -232,6 +238,15 @@ private fun formatTopNavigationSummaryLabel(
destinations.size
)
+private fun formatHomeDashboardSummaryLabel(
+ shelves: List<AppHomeDashboardShelf>,
+ context: Context
+): String = context.resources.getQuantityString(
+ R.plurals.settings_home_dashboard_count,
+ shelves.size,
+ shelves.size
+)
+
private fun formatOfficialBuildStatusLabel(
status: OfficialBuildStatus,
context: Context
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
index 13f4129b..e39c49cc 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
@@ -5,6 +5,7 @@ package com.streamvault.app.ui.screens.settings
import com.streamvault.app.ui.model.LiveTvChannelMode
import com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityMode
import com.streamvault.app.ui.model.VodViewMode
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.AppLandingDestination
import com.streamvault.domain.model.AppTopLevelDestination
import com.streamvault.data.preferences.PreferencesRepository
@@ -44,6 +45,7 @@ internal fun observeSettingsPreferenceSnapshot(
appLanguage = "system",
appLandingDestination = AppLandingDestination.HOME,
appTopLevelDestinations = AppTopLevelDestination.defaultOrder,
+ appHomeDashboardShelves = AppHomeDashboardShelf.defaultOrder,
appTimeFormat = AppTimeFormat.SYSTEM,
preferredAudioLanguage = "auto",
playerMediaSessionEnabled = true,
@@ -116,6 +118,8 @@ internal fun observeSettingsPreferenceSnapshot(
snapshot.copy(appLandingDestination = destination)
}.combine(preferencesRepository.appTopLevelDestinations) { snapshot, destinations ->
snapshot.copy(appTopLevelDestinations = destinations)
+ }.combine(preferencesRepository.appHomeDashboardShelves) { snapshot, shelves ->
+ snapshot.copy(appHomeDashboardShelves = shelves)
}.combine(preferencesRepository.appTimeFormat) { snapshot, timeFormat ->
snapshot.copy(appTimeFormat = timeFormat)
}.combine(preferencesRepository.preferredAudioLanguage) { snapshot, preferredAudioLanguage ->
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
index 737cd7d6..70b339b3 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
@@ -10,6 +10,7 @@ import com.streamvault.domain.manager.DriveSignInRequest
import com.streamvault.domain.manager.DriveSyncStatus
import com.streamvault.domain.manager.ProviderCredentials
import com.streamvault.domain.model.ActiveLiveSource
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.AppLandingDestination
import com.streamvault.domain.model.AppTopLevelDestination
import com.streamvault.domain.model.AppTimeFormat
@@ -65,6 +66,7 @@ data class SettingsUiState(
val appLanguage: String = "system",
val appLandingDestination: AppLandingDestination = AppLandingDestination.HOME,
val appTopLevelDestinations: List<AppTopLevelDestination> = AppTopLevelDestination.defaultOrder,
+ val appHomeDashboardShelves: List<AppHomeDashboardShelf> = AppHomeDashboardShelf.defaultOrder,
val appTimeFormat: AppTimeFormat = AppTimeFormat.SYSTEM,
val preferredAudioLanguage: String = "auto",
val playerMediaSessionEnabled: Boolean = true,
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 40fb3405..5b5d3b66 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
@@ -34,6 +34,7 @@ import com.streamvault.domain.manager.DriveBackupSyncManager
import com.streamvault.domain.manager.ParentalControlManager
import com.streamvault.domain.manager.RecordingManager
import com.streamvault.domain.model.Category
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.AppLandingDestination
import com.streamvault.domain.model.AppTimeFormat
import com.streamvault.domain.model.AppTopLevelDestination
@@ -468,6 +469,20 @@ class SettingsViewModel @Inject constructor(
}
}
+ fun setAppHomeDashboardShelves(shelves: List<AppHomeDashboardShelf>) {
+ viewModelScope.launch {
+ preferencesRepository.setAppHomeDashboardShelves(
+ AppHomeDashboardShelf.normalizeForStorage(shelves)
+ )
+ }
+ }
+
+ fun resetAppHomeDashboardShelves() {
+ viewModelScope.launch {
+ preferencesRepository.setAppHomeDashboardShelves(AppHomeDashboardShelf.defaultOrder)
+ }
+ }
+
fun setLiveTvChannelMode(mode: LiveTvChannelMode) {
viewModelScope.launch {
preferencesRepository.setLiveTvChannelMode(mode.name)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f88d2aa0..ff38d98c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,11 +107,18 @@
<string name="dashboard_subtitle">%1$s is active. Jump back into live, catch up on progress, or browse fresh additions.</string>
<string name="dashboard_favorite_channels">Favorite Channels</string>
<string name="dashboard_recent_channels">Recent Channels</string>
+ <string name="dashboard_favorite_movies">Favorite Movies</string>
+ <string name="dashboard_favorite_series">Favorite Series</string>
<string name="dashboard_recent_movies">Recently Added Movies</string>
<string name="dashboard_recent_series">Recently Updated Series</string>
+ <string name="dashboard_top_rated_movies">Top Rated Movies</string>
+ <string name="dashboard_recommended_movies">Recommended Movies</string>
<string name="dashboard_search_library">Search Library</string>
<string name="dashboard_live_shortcuts">Live Shortcuts</string>
<string name="dashboard_live_shortcuts_subtitle">Favorites, recent channels, and last group.</string>
+ <string name="dashboard_customize_home">Customize Home</string>
+ <string name="dashboard_customize_home_subtitle">Choose which shelves appear here, add more rows, and reorder them any time.</string>
+ <string name="dashboard_customize_home_action">Customize</string>
<string name="dashboard_provider_health_title">Provider Health</string>
<string name="dashboard_provider_status">Status</string>
<string name="dashboard_provider_source">Source</string>
@@ -372,12 +379,24 @@
<string name="settings_top_navigation_move_up">Up</string>
<string name="settings_top_navigation_move_down">Down</string>
<string name="settings_top_navigation_default_updated">Default landing screen changed to %1$s because the previous tab is no longer visible.</string>
+ <string name="settings_customize_home">Customize Home</string>
+ <string name="settings_home_dashboard_dialog_title">Customize Home</string>
+ <string name="settings_home_dashboard_dialog_subtitle">Choose which shelves appear on Home and arrange them in the order you want. Empty shelves stay hidden until they have content.</string>
+ <string name="settings_home_dashboard_enabled_section">Visible on Home</string>
+ <string name="settings_home_dashboard_available_section">Available to add</string>
+ <string name="settings_home_dashboard_enabled_empty">Home is currently empty. Add shelves below to build your layout.</string>
+ <string name="settings_home_dashboard_add">Add</string>
+ <string name="settings_home_dashboard_remove">Remove</string>
<string name="settings_default_landing_screen">Default landing screen</string>
<string name="settings_select_default_landing_screen">Select default landing screen</string>
<plurals name="settings_top_navigation_count">
<item quantity="one">%d tab</item>
<item quantity="other">%d tabs</item>
</plurals>
+ <plurals name="settings_home_dashboard_count">
+ <item quantity="one">%d shelf</item>
+ <item quantity="other">%d shelves</item>
+ </plurals>
<string name="settings_live_tv_quick_filters">Live TV Quick Filters</string>
<string name="settings_live_tv_quick_filters_none">None</string>
<plurals name="settings_live_tv_quick_filters_count">
@@ -1558,6 +1577,8 @@
<string name="dashboard_resume_episode">Resume episode</string>
<string name="dashboard_resume_live">Resume</string>
<string name="dashboard_continue_watching">Continue Watching</string>
+ <string name="dashboard_continue_watching_movies">Continue Watching Movies</string>
+ <string name="dashboard_continue_watching_series">Continue Watching Series</string>
<string name="dashboard_jump_back_live">Jump back into live TV</string>
<string name="dashboard_watch_live">Watch Live</string>
<string name="dashboard_fresh_movie_pick">Fresh movie pick</string>
diff --git a/app/src/test/java/com/streamvault/app/ui/screens/dashboard/DashboardHomeShelvesTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/dashboard/DashboardHomeShelvesTest.kt
new file mode 100644
index 00000000..29c0d231
--- /dev/null
+++ b/app/src/test/java/com/streamvault/app/ui/screens/dashboard/DashboardHomeShelvesTest.kt
@@ -0,0 +1,50 @@
+package com.streamvault.app.ui.screens.dashboard
+
+import com.google.common.truth.Truth.assertThat
+import com.streamvault.domain.model.AppHomeDashboardShelf
+import com.streamvault.domain.model.Channel
+import com.streamvault.domain.model.Movie
+import org.junit.Test
+
+class DashboardHomeShelvesTest {
+
+ @Test
+ fun `resolveVisibleDashboardShelves keeps enabled order and filters empty shelves`() {
+ val uiState = DashboardUiState(
+ homeDashboardShelves = listOf(
+ AppHomeDashboardShelf.RECOMMENDED_MOVIES,
+ AppHomeDashboardShelf.FAVORITE_CHANNELS,
+ AppHomeDashboardShelf.RECENT_MOVIES
+ ),
+ favoriteChannels = listOf(Channel(id = 1L, name = "News")),
+ recentMovies = listOf(Movie(id = 2L, name = "Fresh")),
+ recommendedMovies = emptyList()
+ )
+
+ val visibleShelves = resolveVisibleDashboardShelves(uiState)
+
+ assertThat(visibleShelves).containsExactly(
+ AppHomeDashboardShelf.FAVORITE_CHANNELS,
+ AppHomeDashboardShelf.RECENT_MOVIES
+ ).inOrder()
+ }
+
+ @Test
+ fun `resolveVisibleDashboardShelves supports optional shelves when they have content`() {
+ val uiState = DashboardUiState(
+ homeDashboardShelves = listOf(
+ AppHomeDashboardShelf.TOP_RATED_MOVIES,
+ AppHomeDashboardShelf.FAVORITE_MOVIES
+ ),
+ topRatedMovies = listOf(Movie(id = 10L, name = "Top Pick")),
+ favoriteMovies = listOf(Movie(id = 11L, name = "Saved Pick"))
+ )
+
+ val visibleShelves = resolveVisibleDashboardShelves(uiState)
+
+ assertThat(visibleShelves).containsExactly(
+ AppHomeDashboardShelf.TOP_RATED_MOVIES,
+ AppHomeDashboardShelf.FAVORITE_MOVIES
+ ).inOrder()
+ }
+}
diff --git a/data/src/androidTest/java/com/streamvault/data/local/StreamVaultDatabaseMigrationTest.kt b/data/src/androidTest/java/com/streamvault/data/local/StreamVaultDatabaseMigrationTest.kt
index 894b60c0..24f18635 100644
--- a/data/src/androidTest/java/com/streamvault/data/local/StreamVaultDatabaseMigrationTest.kt
+++ b/data/src/androidTest/java/com/streamvault/data/local/StreamVaultDatabaseMigrationTest.kt
@@ -1193,10 +1193,10 @@ class StreamVaultDatabaseMigrationTest {
@Test
fun migrate57To61_upgradeChainValidatesLatestSchema() {
- migrationTestHelper.createDatabase("streamvault-57-60-test", 57).close()
+ migrationTestHelper.createDatabase("streamvault-57-61-test", 57).close()
val migratedDb = migrationTestHelper.runMigrationsAndValidate(
- "streamvault-57-60-test",
+ "streamvault-57-61-test",
61,
true,
StreamVaultDatabase.MIGRATION_57_58,
@@ -1215,6 +1215,62 @@ class StreamVaultDatabaseMigrationTest {
migratedDb.close()
}
+ @Test
+ fun migrate60To61_release114To115UpgradePreservesProviders() {
+ migrationTestHelper.createDatabase("streamvault-release-114-115-test", 60).apply {
+ execSQL(
+ """
+ INSERT INTO providers (
+ id, name, type, server_url, username, password, m3u_url, epg_url,
+ http_user_agent, http_headers, stalker_mac_address, stalker_device_profile,
+ stalker_device_timezone, stalker_device_locale, stalker_serial_number,
+ stalker_device_id, stalker_device_id2, stalker_signature, stalker_auth_mode,
+ stalker_portal_profile, stalker_portal_fingerprint, stalker_mag_preset,
+ stalker_last_bootstrap_recipe, stalker_endpoint_preference, stalker_cookie_mode,
+ stalker_playback_backend_hint, stalker_last_playback_mode,
+ stalker_credentials_required, stalker_mac_required, stalker_uses_temp_links,
+ stalker_module_restricted, stalker_strict_fingerprint_required,
+ stalker_recipe_fallback_used, stalker_recipe_rediscovery_attempts,
+ is_active, max_connections, expiration_date, api_version,
+ allowed_output_formats_json, epg_sync_mode, xtream_fast_sync_enabled,
+ xtream_live_sync_mode, m3u_vod_classification_enabled, status,
+ last_synced_at, created_at
+ ) VALUES (
+ 1, 'Release 1.0.14 Provider', 'STALKER_PORTAL', 'https://portal.example.com', '', '', '', '',
+ 'MAG200 stbapp', '{\"X-Test\":\"1\"}', '00:1A:79:12:34:56', 'MAG250',
+ 'UTC', 'en', 'serial-1', 'device-1', 'device-2', 'signature-1', 'AUTO',
+ 'MAG_BASIC', 'BASIC_MAC', 'GENERIC_SAFE', 'GENERIC_SAFE', 'AUTO', 'NONE',
+ 'AUTO', NULL, 0, 1, 0,
+ 0, 0, 0, 0,
+ 1, 1, NULL, 'legacy-api',
+ '[]', 'UPFRONT', 1,
+ 'AUTO', 0, 'ACTIVE',
+ 1234, 5678
+ )
+ """.trimIndent()
+ )
+ close()
+ }
+
+ val migratedDb = migrationTestHelper.runMigrationsAndValidate(
+ "streamvault-release-114-115-test",
+ 61,
+ true,
+ StreamVaultDatabase.MIGRATION_60_61
+ )
+
+ assertEquals(1, countRows(migratedDb, "SELECT COUNT(*) FROM pragma_table_info('providers') WHERE name = 'stalker_advanced_options_json'"))
+ assertEquals(
+ 1,
+ countRows(
+ migratedDb,
+ "SELECT COUNT(*) FROM providers WHERE id = 1 AND name = 'Release 1.0.14 Provider' AND stalker_advanced_options_json = ''"
+ )
+ )
+
+ migratedDb.close()
+ }
+
@Test
fun migrate60To61_addsStalkerAdvancedOptionsJson() {
migrationTestHelper.createDatabase("streamvault-60-61-test", 60).close()
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 3fbffd1e..d46d88fa 100644
--- a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
+++ b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
@@ -33,6 +33,7 @@ import com.streamvault.domain.manager.ProtectedCategoryBackup
import com.streamvault.domain.manager.RecordingManager
import com.streamvault.domain.manager.ScheduledRecordingBackup
import com.streamvault.domain.model.AppTopLevelDestination
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.RecordingRecurrence
import com.streamvault.domain.model.RecordingRequest
@@ -90,6 +91,10 @@ class BackupManagerImpl @Inject constructor(
"appTopLevelDestinations",
preferencesRepository.appTopLevelDestinations.first().joinToString(",") { it.storageValue }
)
+ put(
+ "appHomeDashboardShelves",
+ preferencesRepository.appHomeDashboardShelves.first().joinToString(",") { it.storageValue }
+ )
put("liveTvCategoryFilters", preferencesRepository.liveTvCategoryFilters.first().joinToString("\n"))
put("liveTvQuickFilterVisibility", preferencesRepository.liveTvQuickFilterVisibility.first() ?: "always")
put("playerMediaSessionEnabled", preferencesRepository.playerMediaSessionEnabled.first().toString())
@@ -573,6 +578,13 @@ class BackupManagerImpl @Inject constructor(
preferencesRepository.setAppTopLevelDestinations(destinations)
}
}
+ if (prefs.containsKey("appHomeDashboardShelves")) {
+ val shelves = prefs["appHomeDashboardShelves"]
+ .orEmpty()
+ .split(',')
+ .mapNotNull { token -> AppHomeDashboardShelf.fromStorage(token.trim()) }
+ preferencesRepository.setAppHomeDashboardShelves(shelves)
+ }
prefs["liveTvCategoryFilters"]?.let { preferencesRepository.setLiveTvCategoryFilters(it.split('\n')) }
prefs["liveTvQuickFilterVisibility"]?.takeIf { it.isNotBlank() }
?.let { preferencesRepository.setLiveTvQuickFilterVisibility(it) }
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 1a22f367..8cfba160 100644
--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
@@ -23,6 +23,7 @@ import com.streamvault.domain.model.CategorySortMode
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.DecoderMode
import com.streamvault.domain.model.ActiveLiveSource
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.AppLandingDestination
import com.streamvault.domain.model.AppTimeFormat
import com.streamvault.domain.model.LiveChannelGroupingMode
@@ -101,6 +102,7 @@ class PreferencesRepository @Inject constructor(
val APP_LANGUAGE = stringPreferencesKey("app_language")
val APP_LANDING_DESTINATION = stringPreferencesKey("app_landing_destination")
val APP_TOP_LEVEL_DESTINATIONS = stringPreferencesKey("app_top_level_destinations")
+ 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 SHOW_LIVE_SOURCE_SWITCHER = booleanPreferencesKey("show_live_source_switcher")
@@ -1260,6 +1262,10 @@ class PreferencesRepository @Inject constructor(
decodeAppTopLevelDestinations(preferences[PreferencesKeys.APP_TOP_LEVEL_DESTINATIONS])
}
+ val appHomeDashboardShelves: Flow<List<AppHomeDashboardShelf>> = context.dataStore.data.map { preferences ->
+ decodeAppHomeDashboardShelves(preferences[PreferencesKeys.APP_HOME_DASHBOARD_SHELVES])
+ }
+
suspend fun setAppLandingDestination(destination: AppLandingDestination) {
context.dataStore.edit { preferences ->
preferences[PreferencesKeys.APP_LANDING_DESTINATION] = destination.storageValue
@@ -1273,6 +1279,13 @@ class PreferencesRepository @Inject constructor(
}
}
+ suspend fun setAppHomeDashboardShelves(shelves: List<AppHomeDashboardShelf>) {
+ val normalized = AppHomeDashboardShelf.normalizeForStorage(shelves)
+ context.dataStore.edit { preferences ->
+ preferences[PreferencesKeys.APP_HOME_DASHBOARD_SHELVES] = encodeAppHomeDashboardShelves(normalized)
+ }
+ }
+
val appTimeFormat: Flow<AppTimeFormat> = context.dataStore.data.map { preferences ->
AppTimeFormat.fromStorage(preferences[PreferencesKeys.APP_TIME_FORMAT])
}
@@ -1961,6 +1974,29 @@ class PreferencesRepository @Inject constructor(
}
}
+ private fun encodeAppHomeDashboardShelves(shelves: List<AppHomeDashboardShelf>): String =
+ AppHomeDashboardShelf.normalizeForStorage(shelves)
+ .joinToString(",") { it.storageValue }
+
+ private fun decodeAppHomeDashboardShelves(encoded: String?): List<AppHomeDashboardShelf> {
+ if (encoded == null) {
+ return AppHomeDashboardShelf.defaultOrder
+ }
+ if (encoded.isBlank()) {
+ return emptyList()
+ }
+ val decoded = encoded
+ .split(',')
+ .asSequence()
+ .mapNotNull { token -> AppHomeDashboardShelf.fromStorage(token.trim()) }
+ .toList()
+ return if (decoded.isEmpty()) {
+ AppHomeDashboardShelf.defaultOrder
+ } else {
+ AppHomeDashboardShelf.normalizeForStorage(decoded)
+ }
+ }
+
private fun decodeLiveVariantSelections(encoded: String?): Map<String, Long> =
encoded
.orEmpty()
diff --git a/data/src/test/java/com/streamvault/data/manager/BackupManagerImplTest.kt b/data/src/test/java/com/streamvault/data/manager/BackupManagerImplTest.kt
index c8f024ee..b439e213 100644
--- a/data/src/test/java/com/streamvault/data/manager/BackupManagerImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/manager/BackupManagerImplTest.kt
@@ -23,6 +23,7 @@ import com.streamvault.domain.manager.BackupImportPlan
import com.streamvault.domain.manager.RecordingManager
import com.streamvault.domain.manager.RecordingScheduleImportDisposition
import com.streamvault.domain.manager.ScheduledRecordingBackup
+import com.streamvault.domain.model.AppHomeDashboardShelf
import com.streamvault.domain.model.AppTopLevelDestination
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.Favorite
@@ -499,6 +500,66 @@ class BackupManagerImplTest {
)
}
+ @Test
+ fun `importConfig restores home dashboard shelves preference`() = runBlocking {
+ val context: Context = mock()
+ val contentResolver: ContentResolver = mock()
+ val preferencesRepository: PreferencesRepository = mock()
+ val providerDao: ProviderDao = mock()
+ whenever(context.contentResolver).thenReturn(contentResolver)
+ val gson = Gson()
+ val backupData = BackupData(
+ preferences = mapOf(
+ "appHomeDashboardShelves" to "favorite_channels,recommended_movies,top_rated_movies"
+ )
+ )
+ whenever(contentResolver.openInputStream(Uri.parse("content://backup-home-dashboard"))).thenReturn(
+ ByteArrayInputStream(gson.toJson(backupData).toByteArray())
+ )
+ whenever(providerDao.getAllSync()).thenReturn(emptyList())
+
+ val manager = BackupManagerImpl(
+ context = context,
+ preferencesRepository = preferencesRepository,
+ credentialCrypto = mock<CredentialCrypto>(),
+ providerDao = providerDao,
+ favoriteDao = mock<FavoriteDao>(),
+ virtualGroupDao = mock<VirtualGroupDao>(),
+ playbackHistoryDao = mock<PlaybackHistoryDao>(),
+ movieDao = mock<MovieDao>(),
+ episodeDao = mock<EpisodeDao>(),
+ categoryRepository = mock<CategoryRepository>(),
+ recordingScheduleDao = mock<RecordingScheduleDao>(),
+ recordingManager = mock<RecordingManager>(),
+ transactionRunner = object : DatabaseTransactionRunner {
+ override suspend fun <T> inTransaction(block: suspend () -> T): T = block()
+ },
+ gson = gson
+ )
+
+ val result = manager.importConfig(
+ uriString = "content://backup-home-dashboard",
+ plan = BackupImportPlan(
+ importPreferences = true,
+ importProviders = false,
+ importSavedLibrary = false,
+ importPlaybackHistory = false,
+ importMultiViewPresets = false,
+ importRecordingSchedules = false,
+ conflictStrategy = BackupConflictStrategy.KEEP_EXISTING
+ )
+ )
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ verify(preferencesRepository).setAppHomeDashboardShelves(
+ listOf(
+ AppHomeDashboardShelf.FAVORITE_CHANNELS,
+ AppHomeDashboardShelf.RECOMMENDED_MOVIES,
+ AppHomeDashboardShelf.TOP_RATED_MOVIES
+ )
+ )
+ }
+
@Test
fun `toScheduledRecordingBackup stores requested window and padding separately`() {
val provider = Provider(
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 9b528dda..19eb4048 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -31,6 +31,7 @@ All notable product changes are recorded in this document.
### Added
- Added episode preview artwork in series details, preferring episode thumbnails and falling back to series poster/backdrop artwork when episode art is missing.
+- Added customizable Home dashboard shelves so users can hide default rows, enable extra built-in rows, and reorder the Home layout.
- Added customizable top navigation so users can show, hide, and reorder primary tabs while keeping Settings always available and automatically constraining the default landing screen to visible tabs.
- Added a playback setting to prefer live stream format selection with `Auto`, `HLS`, or `MPEG-TS` modes for Xtream live playback.
- Added Movies duplicate handling with smart/grouped presentation, preferred version ranking, detail-page version selection, sticky manual choices, and playback observations for reliability-based movie variant selection.
diff --git a/domain/src/main/java/com/streamvault/domain/model/AppHomeDashboardShelf.kt b/domain/src/main/java/com/streamvault/domain/model/AppHomeDashboardShelf.kt
new file mode 100644
index 00000000..28677eaf
--- /dev/null
+++ b/domain/src/main/java/com/streamvault/domain/model/AppHomeDashboardShelf.kt
@@ -0,0 +1,57 @@
+package com.streamvault.domain.model
+
+enum class AppHomeDashboardShelf(
+ val storageValue: String,
+ val defaultEnabled: Boolean
+) {
+ FAVORITE_CHANNELS("favorite_channels", defaultEnabled = true),
+ RECENT_CHANNELS("recent_channels", defaultEnabled = true),
+ LIVE_SHORTCUTS("live_shortcuts", defaultEnabled = true),
+ CONTINUE_WATCHING("continue_watching", defaultEnabled = true),
+ RECENT_MOVIES("recent_movies", defaultEnabled = true),
+ RECENT_SERIES("recent_series", defaultEnabled = true),
+ FAVORITE_MOVIES("favorite_movies", defaultEnabled = false),
+ FAVORITE_SERIES("favorite_series", defaultEnabled = false),
+ CONTINUE_WATCHING_MOVIES("continue_watching_movies", defaultEnabled = false),
+ CONTINUE_WATCHING_SERIES("continue_watching_series", defaultEnabled = false),
+ TOP_RATED_MOVIES("top_rated_movies", defaultEnabled = false),
+ RECOMMENDED_MOVIES("recommended_movies", defaultEnabled = false);
+
+ companion object {
+ val catalogOrder: List<AppHomeDashboardShelf> = listOf(
+ FAVORITE_CHANNELS,
+ RECENT_CHANNELS,
+ LIVE_SHORTCUTS,
+ CONTINUE_WATCHING,
+ RECENT_MOVIES,
+ RECENT_SERIES,
+ FAVORITE_MOVIES,
+ FAVORITE_SERIES,
+ CONTINUE_WATCHING_MOVIES,
+ CONTINUE_WATCHING_SERIES,
+ TOP_RATED_MOVIES,
+ RECOMMENDED_MOVIES
+ )
+
+ val defaultOrder: List<AppHomeDashboardShelf> = catalogOrder.filter { it.defaultEnabled }
+
+ fun fromStorage(value: String?): AppHomeDashboardShelf? =
+ catalogOrder.firstOrNull { it.storageValue.equals(value, ignoreCase = true) }
+
+ fun normalizeForStorage(shelves: List<AppHomeDashboardShelf>): List<AppHomeDashboardShelf> {
+ val unique = linkedSetOf<AppHomeDashboardShelf>()
+ shelves.forEach { shelf ->
+ if (shelf in catalogOrder) {
+ unique += shelf
+ }
+ }
+ return unique.toList()
+ }
+
+ fun displayOrder(enabledShelves: List<AppHomeDashboardShelf>): List<AppHomeDashboardShelf> {
+ val normalized = normalizeForStorage(enabledShelves)
+ val hidden = catalogOrder.filterNot { it in normalized }
+ return normalized + hidden
+ }
+ }
+}
diff --git a/domain/src/test/java/com/streamvault/domain/model/AppHomeDashboardShelfTest.kt b/domain/src/test/java/com/streamvault/domain/model/AppHomeDashboardShelfTest.kt
new file mode 100644
index 00000000..0d502647
--- /dev/null
+++ b/domain/src/test/java/com/streamvault/domain/model/AppHomeDashboardShelfTest.kt
@@ -0,0 +1,54 @@
+package com.streamvault.domain.model
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class AppHomeDashboardShelfTest {
+
+ @Test
+ fun `defaultOrder matches the existing home layout`() {
+ assertThat(AppHomeDashboardShelf.defaultOrder).containsExactly(
+ AppHomeDashboardShelf.FAVORITE_CHANNELS,
+ AppHomeDashboardShelf.RECENT_CHANNELS,
+ AppHomeDashboardShelf.LIVE_SHORTCUTS,
+ AppHomeDashboardShelf.CONTINUE_WATCHING,
+ AppHomeDashboardShelf.RECENT_MOVIES,
+ AppHomeDashboardShelf.RECENT_SERIES
+ ).inOrder()
+ }
+
+ @Test
+ fun `normalizeForStorage removes duplicates and preserves order`() {
+ val normalized = AppHomeDashboardShelf.normalizeForStorage(
+ listOf(
+ AppHomeDashboardShelf.RECENT_MOVIES,
+ AppHomeDashboardShelf.FAVORITE_CHANNELS,
+ AppHomeDashboardShelf.RECENT_MOVIES,
+ AppHomeDashboardShelf.TOP_RATED_MOVIES
+ )
+ )
+
+ assertThat(normalized).containsExactly(
+ AppHomeDashboardShelf.RECENT_MOVIES,
+ AppHomeDashboardShelf.FAVORITE_CHANNELS,
+ AppHomeDashboardShelf.TOP_RATED_MOVIES
+ ).inOrder()
+ }
+
+ @Test
+ fun `displayOrder keeps enabled shelves first and appends hidden shelves`() {
+ val ordered = AppHomeDashboardShelf.displayOrder(
+ listOf(
+ AppHomeDashboardShelf.RECOMMENDED_MOVIES,
+ AppHomeDashboardShelf.FAVORITE_CHANNELS
+ )
+ )
+
+ assertThat(ordered.take(2)).containsExactly(
+ AppHomeDashboardShelf.RECOMMENDED_MOVIES,
+ AppHomeDashboardShelf.FAVORITE_CHANNELS
+ ).inOrder()
+ assertThat(ordered).containsAtLeastElementsIn(AppHomeDashboardShelf.catalogOrder)
+ assertThat(ordered).hasSize(AppHomeDashboardShelf.catalogOrder.size)
+ }
+}