From 0c74047b32db783f5eabeb9a7c97e6697630783c Mon Sep 17 00:00:00 2001
From: SeniorZhai <developer.zhaitao@gmail.com>
Date: Wed, 29 Apr 2026 14:17:01 +0800
Subject: [PATCH] Fix dark mode styling regressions

---
 .../mixin/android/ui/address/component/DestinationMenu.kt   | 2 +-
 .../main/java/one/mixin/android/ui/sticker/AlbumAdapter.kt  | 3 ++-
 app/src/main/res/drawable/bg_circle.xml                     | 2 +-
 app/src/main/res/drawable/bg_round_gray_btn.xml             | 4 ++--
 app/src/main/res/drawable/ic_group_select_close.xml         | 4 ++--
 app/src/main/res/drawable/ic_not_selected.xml               | 2 +-
 app/src/main/res/drawable/ic_selected.xml                   | 2 +-
 app/src/main/res/drawable/selector_radio.xml                | 6 +++---
 app/src/main/res/drawable/selector_radio_badge.xml          | 6 +++---
 app/src/main/res/layout/view_swap_alert.xml                 | 4 ++--
 10 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/one/mixin/android/ui/address/component/DestinationMenu.kt b/app/src/main/java/one/mixin/android/ui/address/component/DestinationMenu.kt
