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 view model to feature
David Nashash3a9dda13c77e
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.ktindex 27571925..a6906da4 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt@@ -1,5 +1,7 @@package com.streamvault.app.ui.screens.settings+import com.streamvault.feature.settings.presentation.*+import androidx.activity.compose.rememberLauncherForActivityResultimport androidx.activity.result.contract.ActivityResultContractsimport androidx.compose.foundation.BorderStrokediff --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 3b23ddb4..3622a332 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@@ -1,5 +1,7 @@package com.streamvault.app.ui.screens.settings+import com.streamvault.feature.settings.presentation.*+import android.content.ActivityNotFoundExceptionimport android.content.Contextimport androidx.compose.foundation.backgrounddiff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActions.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsAppUpdateActions.ktsimilarity index 70%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActions.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsAppUpdateActions.ktindex dd66ba7c..491aaa8f 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActions.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsAppUpdateActions.kt@@ -1,38 +1,26 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import android.app.Application+import android.content.Contextimport kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.updateimport kotlinx.coroutines.launch-import com.streamvault.app.R-import com.streamvault.app.update.AppUpdateActionState-import com.streamvault.app.update.AppUpdateInstaller-import com.streamvault.app.update.AppUpdateCheckPolicy-import com.streamvault.app.update.GitHubReleaseChecker+import com.streamvault.feature.settings.R+import com.streamvault.feature.settings.api.SettingsAppUpdatePortimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.domain.model.Result-import com.streamvault.feature.settings.api.SettingsReleaseInfoimport com.streamvault.feature.settings.api.SettingsUpdateActionState-import com.streamvault.feature.settings.api.SettingsUpdateDownloadState-import com.streamvault.feature.settings.api.SettingsUpdateDownloadStatus-import com.streamvault.feature.settings.presentation.SettingsUiState-import com.streamvault.feature.settings.presentation.latestActionState-import com.streamvault.feature.settings.presentation.toDownloadState-import com.streamvault.feature.settings.presentation.toReleaseInfoOrNull-import com.streamvault.feature.settings.presentation.withDownloadStateinternal class SettingsAppUpdateActions(- private val appContext: Application,+ private val appContext: Context,private val preferencesRepository: PreferencesRepository,- private val gitHubReleaseChecker: GitHubReleaseChecker,- private val appUpdateInstaller: AppUpdateInstaller,+ private val appUpdatePort: SettingsAppUpdatePort,private val uiState: MutableStateFlow<SettingsUiState>) {private var updateCheckInFlight = falsefun shouldAutoCheckForUpdates(lastSuccessfulCheckAt: Long?, lastFailedCheckAt: Long?): Boolean =- AppUpdateCheckPolicy.shouldAutoCheck(System.currentTimeMillis(), lastSuccessfulCheckAt, lastFailedCheckAt)+ appUpdatePort.shouldAutoCheckForUpdates(lastSuccessfulCheckAt, lastFailedCheckAt)fun checkForAppUpdates(scope: CoroutineScope,@@ -52,7 +40,7 @@ internal class SettingsAppUpdateActions(appUpdate = it.appUpdate.copy(errorMessage = null))}- when (val result = gitHubReleaseChecker.fetchLatestRelease()) {+ when (val result = appUpdatePort.fetchLatestRelease()) {is Result.Error -> {preferencesRepository.setLastAppUpdateFailureTimestamp(checkedAt)preferencesRepository.setLastAppUpdateOutcome("FAILURE: ${result.message}")@@ -113,7 +101,7 @@ internal class SettingsAppUpdateActions(appUpdate = latestUpdateModel.withDownloadState(it.appUpdate.toDownloadState()))}- val refreshedDownloadState = appUpdateInstaller.refreshState().toSettingsDownloadState()+ val refreshedDownloadState = appUpdatePort.refreshDownloadState()latestUpdateModel = latestUpdateModel.withDownloadState(refreshedDownloadState)uiState.update { it.copy(appUpdate = latestUpdateModel) }if (autoDownload &&@@ -140,7 +128,7 @@ internal class SettingsAppUpdateActions(}scope.launch {- when (val result = appUpdateInstaller.startDownload(latestRelease.toGitHubReleaseInfo())) {+ when (val result = appUpdatePort.startDownload(latestRelease)) {is Result.Error -> uiState.update { it.copy(userMessage = result.message) }is Result.Success -> uiState.update {it.copy(userMessage = appContext.getString(R.string.settings_update_download_started))@@ -152,7 +140,7 @@ internal class SettingsAppUpdateActions(fun installDownloadedUpdate(scope: CoroutineScope) {scope.launch {- when (val result = appUpdateInstaller.installDownloadedUpdate(uiState.value.appUpdate.downloadSha256)) {+ when (val result = appUpdatePort.installDownloadedUpdate(uiState.value.appUpdate.downloadSha256)) {is Result.Error -> uiState.update { it.copy(userMessage = result.message) }is Result.Success -> uiState.update {it.copy(userMessage = appContext.getString(R.string.settings_update_install_started))@@ -162,26 +150,3 @@ internal class SettingsAppUpdateActions(}}}--internal fun com.streamvault.app.update.AppUpdateDownloadState.toSettingsDownloadState() =- SettingsUpdateDownloadState(- status = when (status) {- com.streamvault.app.update.AppUpdateDownloadStatus.Idle -> SettingsUpdateDownloadStatus.IDLE- com.streamvault.app.update.AppUpdateDownloadStatus.Downloading -> SettingsUpdateDownloadStatus.DOWNLOADING- com.streamvault.app.update.AppUpdateDownloadStatus.Downloaded -> SettingsUpdateDownloadStatus.DOWNLOADED- com.streamvault.app.update.AppUpdateDownloadStatus.Failed -> SettingsUpdateDownloadStatus.FAILED- },- versionName = versionName,- downloadId = downloadId,- installPermissionRequired = installPermissionRequired,- )--private fun SettingsReleaseInfo.toGitHubReleaseInfo() = com.streamvault.app.update.GitHubReleaseInfo(- versionName = versionName,- versionCode = versionCode,- releaseUrl = releaseUrl,- downloadUrl = downloadUrl,- downloadSha256 = downloadSha256,- releaseNotes = releaseNotes,- publishedAt = publishedAt,-)diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsDerivedStateObservers.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDerivedStateObservers.ktsimilarity index 97%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsDerivedStateObservers.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDerivedStateObservers.ktindex f0ba188d..97b05ade 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsDerivedStateObservers.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDerivedStateObservers.kt@@ -1,11 +1,11 @@@file:OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentationimport com.streamvault.feature.settings.presentation.*-import android.app.Application-import com.streamvault.app.R+import android.content.Context+import com.streamvault.feature.settings.Rimport com.streamvault.data.local.dao.ProgramDaoimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.CategorySortMode@@ -34,7 +34,7 @@ internal fun observeProviderDiagnostics(movieRepository: MovieRepository,seriesRepository: SeriesRepository,programDao: ProgramDao,- application: Application+ application: Context): Flow<Map<Long, ProviderDiagnosticsUiModel>> {return providerRepository.getProviders().flatMapLatest { providers ->@@ -148,7 +148,7 @@ private fun observeHiddenCategoryIdsByType(}}-private fun buildCapabilitySummary(application: Application, provider: Provider): String {+private fun buildCapabilitySummary(application: Context, provider: Provider): String {return when (provider.type) {ProviderType.XTREAM_CODES -> {if (provider.epgUrl.isNotBlank()) {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsObserverRegistrations.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsObserverRegistrations.ktsimilarity index 93%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsObserverRegistrations.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsObserverRegistrations.ktindex c4d63bfa..030f5b8a 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsObserverRegistrations.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsObserverRegistrations.kt@@ -1,10 +1,7 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import com.streamvault.feature.settings.presentation.*--import android.app.Application-import com.streamvault.app.update.isRemoteVersionNewer-import com.streamvault.app.update.AppUpdateInstaller+import android.content.Context+import com.streamvault.feature.settings.api.SettingsAppUpdatePortimport com.streamvault.data.local.dao.ProgramDaoimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.domain.manager.RecordingManager@@ -30,7 +27,7 @@ internal fun registerSettingsAppUpdateObservers(scope: CoroutineScope,preferencesRepository: PreferencesRepository,appUpdateActions: SettingsAppUpdateActions,- appUpdateInstaller: AppUpdateInstaller,+ appUpdatePort: SettingsAppUpdatePort,uiState: MutableStateFlow<SettingsUiState>) {scope.launch {@@ -49,7 +46,7 @@ internal fun registerSettingsAppUpdateObservers(appUpdateActions.checkForAppUpdates(scope = scope,manual = false,- isRemoteVersionNewer = ::isRemoteVersionNewer,+ isRemoteVersionNewer = appUpdatePort::isRemoteVersionNewer,autoDownload = preferences.autoDownload)}@@ -57,15 +54,15 @@ internal fun registerSettingsAppUpdateObservers(}scope.launch {- appUpdateInstaller.downloadState.collect { downloadState ->+ appUpdatePort.downloadState.collect { downloadState ->uiState.update {- it.copy(appUpdate = it.appUpdate.withDownloadState(downloadState.toSettingsDownloadState()))+ it.copy(appUpdate = it.appUpdate.withDownloadState(downloadState))}}}scope.launch {- appUpdateInstaller.refreshState()+ appUpdatePort.refreshDownloadState()}}@@ -162,7 +159,7 @@ internal fun registerDerivedStateObservers(movieRepository: MovieRepository,seriesRepository: SeriesRepository,programDao: ProgramDao,- application: Application,+ application: Context,preferencesRepository: PreferencesRepository,activeProviderIdFlow: Flow<Long?>,categoryRepository: CategoryRepository,diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderActions.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderActions.ktsimilarity index 95%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderActions.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderActions.ktindex 0a7520ad..718e686f 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderActions.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderActions.kt@@ -1,10 +1,6 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import com.streamvault.feature.settings.presentation.SettingsUiState--import com.streamvault.app.tv.LauncherRecommendationsManager-import com.streamvault.app.tv.WatchNextManager-import com.streamvault.app.tvinput.TvInputChannelSyncManager+import com.streamvault.feature.settings.api.SettingsSurfaceRefreshPortimport com.streamvault.domain.model.ActiveLiveSourceimport com.streamvault.domain.model.ChannelLogoSourcePolicyimport com.streamvault.domain.model.GuideSourcePolicy@@ -42,9 +38,7 @@ internal class SettingsProviderActions(private val syncProvider: SyncProvider,private val syncManager: ProviderSyncCommands,private val syncMetadataRepository: SyncMetadataRepository,- private val watchNextManager: WatchNextManager,- private val launcherRecommendationsManager: LauncherRecommendationsManager,- private val tvInputChannelSyncManager: TvInputChannelSyncManager,+ private val surfaceRefreshPort: SettingsSurfaceRefreshPort,private val uiState: MutableStateFlow<SettingsUiState>) {private companion object {@@ -70,9 +64,9 @@ internal class SettingsProviderActions(// Repository write succeeded – now persist the UI-layer preferences and refresh.preferencesRepository.setLastActiveProviderId(providerId)combinedM3uRepository.setActiveLiveSource(ActiveLiveSource.ProviderSource(providerId))- watchNextManager.refreshWatchNext()- launcherRecommendationsManager.refreshRecommendations(force = true)- tvInputChannelSyncManager.refreshTvInputCatalog()+ surfaceRefreshPort.refreshWatchNext()+ surfaceRefreshPort.refreshRecommendations()+ surfaceRefreshPort.refreshTvInputCatalog()val shouldAutoSync = shouldAutoSyncProvider(lastSyncedAt = provider.lastSyncedAt,now = System.currentTimeMillis(),@@ -104,7 +98,7 @@ internal class SettingsProviderActions(uiState.update { it.copy(userMessage = "Enable at least one playlist in this combined source before activating it") }else -> when (combinedM3uRepository.setActiveLiveSource(ActiveLiveSource.CombinedM3uSource(profileId))) {is Result.Success -> {- launcherRecommendationsManager.refreshRecommendations(force = true)+ surfaceRefreshPort.refreshRecommendations()uiState.update { it.copy(userMessage = "Combined M3U source activated") }}is Result.Error -> uiState.update { it.copy(userMessage = "Could not activate combined source") }@@ -375,7 +369,7 @@ internal class SettingsProviderActions(syncingProviderName = providerName)}- tvInputChannelSyncManager.refreshTvInputCatalog()+ surfaceRefreshPort.refreshTvInputCatalog()} else if (!catalogRefreshed) {uiState.update { state ->state.copy(@@ -522,9 +516,9 @@ internal class SettingsProviderActions()}onSuccess()- runCatching { watchNextManager.refreshWatchNext() }- runCatching { launcherRecommendationsManager.refreshRecommendations(force = true) }- runCatching { tvInputChannelSyncManager.refreshTvInputCatalog() }+ runCatching { surfaceRefreshPort.refreshWatchNext() }+ runCatching { surfaceRefreshPort.refreshRecommendations() }+ runCatching { surfaceRefreshPort.refreshTvInputCatalog() }}is Result.Error -> uiState.update {it.copy(diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingActions.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingActions.ktsimilarity index 98%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingActions.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingActions.ktindex f0f64969..7c6c31df 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingActions.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingActions.kt@@ -1,9 +1,7 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import com.streamvault.feature.settings.presentation.SettingsUiState--import android.app.Application-import com.streamvault.app.R+import android.content.Context+import com.streamvault.feature.settings.Rimport com.streamvault.domain.manager.RecordingManagerimport com.streamvault.domain.model.RecordingStorageConfigimport com.streamvault.domain.model.RecordingReconciliationResult@@ -16,7 +14,7 @@ import kotlinx.coroutines.sync.Muteximport kotlinx.coroutines.sync.withLockinternal class SettingsRecordingActions(- private val appContext: Application,+ private val appContext: Context,private val recordingManager: RecordingManager,private val uiState: MutableStateFlow<SettingsUiState>) {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSyncActions.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSyncActions.ktsimilarity index 96%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSyncActions.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSyncActions.ktindex c356ec72..b72c85a3 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSyncActions.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSyncActions.kt@@ -1,11 +1,8 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import com.streamvault.feature.settings.presentation.*--import android.app.Application-import com.streamvault.app.R-import com.streamvault.app.tvinput.TvInputChannelSyncManager-import com.streamvault.app.tvinput.TvInputCatalogRefreshWorker+import android.content.Context+import com.streamvault.feature.settings.R+import com.streamvault.feature.settings.api.SettingsSurfaceRefreshPortimport com.streamvault.data.sync.ProviderSyncCommandsimport com.streamvault.data.sync.SyncRepairSectionimport com.streamvault.domain.model.ProviderType@@ -18,9 +15,9 @@ import kotlinx.coroutines.flow.updateimport kotlinx.coroutines.launchinternal class SettingsSyncActions(- private val appContext: Application,+ private val appContext: Context,private val syncManager: ProviderSyncCommands,- private val tvInputChannelSyncManager: TvInputChannelSyncManager,+ private val surfaceRefreshPort: SettingsSurfaceRefreshPort,private val uiState: MutableStateFlow<SettingsUiState>,private val refreshProvider: (CoroutineScope, Long, SettingsProviderSyncMode, String?, Long, String?, Boolean) -> Job) {@@ -235,7 +232,7 @@ internal class SettingsSyncActions(it == appContext.getString(R.string.settings_sync_option_tv)}) {- TvInputCatalogRefreshWorker.enqueue(appContext)+ surfaceRefreshPort.enqueueTvInputCatalogRefresh()}uiState.update { state ->diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.ktsimilarity index 96%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.ktindex 397efd11..e7fb7626 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt@@ -1,24 +1,18 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import com.streamvault.feature.settings.presentation.*--import android.app.Application+import android.content.Contextimport android.content.Intentimport androidx.activity.result.ActivityResultLauncherimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope-import com.streamvault.app.R-import com.streamvault.app.BuildConfig-import com.streamvault.app.diagnostics.CrashReportStore-import com.streamvault.app.tv.LauncherRecommendationsManager-import com.streamvault.app.tv.WatchNextManager-import com.streamvault.app.tvinput.TvInputChannelSyncManager+import com.streamvault.feature.settings.R+import com.streamvault.feature.settings.api.SettingsAppUpdatePort+import com.streamvault.feature.settings.api.SettingsDiagnosticsPort+import com.streamvault.feature.settings.api.SettingsCrashReport+import com.streamvault.feature.settings.api.SettingsSurfaceRefreshPortimport com.streamvault.domain.model.LiveTvChannelModeimport com.streamvault.domain.model.LiveTvQuickFilterVisibilityModeimport com.streamvault.domain.model.VodViewMode-import com.streamvault.app.update.AppUpdateInstaller-import com.streamvault.app.update.GitHubReleaseChecker-import com.streamvault.app.update.isRemoteVersionNewerimport com.streamvault.data.local.dao.ProgramDaoimport com.streamvault.data.local.dao.XtreamIndexJobDaoimport com.streamvault.data.local.dao.XtreamLiveOnboardingDao@@ -90,6 +84,7 @@ import com.streamvault.domain.usecase.SyncProviderCommandimport com.streamvault.domain.usecase.SyncProviderResultimport com.streamvault.player.AudioCompatibilityMemoryStoreimport dagger.hilt.android.lifecycle.HiltViewModel+import dagger.hilt.android.qualifiers.ApplicationContextimport kotlinx.coroutines.ExperimentalCoroutinesApiimport kotlinx.coroutines.flow.*import kotlinx.coroutines.launch@@ -101,7 +96,7 @@ private const val BACKGROUND_INDEX_STATUS_PREFIX = "Background index:"@HiltViewModel@OptIn(ExperimentalCoroutinesApi::class)class SettingsViewModel @Inject constructor(- application: Application,+ @ApplicationContext application: Context,private val providerRepository: ProviderRepository,private val combinedM3uRepository: CombinedM3uRepository,private val categoryRepository: CategoryRepository,@@ -121,13 +116,11 @@ class SettingsViewModel @Inject constructor(private val xtreamLiveOnboardingDao: XtreamLiveOnboardingDao,private val syncMetadataRepository: SyncMetadataRepository,private val playbackHistoryRepository: com.streamvault.domain.repository.PlaybackHistoryRepository,- private val watchNextManager: WatchNextManager,- private val launcherRecommendationsManager: LauncherRecommendationsManager,- private val tvInputChannelSyncManager: TvInputChannelSyncManager,+ private val surfaceRefreshPort: SettingsSurfaceRefreshPort,+ private val diagnosticsPort: SettingsDiagnosticsPort,private val syncProvider: SyncProvider,private val epgSourceRepository: com.streamvault.domain.repository.EpgSourceRepository,- private val gitHubReleaseChecker: GitHubReleaseChecker,- private val appUpdateInstaller: AppUpdateInstaller,+ private val appUpdatePort: SettingsAppUpdatePort,private val getCustomCategories: GetCustomCategories,private val audioCompatibilityMemoryStore: AudioCompatibilityMemoryStore) : ViewModel() {@@ -147,8 +140,7 @@ class SettingsViewModel @Inject constructor(private val appUpdateActions = SettingsAppUpdateActions(appContext = application,preferencesRepository = preferencesRepository,- gitHubReleaseChecker = gitHubReleaseChecker,- appUpdateInstaller = appUpdateInstaller,+ appUpdatePort = appUpdatePort,uiState = _uiState)private val backupActions = SettingsBackupActions(@@ -174,15 +166,13 @@ class SettingsViewModel @Inject constructor(syncProvider = syncProvider,syncManager = syncManager,syncMetadataRepository = syncMetadataRepository,- watchNextManager = watchNextManager,- launcherRecommendationsManager = launcherRecommendationsManager,- tvInputChannelSyncManager = tvInputChannelSyncManager,+ surfaceRefreshPort = surfaceRefreshPort,uiState = _uiState)private val syncActions = SettingsSyncActions(appContext = application,syncManager = syncManager,- tvInputChannelSyncManager = tvInputChannelSyncManager,+ surfaceRefreshPort = surfaceRefreshPort,uiState = _uiState,refreshProvider = { scope, providerId, syncMode, progressPrefix, startedAt, sectionLabel, isCancelable ->providerActions.refreshProvider(@@ -210,7 +200,7 @@ class SettingsViewModel @Inject constructor(scope = viewModelScope,preferencesRepository = preferencesRepository,appUpdateActions = appUpdateActions,- appUpdateInstaller = appUpdateInstaller,+ appUpdatePort = appUpdatePort,uiState = _uiState)registerCombinedProfileObservers(@@ -255,7 +245,7 @@ class SettingsViewModel @Inject constructor(}fun refreshCrashReport() {- val report = CrashReportStore.latestReport(appContext)+ val report = diagnosticsPort.latestReport()_uiState.update { state ->state.copy(crashReport = report?.toUiModel() ?: CrashReportUiModel(),@@ -276,7 +266,7 @@ class SettingsViewModel @Inject constructor(}fun deleteCrashReport() {- val deleted = CrashReportStore.deleteLatestReport(appContext)+ val deleted = diagnosticsPort.deleteLatestReport()_uiState.update {it.copy(crashReport = CrashReportUiModel(),@@ -290,7 +280,7 @@ class SettingsViewModel @Inject constructor(}}- private fun com.streamvault.app.diagnostics.CrashReportSummary.toUiModel(): CrashReportUiModel =+ private fun SettingsCrashReport.toUiModel(): CrashReportUiModel =CrashReportUiModel(timestamp = timestamp,exception = exception,@@ -694,7 +684,7 @@ class SettingsViewModel @Inject constructor(fun refreshDownloadState() {viewModelScope.launch {- appUpdateInstaller.refreshState()+ appUpdatePort.refreshDownloadState()}}@@ -702,7 +692,7 @@ class SettingsViewModel @Inject constructor(appUpdateActions.checkForAppUpdates(scope = viewModelScope,manual = true,- isRemoteVersionNewer = ::isRemoteVersionNewer+ isRemoteVersionNewer = appUpdatePort::isRemoteVersionNewer)}diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xmlindex 3fc225c7..18219553 100644--- a/feature/settings/src/main/res/values/strings.xml+++ b/feature/settings/src/main/res/values/strings.xml@@ -110,4 +110,60 @@<string name="settings_sync_option_movies">Movies</string><string name="settings_sync_option_series">Series</string><string name="settings_sync_option_epg">EPG</string>+ <string name="settings_capability_xtream_with_epg">Xtream source with XMLTV guide support and on-demand guide fallback. Catch-up is available when the provider exposes replay streams.</string>+ <string name="settings_capability_xtream_without_epg">Xtream source with on-demand guide fallback. Catch-up depends on provider replay support.</string>+ <string name="settings_capability_m3u_with_epg">M3U source with XMLTV guide. Archive support depends on provider stream templates.</string>+ <string name="settings_capability_m3u_without_epg">M3U source without guide URL. Guide and archive coverage may be limited.</string>+ <string name="settings_recording_stop_failed">Stop failed: %1$s</string>+ <string name="settings_recording_stopped">Recording stopped</string>+ <string name="settings_recording_cancel_failed">Cancel failed: %1$s</string>+ <string name="settings_recording_cancelled">Recording cancelled</string>+ <string name="settings_recording_skip_failed">Skip failed: %1$s</string>+ <string name="settings_recording_skipped">Occurrence skipped</string>+ <string name="settings_recording_delete_failed">Delete failed: %1$s</string>+ <string name="settings_recording_deleted">Recording deleted</string>+ <string name="settings_recording_retry_failed">Retry failed: %1$s</string>+ <string name="settings_recording_retry_started">Recording retry scheduled</string>+ <string name="settings_recording_schedule_toggle_failed">Schedule update failed: %1$s</string>+ <string name="settings_recording_schedule_enabled">Recording schedule enabled</string>+ <string name="settings_recording_schedule_disabled">Recording schedule disabled</string>+ <string name="settings_recording_reconcile_failed">Repair failed: %1$s</string>+ <string name="settings_recording_reconcile_complete">Recording schedule repaired</string>+ <string name="settings_recording_storage_update_failed">Storage update failed: %1$s</string>+ <string name="settings_recording_storage_updated">Recording storage updated</string>+ <string name="settings_recording_pattern_failed">Filename pattern update failed: %1$s</string>+ <string name="settings_recording_pattern_saved">Filename pattern saved</string>+ <string name="settings_recording_retention_failed">Retention policy update failed: %1$s</string>+ <string name="settings_recording_retention_saved">Retention policy saved</string>+ <string name="settings_recording_concurrency_failed">Concurrency update failed: %1$s</string>+ <string name="settings_recording_concurrency_saved">Recording concurrency saved</string>+ <string name="settings_sync_cancelled">Sync cancelled.</string>+ <string name="settings_syncing_section">Syncing %1$s...</string>+ <string name="settings_sync_custom_required">Choose at least one section to sync.</string>+ <string name="settings_syncing_preparing">Preparing sync...</string>+ <string name="settings_sync_sections_success">Synced: %1$s.</string>+ <string name="settings_sync_sections_failed">Sync failed: %1$s.</string>+ <string name="settings_sync_sections_partial">Synced: %1$s. Failed: %2$s.</string>+ <string name="settings_crash_report_deleted">Crash report deleted.</string>+ <string name="settings_crash_report_delete_failed">Could not delete crash report.</string>+ <string name="settings_top_navigation_default_updated">Default landing screen changed to %1$s because the previous tab is no longer visible.</string>+ <string name="settings_live_tv_quick_filter_blank">Enter a filter before saving it.</string>+ <string name="settings_live_tv_quick_filter_duplicate">%1$s is already saved.</string>+ <string name="settings_live_tv_quick_filter_added">Saved %1$s to Live TV quick filters.</string>+ <string name="settings_live_tv_quick_filter_removed">Removed %1$s from Live TV quick filters.</string>+ <string name="settings_ffmpeg_compatibility_cleared">Learned playback compatibility data cleared.</string>+ <string name="settings_speed_test_estimate_complete">Network estimate saved.</string>+ <string name="settings_speed_test_complete">Speed test complete.</string>+ <string name="settings_speed_test_failed">Speed test failed: %1$s</string>+ <string name="settings_speed_test_wifi_applied">Applied the recommended Wi-Fi quality cap.</string>+ <string name="settings_speed_test_ethernet_applied">Applied the recommended Ethernet quality cap.</string>+ <string name="settings_history_cleared">Watch history and recents cleared</string>+ <string name="settings_pin_changed">PIN saved successfully</string>+ <string name="nav_home">Home</string>+ <string name="settings_startup_first_favorite_live">Play first favorite channel</string>+ <string name="settings_startup_last_watched_live">Play last watched live channel</string>+ <string name="nav_epg">Guide</string>+ <string name="nav_downloads">Downloads</string>+ <string name="nav_plugins">Plugins</string>+ <string name="nav_settings">Settings</string></resources>diff --git a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActionsTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsAppUpdateActionsTest.ktsimilarity index 77%rename from app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActionsTest.ktrename to feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsAppUpdateActionsTest.ktindex 2b1db959..d8b26a15 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActionsTest.kt+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsAppUpdateActionsTest.kt@@ -1,11 +1,11 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import android.app.Application+import android.content.Contextimport com.google.common.truth.Truth.assertThatimport com.streamvault.data.preferences.PreferencesRepository-import com.streamvault.app.update.AppUpdateInstaller-import com.streamvault.app.update.GitHubReleaseChecker-import com.streamvault.feature.settings.presentation.SettingsUiState+import com.streamvault.feature.settings.api.SettingsAppUpdatePort+import com.streamvault.feature.settings.api.SettingsReleaseInfo+import com.streamvault.feature.settings.api.SettingsUpdateDownloadStateimport com.streamvault.domain.model.Resultimport kotlinx.coroutines.ExperimentalCoroutinesApiimport kotlinx.coroutines.flow.MutableStateFlow@@ -24,18 +24,16 @@ import org.mockito.kotlin.wheneverclass SettingsAppUpdateActionsTest {@Testfun `failed check records failure without replacing cached release`() = runTest(StandardTestDispatcher()) {- val application = mock<Application>()+ val application = mock<Context>()val preferences = mock<PreferencesRepository>()- val checker = mock<GitHubReleaseChecker>()- val installer = mock<AppUpdateInstaller>()+ val updatePort = mock<SettingsAppUpdatePort>()val uiState = MutableStateFlow(SettingsUiState())- whenever(checker.fetchLatestRelease()).thenReturn(Result.error("HTTP 500"))+ whenever(updatePort.fetchLatestRelease()).thenReturn(Result.error("HTTP 500"))val actions = SettingsAppUpdateActions(appContext = application,preferencesRepository = preferences,- gitHubReleaseChecker = checker,- appUpdateInstaller = installer,+ appUpdatePort = updatePort,uiState = uiState)diff --git a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsDerivedStateObserversTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDerivedStateObserversTest.ktsimilarity index 94%rename from app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsDerivedStateObserversTest.ktrename to feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDerivedStateObserversTest.ktindex ed096a5b..220e3518 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsDerivedStateObserversTest.kt+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDerivedStateObserversTest.kt@@ -1,8 +1,8 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentation-import android.app.Application+import android.content.Contextimport com.google.common.truth.Truth.assertThat-import com.streamvault.app.R+import com.streamvault.feature.settings.Rimport com.streamvault.data.local.dao.ProgramDaoimport com.streamvault.domain.model.LegacyProvider as Providerimport com.streamvault.domain.model.ProviderType@@ -24,7 +24,7 @@ class SettingsDerivedStateObserversTest {private val movieRepository: MovieRepository = mock()private val seriesRepository: SeriesRepository = mock()private val programDao: ProgramDao = mock()- private val application: Application = mock()+ private val application: Context = mock()@Testfun `observeProviderDiagnostics uses live movie and series library counts over metadata counts`() = runTest {diff --git a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsProviderActionsTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsProviderActionsTest.ktsimilarity index 79%rename from app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsProviderActionsTest.ktrename to feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsProviderActionsTest.ktindex c0bca61f..7fbd109f 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsProviderActionsTest.kt+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsProviderActionsTest.kt@@ -1,9 +1,6 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentationimport com.google.common.truth.Truth.assertThat-import com.streamvault.app.tv.LauncherRecommendationsManager-import com.streamvault.app.tv.WatchNextManager-import com.streamvault.app.tvinput.TvInputChannelSyncManagerimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.data.sync.SyncManagerimport com.streamvault.domain.model.ActiveLiveSource@@ -14,7 +11,7 @@ import com.streamvault.domain.repository.CombinedM3uRepositoryimport com.streamvault.domain.repository.ProviderRepositoryimport com.streamvault.domain.repository.SyncMetadataRepositoryimport com.streamvault.domain.usecase.SyncProvider-import com.streamvault.feature.settings.presentation.SettingsUiState+import com.streamvault.feature.settings.api.SettingsSurfaceRefreshPortimport kotlinx.coroutines.ExperimentalCoroutinesApiimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.test.StandardTestDispatcher@@ -38,9 +35,7 @@ class SettingsProviderActionsTest {private val syncProvider: SyncProvider = mock()private val syncManager: SyncManager = mock()private val syncMetadataRepository: SyncMetadataRepository = mock()- private val watchNextManager: WatchNextManager = mock()- private val launcherRecommendationsManager: LauncherRecommendationsManager = mock()- private val tvInputChannelSyncManager: TvInputChannelSyncManager = mock()+ private val surfaceRefreshPort: SettingsSurfaceRefreshPort = mock()private val uiState = MutableStateFlow(SettingsUiState())private val actions = SettingsProviderActions(@@ -50,9 +45,7 @@ class SettingsProviderActionsTest {syncProvider = syncProvider,syncManager = syncManager,syncMetadataRepository = syncMetadataRepository,- watchNextManager = watchNextManager,- launcherRecommendationsManager = launcherRecommendationsManager,- tvInputChannelSyncManager = tvInputChannelSyncManager,+ surfaceRefreshPort = surfaceRefreshPort,uiState = uiState)@@ -84,9 +77,9 @@ class SettingsProviderActionsTest {verify(preferencesRepository).setLastActiveProviderId(7L)verify(combinedM3uRepository).setActiveLiveSource(ActiveLiveSource.ProviderSource(7L))verify(providerRepository).setActiveProvider(7L)- verify(watchNextManager).refreshWatchNext()- verify(launcherRecommendationsManager).refreshRecommendations(force = true)- verify(tvInputChannelSyncManager).refreshTvInputCatalog()+ verify(surfaceRefreshPort).refreshWatchNext()+ verify(surfaceRefreshPort).refreshRecommendations()+ verify(surfaceRefreshPort).refreshTvInputCatalog()verify(syncProvider, never()).invoke(any(), any())}@@ -106,9 +99,9 @@ class SettingsProviderActionsTest {advanceUntilIdle()verify(providerRepository).deleteProvider(eq(7L), any())- verify(watchNextManager).refreshWatchNext()- verify(launcherRecommendationsManager).refreshRecommendations(force = true)- verify(tvInputChannelSyncManager).refreshTvInputCatalog()+ verify(surfaceRefreshPort).refreshWatchNext()+ verify(surfaceRefreshPort).refreshRecommendations()+ verify(surfaceRefreshPort).refreshTvInputCatalog()assertThat(uiState.value.userMessage).isEqualTo("Provider deleted")}@@ -142,17 +135,17 @@ class SettingsProviderActionsTest {)))- doThrow(IllegalStateException("refresh boom")).whenever(launcherRecommendationsManager)- .refreshRecommendations(force = true)+ doThrow(IllegalStateException("refresh boom")).whenever(surfaceRefreshPort)+ .refreshRecommendations()var onSuccessCalled = falseactions.deleteProvider(this, 7L, onSuccess = { onSuccessCalled = true })advanceUntilIdle()verify(providerRepository).deleteProvider(eq(7L), any())- verify(watchNextManager).refreshWatchNext()- verify(launcherRecommendationsManager).refreshRecommendations(force = true)- verify(tvInputChannelSyncManager).refreshTvInputCatalog()+ verify(surfaceRefreshPort).refreshWatchNext()+ verify(surfaceRefreshPort).refreshRecommendations()+ verify(surfaceRefreshPort).refreshTvInputCatalog()assertThat(onSuccessCalled).isTrue()assertThat(uiState.value.isDeletingProvider).isFalse()assertThat(uiState.value.userMessage).isEqualTo("Provider deleted")diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsViewModelBoundaryTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsViewModelBoundaryTest.ktnew file mode 100644index 00000000..b6ed1b54--- /dev/null+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsViewModelBoundaryTest.kt@@ -0,0 +1,18 @@+package com.streamvault.feature.settings.presentation++import com.google.common.truth.Truth.assertThat+import java.io.File+import org.junit.Test++class SettingsViewModelBoundaryTest {+ @Test+ fun viewModelUsesPortsInsteadOfAppImplementations() {+ val source = File("src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt")+ assertThat(source.isFile).isTrue()+ val text = source.readText()+ assertThat(text).contains("SettingsSurfaceRefreshPort")+ assertThat(text).contains("SettingsDiagnosticsPort")+ assertThat(text).contains("SettingsAppUpdatePort")+ assertThat(text).doesNotContain("com.streamvault.app")+ }+}