StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor: move settings screen label state
David Nashash7975802ca23a
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.ktindex c9b66a25..b6f2c23f 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt@@ -4,6 +4,7 @@ import com.streamvault.feature.settings.presentation.*import android.content.ActivityNotFoundExceptionimport android.content.Context+import android.content.ContextWrapperimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.*import androidx.compose.foundation.lazy.LazyColumn@@ -24,6 +25,7 @@ import androidx.activity.result.contract.ActivityResultContractsimport android.net.Uriimport androidx.documentfile.provider.DocumentFileimport com.streamvault.app.backup.BackupFileBridge+import com.streamvault.app.MainActivityimport com.streamvault.app.device.isFireTvDeviceimport com.streamvault.app.device.isTelevisionDeviceimport com.streamvault.app.device.removableAppStorageDirs@@ -38,6 +40,7 @@ import com.streamvault.domain.model.LegacyProvider as Providerimport androidx.compose.ui.res.stringResourceimport com.streamvault.app.Rimport com.streamvault.core.ui.design.requestFocusSafely+import com.streamvault.feature.settings.api.SettingsOfficialBuildStatusimport kotlinx.coroutines.delayimport java.time.LocalDateTimeimport java.time.format.DateTimeFormatter@@ -53,6 +56,15 @@ private fun buildBackupFileName(): String =private fun Context.isFireTv(): Boolean =packageManager.hasSystemFeature("amazon.hardware.fire_tv")+private fun Context.findMainActivity(): MainActivity? {+ var current: Context? = this+ while (current is ContextWrapper) {+ if (current is MainActivity) return current+ current = current.baseContext+ }+ return null+}+@Composablefun SettingsScreen(@@ -75,7 +87,12 @@ fun SettingsScreen(val screenLabels = rememberSettingsScreenLabels(uiState = uiState,context = context,- officialBuildStatus = officialBuildVerification.status+ officialBuildStatus = when (officialBuildVerification.status) {+ com.streamvault.app.util.OfficialBuildStatus.OFFICIAL -> SettingsOfficialBuildStatus.OFFICIAL+ com.streamvault.app.util.OfficialBuildStatus.UNOFFICIAL -> SettingsOfficialBuildStatus.UNOFFICIAL+ com.streamvault.app.util.OfficialBuildStatus.VERIFICATION_UNAVAILABLE ->+ SettingsOfficialBuildStatus.VERIFICATION_UNAVAILABLE+ })val dialogState = rememberSettingsScreenDialogState()val providerState = rememberSettingsProviderSectionState(dialogState)diff --git a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackBufferModeTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackBufferModeTest.ktindex 95343765..e6f44eb8 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackBufferModeTest.kt+++ b/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackBufferModeTest.kt@@ -4,7 +4,7 @@ import com.streamvault.feature.settings.presentation.*import android.content.Contextimport com.google.common.truth.Truth.assertThat-import com.streamvault.app.R+import com.streamvault.feature.settings.Rimport com.streamvault.domain.model.PlaybackBufferModeimport org.junit.Testimport org.mockito.kotlin.mockdiff --git a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsTimeshiftBackendPreferenceTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsTimeshiftBackendPreferenceTest.ktindex 37f46fe0..45c5f928 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsTimeshiftBackendPreferenceTest.kt+++ b/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsTimeshiftBackendPreferenceTest.kt@@ -4,7 +4,7 @@ import com.streamvault.feature.settings.presentation.*import android.content.Contextimport com.google.common.truth.Truth.assertThat-import com.streamvault.app.R+import com.streamvault.feature.settings.Rimport com.streamvault.domain.model.TimeshiftBackendPreferenceimport org.junit.Testimport org.mockito.kotlin.mockdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenState.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenState.ktsimilarity index 92%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenState.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenState.ktindex a62cbca3..251d3e31 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenState.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenState.kt@@ -1,15 +1,10 @@-package com.streamvault.app.ui.screens.settings--import com.streamvault.feature.settings.presentation.*+package com.streamvault.feature.settings.presentationimport android.content.Context-import android.content.ContextWrapperimport androidx.compose.runtime.Composableimport androidx.compose.runtime.remember-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.feature.settings.R+import com.streamvault.feature.settings.api.SettingsOfficialBuildStatusimport com.streamvault.domain.model.AppHomeDashboardShelfimport com.streamvault.domain.model.AppLandingDestinationimport com.streamvault.domain.model.AppTopLevelDestination@@ -19,7 +14,7 @@ import com.streamvault.domain.model.PlaybackBufferModeimport com.streamvault.domain.model.TimeshiftBackendPreferenceimport com.streamvault.domain.model.VodHttpProtocolMode-internal data class SettingsScreenLabels(+public data class SettingsScreenLabels(val buildVerificationLabel: String,val appLanguageLabel: String,val appLandingDestinationLabel: String,@@ -58,10 +53,10 @@ internal data class SettingsScreenLabels()@Composable-internal fun rememberSettingsScreenLabels(+public fun rememberSettingsScreenLabels(uiState: SettingsUiState,context: Context,- officialBuildStatus: OfficialBuildStatus+ officialBuildStatus: SettingsOfficialBuildStatus): SettingsScreenLabels {val buildVerificationLabel = remember(officialBuildStatus, context) {formatOfficialBuildStatusLabel(officialBuildStatus, context)@@ -81,7 +76,7 @@ internal fun rememberSettingsScreenLabels(val timeFormatLabel = remember(uiState.appTimeFormat, context) {formatAppTimeFormatLabel(uiState.appTimeFormat, context)}- val dateTimeFormat = remember(uiState.appTimeFormat) { uiState.appTimeFormat.createDateTimeFormat() }+ val dateTimeFormat = remember(uiState.appTimeFormat) { uiState.appTimeFormat.createSettingsDateTimeFormat() }val preferredAudioLanguageLabel = remember(uiState.preferredAudioLanguage, context) {displayLanguageLabel(uiState.preferredAudioLanguage, context.getString(R.string.settings_audio_language_auto))}@@ -227,15 +222,6 @@ internal fun rememberSettingsScreenLabels()}-internal fun Context.findMainActivity(): MainActivity? {- var current: Context? = this- while (current is ContextWrapper) {- if (current is MainActivity) return current- current = current.baseContext- }- return null-}-private fun formatAppLandingDestinationLabel(destination: AppLandingDestination,context: Context@@ -273,12 +259,12 @@ private fun formatHomeDashboardSummaryLabel()private fun formatOfficialBuildStatusLabel(- status: OfficialBuildStatus,+ status: SettingsOfficialBuildStatus,context: Context): String = when (status) {- OfficialBuildStatus.OFFICIAL -> context.getString(R.string.settings_build_verification_official)- OfficialBuildStatus.UNOFFICIAL -> context.getString(R.string.settings_build_verification_unofficial)- OfficialBuildStatus.VERIFICATION_UNAVAILABLE -> context.getString(R.string.settings_build_verification_unavailable)+ SettingsOfficialBuildStatus.OFFICIAL -> context.getString(R.string.settings_build_verification_official)+ SettingsOfficialBuildStatus.UNOFFICIAL -> context.getString(R.string.settings_build_verification_unofficial)+ SettingsOfficialBuildStatus.VERIFICATION_UNAVAILABLE -> context.getString(R.string.settings_build_verification_unavailable)}private fun formatAppTimeFormatLabel(@@ -301,7 +287,7 @@ private fun formatTimeshiftDepthLabel(else -> context.getString(R.string.settings_live_timeshift_depth_30)}-internal fun formatVodHttpProtocolModeLabel(+public fun formatVodHttpProtocolModeLabel(mode: VodHttpProtocolMode,context: Context): String = when (mode) {@@ -309,7 +295,7 @@ internal fun formatVodHttpProtocolModeLabel(VodHttpProtocolMode.AUTO -> context.getString(R.string.settings_vod_http_protocol_auto)}-internal fun formatPlaybackBufferModeLabel(+public fun formatPlaybackBufferModeLabel(mode: PlaybackBufferMode,context: Context): String = when (mode) {@@ -319,7 +305,7 @@ internal fun formatPlaybackBufferModeLabel(PlaybackBufferMode.LARGE -> context.getString(R.string.settings_live_buffer_large)}-internal fun formatTimeshiftBackendPreferenceLabel(+public fun formatTimeshiftBackendPreferenceLabel(preference: TimeshiftBackendPreference,context: Context): String = when (preference) {diff --git a/feature/settings/src/main/res/values/plurals.xml b/feature/settings/src/main/res/values/plurals.xmlindex 34ae8eb3..7b5826c3 100644--- a/feature/settings/src/main/res/values/plurals.xml+++ b/feature/settings/src/main/res/values/plurals.xml@@ -8,4 +8,12 @@<item quantity="one">%1$d minute</item><item quantity="other">%1$d minutes</item></plurals>+ <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></resources>diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xmlindex da9fb731..b80ac6c0 100644--- a/feature/settings/src/main/res/values/strings.xml+++ b/feature/settings/src/main/res/values/strings.xml@@ -641,6 +641,9 @@<string name="settings_build">Build</string><string name="settings_build_desc">StreamVault for Android TV</string><string name="settings_build_verification">Build Verification</string>+ <string name="settings_build_verification_official">Official build</string>+ <string name="settings_build_verification_unofficial">Unofficial build</string>+ <string name="settings_build_verification_unavailable">Verification unavailable</string><string name="settings_developed_by">Developed by</string><string name="settings_developer_name">David Nashash</string><string name="settings_github">GitHub</string>@@ -649,6 +652,7 @@<string name="settings_donate_url">https://ko-fi.com/davidona</string><string name="settings_clear_history_dialog_title">Clear Watch History?</string><string name="settings_clear_history_dialog_body">This will permanently delete all watch history, continue watching progress, and last visited categories across all providers.</string>+ <string name="settings_guide_default_category_fallback">All Channels</string><string name="settings_speed_test_not_run">Not tested yet</string><string name="settings_speed_test_summary_default">Run a quick download test and use the result to pick stable playback quality limits.</string><string name="settings_speed_test_summary_measured">Measured on %1$s at %2$s.</string>