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 and timeout dialogs

David Nashash4c814fe118d4
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
index 3ebcb939..f840c8f9 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
@@ -1,5 +1,7 @@
package com.streamvault.app.ui.screens.settings
+import com.streamvault.feature.settings.presentation.*
+
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogComponents.kt
similarity index 96%
rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt
rename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogComponents.kt
index b4a56585..b47bd6a5 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogComponents.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.screens.settings
+package com.streamvault.feature.settings.presentation
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
@@ -33,7 +33,7 @@ import androidx.compose.ui.window.Dialog
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.rememberDialogOpenGestureBlocker
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
@@ -42,12 +42,12 @@ import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.SurfaceElevated
@Composable
-internal fun PremiumSelectionDialog(
+fun PremiumSelectionDialog(
title: String,
onDismiss: () -> Unit,
content: @Composable ColumnScope.() -> Unit
) {
- val isTelevisionDevice = com.streamvault.app.device.rememberIsTelevisionDevice()
+ val isTelevisionDevice = com.streamvault.core.ui.device.rememberIsTelevisionDevice()
var canInteract by remember { mutableStateOf(false) }
val blockOpenGesture = rememberDialogOpenGestureBlocker(canInteract)
LaunchedEffect(Unit) {
@@ -127,7 +127,7 @@ internal fun PremiumSelectionDialog(
}
@Composable
-internal fun LevelOption(
+fun LevelOption(
level: Int,
text: String,
currentLevel: Int,
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutFormatting.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutFormatting.kt
new file mode 100644
index 00000000..ded2e184
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutFormatting.kt
@@ -0,0 +1,12 @@
+package com.streamvault.feature.settings.presentation
+
+import android.content.Context
+import com.streamvault.feature.settings.R
+
+fun formatTimeoutSecondsLabel(seconds: Int, context: Context): String {
+ return context.resources.getQuantityString(
+ R.plurals.settings_timeout_seconds,
+ seconds,
+ seconds
+ )
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutValueDialog.kt
similarity index 97%
rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt
rename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutValueDialog.kt
index 7a581ad3..fbd496ae 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutValueDialog.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.screens.settings
+package com.streamvault.feature.settings.presentation
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -36,7 +36,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
@@ -45,7 +45,7 @@ import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
@Composable
-internal fun TimeoutValueDialog(
+fun TimeoutValueDialog(
title: String,
subtitle: String,
initialValue: Int,
@@ -109,7 +109,7 @@ private fun NumericSettingsTextField(
onValueChange: (String) -> Unit,
placeholder: String
) {
- val isTelevisionDevice = com.streamvault.app.device.rememberIsTelevisionDevice()
+ val isTelevisionDevice = com.streamvault.core.ui.device.rememberIsTelevisionDevice()
val focusRequester = remember { FocusRequester() }
val keyboardController = LocalSoftwareKeyboardController.current
var hasContainerFocus by remember { mutableStateOf(false) }
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/TopNavigationDialog.kt
similarity index 98%
rename from app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt
rename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/TopNavigationDialog.kt
index ad9a293f..eecaaf83 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/TopNavigationDialog.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.screens.settings
+package com.streamvault.feature.settings.presentation
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
@@ -23,7 +23,7 @@ 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.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.TvButton
@@ -35,7 +35,7 @@ import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.AppTopLevelDestination
@Composable
-internal fun TopNavigationDialog(
+fun TopNavigationDialog(
currentDestinations: List<AppTopLevelDestination>,
onDismiss: () -> Unit,
onSave: (List<AppTopLevelDestination>) -> Unit
diff --git a/feature/settings/src/main/res/values/plurals.xml b/feature/settings/src/main/res/values/plurals.xml
new file mode 100644
index 00000000..bac2a6fd
--- /dev/null
+++ b/feature/settings/src/main/res/values/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <plurals name="settings_timeout_seconds">
+ <item quantity="one">%d second</item>
+ <item quantity="other">%d seconds</item>
+ </plurals>
+</resources>
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index bfc0a263..788a901e 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -172,4 +172,13 @@
<string name="settings_overview_count_label">Sources</string>
<string name="settings_overview_protection_label">Protection</string>
<string name="settings_overview_language_label">Language</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_timeout_seconds_label">Seconds</string>
+ <string name="settings_timeout_seconds_placeholder">Enter 2-60</string>
+ <string name="settings_timeout_apply">Apply</string>
+ <string name="settings_timeout_validation">Enter a value between 2 and 60 seconds.</string>
+ <string name="search_title">Search</string>
</resources>