合并模块WinBoLL 同步最新时间标签winboll-v15.20.5

libwinboll/build.gradle

@@ -44,13 +44,12 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.21'
+    //api 'cc.winboll.studio:libappbase:15.20.22'
-    api 'cc.winboll.studio:libaes:15.20.9'
+    //api 'cc.winboll.studio:libaes:15.20.11'
 	
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.20'
+	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
-	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.8'
+	api 'com.github.ZhanGSKen:libaes:aes-v15.20.11'
-	
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libwinboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jun 01 20:31:36 HKT 2026
+#Tue Jun 02 03:18:21 HKT 2026
-stageCount=5
+stageCount=6
 libraryProject=libwinboll
 baseVersion=15.20
-publishVersion=15.20.4
+publishVersion=15.20.5
 buildCount=0
-baseBetaVersion=15.20.5
+baseBetaVersion=15.20.6

winboll/build.gradle

@@ -105,12 +105,12 @@ dependencies {
 	implementation 'com.termux:termux-shared:0.118.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.22'
+    //api 'cc.winboll.studio:libappbase:15.20.22'
-    api 'cc.winboll.studio:libaes:15.20.10'
+    //api 'cc.winboll.studio:libaes:15.20.11'
 	
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.21'
+	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
-	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.9'
+	api 'com.github.ZhanGSKen:libaes:aes-v15.20.11'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jun 01 20:31:36 HKT 2026
+#Tue Jun 02 03:18:21 HKT 2026
-stageCount=5
+stageCount=6
 libraryProject=libwinboll
 baseVersion=15.20
-publishVersion=15.20.4
+publishVersion=15.20.5
 buildCount=0
-baseBetaVersion=15.20.5
+baseBetaVersion=15.20.6

winboll/src/main/java/cc/winboll/studio/winboll/App.java

@@ -40,7 +40,9 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import java.util.ArrayList;
 
 public class App extends GlobalApplication {
 	
@@ -62,6 +64,17 @@ public class App extends GlobalApplication {
 		//setIsDebugging(false);
 		
 		WinBoLLActivityManager.init(this);
+
+        // 初始化 AES 主题工具（注入当前应用命名空间的主题ID列表，按 ThemeType.ordinal() 顺序）
+        ArrayList<Integer> themeStyleList = new ArrayList<Integer>();
+        themeStyleList.add(R.style.MyAppTheme);         // AES(0)
+        themeStyleList.add(R.style.MyDepthAppTheme);   // DEPTH(1)
+        themeStyleList.add(R.style.MySkyAppTheme);     // SKY(2)
+        themeStyleList.add(R.style.MyGoldenAppTheme);  // GOLDEN(3)
+        themeStyleList.add(R.style.MyBearingAppTheme); // BEARING(4)
+        themeStyleList.add(R.style.MyMemorAppTheme);   // MEMOR(5)
+        themeStyleList.add(R.style.MyTaoAppTheme);     // TAO(6)
+        AESThemeUtil.init(themeStyleList);
         
         // 初始化 Toast 框架
         ToastUtils.init(this);

winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java

@@ -37,7 +37,7 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this));
+        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
         super.onCreate(savedInstanceState);
         initMainHandler();
         if (mBrowserFragment == null) {

winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java

@@ -14,7 +14,6 @@ import android.os.Looper;
 import android.view.MotionEvent;
 import android.widget.FrameLayout;
 import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.winboll.R;
 
@@ -57,7 +56,6 @@ public class PatternLockActivity extends BaseWinBoLLActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        AESThemeUtil.applyAppTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_pattern_lock);
 

winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java

@@ -3,7 +3,6 @@ package cc.winboll.studio.winboll.activities;
 import android.os.Bundle;
 import android.view.View;
 import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.winboll.R;
 import android.app.Activity;
 
@@ -29,7 +28,6 @@ public class SettingsActivity extends BaseWinBoLLActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        AESThemeUtil.applyAppTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);