StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Add customizable top navigation
David Nashash998fab2a4e5c
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.ktindex e98468c9..f0a07f21 100644--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt@@ -34,6 +34,7 @@ import com.streamvault.app.ui.screens.welcome.WelcomeScreenimport com.streamvault.app.ui.screens.downloads.DownloadsScreenimport com.streamvault.app.MainActivityimport com.streamvault.domain.model.AppLandingDestination+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.MovieDetailPresentationHintimport com.streamvault.domain.model.Seriesimport com.streamvault.domain.model.SeriesDetailPresentationHint@@ -310,15 +311,33 @@ internal fun AppLandingDestination.toAppRoute(): String = when (this) {AppLandingDestination.SETTINGS -> Routes.SETTINGS}+internal fun AppTopLevelDestination.toAppRoute(): String = when (this) {+ AppTopLevelDestination.HOME -> Routes.HOME+ AppTopLevelDestination.LIVE_TV -> Routes.LIVE_TV+ AppTopLevelDestination.MOVIES -> Routes.MOVIES+ AppTopLevelDestination.SERIES -> Routes.SERIES+ AppTopLevelDestination.DOWNLOADS -> Routes.DOWNLOADS+ AppTopLevelDestination.GUIDE -> Routes.EPG+ AppTopLevelDestination.SEARCH -> Routes.SEARCH+ AppTopLevelDestination.PLUGINS -> Routes.PLUGINS+ AppTopLevelDestination.SETTINGS -> Routes.SETTINGS+}+@Composablefun AppNavigation(mainActivity: MainActivity) {val navController = rememberNavController()val currentBackStackEntry = navController.currentBackStackEntryAsState().valueval externalNavigationRequest = mainActivity.externalNavigationRequestFlow.collectAsStateWithLifecycle().value+ val topLevelDestinations = mainActivity.preferencesRepository.appTopLevelDestinations+ .collectAsStateWithLifecycle(initialValue = AppTopLevelDestination.defaultOrder)+ .valueval appLandingDestination = mainActivity.preferencesRepository.appLandingDestination.collectAsStateWithLifecycle(initialValue = AppLandingDestination.HOME).value- val landingRoute = appLandingDestination.toAppRoute()+ val landingRoute = AppTopLevelDestination.resolveLandingDestination(+ preferred = appLandingDestination,+ destinations = topLevelDestinations+ ).toAppRoute()LaunchedEffect(externalNavigationRequest, currentBackStackEntry) {val entry = currentBackStackEntry ?: return@LaunchedEffectdiff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.ktindex 4128f977..732bcd08 100644--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt@@ -1,5 +1,7 @@package com.streamvault.app.ui.components.shell+import android.content.Context+import android.content.ContextWrapperimport androidx.annotation.StringResimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.foundation.BorderStroke@@ -38,6 +40,7 @@ import androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValue+import androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clip@@ -62,6 +65,7 @@ import androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.dp+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.tv.material3.Borderimport androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.Icon@@ -70,6 +74,8 @@ import androidx.tv.material3.Surfaceimport androidx.tv.material3.SurfaceDefaultsimport androidx.tv.material3.Textimport com.streamvault.app.R+import com.streamvault.app.MainActivity+import com.streamvault.app.navigation.toAppRouteimport com.streamvault.app.navigation.Routesimport com.streamvault.app.ui.design.AppColorsimport com.streamvault.app.ui.design.AppMotion@@ -79,6 +85,7 @@ import com.streamvault.app.ui.interaction.rememberTvInteractionSoundsimport com.streamvault.app.ui.interaction.TvIconButtonimport com.streamvault.app.ui.design.LocalAppShapesimport com.streamvault.app.ui.design.LocalAppSpacing+import com.streamvault.domain.model.AppTopLevelDestinationenum class AppNavigationChrome {Rail,@@ -251,7 +258,7 @@ private fun TopNavigationBar(actions: (@Composable RowScope.() -> Unit)? = null,modifier: Modifier = Modifier) {- val items = remember { buildDestinationItems() }+ val items = rememberDestinationItems()val scrollState = rememberScrollState()val focusRequesters = remember { mutableMapOf<String, FocusRequester>() }@@ -695,7 +702,7 @@ private fun DestinationRail(modifier: Modifier = Modifier) {val spacing = LocalAppSpacing.current- val items = remember { buildDestinationItems() }+ val items = rememberDestinationItems()val focusRequesters = remember { mutableMapOf<String, FocusRequester>() }Box(@@ -833,17 +840,42 @@ private fun findActiveDestinationItem(.maxByOrNull { it.route.length }?: items.firstOrNull { it.route == currentRoute }-private fun buildDestinationItems(): List<DestinationItem> = listOf(- DestinationItem(Routes.HOME, R.string.nav_home, Icons.Default.Home),- DestinationItem(Routes.LIVE_TV, R.string.nav_live_tv, Icons.Default.PlayArrow),- DestinationItem(Routes.MOVIES, R.string.nav_movies, Icons.Default.Star),- DestinationItem(Routes.SERIES, R.string.nav_series, Icons.Default.Menu),- DestinationItem(Routes.DOWNLOADS, R.string.nav_downloads, Icons.Default.Download),- DestinationItem(Routes.EPG, R.string.nav_epg, Icons.Default.Info),- DestinationItem(Routes.SEARCH, R.string.search_title, Icons.Default.Search),- DestinationItem(Routes.PLUGINS, R.string.nav_plugins, PluginBlocksIcon),- DestinationItem(Routes.SETTINGS, R.string.nav_settings, Icons.Default.Settings)-)+private fun buildDestinationItems(): List<DestinationItem> =+ AppTopLevelDestination.defaultOrder.map { it.toDestinationItem() }++@Composable+private fun rememberDestinationItems(): List<DestinationItem> {+ val context = LocalContext.current+ val mainActivity = remember(context) { context.findMainActivity() }+ val configuredDestinations = mainActivity?.preferencesRepository?.appTopLevelDestinations+ ?.collectAsStateWithLifecycle(initialValue = AppTopLevelDestination.defaultOrder)+ ?.value+ ?: AppTopLevelDestination.defaultOrder+ return remember(configuredDestinations) {+ configuredDestinations.map { it.toDestinationItem() }+ }+}++private fun AppTopLevelDestination.toDestinationItem(): DestinationItem = when (this) {+ AppTopLevelDestination.HOME -> DestinationItem(Routes.HOME, R.string.nav_home, Icons.Default.Home)+ AppTopLevelDestination.LIVE_TV -> DestinationItem(Routes.LIVE_TV, R.string.nav_live_tv, Icons.Default.PlayArrow)+ AppTopLevelDestination.MOVIES -> DestinationItem(Routes.MOVIES, R.string.nav_movies, Icons.Default.Star)+ AppTopLevelDestination.SERIES -> DestinationItem(Routes.SERIES, R.string.nav_series, Icons.Default.Menu)+ AppTopLevelDestination.DOWNLOADS -> DestinationItem(Routes.DOWNLOADS, R.string.nav_downloads, Icons.Default.Download)+ AppTopLevelDestination.GUIDE -> DestinationItem(Routes.EPG, R.string.nav_epg, Icons.Default.Info)+ AppTopLevelDestination.SEARCH -> DestinationItem(Routes.SEARCH, R.string.search_title, Icons.Default.Search)+ AppTopLevelDestination.PLUGINS -> DestinationItem(Routes.PLUGINS, R.string.nav_plugins, PluginBlocksIcon)+ AppTopLevelDestination.SETTINGS -> DestinationItem(Routes.SETTINGS, R.string.nav_settings, Icons.Default.Settings)+}++private fun Context.findMainActivity(): MainActivity? {+ var current: Context? = this+ while (current is ContextWrapper) {+ if (current is MainActivity) return current+ current = current.baseContext+ }+ return null+}private val PluginBlocksIcon: ImageVectorget() {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.ktindex 65feb835..3e8e73be 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@@ -50,6 +50,7 @@ internal fun LazyListScope.settingsBrowsingSection(viewModel: SettingsViewModel,context: android.content.Context,appLandingDestinationLabel: String,+ topNavigationSummaryLabel: String,guideDefaultCategoryLabel: String,timeFormatLabel: String,appLanguageLabel: String,@@ -60,6 +61,7 @@ internal fun LazyListScope.settingsBrowsingSection(onShowLiveChannelGroupingDialogChange: (Boolean) -> Unit,onShowGroupedChannelLabelDialogChange: (Boolean) -> Unit,onShowLiveVariantPreferenceDialogChange: (Boolean) -> Unit,+ onShowTopNavigationDialogChange: (Boolean) -> Unit,onShowLandingScreenDialogChange: (Boolean) -> Unit,onShowGuideDefaultCategoryDialogChange: (Boolean) -> Unit,onShowTimeFormatDialogChange: (Boolean) -> Unit,@@ -76,6 +78,11 @@ internal fun LazyListScope.settingsBrowsingSection(value = stringResource(uiState.liveTvChannelMode.labelResId()),onClick = { onShowLiveTvModeDialogChange(true) })+ ClickableSettingsRow(+ label = stringResource(R.string.settings_top_navigation),+ value = topNavigationSummaryLabel,+ onClick = { onShowTopNavigationDialogChange(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.ktindex 76b857a9..95a045fe 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@@ -107,6 +107,7 @@ internal fun SettingsContentPane(viewModel = viewModel,context = context,appLandingDestinationLabel = screenLabels.appLandingDestinationLabel,+ topNavigationSummaryLabel = screenLabels.topNavigationSummaryLabel,guideDefaultCategoryLabel = screenLabels.guideDefaultCategoryLabel,timeFormatLabel = screenLabels.timeFormatLabel,appLanguageLabel = screenLabels.appLanguageLabel,@@ -117,6 +118,7 @@ internal fun SettingsContentPane(onShowLiveChannelGroupingDialogChange = { dialogState.showLiveChannelGroupingDialog = it },onShowGroupedChannelLabelDialogChange = { dialogState.showGroupedChannelLabelDialog = it },onShowLiveVariantPreferenceDialogChange = { dialogState.showLiveVariantPreferenceDialog = it },+ onShowTopNavigationDialogChange = { dialogState.showTopNavigationDialog = 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.ktindex 704bcf8e..e93441d3 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@@ -7,6 +7,7 @@ import androidx.compose.ui.res.stringResourceimport com.streamvault.app.Rimport com.streamvault.domain.model.AppTimeFormatimport com.streamvault.domain.model.AppLandingDestination+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.CategorySortModeimport com.streamvault.domain.model.ContentTypeimport com.streamvault.domain.model.DecoderMode@@ -18,6 +19,8 @@ internal fun SettingsPreferenceDialogs(uiState: SettingsUiState,viewModel: SettingsViewModel,context: Context,+ showTopNavigationDialog: Boolean,+ onShowTopNavigationDialogChange: (Boolean) -> Unit,showLandingScreenDialog: Boolean,onShowLandingScreenDialogChange: (Boolean) -> Unit,showGuideDefaultCategoryDialog: Boolean,@@ -105,12 +108,26 @@ internal fun SettingsPreferenceDialogs(onShowDiagnosticsTimeoutDialogChange = onShowDiagnosticsTimeoutDialogChange)+ if (showTopNavigationDialog) {+ TopNavigationDialog(+ currentDestinations = uiState.appTopLevelDestinations,+ onDismiss = { onShowTopNavigationDialogChange(false) },+ onSave = { destinations ->+ viewModel.setAppTopLevelDestinations(destinations)+ onShowTopNavigationDialogChange(false)+ }+ )+ }+if (showLandingScreenDialog) {+ val availableLandingDestinations = remember(uiState.appTopLevelDestinations) {+ AppTopLevelDestination.availableLandingDestinations(uiState.appTopLevelDestinations)+ }PremiumSelectionDialog(title = stringResource(R.string.settings_select_default_landing_screen),onDismiss = { onShowLandingScreenDialogChange(false) }) {- AppLandingDestination.entries.forEachIndexed { index, destination ->+ availableLandingDestinations.forEachIndexed { index, destination ->LevelOption(level = index,text = stringResource(destination.labelResId()),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.ktindex d1bf8595..94d85fb5 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@@ -7,6 +7,7 @@ import com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityModeimport com.streamvault.app.ui.model.VodViewModeimport com.streamvault.domain.model.AppTimeFormatimport com.streamvault.domain.model.AppLandingDestination+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.AudioOutputPreferenceimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.ExternalPlaybackMode@@ -44,6 +45,7 @@ internal data class SettingsPreferenceSnapshot(val hasParentalPin: Boolean,val appLanguage: String,val appLandingDestination: AppLandingDestination,+ val appTopLevelDestinations: List<AppTopLevelDestination>,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.ktindex edbac520..330d03cb 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@@ -9,6 +9,7 @@ internal fun SettingsUiState.applyPreferenceSnapshot(snapshot: SettingsPreferenchasParentalPin = snapshot.hasParentalPin,appLanguage = snapshot.appLanguage,appLandingDestination = snapshot.appLandingDestination,+ appTopLevelDestinations = snapshot.appTopLevelDestinations,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.ktindex 93908400..6889ca1e 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@@ -19,6 +19,7 @@ internal class SettingsScreenDialogState(private val showLiveChannelGroupingDialogState: MutableState<Boolean>,private val showGroupedChannelLabelDialogState: MutableState<Boolean>,private val showLiveVariantPreferenceDialogState: MutableState<Boolean>,+ private val showTopNavigationDialogState: MutableState<Boolean>,private val showLandingScreenDialogState: MutableState<Boolean>,private val showVodViewModeDialogState: MutableState<Boolean>,private val showVodDuplicateHandlingDialogState: MutableState<Boolean>,@@ -78,6 +79,7 @@ internal class SettingsScreenDialogState(var showLiveChannelGroupingDialog by showLiveChannelGroupingDialogStatevar showGroupedChannelLabelDialog by showGroupedChannelLabelDialogStatevar showLiveVariantPreferenceDialog by showLiveVariantPreferenceDialogState+ var showTopNavigationDialog by showTopNavigationDialogStatevar showLandingScreenDialog by showLandingScreenDialogStatevar showVodViewModeDialog by showVodViewModeDialogStatevar showVodDuplicateHandlingDialog by showVodDuplicateHandlingDialogState@@ -205,6 +207,7 @@ internal fun rememberSettingsScreenDialogState(): SettingsScreenDialogState {val showLiveChannelGroupingDialogState = rememberSaveable { mutableStateOf(false) }val showGroupedChannelLabelDialogState = rememberSaveable { mutableStateOf(false) }val showLiveVariantPreferenceDialogState = rememberSaveable { mutableStateOf(false) }+ val showTopNavigationDialogState = rememberSaveable { mutableStateOf(false) }val showLandingScreenDialogState = rememberSaveable { mutableStateOf(false) }val showVodViewModeDialogState = rememberSaveable { mutableStateOf(false) }val showVodDuplicateHandlingDialogState = rememberSaveable { mutableStateOf(false) }@@ -273,6 +276,7 @@ internal fun rememberSettingsScreenDialogState(): SettingsScreenDialogState {showLiveChannelGroupingDialogState = showLiveChannelGroupingDialogState,showGroupedChannelLabelDialogState = showGroupedChannelLabelDialogState,showLiveVariantPreferenceDialogState = showLiveVariantPreferenceDialogState,+ showTopNavigationDialogState = showTopNavigationDialogState,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.ktindex 18509a2d..81f5c27c 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@@ -172,6 +172,8 @@ internal fun SettingsScreenDialogs(uiState = uiState,viewModel = viewModel,context = context,+ showTopNavigationDialog = dialogState.showTopNavigationDialog,+ onShowTopNavigationDialogChange = { dialogState.showTopNavigationDialog = 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.ktindex 8f02d8c8..bf2afeda 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@@ -9,6 +9,7 @@ import com.streamvault.app.Rimport com.streamvault.app.ui.time.createDateTimeFormatimport com.streamvault.app.util.OfficialBuildStatusimport com.streamvault.domain.model.AppLandingDestination+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.AppTimeFormatimport com.streamvault.domain.model.AudioOutputPreferenceimport com.streamvault.domain.model.LiveStreamFormatMode@@ -18,6 +19,7 @@ internal data class SettingsScreenLabels(val buildVerificationLabel: String,val appLanguageLabel: String,val appLandingDestinationLabel: String,+ val topNavigationSummaryLabel: String,val timeFormatLabel: String,val preferredAudioLanguageLabel: String,val playbackSpeedLabel: String,@@ -61,6 +63,9 @@ internal fun rememberSettingsScreenLabels(val appLandingDestinationLabel = remember(uiState.appLandingDestination, context) {formatAppLandingDestinationLabel(uiState.appLandingDestination, context)}+ val topNavigationSummaryLabel = remember(uiState.appTopLevelDestinations, context) {+ formatTopNavigationSummaryLabel(uiState.appTopLevelDestinations, context)+ }val timeFormatLabel = remember(uiState.appTimeFormat, context) {formatAppTimeFormatLabel(uiState.appTimeFormat, context)}@@ -163,6 +168,7 @@ internal fun rememberSettingsScreenLabels(buildVerificationLabel = buildVerificationLabel,appLanguageLabel = appLanguageLabel,appLandingDestinationLabel = appLandingDestinationLabel,+ topNavigationSummaryLabel = topNavigationSummaryLabel,timeFormatLabel = timeFormatLabel,preferredAudioLanguageLabel = preferredAudioLanguageLabel,playbackSpeedLabel = playbackSpeedLabel,@@ -217,6 +223,15 @@ private fun formatAppLandingDestinationLabel(})+private fun formatTopNavigationSummaryLabel(+ destinations: List<AppTopLevelDestination>,+ context: Context+): String = context.resources.getQuantityString(+ R.plurals.settings_top_navigation_count,+ destinations.size,+ destinations.size+)+private fun formatOfficialBuildStatusLabel(status: OfficialBuildStatus,context: Contextdiff --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.ktindex 213dac71..13f4129b 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@@ -6,6 +6,7 @@ import com.streamvault.app.ui.model.LiveTvChannelModeimport com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityModeimport com.streamvault.app.ui.model.VodViewModeimport com.streamvault.domain.model.AppLandingDestination+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.domain.model.AppTimeFormatimport com.streamvault.domain.model.AudioOutputPreference@@ -42,6 +43,7 @@ internal fun observeSettingsPreferenceSnapshot(hasParentalPin = hasParentalPin,appLanguage = "system",appLandingDestination = AppLandingDestination.HOME,+ appTopLevelDestinations = AppTopLevelDestination.defaultOrder,appTimeFormat = AppTimeFormat.SYSTEM,preferredAudioLanguage = "auto",playerMediaSessionEnabled = true,@@ -112,6 +114,8 @@ internal fun observeSettingsPreferenceSnapshot(snapshot.copy(appLanguage = language)}.combine(preferencesRepository.appLandingDestination) { snapshot, destination ->snapshot.copy(appLandingDestination = destination)+ }.combine(preferencesRepository.appTopLevelDestinations) { snapshot, destinations ->+ snapshot.copy(appTopLevelDestinations = destinations)}.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.ktindex 0cefa323..737cd7d6 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@@ -11,6 +11,7 @@ import com.streamvault.domain.manager.DriveSyncStatusimport com.streamvault.domain.manager.ProviderCredentialsimport com.streamvault.domain.model.ActiveLiveSourceimport com.streamvault.domain.model.AppLandingDestination+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.AppTimeFormatimport com.streamvault.domain.model.AudioOutputPreferenceimport com.streamvault.domain.model.Category@@ -63,6 +64,7 @@ data class SettingsUiState(val hasParentalPin: Boolean = false,val appLanguage: String = "system",val appLandingDestination: AppLandingDestination = AppLandingDestination.HOME,+ val appTopLevelDestinations: List<AppTopLevelDestination> = AppTopLevelDestination.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.ktindex 9fbe4310..40fb3405 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@@ -36,6 +36,7 @@ import com.streamvault.domain.manager.RecordingManagerimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.AppLandingDestinationimport com.streamvault.domain.model.AppTimeFormat+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.CategorySortModeimport com.streamvault.domain.model.ChannelNumberingModeimport com.streamvault.domain.model.ContentType@@ -435,7 +436,35 @@ class SettingsViewModel @Inject constructor(fun setAppLandingDestination(destination: AppLandingDestination) {viewModelScope.launch {- preferencesRepository.setAppLandingDestination(destination)+ preferencesRepository.setAppLandingDestination(+ AppTopLevelDestination.resolveLandingDestination(+ preferred = destination,+ destinations = _uiState.value.appTopLevelDestinations+ )+ )+ }+ }++ fun setAppTopLevelDestinations(destinations: List<AppTopLevelDestination>) {+ viewModelScope.launch {+ val normalized = AppTopLevelDestination.normalizeForStorage(destinations)+ val currentLanding = _uiState.value.appLandingDestination+ val resolvedLanding = AppTopLevelDestination.resolveLandingDestination(+ preferred = currentLanding,+ destinations = normalized+ )+ preferencesRepository.setAppTopLevelDestinations(normalized)+ if (resolvedLanding != currentLanding) {+ preferencesRepository.setAppLandingDestination(resolvedLanding)+ _uiState.update {+ it.copy(+ userMessage = appContext.getString(+ R.string.settings_top_navigation_default_updated,+ appContext.getString(resolvedLanding.labelResId())+ )+ )+ }+ }}}@@ -953,6 +982,17 @@ class SettingsViewModel @Inject constructor(_uiState.update { it.copy(userMessage = message) }}+ private fun AppLandingDestination.labelResId(): Int = when (this) {+ AppLandingDestination.HOME -> R.string.nav_home+ AppLandingDestination.LIVE_TV -> R.string.nav_live_tv+ AppLandingDestination.MOVIES -> R.string.nav_movies+ AppLandingDestination.SERIES -> R.string.nav_series+ AppLandingDestination.GUIDE -> R.string.nav_epg+ AppLandingDestination.DOWNLOADS -> R.string.nav_downloads+ AppLandingDestination.PLUGINS -> R.string.nav_plugins+ AppLandingDestination.SETTINGS -> R.string.nav_settings+ }+fun refreshProvider(providerId: Long,syncMode: SettingsProviderSyncMode = SettingsProviderSyncMode.SYNC_NOWdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.ktnew file mode 100644index 00000000..cf26fc79--- /dev/null+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt@@ -0,0 +1,248 @@+package com.streamvault.app.ui.screens.settings++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.interaction.TvButton+import com.streamvault.app.ui.interaction.TvClickableSurface+import com.streamvault.app.ui.design.FocusSpec+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.AppTopLevelDestination++@Composable+internal fun TopNavigationDialog(+ currentDestinations: List<AppTopLevelDestination>,+ onDismiss: () -> Unit,+ onSave: (List<AppTopLevelDestination>) -> Unit+) {+ var draftDestinations by remember(currentDestinations) {+ mutableStateOf(AppTopLevelDestination.normalizeForStorage(currentDestinations))+ }+ val displayDestinations = remember(draftDestinations) {+ val hidden = AppTopLevelDestination.defaultOrder.filterNot { it in draftDestinations }+ draftDestinations + hidden+ }++ PremiumDialog(+ title = stringResource(R.string.settings_top_navigation_dialog_title),+ subtitle = stringResource(R.string.settings_top_navigation_dialog_subtitle),+ onDismissRequest = onDismiss,+ widthFraction = 0.58f,+ bodyHeightFraction = 0.62f,+ content = {+ Text(+ text = stringResource(R.string.settings_top_navigation_landing_note),+ style = MaterialTheme.typography.bodySmall,+ color = OnSurfaceDim+ )+ displayDestinations.forEachIndexed { index, destination ->+ TopNavigationDialogRow(+ destination = destination,+ enabled = destination in draftDestinations,+ canMoveUp = index > 0,+ canMoveDown = index < displayDestinations.lastIndex,+ onEnabledChange = { enabled ->+ if (!destination.isRequired) {+ draftDestinations = if (enabled) {+ AppTopLevelDestination.normalizeForStorage(+ displayDestinations+ .filter { item -> item == destination || item in draftDestinations }+ )+ } else {+ AppTopLevelDestination.normalizeForStorage(+ draftDestinations.filterNot { it == destination }+ )+ }+ }+ },+ onMoveUp = {+ val reordered = displayDestinations.toMutableList().also { items ->+ items[index] = items[index - 1]+ items[index - 1] = destination+ }+ draftDestinations = AppTopLevelDestination.normalizeForStorage(+ reordered.filter { it in draftDestinations || it.isRequired }+ )+ },+ onMoveDown = {+ val reordered = displayDestinations.toMutableList().also { items ->+ items[index] = items[index + 1]+ items[index + 1] = destination+ }+ draftDestinations = AppTopLevelDestination.normalizeForStorage(+ reordered.filter { it in draftDestinations || it.isRequired }+ )+ }+ )+ }+ },+ footer = {+ PremiumDialogFooterButton(+ label = stringResource(R.string.settings_cancel),+ onClick = onDismiss+ )+ PremiumDialogFooterButton(+ label = stringResource(R.string.action_save_order),+ emphasized = true,+ onClick = { onSave(draftDestinations) }+ )+ }+ )+}++@Composable+private fun TopNavigationDialogRow(+ destination: AppTopLevelDestination,+ enabled: Boolean,+ canMoveUp: Boolean,+ canMoveDown: Boolean,+ onEnabledChange: (Boolean) -> Unit,+ onMoveUp: () -> Unit,+ onMoveDown: () -> Unit+) {+ Box(+ modifier = Modifier+ .fillMaxWidth()+ .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(destination.labelResId()),+ style = MaterialTheme.typography.titleSmall,+ color = OnSurface+ )+ Text(+ text = if (destination.isRequired) {+ stringResource(R.string.settings_top_navigation_required)+ } else if (enabled) {+ stringResource(R.string.settings_top_navigation_visible)+ } else {+ stringResource(R.string.settings_top_navigation_hidden)+ },+ style = MaterialTheme.typography.bodySmall,+ color = if (destination.isRequired) Primary else OnSurfaceDim+ )+ }+ NavigationVisibilityToggle(+ enabled = enabled,+ required = destination.isRequired,+ onToggle = { onEnabledChange(!enabled) }+ )+ 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 NavigationVisibilityToggle(+ enabled: Boolean,+ required: Boolean,+ onToggle: () -> Unit+) {+ TvClickableSurface(+ onClick = onToggle,+ enabled = !required,+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),+ colors = ClickableSurfaceDefaults.colors(+ containerColor = if (enabled) Primary.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.05f),+ focusedContainerColor = if (enabled) 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)+ )+ )+ ) {+ Row(+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),+ horizontalArrangement = Arrangement.spacedBy(8.dp),+ verticalAlignment = Alignment.CenterVertically+ ) {+ Box(+ modifier = Modifier+ .background(+ color = if (enabled) Primary else OnSurfaceDim,+ shape = RoundedCornerShape(999.dp)+ )+ .padding(horizontal = 8.dp, vertical = 2.dp)+ ) {+ Text(+ text = if (enabled) {+ stringResource(R.string.settings_top_navigation_visible)+ } else {+ stringResource(R.string.settings_top_navigation_hidden)+ },+ style = MaterialTheme.typography.labelSmall,+ color = if (enabled) Color.Black else OnSurface+ )+ }+ }+ }+}++@Composable+private fun AppTopLevelDestination.labelResId(): Int = when (this) {+ AppTopLevelDestination.HOME -> R.string.nav_home+ AppTopLevelDestination.LIVE_TV -> R.string.nav_live_tv+ AppTopLevelDestination.MOVIES -> R.string.nav_movies+ AppTopLevelDestination.SERIES -> R.string.nav_series+ AppTopLevelDestination.DOWNLOADS -> R.string.nav_downloads+ AppTopLevelDestination.GUIDE -> R.string.nav_epg+ AppTopLevelDestination.SEARCH -> R.string.search_title+ AppTopLevelDestination.PLUGINS -> R.string.nav_plugins+ AppTopLevelDestination.SETTINGS -> R.string.nav_settings+}diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 6f3d816d..f88d2aa0 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -362,8 +362,22 @@<string name="settings_browsing">Browsing</string><string name="settings_live_tv_channel_mode">Live TV Channel Mode</string><string name="settings_live_tv_channel_mode_subtitle">Choose how the Live TV browser should present channels and whether it should preview before playback.</string>+ <string name="settings_top_navigation">Top navigation</string>+ <string name="settings_top_navigation_dialog_title">Customize top navigation</string>+ <string name="settings_top_navigation_dialog_subtitle">Choose which tabs appear and arrange them in the order you want. Settings always stays available.</string>+ <string name="settings_top_navigation_landing_note">Only visible tabs can be used as the startup landing screen.</string>+ <string name="settings_top_navigation_required">Always visible</string>+ <string name="settings_top_navigation_visible">Visible</string>+ <string name="settings_top_navigation_hidden">Hidden</string>+ <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_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><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">diff --git a/app/src/test/java/com/streamvault/app/navigation/RoutesTest.kt b/app/src/test/java/com/streamvault/app/navigation/RoutesTest.ktindex 248dec65..50d477c3 100644--- a/app/src/test/java/com/streamvault/app/navigation/RoutesTest.kt+++ b/app/src/test/java/com/streamvault/app/navigation/RoutesTest.kt@@ -2,6 +2,7 @@ package com.streamvault.app.navigationimport com.google.common.truth.Truth.assertThatimport com.streamvault.domain.model.AppLandingDestination+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Episodeimport com.streamvault.domain.model.Movie@@ -136,6 +137,29 @@ class RoutesTest {assertThat(AppLandingDestination.SETTINGS.toAppRoute()).isEqualTo(Routes.SETTINGS)}+ @Test+ fun `top level destinations map to routes including search`() {+ assertThat(AppTopLevelDestination.HOME.toAppRoute()).isEqualTo(Routes.HOME)+ assertThat(AppTopLevelDestination.LIVE_TV.toAppRoute()).isEqualTo(Routes.LIVE_TV)+ assertThat(AppTopLevelDestination.MOVIES.toAppRoute()).isEqualTo(Routes.MOVIES)+ assertThat(AppTopLevelDestination.SERIES.toAppRoute()).isEqualTo(Routes.SERIES)+ assertThat(AppTopLevelDestination.DOWNLOADS.toAppRoute()).isEqualTo(Routes.DOWNLOADS)+ assertThat(AppTopLevelDestination.GUIDE.toAppRoute()).isEqualTo(Routes.EPG)+ assertThat(AppTopLevelDestination.SEARCH.toAppRoute()).isEqualTo(Routes.SEARCH)+ assertThat(AppTopLevelDestination.PLUGINS.toAppRoute()).isEqualTo(Routes.PLUGINS)+ assertThat(AppTopLevelDestination.SETTINGS.toAppRoute()).isEqualTo(Routes.SETTINGS)+ }++ @Test+ fun `top level destinations resolve landing to a visible fallback`() {+ val resolved = AppTopLevelDestination.resolveLandingDestination(+ preferred = AppLandingDestination.MOVIES,+ destinations = listOf(AppTopLevelDestination.HOME, AppTopLevelDestination.SETTINGS)+ )++ assertThat(resolved).isEqualTo(AppLandingDestination.HOME)+ }+@Testfun `player route preserves return route back to guide`() {val returnRoute = Routes.epg(diff --git a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.ktindex 6fe6fe5c..3fbffd1e 100644--- a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt+++ b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt@@ -32,6 +32,7 @@ import com.streamvault.domain.manager.RecordingScheduleImportSummaryimport com.streamvault.domain.manager.ProtectedCategoryBackupimport com.streamvault.domain.manager.RecordingManagerimport com.streamvault.domain.manager.ScheduledRecordingBackup+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.ContentTypeimport com.streamvault.domain.model.RecordingRecurrenceimport com.streamvault.domain.model.RecordingRequest@@ -85,6 +86,10 @@ class BackupManagerImpl @Inject constructor(put("parentalPinSalt", parentalPinBackup?.saltBase64 ?: "")put("appLanguage", preferencesRepository.appLanguage.first())put("appLandingDestination", preferencesRepository.appLandingDestination.first().storageValue)+ put(+ "appTopLevelDestinations",+ preferencesRepository.appTopLevelDestinations.first().joinToString(",") { it.storageValue }+ )put("liveTvCategoryFilters", preferencesRepository.liveTvCategoryFilters.first().joinToString("\n"))put("liveTvQuickFilterVisibility", preferencesRepository.liveTvQuickFilterVisibility.first() ?: "always")put("playerMediaSessionEnabled", preferencesRepository.playerMediaSessionEnabled.first().toString())@@ -560,6 +565,14 @@ class BackupManagerImpl @Inject constructor(com.streamvault.domain.model.AppLandingDestination.fromStorage(savedDestination))}+ prefs["appTopLevelDestinations"]?.let { encoded ->+ val destinations = encoded+ .split(',')+ .mapNotNull { token -> AppTopLevelDestination.fromStorage(token.trim()) }+ if (destinations.isNotEmpty()) {+ preferencesRepository.setAppTopLevelDestinations(destinations)+ }+ }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.ktindex 9050c0c5..1a22f367 100644--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt@@ -29,6 +29,7 @@ import com.streamvault.domain.model.LiveChannelGroupingModeimport com.streamvault.domain.model.LiveChannelObservedQualityimport com.streamvault.domain.model.LiveStreamFormatModeimport com.streamvault.domain.model.LiveVariantPreferenceMode+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.VodDuplicateHandlingModeimport com.streamvault.domain.model.VodHttpProtocolModeimport com.streamvault.domain.model.VodVariantObservation@@ -99,6 +100,7 @@ class PreferencesRepository @Inject constructor(val DEFAULT_CATEGORY_ID = longPreferencesKey("default_category_id")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_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")@@ -1254,12 +1256,23 @@ class PreferencesRepository @Inject constructor(AppLandingDestination.fromStorage(preferences[PreferencesKeys.APP_LANDING_DESTINATION])}+ val appTopLevelDestinations: Flow<List<AppTopLevelDestination>> = context.dataStore.data.map { preferences ->+ decodeAppTopLevelDestinations(preferences[PreferencesKeys.APP_TOP_LEVEL_DESTINATIONS])+ }+suspend fun setAppLandingDestination(destination: AppLandingDestination) {context.dataStore.edit { preferences ->preferences[PreferencesKeys.APP_LANDING_DESTINATION] = destination.storageValue}}+ suspend fun setAppTopLevelDestinations(destinations: List<AppTopLevelDestination>) {+ val normalized = AppTopLevelDestination.normalizeForStorage(destinations)+ context.dataStore.edit { preferences ->+ preferences[PreferencesKeys.APP_TOP_LEVEL_DESTINATIONS] = encodeAppTopLevelDestinations(normalized)+ }+ }+val appTimeFormat: Flow<AppTimeFormat> = context.dataStore.data.map { preferences ->AppTimeFormat.fromStorage(preferences[PreferencesKeys.APP_TIME_FORMAT])}@@ -1930,6 +1943,24 @@ class PreferencesRepository @Inject constructor(.sortedBy { it.key }.joinToString("\n") { (key, rawChannelId) -> "$key=$rawChannelId" }+ private fun encodeAppTopLevelDestinations(destinations: List<AppTopLevelDestination>): String =+ AppTopLevelDestination.normalizeForStorage(destinations)+ .joinToString(",") { it.storageValue }++ private fun decodeAppTopLevelDestinations(encoded: String?): List<AppTopLevelDestination> {+ val decoded = encoded+ .orEmpty()+ .split(',')+ .asSequence()+ .mapNotNull { token -> AppTopLevelDestination.fromStorage(token.trim()) }+ .toList()+ return if (decoded.isEmpty()) {+ AppTopLevelDestination.defaultOrder+ } else {+ AppTopLevelDestination.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.ktindex b83700b9..c8f024ee 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.BackupImportPlanimport com.streamvault.domain.manager.RecordingManagerimport com.streamvault.domain.manager.RecordingScheduleImportDispositionimport com.streamvault.domain.manager.ScheduledRecordingBackup+import com.streamvault.domain.model.AppTopLevelDestinationimport com.streamvault.domain.model.ContentTypeimport com.streamvault.domain.model.Favoriteimport com.streamvault.domain.model.PlaybackHistory@@ -437,6 +438,67 @@ class BackupManagerImplTest {verify(preferencesRepository).setPlayerAudioVideoOffsetMs(150)}+ @Test+ fun `importConfig restores top navigation destinations preference`() = runBlocking {+ val context: Context = mock()+ val contentResolver: ContentResolver = mock()+ whenever(context.contentResolver).thenReturn(contentResolver)++ val providerDao: ProviderDao = mock()+ val preferencesRepository: PreferencesRepository = mock()+ val gson = Gson()+ val backupData = BackupData(+ preferences = mapOf(+ "appTopLevelDestinations" to "home,search,settings"+ )+ )+ whenever(contentResolver.openInputStream(Uri.parse("content://backup-top-navigation"))).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-top-navigation",+ 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).setAppTopLevelDestinations(+ listOf(+ AppTopLevelDestination.HOME,+ AppTopLevelDestination.SEARCH,+ AppTopLevelDestination.SETTINGS+ )+ )+ }+@Testfun `toScheduledRecordingBackup stores requested window and padding separately`() {val provider = Provider(diff --git a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.ktindex 10fb7276..99627ca0 100644--- a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt+++ b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt@@ -440,7 +440,8 @@ class XtreamStreamUrlResolverTest {)),credentialCrypto = credentialCrypto,- stalkerApiService = fakeStalkerApiService+ stalkerApiService = fakeStalkerApiService,+ preferencesRepository = preferencesRepository())val internalUrl = StalkerUrlFactory.buildInternalStreamUrl(providerId = 14,diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex 10299786..9b528dda 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 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.- Added Series duplicate handling with smart/grouped browse and search presentation, preferred version ranking, detail-page version selection with sticky manual choice, and raw-safe favorites/custom-group actions across grouped variants.diff --git a/domain/src/main/java/com/streamvault/domain/model/AppTopLevelDestination.kt b/domain/src/main/java/com/streamvault/domain/model/AppTopLevelDestination.ktnew file mode 100644index 00000000..2a5185e0--- /dev/null+++ b/domain/src/main/java/com/streamvault/domain/model/AppTopLevelDestination.kt@@ -0,0 +1,59 @@+package com.streamvault.domain.model++enum class AppTopLevelDestination(+ val storageValue: String,+ val landingDestination: AppLandingDestination? = null,+ val isRequired: Boolean = false+) {+ HOME("home", AppLandingDestination.HOME),+ LIVE_TV("live_tv", AppLandingDestination.LIVE_TV),+ MOVIES("movies", AppLandingDestination.MOVIES),+ SERIES("series", AppLandingDestination.SERIES),+ DOWNLOADS("downloads", AppLandingDestination.DOWNLOADS),+ GUIDE("guide", AppLandingDestination.GUIDE),+ SEARCH("search"),+ PLUGINS("plugins", AppLandingDestination.PLUGINS),+ SETTINGS("settings", AppLandingDestination.SETTINGS, isRequired = true);++ companion object {+ val defaultOrder: List<AppTopLevelDestination> = listOf(+ HOME,+ LIVE_TV,+ MOVIES,+ SERIES,+ DOWNLOADS,+ GUIDE,+ SEARCH,+ PLUGINS,+ SETTINGS+ )++ fun fromStorage(value: String?): AppTopLevelDestination? =+ entries.firstOrNull { it.storageValue.equals(value, ignoreCase = true) }++ fun normalizeForStorage(destinations: List<AppTopLevelDestination>): List<AppTopLevelDestination> {+ val unique = linkedSetOf<AppTopLevelDestination>()+ destinations.forEach(unique::add)+ unique += SETTINGS+ return unique.toList()+ }++ fun availableLandingDestinations(+ destinations: List<AppTopLevelDestination>+ ): List<AppLandingDestination> = normalizeForStorage(destinations)+ .mapNotNull { it.landingDestination }+ .distinct()++ fun resolveLandingDestination(+ preferred: AppLandingDestination,+ destinations: List<AppTopLevelDestination>+ ): AppLandingDestination {+ val available = availableLandingDestinations(destinations)+ return if (preferred in available) {+ preferred+ } else {+ available.firstOrNull() ?: AppLandingDestination.SETTINGS+ }+ }+ }+}