From 0ac3caeaf8170876e3e6659d757a6f4c8c46e3b5 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Sun, 9 Nov 2025 16:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=88=97=E8=A1=A8=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E6=97=B6=E5=8B=BE=E9=80=89=20#252?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/ui/config/ThemeListDialog.kt   |  9 ++-
 app/src/main/res/layout/item_theme_config.xml | 80 +++++++++++--------
 2 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt b/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt
index 3bca3cd6a..bab1a338e 100644
--- a/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt
@@ -2,10 +2,12 @@ package io.legado.app.ui.config
 
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import androidx.core.graphics.toColorInt
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.R
 import io.legado.app.base.BaseBottomSheetDialogFragment
@@ -15,6 +17,7 @@ import io.legado.app.databinding.DialogRecyclerViewBinding
 import io.legado.app.databinding.ItemThemeConfigBinding
 import io.legado.app.help.config.ThemeConfig
 import io.legado.app.lib.dialogs.alert
+import io.legado.app.lib.theme.primaryColor
 //import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.widget.recycler.VerticalDivider
 import io.legado.app.utils.*
@@ -41,7 +44,6 @@ class ThemeListDialog : BaseBottomSheetDialogFragment(R.layout.dialog_recycler_v
 
     private fun initView() = binding.run {
         recyclerView.layoutManager = LinearLayoutManager(requireContext())
-        recyclerView.addItemDecoration(VerticalDivider(requireContext()))
         recyclerView.adapter = adapter
     }
 
@@ -100,9 +102,14 @@ class ThemeListDialog : BaseBottomSheetDialogFragment(R.layout.dialog_recycler_v
         ) {
             binding.apply {
                 tvName.text = item.themeName
+                if (item.primaryColor.toColorInt() == context.primaryColor)
+                    cdRoot.setCardBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSecondaryContainer))
+                else
+                    cdRoot.setCardBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainer))
             }
         }
 
+
         override fun registerListener(holder: ItemViewHolder, binding: ItemThemeConfigBinding) {
             binding.apply {
                 root.setOnClickListener {
diff --git a/app/src/main/res/layout/item_theme_config.xml b/app/src/main/res/layout/item_theme_config.xml
index d8f898990..aa8c04553 100644
--- a/app/src/main/res/layout/item_theme_config.xml
+++ b/app/src/main/res/layout/item_theme_config.xml
@@ -1,44 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.listitem.ListItemCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cd_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
-    android:background="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:checkable="true"
+    app:cardCornerRadius="16dp"
+    android:layout_margin="8dp">
 
-    <TextView
-        android:padding="6dp"
-        android:id="@+id/tv_name"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:maxLines="1"
-        android:textSize="16sp"
-        tools:text="theme" />
+        android:padding="8dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_share"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_gravity="center"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/edit"
-        android:padding="6dp"
-        android:tooltipText="@string/edit"
-        android:src="@drawable/ic_share"
-        tools:ignore="UnusedAttribute" />
+        <TextView
+            android:padding="6dp"
+            android:id="@+id/tv_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:maxLines="1"
+            android:textSize="16sp"
+            tools:text="theme" />
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_delete"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/delete"
-        android:tooltipText="@string/delete"
-        android:padding="6dp"
-        android:src="@drawable/ic_clear_all"
-        tools:ignore="UnusedAttribute" />
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_share"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_gravity="center"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/edit"
+            android:padding="6dp"
+            android:tooltipText="@string/edit"
+            android:src="@drawable/ic_share"
+            tools:ignore="UnusedAttribute" />
 
-</LinearLayout>
\ No newline at end of file
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_delete"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/delete"
+            android:tooltipText="@string/delete"
+            android:padding="6dp"
+            android:src="@drawable/ic_clear_all"
+            tools:ignore="UnusedAttribute" />
+
+    </LinearLayout>
+
+</com.google.android.material.listitem.ListItemCardView>
\ No newline at end of file