From afee7886b1d23df68ea1cf19b9895a1270b797e7 Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Fri, 29 May 2026 01:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E7=AE=A1=E7=90=86=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/config/themeConfig/ThemeConfigScreen.kt  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigScreen.kt b/app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigScreen.kt
index 4ed50ccd7..8b7409cc8 100644
--- a/app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigScreen.kt
+++ b/app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigScreen.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.graphics.Typeface
 import android.os.Handler
 import android.os.Looper
+import android.widget.TextView
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
@@ -61,6 +62,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringArrayResource
@@ -90,6 +92,7 @@ import io.legado.app.ui.widget.components.SplicedColumnGroup
 import io.legado.app.ui.widget.components.alert.AppAlertDialog
 import io.legado.app.ui.widget.components.button.series.SmallPlainButton
 import io.legado.app.ui.widget.components.card.GlassCard
+import io.legado.app.ui.widget.components.card.NormalCard
 import io.legado.app.ui.widget.components.dialog.ColorPickerSheet
 import io.legado.app.ui.widget.components.icon.AppIcons
 import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
@@ -797,7 +800,8 @@ fun ThemeConfigScreen(
                 ) {
                     fontItems.forEach { fontDoc ->
                         item {
-                            Card(
+                            val textColor = LegadoTheme.colorScheme.onSurface.toArgb()
+                            NormalCard(
                                 modifier = Modifier
                                     .fillMaxWidth()
                                     .height(100.dp),
@@ -805,15 +809,14 @@ fun ThemeConfigScreen(
                                     ThemeConfig.appFontPath = fontDoc.uri.toString()
                                     showFontSheet = false
                                 },
-                                colors = CardDefaults.cardColors(
-                                    containerColor = MaterialTheme.colorScheme.surfaceVariant
-                                )
+                                containerColor = LegadoTheme.colorScheme.onSheetContent
                             ) {
                                 AndroidView(
                                     factory = { ctx ->
-                                        android.widget.TextView(ctx).apply {
+                                        TextView(ctx).apply {
                                             text = fontDoc.name
                                             textSize = 14f
+                                            setTextColor(textColor)
                                             gravity = android.view.Gravity.CENTER
                                             maxLines = 2
                                             ellipsize = android.text.TextUtils.TruncateAt.END