Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-05-17 15:32:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: localize stream label at render, simplify parser test runBlocking

Browse source 
StreamItem.streamLabel now returns name.orEmpty() so the data class
stays locale-neutral. The four composable display sites
(StreamsScreen, PlayerSourcesPanel, PlayerEpisodesPanel,
PlayerControls) localize the blank case with
stringResource(Res.string.stream_default_name). DownloadsRepository's
fallbackTitle path is unchanged because buildFileName already does
.ifBlank { "download" }; DownloadItem.streamTitle is only re-read in
PlayerScreen which already has its own .ifBlank fallback.

Also drops the redundant outer runBlocking wrapper on the
assertFailsWith test in MetaDetailsParserTest — only the inner
runBlocking is needed since assertFailsWith's lambda is non-suspend.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Aniket Tuli 2026-05-13 11:26:17 -07:00
parent 62d38f74f8
commit 71bea9a00f
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerControls.kt
View file

@ -238,7 +238,7 @@ private fun PlayerHeader(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
Text( Text(
text = streamTitle, text = streamTitle.ifBlank { stringResource(Res.string.stream_default_name) },
style = typeScale.labelSm.copy( style = typeScale.labelSm.copy(
fontSize = metrics.metadataSize, fontSize = metrics.metadataSize,
lineHeight = metrics.metadataSize * 1.25f, lineHeight = metrics.metadataSize * 1.25f,

2
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerEpisodesPanel.kt
View file

@ -629,7 +629,7 @@ private fun EpisodeSourceStreamRow(
) { ) {
Column(modifier = Modifier.weight(1f)) { Column(modifier = Modifier.weight(1f)) {
Text( Text(
text = stream.streamLabel, text = stream.streamLabel.ifBlank { stringResource(Res.string.stream_default_name) },
color = colorScheme.onSurface, color = colorScheme.onSurface,
fontSize = 14.sp, fontSize = 14.sp,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,

2
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerSourcesPanel.kt
View file

@ -267,7 +267,7 @@ private fun SourceStreamRow(
horizontalArrangement = Arrangement.spacedBy(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
Text( Text(
text = stream.streamLabel, text = stream.streamLabel.ifBlank { stringResource(Res.string.stream_default_name) },
color = colorScheme.onSurface, color = colorScheme.onSurface,
style = MaterialTheme.typography.bodyMedium.copy( style = MaterialTheme.typography.bodyMedium.copy(
fontSize = 14.sp, fontSize = 14.sp,

2
composeApp/src/commonMain/kotlin/com/nuvio/app/features/streams/StreamModels.kt
View file

@ -13,7 +13,7 @@ data class StreamItem(
val behaviorHints: StreamBehaviorHints = StreamBehaviorHints(), val behaviorHints: StreamBehaviorHints = StreamBehaviorHints(),
) { ) {
val streamLabel: String val streamLabel: String
get() = name ?: "Stream" get() = name.orEmpty()
val streamSubtitle: String? val streamSubtitle: String?
get() = description get() = description

4
composeApp/src/commonMain/kotlin/com/nuvio/app/features/streams/StreamsScreen.kt
View file

@ -994,7 +994,7 @@ private fun StreamCard(
) { ) {
Column(modifier = Modifier.weight(1f)) { Column(modifier = Modifier.weight(1f)) {
Text( Text(
text = stream.streamLabel, text = stream.streamLabel.ifBlank { stringResource(Res.string.stream_default_name) },
style = MaterialTheme.typography.bodyMedium.copy( style = MaterialTheme.typography.bodyMedium.copy(
fontSize = 14.sp, fontSize = 14.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
@ -1060,7 +1060,7 @@ private fun StreamActionsSheet(
verticalArrangement = Arrangement.spacedBy(4.dp), verticalArrangement = Arrangement.spacedBy(4.dp),
) { ) {
Text( Text(
text = stream.streamLabel, text = stream.streamLabel.ifBlank { stringResource(Res.string.stream_default_name) },
style = MaterialTheme.typography.titleLarge, style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onSurface, color = MaterialTheme.colorScheme.onSurface,
fontWeight = FontWeight.SemiBold, fontWeight = FontWeight.SemiBold,

3
composeApp/src/commonTest/kotlin/com/nuvio/app/features/details/MetaDetailsParserTest.kt
View file

@ -8,11 +8,10 @@ import kotlin.test.assertFailsWith
class MetaDetailsParserTest { class MetaDetailsParserTest {
@Test @Test
fun `parse rejects null meta object without json object cast crash`() = runBlocking { fun `parse rejects null meta object without json object cast crash`() {
assertFailsWith<IllegalStateException> { assertFailsWith<IllegalStateException> {
runBlocking { MetaDetailsParser.parse("""{"meta":null}""") } runBlocking { MetaDetailsParser.parse("""{"meta":null}""") }
} }
Unit
} }
@Test @Test