Skip to content

i18n(settings): move SettingsViewModel status messages into string resources #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ProdigyV21 merged 1 commit into from
Sep 5, 2026
Merged

i18n(settings): move SettingsViewModel status messages into string resources #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions app/src/main/kotlin/com/arflix/tv/ui/screens/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,22 @@ private fun openExternalUrl(context: Context, url: String) {
}
}

/**
* Resolves a [SettingsMessage] against the app language. Nested messages (e.g. the EPG summary
* inside an IPTV status line) are resolved first so they are localized too.
*/
@Composable
private fun SettingsMessage.localizedText(): String = when (this) {
is SettingsMessage.Raw -> text
is SettingsMessage.Res -> {
val args = mutableListOf<Any>()
formatArgs.forEach { arg ->
args += if (arg is SettingsMessage) arg.localizedText() else arg
}
stringResource(resourceId, *args.toTypedArray())
}
}

@Composable
private fun formatUserAgentPreview(value: String?, maxLength: Int): String {
val safeValue = value.orEmpty()
Expand Down Expand Up @@ -1695,8 +1711,8 @@ fun SettingsScreen(
playlists = uiState.iptvPlaylists,
channelCount = uiState.iptvChannelCount,
isLoading = uiState.isIptvLoading,
error = uiState.iptvError,
statusMessage = uiState.iptvStatusMessage,
error = uiState.iptvError?.localizedText(),
statusMessage = uiState.iptvStatusMessage?.localizedText(),
statusType = uiState.iptvStatusType,
progressText = uiState.iptvProgressText,
progressPercent = uiState.iptvProgressPercent,
Expand Down Expand Up @@ -1756,8 +1772,8 @@ fun SettingsScreen(
playlists = uiState.iptvPlaylists,
channelCount = uiState.iptvChannelCount,
isLoading = uiState.isIptvLoading,
error = uiState.iptvError,
statusMessage = uiState.iptvStatusMessage,
error = uiState.iptvError?.localizedText(),
statusMessage = uiState.iptvStatusMessage?.localizedText(),
statusType = uiState.iptvStatusType,
progressText = uiState.iptvProgressText,
progressPercent = uiState.iptvProgressPercent,
Expand Down Expand Up @@ -1817,7 +1833,7 @@ fun SettingsScreen(
connections = uiState.homeServerConnections,
isWorking = uiState.isHomeServerConnecting,
isPlexWorking = uiState.isPlexHomeServerPolling || uiState.plexHomeServerAuth != null,
error = uiState.homeServerError,
error = uiState.homeServerError?.localizedText(),
focusedIndex = if (activeZone == Zone.CONTENT) contentFocusIndex else -1,
onConnect = {
homeServerUrl = ""
Expand Down Expand Up @@ -1899,7 +1915,7 @@ fun SettingsScreen(
isTraktAuthStarting = uiState.isTraktAuthStarting,
isTraktPolling = uiState.isTraktPolling,
isForceCloudSyncing = uiState.isForceCloudSyncing,
lastCloudSyncStatus = uiState.lastCloudSyncStatus,
lastCloudSyncStatus = uiState.lastCloudSyncStatus?.localizedText(),
diagnosticsSharingEnabled = uiState.diagnosticsSharingEnabled,
isSelfUpdateSupported = uiState.isSelfUpdateSupported,
updateStatus = uiState.updateStatus,
Expand Down Expand Up @@ -2202,7 +2218,7 @@ fun SettingsScreen(
query = uiState.catalogSearchQuery,
results = uiState.catalogSearchResults,
isSearching = uiState.isCatalogSearching,
error = uiState.catalogSearchError,
error = uiState.catalogSearchError?.localizedText(),
manualUrl = catalogInputUrl,
addedCatalogUrls = uiState.catalogs.mapNotNull { it.sourceUrl }.toSet(),
onQueryChange = viewModel::setCatalogSearchQuery,
Expand Down Expand Up @@ -2266,7 +2282,7 @@ fun SettingsScreen(
CatalogPackImportDialog(
pendingPack = uiState.pendingPackManifest,
isLoading = uiState.isPackLoading,
error = uiState.packError,
error = uiState.packError?.localizedText(),
onConfirm = { manifest ->
viewModel.confirmInstallPack(uiState.pendingPackUrl ?: "")
},
Expand Down Expand Up @@ -2606,7 +2622,7 @@ fun SettingsScreen(
// Toast notification
uiState.toastMessage?.let { message ->
Toast(
message = message,
message = message.localizedText(),
type = when (uiState.toastType) {
ToastType.SUCCESS -> ComponentToastType.SUCCESS
ToastType.ERROR -> ComponentToastType.ERROR
Expand Down Expand Up @@ -4741,8 +4757,8 @@ private fun MobileSettingsSubPage(
playlists = uiState.iptvPlaylists,
channelCount = uiState.iptvChannelCount,
isLoading = uiState.isIptvLoading,
error = uiState.iptvError,
statusMessage = uiState.iptvStatusMessage,
error = uiState.iptvError?.localizedText(),
statusMessage = uiState.iptvStatusMessage?.localizedText(),
statusType = uiState.iptvStatusType,
progressText = uiState.iptvProgressText,
progressPercent = uiState.iptvProgressPercent,
Expand Down Expand Up @@ -4823,7 +4839,7 @@ private fun MobileSettingsSubPage(
connections = uiState.homeServerConnections,
isWorking = uiState.isHomeServerConnecting,
isPlexWorking = uiState.isPlexHomeServerPolling || uiState.plexHomeServerAuth != null,
error = uiState.homeServerError,
error = uiState.homeServerError?.localizedText(),
focusedIndex = -1,
onConnect = onConnectHomeServerClick,
onConnectPlex = onConnectPlexHomeServerClick,
Expand Down Expand Up @@ -5103,7 +5119,8 @@ private fun MobileCloudAccountSubPage(
MobileSettingsRow(
icon = Icons.Default.Sync,
title = stringResource(R.string.settings_force_sync),
subtitle = uiState.lastCloudSyncStatus ?: stringResource(R.string.settings_cloud_manual_sync_sub),
subtitle = uiState.lastCloudSyncStatus?.localizedText()
?: stringResource(R.string.settings_cloud_manual_sync_sub),
value = if (uiState.isForceCloudSyncing) stringResource(R.string.settings_badge_syncing) else stringResource(R.string.settings_badge_sync),
isFocused = false,
showDivider = true,
Expand Down
Loading
Loading