Refactor tracker status string mappings

Should fix #9195
This commit is contained in:
arkon
2023-03-10 23:01:10 -05:00
parent ce66ed0389
commit 47a2d06682
14 changed files with 92 additions and 105 deletions

View File

@@ -1,5 +1,6 @@
package eu.kanade.presentation.track
import androidx.annotation.StringRes
import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
@@ -125,7 +126,7 @@ fun TrackInfoDialogHome(
private fun TrackInfoItem(
title: String,
service: TrackService,
status: String,
@StringRes status: Int?,
onStatusClick: () -> Unit,
chapters: String,
onChaptersClick: () -> Unit,
@@ -187,7 +188,7 @@ private fun TrackInfoItem(
Row(modifier = Modifier.height(IntrinsicSize.Min)) {
TrackDetailsItem(
modifier = Modifier.weight(1f),
text = status,
text = status?.let { stringResource(it) } ?: "",
onClick = onStatusClick,
)
VerticalDivider()

View File

@@ -41,7 +41,7 @@ import tachiyomi.presentation.core.util.isScrolledToStart
fun TrackStatusSelector(
selection: Int,
onSelectionChange: (Int) -> Unit,
selections: Map<Int, String>,
selections: Map<Int, Int?>,
onConfirm: () -> Unit,
onDismissRequest: () -> Unit,
) {
@@ -69,7 +69,7 @@ fun TrackStatusSelector(
onClick = null,
)
Text(
text = value,
text = value?.let { stringResource(it) } ?: "",
style = MaterialTheme.typography.bodyLarge.merge(),
modifier = Modifier.padding(start = 24.dp),
)