From 54b040285c6498b0be19532adb8d2c72c0182fc3 Mon Sep 17 00:00:00 2001
From: LaizyBoy <laizyboy@winboll.cc>
Date: Mon, 11 May 2026 10:00:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=B8=BB=E9=A2=98=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E5=80=BC=E7=BB=9F=E4=B8=80=E5=BC=95=E7=94=A8=20colors?=
 =?UTF-8?q?.xml=20=E5=AE=9A=E4=B9=89=E7=9A=84=E5=91=BD=E5=90=8D=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新增 colors.xml 颜色定义
   - 普通模式: mainWindowBackgroundColor, mainWindowTextColor, buttonBackgroundColor, debugTextColor
   - 深色模式: 同上，颜色值适配深色主题

2. 重构 styles.xml 颜色引用
   - APPBaseTheme 和 DebugActivityTheme 中的颜色值改为 @color/xxx 引用
   - 统一使用命名颜色属性

3. 重构 MyDebugActivityTheme
   - 继承父主题的颜色属性定义
---
 appbase/src/main/res/values-night/styles.xml  |  4 ++--
 appbase/src/main/res/values/styles.xml        |  4 ++--
 .../src/main/res/values-night/colors.xml      |  6 ++++++
 .../src/main/res/values-night/styles.xml      | 20 +++++++++----------
 libappbase/src/main/res/values/colors.xml     |  6 ++++++
 libappbase/src/main/res/values/styles.xml     | 20 +++++++++----------
 6 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/appbase/src/main/res/values-night/styles.xml b/appbase/src/main/res/values-night/styles.xml
index 40600c3..799f2b6 100644
--- a/appbase/src/main/res/values-night/styles.xml
+++ b/appbase/src/main/res/values-night/styles.xml
@@ -6,8 +6,8 @@
 
     <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
         <item name="colorTittle">?attr/mainWindowDarkTextColor</item>
-        <item name="colorTittleBackgound">#FF1E3A5F</item>
-        <item name="colorText">?attr/mainWindowDarkTextColor</item>
+        <item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
         <item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
 	</style>
 </resources>
\ No newline at end of file
diff --git a/appbase/src/main/res/values/styles.xml b/appbase/src/main/res/values/styles.xml
index 4417b69..f738ba0 100644
--- a/appbase/src/main/res/values/styles.xml
+++ b/appbase/src/main/res/values/styles.xml
@@ -6,8 +6,8 @@
 
     <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
         <item name="colorTittle">?attr/mainWindowTextColor</item>
-        <item name="colorTittleBackgound">#FF00B322</item>
-        <item name="colorText">?attr/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
         <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
 	</style>
 </resources>
diff --git a/libappbase/src/main/res/values-night/colors.xml b/libappbase/src/main/res/values-night/colors.xml
index 599a10d..04ca7cb 100644
--- a/libappbase/src/main/res/values-night/colors.xml
+++ b/libappbase/src/main/res/values-night/colors.xml
@@ -60,4 +60,10 @@
 	<color name="btn_gray_pressed">#4D4D4D</color>
 	<color name="btn_gray_disabled">#333333</color>
 
+	<!-- ============== 主题颜色 ============== -->
+	<color name="mainWindowBackgroundColor">#FF0D1B2A</color>
+	<color name="mainWindowTextColor">#FFE0E0E0</color>
+	<color name="buttonBackgroundColor">#FF1E3A5F</color>
+	<color name="debugTextColor">#FF00FF00</color>
+
 </resources>
\ No newline at end of file
diff --git a/libappbase/src/main/res/values-night/styles.xml b/libappbase/src/main/res/values-night/styles.xml
index b94b2cc..547270c 100644
--- a/libappbase/src/main/res/values-night/styles.xml
+++ b/libappbase/src/main/res/values-night/styles.xml
@@ -8,11 +8,11 @@
         <item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
         <item name="aboutViewTitleColor">?attr/mainWindowDarkTextColor</item>
         <item name="aboutViewDividerColor">?attr/mainWindowTextColor</item>
-        <item name="buttonBackgroundColor">#FF1E3A5F</item>
+        <item name="buttonBackgroundColor">@color/buttonBackgroundColor</item>
         <item name="buttonTextColor">?attr/mainWindowDarkTextColor</item>
         <item name="dialogBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
         <item name="dialogTextColor">?attr/mainWindowDarkTextColor</item>
