Skip to content

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

refactor: move settings selection dialogs

David Nashash81135ed51eb5
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCategoryFormatting.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCategoryFormatting.kt
new file mode 100644
index 00000000..5335e9a1
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCategoryFormatting.kt
@@ -0,0 +1,36 @@
+package com.streamvault.feature.settings.presentation
+
+import android.content.Context
+import com.streamvault.domain.model.CategorySortMode
+import com.streamvault.domain.model.ContentType
+import com.streamvault.feature.settings.R
+
+public fun formatQualityCapLabel(maxHeight: Int?, autoLabel: String): String =
+ maxHeight?.let { "${it}p" } ?: autoLabel
+
+public fun sortModeLabel(mode: CategorySortMode, context: Context): String = when (mode) {
+ CategorySortMode.DEFAULT -> context.getString(R.string.settings_category_sort_default)
+ CategorySortMode.TITLE_ASC -> context.getString(R.string.settings_category_sort_az)
+ CategorySortMode.TITLE_DESC -> context.getString(R.string.settings_category_sort_za)
+ CategorySortMode.COUNT_DESC -> context.getString(R.string.settings_category_sort_most_items)
+ CategorySortMode.COUNT_ASC -> context.getString(R.string.settings_category_sort_least_items)
+}
+
+public fun formatCategorySortModeLabel(mode: CategorySortMode, context: Context): String =
+ sortModeLabel(mode, context)
+
+public fun categoryTypeLabel(type: ContentType, context: Context): String = when (type) {
+ ContentType.LIVE -> context.getString(R.string.settings_category_sort_live)
+ ContentType.MOVIE,
+ ContentType.VOD -> context.getString(R.string.nav_vod)
+ ContentType.SERIES,
+ ContentType.SERIES_EPISODE -> context.getString(R.string.settings_category_sort_series)
+}
+
+public fun categoryTypeDescription(type: ContentType, context: Context): String = when (type) {
+ ContentType.LIVE -> context.getString(R.string.settings_category_type_live_description)
+ ContentType.MOVIE,
+ ContentType.VOD -> context.getString(R.string.settings_category_type_movies_description)
+ ContentType.SERIES,
+ ContentType.SERIES_EPISODE -> context.getString(R.string.settings_category_type_series_description)
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogs.kt
similarity index 92%
rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
rename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogs.kt
index f840c8f9..93bdc0f8 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogs.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.screens.settings
+package com.streamvault.feature.settings.presentation
import com.streamvault.feature.settings.presentation.*
@@ -17,7 +17,7 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
-import com.streamvault.app.R
+import com.streamvault.feature.settings.R
import com.streamvault.core.ui.components.dialogs.PremiumDialog
import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.interaction.TvClickableSurface
@@ -29,14 +29,14 @@ import com.streamvault.domain.model.CategorySortMode
import com.streamvault.domain.model.ContentType
@Composable
-internal fun QualityCapSelectionDialog(
+public fun QualityCapSelectionDialog(
title: String,
currentValue: Int?,
onDismiss: () -> Unit,
onSelect: (Int?) -> Unit
) {
- val context = LocalContext.current
- val options = remember(context) {
+ val autoLabel = stringResource(R.string.settings_quality_cap_auto)
+ val options = remember {
listOf<Int?>(null, 2160, 1080, 720, 480)
}
PremiumSelectionDialog(
@@ -46,7 +46,7 @@ internal fun QualityCapSelectionDialog(
options.forEachIndexed { index, option ->
LevelOption(
level = index,
- text = formatQualityCapLabel(option, context.getString(R.string.settings_quality_cap_auto)),
+ text = formatQualityCapLabel(option, autoLabel),
currentLevel = if (option == currentValue) index else -1,
onSelect = { onSelect(option) }
)
@@ -55,7 +55,7 @@ internal fun QualityCapSelectionDialog(
}
@Composable
-internal fun CategorySortModeDialog(
+public fun CategorySortModeDialog(
type: ContentType,
currentMode: CategorySortMode,
onDismiss: () -> Unit,
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index 3e8773b4..926d6c48 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -60,6 +60,18 @@
<string name="settings_level_private_subtitle">Categories visible with PIN. Hidden from Search, EPG, All Channels and Recent.</string>
<string name="settings_level_hidden_desc">HIDDEN - Content hidden from all lists</string>
<string name="settings_level_hidden_subtitle">Adult categories not shown anywhere.</string>
+ <string name="settings_quality_cap_auto">Auto</string>
+ <string name="settings_category_sort_live">Live TV Categories</string>
+ <string name="settings_category_sort_movies">Movie Categories</string>
+ <string name="settings_category_sort_series">Series Categories</string>
+ <string name="settings_category_sort_default">Provider Order</string>
+ <string name="settings_category_sort_az">A-Z</string>
+ <string name="settings_category_sort_za">Z-A</string>
+ <string name="settings_category_sort_most_items">Most Items First</string>
+ <string name="settings_category_sort_least_items">Least Items First</string>
+ <string name="settings_category_type_live_description">Sort and hide provider live groups while keeping All Channels, Favorites, Recent, and custom groups in their pinned positions.</string>
+ <string name="settings_category_type_movies_description">Sort and hide provider movie categories without affecting Favorites, Resume, or custom shelves.</string>
+ <string name="settings_category_type_series_description">Sort and hide provider series categories without affecting Favorites, Continue Watching, or custom shelves.</string>
<string name="settings_protection_level">Protection Level</string>
<string name="settings_level_off">OFF</string>
<string name="settings_level_locked">LOCKED</string>