diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt b/app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt index 8bd3f48e1..74f8c4397 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt @@ -112,7 +112,7 @@ object EhUtils { return Hct.from(outputHue, toHct.chroma, toHct.tone).toInt() } - fun getCategoryColor(context: Context, category: Int): Int { + private fun getCategoryColor(context: Context, category: Int): Int { val primary = when (category) { DOUJINSHI -> BG_COLOR_DOUJINSHI MANGA -> BG_COLOR_MANGA 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 8ab2dac73..6c7a65f63 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 @@ -109,7 +109,6 @@ fun GalleryInfoListItem( start.linkTo(parent.start) bottom.linkTo(parent.bottom) }.clip(ShapeDefaults.Small).background(categoryColor).padding(vertical = 2.dp, horizontal = 8.dp), - color = MaterialTheme.colorScheme.onPrimaryContainer, textAlign = TextAlign.Center, ) Row( @@ -202,7 +201,7 @@ fun GalleryInfoGridItem( Badge( modifier = Modifier.align(Alignment.TopEnd).width(32.dp).height(24.dp), containerColor = EhUtils.getCategoryColor(info.category), - contentColor = MaterialTheme.colorScheme.onPrimaryContainer, + contentColor = MaterialTheme.colorScheme.onSurface, ) { simpleLang?.let { Text(text = it.uppercase()) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt index 8ed8a03ff..8b47f9a25 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt @@ -889,7 +889,6 @@ class DownloadsScene : Text( text = categoryText, modifier = Modifier.clip(ShapeDefaults.Small).background(categoryColor).padding(vertical = 2.dp, horizontal = 8.dp), - color = MaterialTheme.colorScheme.onPrimaryContainer, textAlign = TextAlign.Center, style = MaterialTheme.typography.labelLarge, )