-        <item name="toolbarBackgroundColor">#FF1E3A5F</item>
+        <item name="toolbarBackgroundColor">?attr/buttonBackgroundColor</item>
         <item name="toolbarTextColor">?attr/mainWindowDarkTextColor</item>
         <item name="textViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
         <item name="textViewTextColor">?attr/mainWindowDarkTextColor</item>
@@ -21,20 +21,20 @@
         <item name="scrollViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
         <item name="activityBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
         <item name="activityTextColor">?attr/mainWindowDarkTextColor</item>
-        <item name="mainWindowBackgroundColor">#FF0D1B2A</item>
-        <item name="mainWindowTextColor">#FFE0E0E0</item>
-        <item name="mainWindowDarkBackgroundColor">#FF0D1B2A</item>
-        <item name="mainWindowDarkTextColor">#FFE0E0E0</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
     </style>
 
-    <!-- GlobalCrashActivityTheme 深色模式样式 -->
+    <!-- DebugActivityTheme 深色模式样式 -->
     <style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
-        <item name="android:statusBarColor">#FF0D1B2A</item>
+        <item name="android:statusBarColor">@color/mainWindowBackgroundColor</item>
         <item name="colorTittle">?attr/mainWindowDarkTextColor</item>
-        <item name="colorTittleBackgound">#FF1E3A5F</item>
+        <item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
         <item name="colorText">?attr/debugTextColor</item>
         <item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
-        <item name="debugTextColor">#FF00FF00</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
 	</style>
 
     <!-- DialogStyle 对话框样式 -->
diff --git a/libappbase/src/main/res/values/colors.xml b/libappbase/src/main/res/values/colors.xml
index ecc1e86..c66304e 100644
--- a/libappbase/src/main/res/values/colors.xml
+++ b/libappbase/src/main/res/values/colors.xml
@@ -60,4 +60,10 @@
 	<color name="btn_gray_pressed">#757575</color>
 	<color name="btn_gray_disabled">#E0E0E0</color>
 
+	<!-- ============== 主题颜色 ============== -->
+	<color name="mainWindowBackgroundColor">#FFF5F5F5</color>
+	<color name="mainWindowTextColor">#FF000000</color>
+	<color name="buttonBackgroundColor">#FF00B322</color>
+	<color name="debugTextColor">#FF808080</color>
+
 </resources>
\ No newline at end of file
diff --git a/libappbase/src/main/res/values/styles.xml b/libappbase/src/main/res/values/styles.xml
index b7ba2ea..0406697 100644
--- a/libappbase/src/main/res/values/styles.xml
+++ b/libappbase/src/main/res/values/styles.xml
@@ -8,11 +8,11 @@
         <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
         <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
         <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
-        <item name="buttonBackgroundColor">#FF00B322</item>
+        <item name="buttonBackgroundColor">@color/buttonBackgroundColor</item>
         <item name="buttonTextColor">?attr/mainWindowTextColor</item>
         <item name="dialogBackgroundColor">?attr/mainWindowBackgroundColor</item>
         <item name="dialogTextColor">?attr/mainWindowTextColor</item>
-        <item name="toolbarBackgroundColor">#FF00B322</item>
+        <item name="toolbarBackgroundColor">?attr/buttonBackgroundColor</item>
         <item name="toolbarTextColor">?attr/mainWindowTextColor</item>
         <item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
         <item name="textViewTextColor">?attr/mainWindowTextColor</item>
@@ -21,20 +21,20 @@
         <item name="scrollViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
         <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
         <item name="activityTextColor">?attr/mainWindowTextColor</item>
-        <item name="mainWindowBackgroundColor">#FFF5F5F5</item>
-        <item name="mainWindowTextColor">#FF000000</item>
-        <item name="mainWindowDarkBackgroundColor">#FF0D1B2A</item>
-        <item name="mainWindowDarkTextColor">#FFE0E0E0</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
     </style>
 
-    <!-- GlobalCrashActivityTheme 普通模式样式 -->
+    <!-- DebugActivityTheme 普通模式样式 -->
     <style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
-        <item name="android:statusBarColor">#FF00B322</item>
+        <item name="android:statusBarColor">@color/buttonBackgroundColor</item>
         <item name="colorTittle">?attr/mainWindowTextColor</item>
-        <item name="colorTittleBackgound">#FF00B322</item>
+        <item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
         <item name="colorText">?attr/debugTextColor</item>
         <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
-        <item name="debugTextColor">#FF808080</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
 	</style>
 
     <!-- DialogStyle 对话框样式 -->