From 06004de0f1b5c9abe7ea2fdff65244a993ca908c Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Mon, 24 Jun 2024 23:31:15 +0700 Subject: [PATCH] refactor(ui): Update text and icon colors in metadata description adapters for delegated sources --- .../ui/metadata/adapters/EHentaiDescriptionAdapter.kt | 5 +++-- .../ui/metadata/adapters/EightMusesDescriptionAdapter.kt | 9 +++------ .../ui/metadata/adapters/HBrowseDescriptionAdapter.kt | 5 +++-- .../ui/metadata/adapters/MangaDexDescriptionAdapter.kt | 5 +++-- .../ui/metadata/adapters/NHentaiDescriptionAdapter.kt | 5 +++-- .../ui/metadata/adapters/PururinDescriptionAdapter.kt | 5 +++-- .../ui/metadata/adapters/TsuminoDescriptionAdapter.kt | 5 +++-- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt index a28e0da63..4065e79f0 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.res.ColorStateList import android.view.LayoutInflater import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -31,8 +32,8 @@ fun EHentaiDescription( ) { val context = LocalContext.current // KMK --> - val textColor = MaterialTheme.colorScheme.secondary.toArgb() val iconColor = MaterialTheme.colorScheme.primary.toArgb() + val textColor = LocalContentColor.current.toArgb() val ratingBarSecondaryColor = MaterialTheme.colorScheme.outlineVariant.toArgb() // KMK <-- AndroidView( @@ -107,7 +108,7 @@ fun EHentaiDescription( binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp, iconColor) binding.moreInfo.text = context.stringResource(SYMR.strings.more_info) - binding.moreInfo.setTextColor(textColor) + binding.moreInfo.setTextColor(iconColor) // KMK <-- listOf( diff --git a/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt index bb5ba4a9f..2cf63286a 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt @@ -22,7 +22,7 @@ import tachiyomi.i18n.sy.SYMR fun EightMusesDescription(state: State.Success, openMetadataViewer: () -> Unit) { val context = LocalContext.current // KMK --> - val textColor = MaterialTheme.colorScheme.secondary.toArgb() + val titleColor = MaterialTheme.colorScheme.primary.toArgb() val iconColor = MaterialTheme.colorScheme.primary.toArgb() // KMK <-- AndroidView( @@ -37,11 +37,11 @@ fun EightMusesDescription(state: State.Success, openMetadataViewer: () -> Unit) binding.title.text = meta.title ?: context.stringResource(MR.strings.unknown) // KMK --> - binding.title.setTextColor(textColor) + binding.title.setTextColor(titleColor) binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp, iconColor) binding.moreInfo.text = context.stringResource(SYMR.strings.more_info) - binding.moreInfo.setTextColor(textColor) + binding.moreInfo.setTextColor(iconColor) // KMK <-- binding.title.setOnLongClickListener { @@ -51,9 +51,6 @@ fun EightMusesDescription(state: State.Success, openMetadataViewer: () -> Unit) ) true } - // KMK --> - binding.title.setTextColor(textColor) - // KMK <-- binding.moreInfo.setOnClickListener { openMetadataViewer() diff --git a/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt index 1b12e1cca..f0dc57cd0 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt @@ -2,6 +2,7 @@ package exh.ui.metadata.adapters import android.view.LayoutInflater import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -22,8 +23,8 @@ import tachiyomi.i18n.sy.SYMR fun HBrowseDescription(state: State.Success, openMetadataViewer: () -> Unit) { val context = LocalContext.current // KMK --> - val textColor = MaterialTheme.colorScheme.secondary.toArgb() val iconColor = MaterialTheme.colorScheme.primary.toArgb() + val textColor = LocalContentColor.current.toArgb() // KMK <-- AndroidView( modifier = Modifier.fillMaxWidth(), @@ -42,7 +43,7 @@ fun HBrowseDescription(state: State.Success, openMetadataViewer: () -> Unit) { binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp, iconColor) binding.moreInfo.text = context.stringResource(SYMR.strings.more_info) - binding.moreInfo.setTextColor(textColor) + binding.moreInfo.setTextColor(iconColor) // KMK <-- binding.pages.setOnLongClickListener { diff --git a/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt index 79b475016..c27fecb8b 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.res.ColorStateList import android.view.LayoutInflater import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -26,8 +27,8 @@ import kotlin.math.round fun MangaDexDescription(state: State.Success, openMetadataViewer: () -> Unit) { val context = LocalContext.current // KMK --> - val textColor = MaterialTheme.colorScheme.secondary.toArgb() val iconColor = MaterialTheme.colorScheme.primary.toArgb() + val textColor = LocalContentColor.current.toArgb() val ratingBarSecondaryColor = MaterialTheme.colorScheme.outlineVariant.toArgb() // KMK <-- AndroidView( @@ -54,7 +55,7 @@ fun MangaDexDescription(state: State.Success, openMetadataViewer: () -> Unit) { binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp, iconColor) binding.moreInfo.text = context.stringResource(SYMR.strings.more_info) - binding.moreInfo.setTextColor(textColor) + binding.moreInfo.setTextColor(iconColor) // KMK <-- binding.rating.setOnLongClickListener { diff --git a/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt index 994b8208e..123989adf 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt @@ -3,6 +3,7 @@ package exh.ui.metadata.adapters import android.annotation.SuppressLint import android.view.LayoutInflater import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -29,8 +30,8 @@ import java.time.ZonedDateTime fun NHentaiDescription(state: State.Success, openMetadataViewer: () -> Unit) { val context = LocalContext.current // KMK --> - val textColor = MaterialTheme.colorScheme.secondary.toArgb() val iconColor = MaterialTheme.colorScheme.primary.toArgb() + val textColor = LocalContentColor.current.toArgb() // KMK <-- AndroidView( modifier = Modifier.fillMaxWidth(), @@ -92,7 +93,7 @@ fun NHentaiDescription(state: State.Success, openMetadataViewer: () -> Unit) { binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp, iconColor) binding.moreInfo.text = context.stringResource(SYMR.strings.more_info) - binding.moreInfo.setTextColor(textColor) + binding.moreInfo.setTextColor(iconColor) // KMK <-- listOf( diff --git a/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt index 7cad637b7..7e547dc89 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.res.ColorStateList import android.view.LayoutInflater import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -27,8 +28,8 @@ import kotlin.math.round fun PururinDescription(state: State.Success, openMetadataViewer: () -> Unit) { val context = LocalContext.current // KMK --> - val textColor = MaterialTheme.colorScheme.secondary.toArgb() val iconColor = MaterialTheme.colorScheme.primary.toArgb() + val textColor = LocalContentColor.current.toArgb() val ratingBarSecondaryColor = MaterialTheme.colorScheme.outlineVariant.toArgb() // KMK <-- AndroidView( @@ -80,7 +81,7 @@ fun PururinDescription(state: State.Success, openMetadataViewer: () -> Unit) { binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp, iconColor) binding.moreInfo.text = context.stringResource(SYMR.strings.more_info) - binding.moreInfo.setTextColor(textColor) + binding.moreInfo.setTextColor(iconColor) // KMK <-- listOf( diff --git a/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt index 8c3835b18..e400f034f 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.res.ColorStateList import android.view.LayoutInflater import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -28,8 +29,8 @@ import kotlin.math.round fun TsuminoDescription(state: State.Success, openMetadataViewer: () -> Unit) { val context = LocalContext.current // KMK --> - val textColor = MaterialTheme.colorScheme.secondary.toArgb() val iconColor = MaterialTheme.colorScheme.primary.toArgb() + val textColor = LocalContentColor.current.toArgb() val ratingBarSecondaryColor = MaterialTheme.colorScheme.outlineVariant.toArgb() // KMK <-- AndroidView( @@ -83,7 +84,7 @@ fun TsuminoDescription(state: State.Success, openMetadataViewer: () -> Unit) { binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp, iconColor) binding.moreInfo.text = context.stringResource(SYMR.strings.more_info) - binding.moreInfo.setTextColor(textColor) + binding.moreInfo.setTextColor(iconColor) // KMK <-- listOf(