From 3bbd9451f06eca0ad230d8e6fea6ddbebeda0352 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Sun, 12 Oct 2025 15:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=99=BD=E8=89=B2=E7=8C=AB=E7=8C=AB=E5=A4=B4=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=96=B5=20#79?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 17 ++++--
 .../io/legato/kazusa/help/LauncherIconHelp.kt |  1 +
 .../kazusa/lib/prefs/IconListPreference.kt    | 34 ++++++-----
 .../main/res/layout/dialog_recycler_view.xml  |  1 +
 .../main/res/layout/item_icon_preference.xml  | 57 ++++++++++---------
 .../main/res/mipmap-anydpi-v26/launcherw.xml  |  6 ++
 app/src/main/res/values-zh-rTW/arrays.xml     |  1 +
 app/src/main/res/values-zh/arrays.xml         |  1 +
 app/src/main/res/values/array_values.xml      |  1 +
 app/src/main/res/values/arrays.xml            |  1 +
 app/src/main/res/values/colors.xml            |  3 +
 .../res/values/ic_launcher_background.xml     |  4 --
 12 files changed, 71 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/res/mipmap-anydpi-v26/launcherw.xml
 delete mode 100644 app/src/main/res/values/ic_launcher_background.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0236a8ffc..43cb4f628 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,17 @@
         android:theme="@style/Base.AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">
         <!-- 图标0 -->
+        <activity-alias
+            android:name=".Launcherw"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/launcherw"
+            android:targetActivity=".ui.main.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
         <activity-alias
             android:name=".Launcher0"
             android:enabled="false"
@@ -54,7 +65,6 @@
             android:targetActivity=".ui.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
@@ -67,7 +77,6 @@
             android:targetActivity=".ui.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
@@ -80,7 +89,6 @@
             android:targetActivity=".ui.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
@@ -93,7 +101,6 @@
             android:targetActivity=".ui.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
@@ -106,7 +113,6 @@
             android:targetActivity=".ui.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
@@ -119,7 +125,6 @@
             android:targetActivity=".ui.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
