From 8f8c3c6c97a84d272a2e1ae34fd6e2f58f702f9f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 4 Feb 2025 08:24:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=BB=E9=A2=98=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +- aes/src/main/AndroidManifest.xml | 2 +- libaes/build.properties | 4 +- .../studio/libaes/beans/AESThemeBean.java | 16 +- .../studio/libaes/utils/AESThemeUtil.java | 8 +- libaes/src/main/res/values/attrs.xml | 7 + libaes/src/main/res/values/styles.xml | 270 ++++++++++-------- 7 files changed, 178 insertions(+), 133 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index b3cf5a9..9cb10b4 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 26 14:20:15 HKT 2025 +#Tue Feb 04 00:22:34 GMT 2025 stageCount=5 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.4 -buildCount=0 +buildCount=10 baseBetaVersion=7.6.5 diff --git a/aes/src/main/AndroidManifest.xml b/aes/src/main/AndroidManifest.xml index cc00d93..0113548 100644 --- a/aes/src/main/AndroidManifest.xml +++ b/aes/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/WinBoll.SupportThemeNoActionBar" + android:theme="@style/AESTheme" android:requestLegacyExternalStorage="true" android:supportsRtl="true"> diff --git a/libaes/build.properties b/libaes/build.properties index 0ca2160..9cb10b4 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 26 14:19:55 HKT 2025 +#Tue Feb 04 00:22:34 GMT 2025 stageCount=5 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.4 -buildCount=0 +buildCount=10 baseBetaVersion=7.6.5 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java index 2d3a474..fe23895 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java @@ -16,7 +16,7 @@ public class AESThemeBean extends BaseBean { public static final String TAG = "AESThemeBean"; public enum ThemeType { - DEFAULT("默认主题"), + AES("默认主题"), DEPTH("深奥主题"), SKY("天空主题"), GOLDEN("辉煌主题"), @@ -42,7 +42,7 @@ public class AESThemeBean extends BaseBean { } // 保存当前主题 - int currentThemeStyleID = getThemeStyleID(ThemeType.DEFAULT); + int currentThemeStyleID = getThemeStyleID(ThemeType.AES); public AESThemeBean() { } @@ -99,7 +99,7 @@ public class AESThemeBean extends BaseBean { } public static int getThemeStyleID(ThemeType themeType) { - int themeStyleID = R.style.DefaultAESTheme; + int themeStyleID = R.style.AESTheme; if (AESThemeBean.ThemeType.DEPTH == themeType) { themeStyleID = R.style.DepthAESTheme; } else if (AESThemeBean.ThemeType.SKY == themeType) { @@ -110,15 +110,15 @@ public class AESThemeBean extends BaseBean { themeStyleID = R.style.MemorAESTheme; } else if (AESThemeBean.ThemeType.TAO == themeType) { themeStyleID = R.style.TaoAESTheme; - } else if (AESThemeBean.ThemeType.DEFAULT == themeType) { - themeStyleID = R.style.DefaultAESTheme; + } else if (AESThemeBean.ThemeType.AES == themeType) { + themeStyleID = R.style.AESTheme; } //LogUtils.d(TAG, "themeStyleID " + Integer.toString(themeStyleID)); return themeStyleID; } public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) { - AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.DEFAULT; + AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES; if (R.style.DepthAESTheme == nThemeStyleID) { themeStyle = AESThemeBean.ThemeType.DEPTH ; } else if (R.style.SkyAESTheme == nThemeStyleID) { @@ -129,8 +129,8 @@ public class AESThemeBean extends BaseBean { themeStyle = AESThemeBean.ThemeType.MEMOR ; } else if (R.style.TaoAESTheme == nThemeStyleID) { themeStyle = AESThemeBean.ThemeType.TAO ; - } else if (R.style.DefaultAESTheme == nThemeStyleID) { - themeStyle = AESThemeBean.ThemeType.DEFAULT; + } else if (R.style.AESTheme == nThemeStyleID) { + themeStyle = AESThemeBean.ThemeType.AES; } //LogUtils.d(TAG, "themeStyle " + Integer.toString(themeStyle.ordinal())); return themeStyle; diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java index 68f3dd1..ccc22ec 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java @@ -25,7 +25,7 @@ public class AESThemeUtil { public static int getThemeTypeID(T context) { AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class); - return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT): bean.getCurrentThemeTypeID(); + return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID(); } public static void saveThemeStyleID(T context, int nThemeTypeID) { @@ -92,7 +92,7 @@ public class AESThemeUtil { saveThemeStyleID(activity, nThemeStyleID); return true; } else if (R.id.item_defaulttheme == item.getItemId()) { - nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT); + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES); saveThemeStyleID(activity, nThemeStyleID); return true; } @@ -123,7 +123,7 @@ public class AESThemeUtil { saveThemeStyleID(activity, nThemeStyleID); return true; } else if (R.id.item_defaulttheme == item.getItemId()) { - nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT); + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES); saveThemeStyleID(activity, nThemeStyleID); return true; } @@ -154,7 +154,7 @@ public class AESThemeUtil { saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); return true; } else if (R.id.item_defaulttheme == item.getItemId()) { - nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT); + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES); saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); return true; } diff --git a/libaes/src/main/res/values/attrs.xml b/libaes/src/main/res/values/attrs.xml index 4dfb542..c3a273d 100644 --- a/libaes/src/main/res/values/attrs.xml +++ b/libaes/src/main/res/values/attrs.xml @@ -32,6 +32,13 @@ + + + + + + + + + +