Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Batch 11: RTL string concatenation fixes, HomeScreen error state UI

Davidona5ca3b522abe6
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
index 0a48984e..5eaf1940 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
@@ -140,7 +140,7 @@ fun ProgramHistoryDialog(
overflow = TextOverflow.Ellipsis
)
Text(
- text = "${dayFormat.format(program.startTime)} | ${timeFormat.format(program.startTime)} - ${timeFormat.format(program.endTime)}",
+ text = stringResource(R.string.program_date_time_range, dayFormat.format(program.startTime), timeFormat.format(program.startTime), timeFormat.format(program.endTime)),
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
index e6b3e96d..397e86b9 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
@@ -394,7 +394,7 @@ fun FullEpgScreen(
overflow = TextOverflow.Ellipsis
)
Text(
- text = "${format.format(Date(scheduleProgram.startTime))} - ${format.format(Date(scheduleProgram.endTime))}",
+ text = stringResource(R.string.time_range_format, format.format(Date(scheduleProgram.startTime)), format.format(Date(scheduleProgram.endTime))),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
@@ -1359,7 +1359,7 @@ fun EpgRow(
)
}
Text(
- text = "${channel.number}. ${channel.name}",
+ text = stringResource(R.string.channel_number_name_format, channel.number, channel.name),
style = MaterialTheme.typography.titleMedium,
color = if (isFocused) TextPrimary else OnSurface,
maxLines = 1,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
index ab1d20ae..f97a3710 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
@@ -525,7 +525,7 @@ fun HomeScreen(
verticalAlignment = Alignment.CenterVertically
) {
Text(
- text = "${stringResource(R.string.live_shell_provider)}: ${uiState.provider?.name ?: stringResource(R.string.playlist_no_provider)}",
+ text = stringResource(R.string.label_colon_value_format, stringResource(R.string.live_shell_provider), uiState.provider?.name ?: stringResource(R.string.playlist_no_provider)),
style = MaterialTheme.typography.labelMedium,
color = OnSurfaceDim,
maxLines = 1
@@ -540,10 +540,10 @@ fun HomeScreen(
} else {
ContentMetadataStrip(
values = buildList {
- add("${stringResource(R.string.live_shell_provider)}: ${uiState.provider?.name ?: stringResource(R.string.playlist_no_provider)}")
+ add(stringResource(R.string.label_colon_value_format, stringResource(R.string.live_shell_provider), uiState.provider?.name ?: stringResource(R.string.playlist_no_provider)))
add(stringResource(R.string.live_channel_results, uiState.filteredChannels.size))
uiState.lastVisitedCategory?.name?.let {
- add("${stringResource(R.string.live_shell_last_group)}: $it")
+ add(stringResource(R.string.label_colon_value_format, stringResource(R.string.live_shell_last_group), it))
}
}
)
@@ -562,7 +562,7 @@ fun HomeScreen(
)
if (hasSplitChannels) {
StatusPill(
- label = "${stringResource(R.string.live_shell_split)} ${splitSlots.count { it != null }}/4"
+ label = stringResource(R.string.split_count_format, stringResource(R.string.live_shell_split), splitSlots.count { it != null })
)
}
}
@@ -582,6 +582,23 @@ fun HomeScreen(
)
}
}
+ } else if (uiState.errorMessage != null) {
+ val errorMsg = uiState.errorMessage
+ Box(
+ modifier = Modifier.fillMaxSize(),
+ contentAlignment = Alignment.Center
+ ) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(6.dp)
+ ) {
+ Text(
+ text = errorMsg ?: "",
+ style = MaterialTheme.typography.titleMedium,
+ color = OnBackground
+ )
+ }
+ }
} else if (!uiState.hasChannels) {
Box(
modifier = Modifier.fillMaxSize(),
@@ -961,7 +978,7 @@ private fun LivePreviewPane(
color = OnBackground
)
Text(
- text = "${formatProgramTime(program.startTime)} - ${formatProgramTime(program.endTime)}",
+ text = stringResource(R.string.time_range_format, formatProgramTime(program.startTime), formatProgramTime(program.endTime)),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
@@ -1213,7 +1230,7 @@ fun ReorderSidePanel(
Text(stringResource(R.string.action_move), color = Color.White, modifier = Modifier.padding(end = 8.dp))
}
Text(
- "${index + 1}. ${channel.name}",
+ stringResource(R.string.channel_number_name_format, index + 1, channel.name),
modifier = Modifier.weight(1f),
style = MaterialTheme.typography.bodyMedium,
color = if (isDraggingThis) Color.White else if (isFocused) OnBackground else OnSurface,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
index a1195a45..f7b1b6ec 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
@@ -287,6 +287,7 @@ class HomeViewModel @Inject constructor(
val providerId = _uiState.value.provider?.id ?: return
loadChannelsJob?.cancel()
loadChannelsJob = viewModelScope.launch {
+ try {
val queryFlow = _uiState.map { it.channelSearchQuery }
.debounce(150)
.distinctUntilChanged()
@@ -328,9 +329,17 @@ class HomeViewModel @Inject constructor(
val numberedChannels = channels.mapIndexed { index, channel ->
channel.copy(number = index + 1)
}
- _uiState.update { it.copy(hasChannels = numberedChannels.isNotEmpty(), isLoading = false) }
+ _uiState.update { it.copy(hasChannels = numberedChannels.isNotEmpty(), isLoading = false, errorMessage = null) }
_localChannels.value = numberedChannels
}
+ } catch (e: Exception) {
+ _uiState.update {
+ it.copy(
+ isLoading = false,
+ errorMessage = appContext.getString(R.string.home_error_load_failed)
+ )
+ }
+ }
}
}
@@ -477,7 +486,7 @@ class HomeViewModel @Inject constructor(
groupId = null
)
onDismissDialog()
- _uiState.update { it.copy(userMessage = "Added ${channel.name} to Favorites") }
+ _uiState.update { it.copy(userMessage = appContext.getString(R.string.home_added_to_favorites, channel.name)) }
}
}
@@ -489,7 +498,7 @@ class HomeViewModel @Inject constructor(
groupId = null
)
onDismissDialog()
- _uiState.update { it.copy(userMessage = "Removed ${channel.name} from Favorites") }
+ _uiState.update { it.copy(userMessage = appContext.getString(R.string.home_removed_from_favorites, channel.name)) }
}
}
@@ -895,7 +904,8 @@ data class HomeUiState(
val previewChannelId: Long? = null,
val previewPlayerEngine: PlayerEngine? = null,
val isPreviewLoading: Boolean = false,
- val previewErrorMessage: String? = null
+ val previewErrorMessage: String? = null,
+ val errorMessage: String? = null
)
private data class CategorySelectionContext(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
index fb75354f..8f79e14e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
@@ -571,7 +571,7 @@ private fun PlayerLiveInfo(
)
Text(
text = if (currentProgram != null) {
- "$displayChannelNumber. ${currentChannelName.orEmpty()}"
+ stringResource(R.string.channel_number_name_format, displayChannelNumber, currentChannelName.orEmpty())
} else {
stringResource(R.string.player_no_guide_data)
},
@@ -614,7 +614,7 @@ private fun PlayerLiveInfo(
}
} else {
Text(
- text = currentChannelName?.let { "$displayChannelNumber. $it" }.orEmpty(),
+ text = currentChannelName?.let { stringResource(R.string.channel_number_name_format, displayChannelNumber, it) }.orEmpty(),
style = MaterialTheme.typography.labelLarge,
color = Color.White.copy(alpha = 0.82f)
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
index 719c6a33..e98c9f4f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
@@ -920,7 +920,7 @@ fun EpgOverlay(
if (currentChannel != null) {
Spacer(Modifier.height(8.dp))
Text(
- text = "$displayChannelNumber. ${currentChannel.name}",
+ text = stringResource(R.string.channel_number_name_format, displayChannelNumber, currentChannel.name),
style = MaterialTheme.typography.headlineSmall,
color = Color.White,
fontWeight = FontWeight.Bold
@@ -961,7 +961,7 @@ fun EpgOverlay(
Spacer(Modifier.height(4.dp))
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
- text = "${timeFormat.format(Date(currentProgram.startTime))} - ${timeFormat.format(Date(currentProgram.endTime))}",
+ text = stringResource(R.string.time_range_format, timeFormat.format(Date(currentProgram.startTime)), timeFormat.format(Date(currentProgram.endTime))),
style = MaterialTheme.typography.bodyMedium,
color = TextSecondary
)
@@ -1082,7 +1082,7 @@ fun EpgOverlay(
Spacer(Modifier.height(2.dp))
Row {
Text(
- text = "${timeFormat.format(Date(program.startTime))} - ${timeFormat.format(Date(program.endTime))}",
+ text = stringResource(R.string.time_range_format, timeFormat.format(Date(program.startTime)), timeFormat.format(Date(program.endTime))),
style = MaterialTheme.typography.bodySmall,
color = TextSecondary
)
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.kt
index 3e0dbd60..cd2994db 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
@@ -1285,7 +1285,7 @@ private fun ProviderDiagnosticsPanel(
color = OnSurfaceDim
)
Text(
- text = "${diagnostics.sourceLabel} | ${diagnostics.connectionSummary}",
+ text = stringResource(R.string.diagnostics_summary_format, diagnostics.sourceLabel, diagnostics.connectionSummary),
style = MaterialTheme.typography.bodySmall,
color = OnSurface
)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bfde2f12..db5173a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -806,4 +806,15 @@
<!-- Status Pill Format -->
<string name="favorites_status_pill_format">%1$s %2$d</string>
+
+ <!-- RTL-safe compound formats -->
+ <string name="time_range_format">%1$s – %2$s</string>
+ <string name="channel_number_name_format">%1$d. %2$s</string>
+ <string name="label_colon_value_format">%1$s: %2$s</string>
+ <string name="split_count_format">%1$s %2$d/4</string>
+ <string name="program_date_time_range">%1$s | %2$s – %3$s</string>
+ <string name="diagnostics_summary_format">%1$s | %2$s</string>
+ <string name="home_added_to_favorites">Added %1$s to Favorites</string>
+ <string name="home_removed_from_favorites">Removed %1$s from Favorites</string>
+ <string name="home_error_load_failed">Failed to load channels. Please check your connection and try again.</string>
</resources>