index f4ae03af4e..b194e9e26a 100644
--- a/app/src/main/java/one/mixin/android/ui/address/component/DestinationMenu.kt
+++ b/app/src/main/java/one/mixin/android/ui/address/component/DestinationMenu.kt
@@ -82,7 +82,7 @@ fun DestinationMenu(
             modifier = Modifier.padding(8.dp),
             painter = painterResource(icon),
             contentDescription = null,
-            tint = MixinAppTheme.colors.icon
+            tint = MixinAppTheme.colors.iconGray
         )
         Spacer(modifier = Modifier.width(16.dp))
         Column {
diff --git a/app/src/main/java/one/mixin/android/ui/sticker/AlbumAdapter.kt b/app/src/main/java/one/mixin/android/ui/sticker/AlbumAdapter.kt
index 73c49a3df1..9608e2ee1b 100644
--- a/app/src/main/java/one/mixin/android/ui/sticker/AlbumAdapter.kt
+++ b/app/src/main/java/one/mixin/android/ui/sticker/AlbumAdapter.kt
@@ -15,6 +15,7 @@ import androidx.room.Relation
 import one.mixin.android.R
 import one.mixin.android.databinding.ItemAlbumBinding
 import one.mixin.android.databinding.ItemStickerBinding
+import one.mixin.android.extension.colorFromAttribute
 import one.mixin.android.extension.dp
 import one.mixin.android.extension.loadSticker
 import one.mixin.android.extension.textColor
@@ -145,7 +146,7 @@ fun TextView.updateAlbumAdd(
 ) {
     if (added) {
         text = ctx.getString(R.string.Added)
-        textColor = ctx.getColor(R.color.colorAccent)
+        textColor = ctx.colorFromAttribute(R.attr.color_accent)
         setBackgroundResource(R.drawable.bg_round_gray_btn)
         isEnabled = false
         setOnClickListener(null)
diff --git a/app/src/main/res/drawable/bg_circle.xml b/app/src/main/res/drawable/bg_circle.xml
index 07e49414b9..5c801bd8f4 100644
--- a/app/src/main/res/drawable/bg_circle.xml
+++ b/app/src/main/res/drawable/bg_circle.xml
@@ -1,4 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="50dp" android:height="50dp" android:viewportWidth="50" android:viewportHeight="50">
-    <path android:pathData="M25 50c13.807 0 25-11.193 25-25S38.807 0 25 0 0 11.193 0 25s11.193 25 25 25z" android:fillColor="#F5F7FA"/>
+    <path android:pathData="M25 50c13.807 0 25-11.193 25-25S38.807 0 25 0 0 11.193 0 25s11.193 25 25 25z" android:fillColor="?attr/bg_gray_light"/>
     <path android:fillAlpha="0.01" android:fillColor="#D8D8D8" android:pathData="M13 13h24v24H13z"/>
 </vector>
diff --git a/app/src/main/res/drawable/bg_round_gray_btn.xml b/app/src/main/res/drawable/bg_round_gray_btn.xml
index d423035344..43267be902 100644
--- a/app/src/main/res/drawable/bg_round_gray_btn.xml
+++ b/app/src/main/res/drawable/bg_round_gray_btn.xml
@@ -5,13 +5,13 @@
         <selector>
             <item android:state_enabled="true">
                 <shape android:shape="rectangle">
-                    <solid android:color="@color/bg_button_gray" />
+                    <solid android:color="?attr/bg_gray_light" />
                     <corners android:radius="30dp" />
                 </shape>
             </item>
             <item android:state_enabled="false">
                 <shape android:shape="rectangle">
-                    <solid android:color="#E3E4E5" />
+                    <solid android:color="?attr/bg_menu_border" />
                     <corners android:radius="30dp" />
                 </shape>
             </item>
diff --git a/app/src/main/res/drawable/ic_group_select_close.xml b/app/src/main/res/drawable/ic_group_select_close.xml
index 8789e74060..61b9b4c8ce 100644
--- a/app/src/main/res/drawable/ic_group_select_close.xml
+++ b/app/src/main/res/drawable/ic_group_select_close.xml
@@ -1,4 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M1 10a9 9 0 1 1 18 0 9 9 0 1 1-18 0" android:strokeWidth="2" android:fillColor="#BBBEC3" android:strokeColor="?attr/bg_white" android:fillType="evenOdd"/>
-    <path android:pathData="M6.465 6.493c0.39-0.39 1.023-0.39 1.414 0l2.12 2.12 2.122-2.12c0.39-0.39 1.024-0.39 1.415 0 0.39 0.39 0.39 1.024 0 1.414l-2.122 2.121 2.122 2.122c0.36 0.36 0.388 0.928 0.083 1.32l-0.083 0.094c-0.391 0.39-1.024 0.39-1.415 0L10 11.442l-2.121 2.122c-0.39 0.39-1.024 0.39-1.414 0-0.391-0.39-0.391-1.024 0-1.414l2.12-2.122-2.12-2.12c-0.361-0.362-0.39-0.93-0.085-1.321z" android:strokeWidth="1" android:fillColor="?attr/bg_white" android:fillType="evenOdd"/>
+    <path android:pathData="M1 10a9 9 0 1 1 18 0 9 9 0 1 1-18 0" android:strokeWidth="2" android:fillColor="?attr/icon_gray" android:strokeColor="?attr/bg_white" android:fillType="evenOdd"/>
+    <path android:pathData="M6.465 6.493c0.39-0.39 1.023-0.39 1.414 0l2.12 2.12 2.122-2.12c0.39-0.39 1.024-0.39 1.415 0 0.39 0.39 0.39 1.024 0 1.414l-2.122 2.121 2.122 2.122c0.36 0.36 0.388 0.928 0.083 1.32l-0.083 0.094c-0.391 0.39-1.024 0.39-1.415 0L10 11.442l-2.121 2.122c-0.39 0.39-1.024 0.39-1.414 0-0.391-0.39-0.391-1.024 0-1.414l2.12-2.122-2.12-2.12c-0.361-0.362-0.39-0.93-0.085-1.321z" android:strokeWidth="1" android:fillColor="@color/white" android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_not_selected.xml b/app/src/main/res/drawable/ic_not_selected.xml
index 8460de1fff..5b655fe061 100644
--- a/app/src/main/res/drawable/ic_not_selected.xml
+++ b/app/src/main/res/drawable/ic_not_selected.xml
@@ -1,4 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
-    <path android:pathData="M0 8a8 8 0 1 1 16 0A8 8 0 1 1 0 8" android:strokeWidth="1" android:fillColor="#E5E8EE" android:fillType="evenOdd"/>
+    <path android:pathData="M0 8a8 8 0 1 1 16 0A8 8 0 1 1 0 8" android:strokeWidth="1" android:fillColor="?attr/bg_menu_border" android:fillType="evenOdd"/>
     <path android:pathData="M11.364 6l-4.243 4.243-2.12-2.122" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeColor="#FFFFFF" android:fillType="evenOdd" android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_selected.xml b/app/src/main/res/drawable/ic_selected.xml
index 3a2da67392..bdcf3c9925 100644
--- a/app/src/main/res/drawable/ic_selected.xml
+++ b/app/src/main/res/drawable/ic_selected.xml
@@ -1,4 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
-    <path android:pathData="M1.5 8a6.5 6.5 0 1 1 13 0 6.5 6.5 0 1 1-13 0" android:strokeWidth="3" android:fillColor="#4B7CDD" android:strokeColor="#4B7CDD" android:fillType="evenOdd"/>
+    <path android:pathData="M1.5 8a6.5 6.5 0 1 1 13 0 6.5 6.5 0 1 1-13 0" android:strokeWidth="3" android:fillColor="?attr/color_accent" android:strokeColor="?attr/color_accent" android:fillType="evenOdd"/>
     <path android:pathData="M11.364 6.207L7.121 10.45l-2.12-2.122" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeColor="#FFFFFF" android:fillType="evenOdd" android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/selector_radio.xml b/app/src/main/res/drawable/selector_radio.xml
index 7ee056f639..5b443d0133 100644
--- a/app/src/main/res/drawable/selector_radio.xml
+++ b/app/src/main/res/drawable/selector_radio.xml
@@ -5,7 +5,7 @@
             <item>
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
-                    <stroke android:color="@color/color_gray" android:width="1dp" />
+                    <stroke android:color="?attr/bg_menu_border" android:width="1dp" />
                     <padding android:left="12dp" android:right="12dp" android:top="9dp" android:bottom="9dp" />
                 </shape>
             </item>
@@ -16,11 +16,11 @@
             <item>
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
-                    <stroke android:color="@color/colorAccent" android:width="1dp" />
+                    <stroke android:color="?attr/color_accent" android:width="1dp" />
                     <solid android:color="?attr/bg_clip" />
                     <padding android:left="12dp" android:right="12dp" android:top="9dp" android:bottom="9dp" />
                 </shape>
             </item>
         </ripple>
     </item>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/selector_radio_badge.xml b/app/src/main/res/drawable/selector_radio_badge.xml
index bbd3102bf7..762ba5b263 100644
--- a/app/src/main/res/drawable/selector_radio_badge.xml
+++ b/app/src/main/res/drawable/selector_radio_badge.xml
@@ -5,7 +5,7 @@
             <item android:state_enabled="true">
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
-                    <stroke android:width="1dp" android:color="@color/color_gray" />
+                    <stroke android:width="1dp" android:color="?attr/bg_menu_border" />
                     <padding android:bottom="9dp" android:left="12dp" android:right="12dp" android:top="9dp" />
                 </shape>
             </item>
@@ -23,7 +23,7 @@
             <item android:state_enabled="true">
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
-                    <stroke android:width="1dp" android:color="@color/colorAccent" />
+                    <stroke android:width="1dp" android:color="?attr/color_accent" />
                     <solid android:color="?attr/bg_clip" />
                     <padding android:bottom="9dp" android:left="12dp" android:right="12dp" android:top="9dp" />
                 </shape>
@@ -37,4 +37,4 @@
             </item>
         </layer-list>
     </item>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/layout/view_swap_alert.xml b/app/src/main/res/layout/view_swap_alert.xml
index e5bf85cdc0..60c1a49380 100644
--- a/app/src/main/res/layout/view_swap_alert.xml
+++ b/app/src/main/res/layout/view_swap_alert.xml
@@ -20,7 +20,7 @@
         android:layout_width="2dp"
         android:layout_height="20dp"
         android:layout_gravity="center_vertical"
-        android:background="#0D000000" />
+        android:background="?attr/bg_divider" />
 
     <ViewAnimator
         android:id="@+id/alert_va"
@@ -47,4 +47,4 @@
             android:layout_gravity="center" />
     </ViewAnimator>
 
-</merge>
\ No newline at end of file
+</merge>