From 4ded8537e8a34fdca043e9ebb402c2381c80e09b Mon Sep 17 00:00:00 2001
From: LaizyBoy <laizyboy@winboll.cc>
Date: Tue, 12 May 2026 12:05:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20WinBoLL=20=E5=BA=93?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E5=B9=B6=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=B8=BB=E9=A2=98=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 升级 WinBoLL 库依赖版本至 15.20.x 系列：
  - libaes: 15.15.10 → 15.20.2
  - libappbase: 15.15.23 → 15.20.9
- 完善 winboll 模块主题配置：
  - MyAppTheme 改用 Theme.AppCompat.Light.NoActionBar 解决 AppCompat 兼容问题
  - 添加完整的应用主题属性定义
  - 添加 MyDebugActivityTheme 调试主题
- 添加主窗口、工具栏、调试文字颜色定义
---
 libwinboll/build.gradle                |  4 +--
 libwinboll/build.properties            |  4 +--
 winboll/build.gradle                   |  4 +--
 winboll/build.properties               |  4 +--
 winboll/src/main/res/values/colors.xml |  6 +++++
 winboll/src/main/res/values/styles.xml | 34 ++++++++++++++++++++++++--
 6 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/libwinboll/build.gradle b/libwinboll/build.gradle
index e1e4410..be58ff1 100644
--- a/libwinboll/build.gradle
+++ b/libwinboll/build.gradle
@@ -31,8 +31,8 @@ dependencies {
 	api 'com.jcraft:jsch:0.1.54'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.10'
-    api 'cc.winboll.studio:libappbase:15.15.23'
+	api 'cc.winboll.studio:libaes:15.20.2'
+    api 'cc.winboll.studio:libappbase:15.20.9'
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }
diff --git a/libwinboll/build.properties b/libwinboll/build.properties
index ee10888..51737a0 100644
--- a/libwinboll/build.properties
+++ b/libwinboll/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 09 21:11:12 GMT 2026
+#Tue May 12 12:01:48 CST 2026
 stageCount=27
 libraryProject=libwinboll
 baseVersion=15.11
 publishVersion=15.11.26
-buildCount=30
+buildCount=35
 baseBetaVersion=15.11.27
diff --git a/winboll/build.gradle b/winboll/build.gradle
index 568f297..a9cda79 100644
--- a/winboll/build.gradle
+++ b/winboll/build.gradle
@@ -109,8 +109,8 @@ dependencies {
 	implementation 'com.termux:termux-shared:0.118.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.10'
-    api 'cc.winboll.studio:libappbase:15.15.23'
+	api 'cc.winboll.studio:libaes:15.20.2'
+    api 'cc.winboll.studio:libappbase:15.20.9'
 	
 	// WinBoLL备用库 jitpack.io 地址
 	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
diff --git a/winboll/build.properties b/winboll/build.properties
index ee10888..51737a0 100644
--- a/winboll/build.properties
+++ b/winboll/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 09 21:11:12 GMT 2026
+#Tue May 12 12:01:48 CST 2026
 stageCount=27
 libraryProject=libwinboll
 baseVersion=15.11
 publishVersion=15.11.26
-buildCount=30
+buildCount=35
 baseBetaVersion=15.11.27
diff --git a/winboll/src/main/res/values/colors.xml b/winboll/src/main/res/values/colors.xml
index b49a043..c31ed9d 100644
--- a/winboll/src/main/res/values/colors.xml
+++ b/winboll/src/main/res/values/colors.xml
@@ -4,4 +4,10 @@
     <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#FF9800</color>
     <color name="pattern_lock_black">#000000</color>
+
+    <color name="mainWindowBackgroundColor">#FFF5F5F5</color>
+    <color name="mainWindowTextColor">#FF000000</color>
+    <color name="toolbarTextColor">#FF000000</color>
+    <color name="toolbarBackgroundColor">#FF00B322</color>
+    <color name="debugTextColor">#FF808080</color>
 </resources>
\ No newline at end of file
diff --git a/winboll/src/main/res/values/styles.xml b/winboll/src/main/res/values/styles.xml
index e62a453..2ae79d5 100644
--- a/winboll/src/main/res/values/styles.xml
+++ b/winboll/src/main/res/values/styles.xml
@@ -1,5 +1,35 @@
 <resources>
-	<style name="MyAppTheme" parent="AESTheme">
+    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">@color/mainWindowTextColor</item>
+        <item name="dialogBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="dialogTextColor">@color/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="textViewTextColor">@color/mainWindowTextColor</item>
+        <item name="editTextBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="editTextTextColor">@color/mainWindowTextColor</item>
+        <item name="scrollViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">@color/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>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+    </style>
+
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
     </style>
-	
 </resources>