From 79f161b559fa822854ca5f5ddc62b2cedcbcfd3b Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Wed, 1 Jul 2026 17:06:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20MyAppTheme=20?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E7=BB=A7=E6=89=BF=E9=93=BE=EF=BC=8C=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=20Android=2016(SDK=2036)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复 view_log.xml 自定义属性解析失败崩溃（需要 APPBaseTheme 的属性集）
- 修复 AppCompatActivity 需要 Theme.AppCompat 子主题的 IllegalStateException
- 父主题改为 Theme.AppCompat.Light.NoActionBar / Theme.AppCompat.NoActionBar
- 新增 values-night/ 日夜模式自动切换支持
- 主色调从 Teal/Orange 更换为 Blue/Amber 专业配色方案
---
 .../src/main/res/values-night/colors.xml      | 12 +++++++
 .../src/main/res/values-night/styles.xml      | 26 +++++++++++++++
 mywinboll/src/main/res/values/colors.xml      | 12 +++++--
 mywinboll/src/main/res/values/styles.xml      | 33 ++++++++++++++++---
 4 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 mywinboll/src/main/res/values-night/colors.xml
 create mode 100644 mywinboll/src/main/res/values-night/styles.xml

diff --git a/mywinboll/src/main/res/values-night/colors.xml b/mywinboll/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..e013d7d
--- /dev/null
+++ b/mywinboll/src/main/res/values-night/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#42A5F5</color>
+    <color name="colorPrimaryDark">#1565C0</color>
+    <color name="colorAccent">#FFD740</color>
+    <color name="mainWindowBackgroundColor">#121212</color>
+    <color name="mainWindowTextColor">#E0E0E0</color>
+    <color name="toolbarTextColor">#FFFFFF</color>
+    <color name="toolbarBackgroundColor">#1E3A5F</color>
+    <color name="debugTextColor">#00E676</color>
+    <color name="colorTextBackgound">#121212</color>
+</resources>
\ No newline at end of file
diff --git a/mywinboll/src/main/res/values-night/styles.xml b/mywinboll/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..850d4c4
--- /dev/null
+++ b/mywinboll/src/main/res/values-night/styles.xml
@@ -0,0 +1,26 @@
+<resources>
+
+    <style name="MyAppTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="aboutViewTitleColor">?attr/mainWindowDarkTextColor</item>
+        <item name="aboutViewDividerColor">?attr/mainWindowTextColor</item>
+        <item name="dialogBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="dialogTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="textViewTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="editTextBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="editTextTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="scrollViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="activityBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="activityTextColor">?attr/mainWindowDarkTextColor</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>
+
+</resources>
\ No newline at end of file
diff --git a/mywinboll/src/main/res/values/colors.xml b/mywinboll/src/main/res/values/colors.xml
index 479769a..eb36144 100644
--- a/mywinboll/src/main/res/values/colors.xml
+++ b/mywinboll/src/main/res/values/colors.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#009688</color>
-    <color name="colorPrimaryDark">#00796B</color>
-    <color name="colorAccent">#FF9800</color>
+    <color name="colorPrimary">#1565C0</color>
+    <color name="colorPrimaryDark">#0D47A1</color>
+    <color name="colorAccent">#FF6F00</color>
+    <color name="mainWindowBackgroundColor">#FAFAFA</color>
+    <color name="mainWindowTextColor">#212121</color>
+    <color name="toolbarTextColor">#FFFFFF</color>
+    <color name="toolbarBackgroundColor">#1565C0</color>
+    <color name="debugTextColor">#616161</color>
+    <color name="colorTextBackgound">#FAFAFA</color>
 </resources>
\ No newline at end of file
diff --git a/mywinboll/src/main/res/values/styles.xml b/mywinboll/src/main/res/values/styles.xml
index a70e242..9a676c0 100644
--- a/mywinboll/src/main/res/values/styles.xml
+++ b/mywinboll/src/main/res/values/styles.xml
@@ -1,11 +1,34 @@
 <resources>
 
-    <!-- Base application theme. -->
     <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
+        <item name="dialogBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="dialogTextColor">?attr/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="textViewTextColor">?attr/mainWindowTextColor</item>
+        <item name="editTextBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="editTextTextColor">?attr/mainWindowTextColor</item>
+        <item name="scrollViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">?attr/mainWindowTextColor</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>
+
+    <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
+        <item name="colorTittle">?attr/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
+        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
     </style>
 
 </resources>