From a2d9113be23a2e2561dcd9666fe5ca59adefef7e Mon Sep 17 00:00:00 2001 From: tarsin Date: Sun, 2 Jul 2023 12:42:02 +0800 Subject: [PATCH] Remove unused defensive code --- .../main/java/com/hippo/ehviewer/ui/main/GalleryTag.kt | 8 ++++---- .../com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryTag.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryTag.kt index 0f5455d9f..f8680293c 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryTag.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryTag.kt @@ -22,7 +22,7 @@ import com.hippo.ehviewer.ui.tools.includeFontPadding @Composable fun GalleryTags( - tags: Array, + tagGroups: Array, onTagClick: (String) -> Unit, onTagLongClick: (String, String) -> Unit, modifier: Modifier = Modifier, @@ -30,10 +30,10 @@ fun GalleryTags( val context = LocalContext.current val canTranslate = Settings.showTagTranslations && EhTagDatabase.isTranslatable(context) && EhTagDatabase.initialized val ehTags = EhTagDatabase.takeIf { canTranslate } - fun String.translate() = ehTags?.takeIf { it.initialized }?.getTranslation(tag = this) ?: this - fun String.translate(prefix: String?) = ehTags?.takeIf { it.initialized }?.getTranslation(prefix = prefix, tag = this) ?: this + fun String.translate() = ehTags?.getTranslation(tag = this) ?: this + fun String.translate(prefix: String?) = ehTags?.getTranslation(prefix = prefix, tag = this) ?: this Column(modifier) { - tags.forEach { tagGroup -> + tagGroups.forEach { tagGroup -> Row { BaseRoundText( text = tagGroup.groupName.translate(), diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index d25ae883d..75141f1aa 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -737,7 +737,7 @@ class GalleryDetailScene : BaseScene(), DownloadInfoListener { } } else { GalleryTags( - tags = tags, + tagGroups = tags, onTagClick = { val lub = ListUrlBuilder() lub.mode = ListUrlBuilder.MODE_TAG