From b9bc7dfa1868b79799a35e19c1779c1b55fc0c0d Mon Sep 17 00:00:00 2001
From: BigPickle <BigPickle@WinBoLL.CC>
Date: Thu, 4 Jun 2026 17:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DGitsion=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=9C=A8Android=2016=E4=B8=8A=E7=9A=84=E5=B8=83=E5=B1=80Inflat?=
 =?UTF-8?q?e=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正 activity_main.xml 中 GpsSubscribeControlView 的包名
  (libgpsrelaysentinel → libgitsion)
- 补充 MyAppTheme 缺失的自定义主题属性，新增 DebugActivityTheme
  解决 view_log.xml 中 ?attr/colorTextBackgound 等引用无法
  在 Android 16 (SDK 36) 上解析导致的 InflateException
- 添加 colors.xml 中对应的主题颜色定义
---
 gitsion/src/main/res/layout/activity_main.xml |  6 ++---
 gitsion/src/main/res/values/colors.xml        |  8 +++++++
 gitsion/src/main/res/values/styles.xml        | 22 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/gitsion/src/main/res/layout/activity_main.xml b/gitsion/src/main/res/layout/activity_main.xml
index 4e9f9bc..d1063a5 100644
--- a/gitsion/src/main/res/layout/activity_main.xml
+++ b/gitsion/src/main/res/layout/activity_main.xml
@@ -158,19 +158,19 @@
 			android:gravity="center_horizontal"
 			android:padding="12dp">
 
-			<cc.winboll.studio.libgpsrelaysentinel.view.GpsSubscribeControlView
+			<cc.winboll.studio.libgitsion.view.GpsSubscribeControlView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="10dp"
 				android:background="@drawable/border_gray"/>
 
-			<cc.winboll.studio.libgpsrelaysentinel.view.GpsSubscribeControlView
+			<cc.winboll.studio.libgitsion.view.GpsSubscribeControlView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="10dp"
 				android:background="@drawable/border_gray"/>
 
-			<cc.winboll.studio.libgpsrelaysentinel.view.GpsSubscribeControlView
+			<cc.winboll.studio.libgitsion.view.GpsSubscribeControlView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="10dp"
diff --git a/gitsion/src/main/res/values/colors.xml b/gitsion/src/main/res/values/colors.xml
index 479769a..c9279e0 100644
--- a/gitsion/src/main/res/values/colors.xml
+++ b/gitsion/src/main/res/values/colors.xml
@@ -3,4 +3,12 @@
     <color name="colorPrimary">#009688</color>
     <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#FF9800</color>
+
+    <color name="mainWindowBackgroundColor">#FFF5F5F5</color>
+    <color name="mainWindowTextColor">#FF000000</color>
+    <color name="mainWindowDarkBackgroundColor">#FFF5F5F5</color>
+    <color name="mainWindowDarkTextColor">#FF000000</color>
+    <color name="toolbarBackgroundColor">#FF009688</color>
+    <color name="toolbarTextColor">#FF000000</color>
+    <color name="debugTextColor">#FF808080</color>
 </resources>
\ No newline at end of file
diff --git a/gitsion/src/main/res/values/styles.xml b/gitsion/src/main/res/values/styles.xml
index a70e242..6345c33 100644
--- a/gitsion/src/main/res/values/styles.xml
+++ b/gitsion/src/main/res/values/styles.xml
@@ -2,10 +2,30 @@
 
     <!-- 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/DebugActivityTheme</item>
+
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowDarkBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowDarkTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">?attr/mainWindowTextColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+    </style>
+
+    <style name="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorTittle">?attr/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
+        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
     </style>
 
 </resources>