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 provider settings presentation
David Nashashdfb4449f8a60
diff --git a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsXtreamLiveOnboardingMessageTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsXtreamLiveOnboardingMessageTest.ktindex 2fb05a9d..7475231b 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsXtreamLiveOnboardingMessageTest.kt+++ b/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsXtreamLiveOnboardingMessageTest.kt@@ -3,7 +3,7 @@ package com.streamvault.app.ui.screens.settingsimport com.streamvault.feature.settings.presentation.*import com.google.common.truth.Truth.assertThat-import com.streamvault.app.R+import com.streamvault.feature.settings.Rimport org.junit.Testclass SettingsXtreamLiveOnboardingMessageTest {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderComponents.ktsimilarity index 77%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderComponents.ktindex 0b4b8c19..796517f6 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderComponents.kt@@ -1,67 +1,29 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import com.streamvault.feature.settings.presentation.*--import androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.border-import androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.*-import androidx.compose.foundation.lazy.LazyRow-import androidx.compose.foundation.lazy.items-import androidx.compose.foundation.relocation.BringIntoViewRequester-import androidx.compose.foundation.relocation.bringIntoViewRequester-import androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.foundation.text.BasicTextField-import androidx.compose.foundation.verticalScroll-import androidx.compose.material3.Checkbox-import androidx.compose.material3.OutlinedButton-import androidx.compose.material3.RadioButton-import androidx.compose.material3.Switchimport androidx.compose.runtime.*-import androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier-import androidx.compose.ui.focus.FocusRequester-import androidx.compose.ui.focus.focusProperties-import androidx.compose.ui.focus.focusRequester-import androidx.compose.ui.focus.onFocusChangedimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.graphics.SolidColor-import androidx.compose.ui.input.key.onPreviewKeyEvent-import androidx.compose.ui.platform.LocalDensity-import androidx.compose.ui.platform.LocalSoftwareKeyboardControllerimport androidx.compose.ui.res.stringResource-import androidx.compose.ui.text.TextRange-import androidx.compose.ui.text.font.FontWeight-import androidx.compose.ui.text.input.TextFieldValueimport androidx.compose.ui.unit.dpimport androidx.tv.material3.*-import com.streamvault.app.R-import com.streamvault.core.ui.components.dialogs.PremiumDialog-import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton-import com.streamvault.core.ui.design.FocusSpec-import com.streamvault.core.ui.interaction.TvButton-import com.streamvault.core.ui.interaction.TvClickableSurface-import com.streamvault.core.ui.interaction.mouseClickable+import com.streamvault.feature.settings.Rimport com.streamvault.core.ui.theme.*-import com.streamvault.app.ui.time.LocalAppTimeFormat-import com.streamvault.app.ui.time.createDateTimeFormat-import com.streamvault.domain.model.ActiveLiveSource-import com.streamvault.domain.model.CombinedM3uProfile+import com.streamvault.domain.model.AppTimeFormatimport com.streamvault.domain.model.LegacyProvider as Providerimport com.streamvault.domain.model.ProviderStatusimport com.streamvault.domain.model.ProviderType-import kotlinx.coroutines.launch-import java.text.DateFormat-import java.util.Locale@Composable-internal fun ProviderSettingsCard(+public fun ProviderSettingsCard(provider: Provider,isActive: Boolean,isSyncing: Boolean,+ appTimeFormat: AppTimeFormat,xtreamLiveOnboardingPhase: String?,xtreamLiveOnboarding: XtreamLiveOnboardingUiModel?,xtreamIndexSectionStatuses: Map<String, ProviderCatalogCountStatus>,@@ -77,7 +39,6 @@ internal fun ProviderSettingsCard(onToggleM3uVodClassification: (Boolean) -> Unit,onRefreshM3uClassification: () -> Unit) {- val context = androidx.compose.ui.platform.LocalContext.currentval liveOnboardingIncomplete = provider.type == ProviderType.XTREAM_CODES &&provider.status == ProviderStatus.PARTIAL &&!isActive@@ -142,12 +103,14 @@ internal fun ProviderSettingsCard(// Expiration Dateval expDate = provider.expirationDate- val expirationText = remember(expDate) {- when (expDate) {- null -> context.getString(R.string.settings_expiration_unknown)- Long.MAX_VALUE -> context.getString(R.string.settings_expiration_never)- else -> context.getString(R.string.settings_expires, java.text.SimpleDateFormat("d MMM yyyy", java.util.Locale.getDefault()).format(java.util.Date(expDate)))- }+ val expirationText = when (expDate) {+ null -> stringResource(R.string.settings_expiration_unknown)+ Long.MAX_VALUE -> stringResource(R.string.settings_expiration_never)+ else -> stringResource(+ R.string.settings_expires,+ java.text.SimpleDateFormat("d MMM yyyy", java.util.Locale.getDefault())+ .format(java.util.Date(expDate))+ )}Text(text = expirationText,@@ -205,6 +168,7 @@ internal fun ProviderSettingsCard(ProviderDiagnosticsPanel(provider = provider,diagnostics = model,+ appTimeFormat = appTimeFormat,movieIndexInProgress = xtreamIndexSectionStatuses["MOVIE"] in setOf(ProviderCatalogCountStatus.QUEUED,ProviderCatalogCountStatus.SYNCING@@ -247,7 +211,7 @@ internal fun ProviderSettingsCard(-internal fun xtreamLiveOnboardingMessageRes(phase: String?): Int = when (phase?.uppercase()) {+public fun xtreamLiveOnboardingMessageRes(phase: String?): Int = when (phase?.uppercase()) {"STARTING" -> R.string.settings_provider_live_onboarding_starting"FETCHING" -> R.string.settings_provider_live_onboarding_fetching"RECOVERING" -> R.string.settings_provider_live_onboarding_recovering@@ -257,7 +221,7 @@ internal fun xtreamLiveOnboardingMessageRes(phase: String?): Int = when (phase?.else -> R.string.settings_provider_live_onboarding_incomplete}-internal fun ProviderDiagnosticsUiModel.liveCatalogCount(+public fun ProviderDiagnosticsUiModel.liveCatalogCount(liveOnboardingIncomplete: Boolean,xtreamLiveOnboardingPhase: String?): ProviderCatalogCountUiModel {@@ -278,7 +242,7 @@ internal fun ProviderDiagnosticsUiModel.liveCatalogCount(}}-internal fun ProviderDiagnosticsUiModel.movieCatalogCount(+public fun ProviderDiagnosticsUiModel.movieCatalogCount(jobStatus: ProviderCatalogCountStatus?): ProviderCatalogCountUiModel = sectionCatalogCount(count = movieCount,@@ -286,7 +250,7 @@ internal fun ProviderDiagnosticsUiModel.movieCatalogCount(jobStatus = jobStatus)-internal fun ProviderDiagnosticsUiModel.seriesCatalogCount(+public fun ProviderDiagnosticsUiModel.seriesCatalogCount(jobStatus: ProviderCatalogCountStatus?): ProviderCatalogCountUiModel = sectionCatalogCount(count = seriesCount,@@ -294,7 +258,7 @@ internal fun ProviderDiagnosticsUiModel.seriesCatalogCount(jobStatus = jobStatus)-internal fun ProviderDiagnosticsUiModel.epgCatalogCount(+public fun ProviderDiagnosticsUiModel.epgCatalogCount(jobStatus: ProviderCatalogCountStatus?): ProviderCatalogCountUiModel = sectionCatalogCount(count = epgCount,@@ -302,7 +266,7 @@ internal fun ProviderDiagnosticsUiModel.epgCatalogCount(jobStatus = jobStatus)-internal fun sectionCatalogCount(+public fun sectionCatalogCount(count: Int,lastSuccess: Long,jobStatus: ProviderCatalogCountStatus?diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderDiagnosticsPanel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderDiagnosticsPanel.ktsimilarity index 95%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderDiagnosticsPanel.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderDiagnosticsPanel.ktindex 1bb26190..1ea3a976 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderDiagnosticsPanel.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderDiagnosticsPanel.kt@@ -1,6 +1,4 @@-package com.streamvault.app.ui.screens.settings--import com.streamvault.feature.settings.presentation.*+package com.streamvault.feature.settings.presentationimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -17,22 +15,22 @@ import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.unit.dpimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.app.R+import com.streamvault.feature.settings.Rimport com.streamvault.core.ui.theme.ErrorColorimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDimimport com.streamvault.core.ui.theme.Primary-import com.streamvault.app.ui.time.LocalAppTimeFormat-import com.streamvault.app.ui.time.createDateTimeFormat+import com.streamvault.domain.model.AppTimeFormatimport com.streamvault.domain.model.LegacyProvider as Providerimport com.streamvault.domain.model.ProviderTypeimport java.text.DateFormatimport java.util.Locale@Composable-internal fun ProviderDiagnosticsPanel(+public fun ProviderDiagnosticsPanel(provider: Provider,diagnostics: ProviderDiagnosticsUiModel,+ appTimeFormat: AppTimeFormat,movieIndexInProgress: Boolean,databaseMaintenance: DatabaseMaintenanceUiModel?) {@@ -151,15 +149,17 @@ internal fun ProviderDiagnosticsPanel()}databaseMaintenance?.let { report ->- DatabaseMaintenancePanel(report = report)+ DatabaseMaintenancePanel(report = report, appTimeFormat = appTimeFormat)}}}@Composable-private fun DatabaseMaintenancePanel(report: DatabaseMaintenanceUiModel) {- val appTimeFormat = LocalAppTimeFormat.current- val dateTimeFormat = remember(appTimeFormat) { appTimeFormat.createDateTimeFormat() }+private fun DatabaseMaintenancePanel(+ report: DatabaseMaintenanceUiModel,+ appTimeFormat: AppTimeFormat+) {+ val dateTimeFormat = remember(appTimeFormat) { appTimeFormat.createSettingsDateTimeFormat() }Column(modifier = Modifier.fillMaxWidth()diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderSection.ktsimilarity index 97%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderSection.ktindex 6f0c7e95..9b9a6406 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderSection.kt@@ -1,6 +1,4 @@-package com.streamvault.app.ui.screens.settings--import com.streamvault.feature.settings.presentation.*+package com.streamvault.feature.settings.presentationimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.PaddingValues@@ -26,7 +24,7 @@ import androidx.compose.ui.unit.dpimport androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text-import com.streamvault.app.R+import com.streamvault.feature.settings.Rimport com.streamvault.core.ui.components.TvEmptyStateimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDim@@ -34,7 +32,7 @@ import com.streamvault.core.ui.theme.Primaryimport com.streamvault.domain.model.LegacyProvider as Providerimport com.streamvault.domain.model.ProviderType-internal fun LazyListScope.providerSection(+public fun LazyListScope.providerSection(uiState: SettingsUiState,onAddProvider: () -> Unit,onEditProvider: (Provider) -> Unit,@@ -89,6 +87,7 @@ internal fun LazyListScope.providerSection(provider = selectedProvider,isActive = selectedProvider.id == uiState.activeProviderId,isSyncing = uiState.isSyncing,+ appTimeFormat = uiState.appTimeFormat,xtreamLiveOnboardingPhase = uiState.xtreamLiveOnboardingPhaseByProvider[selectedProvider.id],xtreamLiveOnboarding = uiState.xtreamLiveOnboardingByProvider[selectedProvider.id],xtreamIndexSectionStatuses = uiState.xtreamIndexSectionStatusByProvider[selectedProvider.id].orEmpty(),diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeFormatting.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeFormatting.ktnew file mode 100644index 00000000..8f55dcf4--- /dev/null+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeFormatting.kt@@ -0,0 +1,26 @@+package com.streamvault.feature.settings.presentation++import com.streamvault.domain.model.AppTimeFormat+import java.text.DateFormat+import java.text.SimpleDateFormat+import java.time.format.DateTimeFormatter+import java.time.format.FormatStyle+import java.util.Locale++internal fun AppTimeFormat.createSettingsTimeFormat(locale: Locale = Locale.getDefault()): DateFormat = when (this) {+ AppTimeFormat.SYSTEM -> DateFormat.getTimeInstance(DateFormat.SHORT, locale)+ AppTimeFormat.TWELVE_HOUR -> SimpleDateFormat("h:mm a", locale)+ AppTimeFormat.TWENTY_FOUR_HOUR -> SimpleDateFormat("HH:mm", locale)+}++internal fun AppTimeFormat.createSettingsDateTimeFormat(locale: Locale = Locale.getDefault()): DateFormat = when (this) {+ AppTimeFormat.SYSTEM -> DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, locale)+ AppTimeFormat.TWELVE_HOUR -> SimpleDateFormat("MMM d, h:mm a", locale)+ AppTimeFormat.TWENTY_FOUR_HOUR -> SimpleDateFormat("MMM d, HH:mm", locale)+}++internal fun AppTimeFormat.createSettingsTimeFormatter(locale: Locale = Locale.getDefault()): DateTimeFormatter = when (this) {+ AppTimeFormat.SYSTEM -> DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).withLocale(locale)+ AppTimeFormat.TWELVE_HOUR -> DateTimeFormatter.ofPattern("h:mm a", locale)+ AppTimeFormat.TWENTY_FOUR_HOUR -> DateTimeFormatter.ofPattern("HH:mm", locale)+}diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xmlindex 652daffd..7c41c5c3 100644--- a/feature/settings/src/main/res/values/strings.xml+++ b/feature/settings/src/main/res/values/strings.xml@@ -522,4 +522,26 @@<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>+ <string name="settings_provider_diagnostics_title">Provider Diagnostics</string>+ <string name="settings_diagnostic_live">Live</string>+ <string name="settings_diagnostic_movies">Movies</string>+ <string name="settings_diagnostic_series">Series</string>+ <string name="settings_diagnostic_epg">EPG</string>+ <string name="settings_catalog_count_indexing">Indexing</string>+ <string name="settings_diagnostic_status">Last sync status: %1$s</string>+ <string name="diagnostics_summary_format">%1$s | %2$s</string>+ <string name="settings_expiration_unknown">Expiration: Unknown</string>+ <string name="settings_expiration_never">Expiration: Never</string>+ <string name="settings_expires">Expires: %1$s</string>+ <string name="settings_provider_live_onboarding_incomplete">Live setup is still completing in the background. Sync this provider to resume setup; it will become active after channels are ready.</string>+ <string name="settings_provider_live_onboarding_starting">Live setup is preparing. Sync this provider to continue setup.</string>+ <string name="settings_provider_live_onboarding_fetching">Live channels are still importing. Sync this provider to resume setup.</string>+ <string name="settings_provider_live_onboarding_recovering">A saved Live import is ready to recover. Sync this provider to finish setup.</string>+ <string name="settings_provider_live_onboarding_staged">Live channels are staged and waiting to be finalized. Sync this provider to finish setup.</string>+ <string name="settings_provider_live_onboarding_committing">Live channels are being finalized. Keep sync running until this provider becomes active.</string>+ <string name="settings_provider_live_onboarding_failed">Live setup needs retry. Sync this provider to try again.</string>+ <string name="settings_no_providers">No providers configured</string>+ <string name="settings_add_provider">Add Provider</string>+ <string name="settings_provider_selector_hint">Select a provider to view details and actions.</string>+ <string name="settings_no_providers_subtitle">Add a provider to unlock playback, guide data, and the rest of the TV experience.</string></resources>