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 privacy section

David Nashasheaff72a55933
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 609784ae..3b0df103 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
@@ -150,7 +150,9 @@ internal fun SettingsContentPane(
} else if (dialogState.selectedCategory == 3) {
settingsPrivacySection(
uiState = uiState,
- viewModel = viewModel,
+ onToggleIncognitoMode = viewModel::toggleIncognitoMode,
+ onToggleXtreamTextClassification = viewModel::toggleXtreamTextClassification,
+ onToggleXtreamBase64TextCompatibility = viewModel::toggleXtreamBase64TextCompatibility,
onPendingProtectionLevelChange = { dialogState.pendingProtectionLevel = it },
onPendingActionChange = { dialogState.pendingAction = it },
onShowPinDialogChange = { dialogState.showPinDialog = it },
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPrivacySection.kt
similarity index 94%
rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt
rename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPrivacySection.kt
index 3fa381bc..3a1f7199 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPrivacySection.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.screens.settings
+package com.streamvault.feature.settings.presentation
import com.streamvault.feature.settings.presentation.*
@@ -21,15 +21,17 @@ 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.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.Primary
-internal fun LazyListScope.settingsPrivacySection(
+public fun LazyListScope.settingsPrivacySection(
uiState: SettingsUiState,
- viewModel: SettingsViewModel,
+ onToggleIncognitoMode: () -> Unit,
+ onToggleXtreamTextClassification: () -> Unit,
+ onToggleXtreamBase64TextCompatibility: () -> Unit,
onPendingProtectionLevelChange: (Int?) -> Unit,
onPendingActionChange: (ParentalAction?) -> Unit,
onShowPinDialogChange: (Boolean) -> Unit,
@@ -66,7 +68,7 @@ internal fun LazyListScope.settingsPrivacySection(
item {
HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
TvClickableSurface(
- onClick = { viewModel.toggleIncognitoMode() },
+ onClick = onToggleIncognitoMode,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = Color.Transparent,
@@ -89,7 +91,7 @@ internal fun LazyListScope.settingsPrivacySection(
}
Spacer(Modifier.height(2.dp))
TvClickableSurface(
- onClick = { viewModel.toggleXtreamTextClassification() },
+ onClick = onToggleXtreamTextClassification,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = Color.Transparent,
@@ -112,7 +114,7 @@ internal fun LazyListScope.settingsPrivacySection(
}
Spacer(Modifier.height(2.dp))
TvClickableSurface(
- onClick = { viewModel.toggleXtreamBase64TextCompatibility() },
+ onClick = onToggleXtreamBase64TextCompatibility,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = Color.Transparent,
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index eced72d9..f09d8e3c 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -33,6 +33,15 @@
<string name="settings_recording_title">Recording</string>
<string name="settings_backup_restore">Backup &amp; Restore</string>
<string name="settings_about">About</string>
+ <string name="settings_incognito_mode">Incognito Mode</string>
+ <string name="settings_incognito_mode_subtitle">Don\'t save watch history or recently visited categories while active.</string>
+ <string name="settings_clear_history">Clear Watch History</string>
+ <string name="settings_clear_history_subtitle">Wipe all watch progress and recents for all providers.</string>
+ <string name="settings_clear_history_confirm">Clear History</string>
+ <string name="settings_xtream_text_classification">Xtream Name-Based Adult Detection</string>
+ <string name="settings_xtream_text_classification_subtitle">Use category name keywords to flag adult content when the provider doesn\'t set the adult flag explicitly</string>
+ <string name="settings_xtream_base64_compatibility">Xtream Base64 Text Compatibility</string>
+ <string name="settings_xtream_base64_compatibility_subtitle">Broadly decode Xtream names and categories when a provider stores them as Base64. Leave this off unless text looks encoded.</string>
<string name="settings_sync_elapsed">Elapsed: %1$s</string>
<string name="settings_speed_test_title">Internet Speed Test</string>
<string name="settings_speed_test_recommendation">Recommended quality cap: %1$s</string>