yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cosplayer tag translation in download label

Browse Source
This commit is contained in:
FooIbar authored and renovate[bot] committed 2024-09-10 06:11:25 +08:00
1 parent 31ce4eac92
commit cae02acfc4
2 files changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt
+6 -3
View File
@@ -152,7 +152,10 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
val density = LocalDensity.current
val canTranslate = Settings.showTagTranslations && EhTagDatabase.isTranslatable(implicit<Context>()) && EhTagDatabase.initialized
val ehTags = EhTagDatabase.takeIf { canTranslate }
fun String.translateArtist() = ehTags?.getTranslation(TagNamespace.Artist.toPrefix(), this) ?: this
fun getTranslation(tag: String) = ehTags?.run {
getTranslation(TagNamespace.Artist.toPrefix(), tag)
?: getTranslation(TagNamespace.Cosplayer.toPrefix(), tag)
} ?: tag
val allName = stringResource(R.string.download_all)
val defaultName = stringResource(R.string.default_download_label_name)
val unknownName = stringResource(R.string.unknown_artists)
@@ -166,7 +169,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
when (label) {
"" -> allName
null -> emptyLabelName
else -> if (mode == DownloadsFilterMode.ARTIST) label.translateArtist() else label
else -> if (mode == DownloadsFilterMode.ARTIST) getTranslation(label) else label
}
},
)
@@ -381,7 +384,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
tonalElevation = 1.dp,
shadowElevation = elevation,
headlineContent = {
val name = if (filterMode == DownloadsFilterMode.ARTIST) label.translateArtist() else label
val name = if (filterMode == DownloadsFilterMode.ARTIST) getTranslation(label) else label
Text("$name [${downloadsCount.getOrDefault(item, 0)}]")
},
trailingContent = editEnable.ifTrueThen {
app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt
+5 -3
View File
@@ -201,10 +201,12 @@ private fun getRatingText(rating: Float): Int = when ((rating * 2).roundToInt())
}
private fun List<GalleryTagGroup>.getArtistTag(): String? {
val namespace = TagNamespace.Artist.value
for (tagGroup in this) {
if (tagGroup.groupName == namespace && tagGroup.size > 0) {
return "$namespace:${tagGroup[0].removePrefix("_")}"
if (tagGroup.isNotEmpty()) {
val namespace = tagGroup.groupName
if (namespace == TagNamespace.Artist.value || namespace == TagNamespace.Cosplayer.value) {
return "$namespace:${tagGroup[0].removePrefix("_")}"
}
}
}
return null