From 14609583b59e09fa715d4607497ede128dc5549c Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Tue, 20 Jun 2023 21:24:43 +0800 Subject: [PATCH] Show favorite name in gallery list --- .../com/hippo/ehviewer/ui/main/GalleryInfo.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt index abd3b6067..3368e0a70 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt @@ -107,6 +107,7 @@ fun GalleryInfoListItem( contentDescription = null, modifier = Modifier.size(16.dp), ) + Text(text = info.favoriteName.orEmpty()) } Text(text = info.simpleLanguage.orEmpty()) if (info.pages != 0 && showPages) { @@ -143,13 +144,15 @@ fun GalleryInfoGridItem( modifier = Modifier.aspectRatio(aspect).fillMaxWidth(), contentScale = ContentScale.Crop, ) - val container = Color(color) - Badge( - modifier = Modifier.align(Alignment.TopEnd).width(32.dp).height(24.dp), - containerColor = container, - contentColor = contentColorFor(container), - ) { - Text(text = simpleLang?.uppercase().orEmpty()) + simpleLang?.let { + val container = Color(color) + Badge( + modifier = Modifier.align(Alignment.TopEnd).width(32.dp).height(24.dp), + containerColor = container, + contentColor = contentColorFor(container), + ) { + Text(text = it.uppercase()) + } } } }