diff --git a/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt b/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt
index f5e78da43..bcf361e47 100644
--- a/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt
+++ b/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt
@@ -13,6 +13,7 @@ import splitties.init.appCtx
 object LauncherIconHelp {
     private val packageManager: PackageManager = appCtx.packageManager
     private val componentNames = arrayListOf(
+        ComponentName(appCtx.packageName, "${appCtx.packageName}.Launcherw"),
         ComponentName(appCtx.packageName, "${appCtx.packageName}.Launcher0"),
         ComponentName(appCtx.packageName, "${appCtx.packageName}.Launcher1"),
         ComponentName(appCtx.packageName, "${appCtx.packageName}.Launcher2"),
diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/IconListPreference.kt b/app/src/main/java/io/legato/kazusa/lib/prefs/IconListPreference.kt
index 8d4406728..0b61b0867 100644
--- a/app/src/main/java/io/legato/kazusa/lib/prefs/IconListPreference.kt
+++ b/app/src/main/java/io/legato/kazusa/lib/prefs/IconListPreference.kt
@@ -11,15 +11,15 @@ import android.widget.ImageView
 import androidx.fragment.app.FragmentActivity
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceViewHolder
-import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.GridLayoutManager
 import io.legato.kazusa.R
 import io.legato.kazusa.base.BaseBottomSheetDialogFragment
 import io.legato.kazusa.base.adapter.ItemViewHolder
 import io.legato.kazusa.base.adapter.RecyclerAdapter
 import io.legato.kazusa.databinding.DialogRecyclerViewBinding
 import io.legato.kazusa.databinding.ItemIconPreferenceBinding
-//import io.legado.app.lib.theme.primaryColor
 import io.legato.kazusa.utils.getCompatDrawable
+import io.legato.kazusa.utils.themeColor
 import io.legato.kazusa.utils.viewbindingdelegate.viewBinding
 
 
@@ -134,7 +134,7 @@ class IconListPreference(context: Context, attrs: AttributeSet) : ListPreference
         override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
             //binding.toolBar.setBackgroundColor(primaryColor)
             binding.toolBar.setTitle(R.string.change_icon)
-            binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
+            binding.recyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
             val adapter = Adapter(requireContext())
             binding.recyclerView.adapter = adapter
             arguments?.let {
@@ -164,23 +164,21 @@ class IconListPreference(context: Context, attrs: AttributeSet) : ListPreference
             ) {
                 binding.run {
                     val index = findIndexOfValue(item.toString())
-                    dialogEntries?.let {
-                        label.text = it[index]
-                    }
                     dialogIconNames?.let {
-                        val resId = context.resources
-                            .getIdentifier(it[index].toString(), "mipmap", context.packageName)
-                        val d = try {
-                            context.getCompatDrawable(resId)
-                        } catch (e: Exception) {
-                            null
-                        }
-                        d?.let {
-                            icon.setImageDrawable(d)
-                        }
+                        val resId = context.resources.getIdentifier(it[index].toString(), "mipmap", context.packageName)
+                        val d = context.getCompatDrawable(resId)
+                        d?.let { icon.setImageDrawable(it) }
                     }
-                    label.isChecked = item.toString() == dialogValue
-                    root.setOnClickListener {
+
+                    val isSelected = item.toString() == dialogValue
+
+                    if (isSelected) {
+                        card.setCardBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSecondaryContainer))
+                    } else {
+                        card.setCardBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainer))
+                    }
+
+                    card.setOnClickListener {
                         onChanged?.invoke(item.toString())
                         this@IconDialog.dismissAllowingStateLoss()
                     }
diff --git a/app/src/main/res/layout/dialog_recycler_view.xml b/app/src/main/res/layout/dialog_recycler_view.xml
index 94c74f2a2..a718cd1f4 100644
--- a/app/src/main/res/layout/dialog_recycler_view.xml
+++ b/app/src/main/res/layout/dialog_recycler_view.xml
@@ -21,6 +21,7 @@
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginHorizontal="8dp"
             android:scrollbars="none"
             tools:ignore="SpeakableTextPresentCheck" />
 
diff --git a/app/src/main/res/layout/item_icon_preference.xml b/app/src/main/res/layout/item_icon_preference.xml
index ad25271b4..ec86ad605 100644
--- a/app/src/main/res/layout/item_icon_preference.xml
+++ b/app/src/main/res/layout/item_icon_preference.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:padding="16dp">
+    android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:adjustViewBounds="true"
-        android:contentDescription="ICON"
-        tools:ignore="HardcodedText" />
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/card"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:cardCornerRadius="16dp"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
+            app:strokeWidth="0dp"
+            android:layout_marginBottom="20dp"
+            android:layout_marginHorizontal="10dp">
 
-    <CheckedTextView
-        android:id="@+id/label"
-        android:layout_width="wrap_content"
-        android:layout_height="48dp"
-        android:paddingStart="8dp"
-        android:layout_alignParentEnd="true"
-        android:layout_toRightOf="@+id/icon"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
-        android:ellipsize="marquee"
-        android:gravity="center_vertical"
-        android:minHeight="?android:attr/listPreferredItemHeight"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorAlertDialogListItem"
-        android:textIsSelectable="false"
-        tools:ignore="RtlHardcoded,RtlSymmetry" />
+                <ImageView
+                    android:id="@+id/icon"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="20dp"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="ICON"
+                    tools:ignore="HardcodedText" />
 
-</RelativeLayout>
\ No newline at end of file
+        </com.google.android.material.card.MaterialCardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcherw.xml b/app/src/main/res/mipmap-anydpi-v26/launcherw.xml
new file mode 100644
index 000000000..005f2962c
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/launcherw.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background_w" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher4" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
index b488e8618..3daf623ae 100644
--- a/app/src/main/res/values-zh-rTW/arrays.xml
+++ b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -62,6 +62,7 @@
 
     <string-array name="icon_names">
         <item>iconMain</item>
+        <item>iconWhite</item>
         <item>icon0</item>
         <item>icon1</item>
         <item>icon2</item>
diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml
index 21d1ce031..6a88f5078 100644
--- a/app/src/main/res/values-zh/arrays.xml
+++ b/app/src/main/res/values-zh/arrays.xml
@@ -49,6 +49,7 @@
 
     <string-array name="icon_names">
         <item>iconMain</item>
+        <item>iconWhite</item>
         <item>icon0</item>
         <item>icon1</item>
         <item>icon2</item>
diff --git a/app/src/main/res/values/array_values.xml b/app/src/main/res/values/array_values.xml
index 689f10f67..6a20dfa0c 100644
--- a/app/src/main/res/values/array_values.xml
+++ b/app/src/main/res/values/array_values.xml
@@ -3,6 +3,7 @@
 
     <string-array name="icons">
         <item>ic_launcher</item>
+        <item>launcherw</item>
         <item>launcher0</item>
         <item>launcher1</item>
         <item>launcher2</item>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 2a48cb534..0fb1d174c 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -107,6 +107,7 @@
 
 	<string-array name="icon_names" tools:ignore="Typos">
 		<item>iconMain</item>
+		<item>iconWhite</item>
         <item>icon0</item>
 		<item>icon1</item>
 		<item>icon2</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6e4425866..6a401e06e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="ic_launcher_background">#2E2D3D</color>
+    <color name="ic_launcher_background_w">#F2F1F6</color>
+
     <!--    GR Theme-->
     <color name="gr_theme_primary">#4C662B</color>
     <color name="gr_theme_onPrimary">#FFFFFF</color>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index 63755c4c8..000000000
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#2E2D3D</color>
-</resources>
\ No newline at end of file