Studio/WinBoLL
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/projects_keeper_tag' into winboll

Browse Source
This commit is contained in:
ZhangShaojian
2026-05-27 20:27:10 +08:00
parent 00220a382d b1059c3f46
commit c3f84afb62
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
aes/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sun May 24 10:48:48 HKT 2026 #Wed May 27 20:22:45 HKT 2026
stageCount=10 stageCount=11
libraryProject=libaes libraryProject=libaes
baseVersion=15.20 baseVersion=15.20
publishVersion=15.20.9 publishVersion=15.20.10
buildCount=0 buildCount=0
baseBetaVersion=15.20.10 baseBetaVersion=15.20.11

3
aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
View File

@@ -84,11 +84,12 @@ public class MainActivity extends DrawerFragmentActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
getMenuInflater().inflate(R.menu.toolbar_main, menu); getMenuInflater().inflate(R.menu.toolbar_main, menu);
// if(App.isDebugging()) { // if(App.isDebugging()) {
// getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu); // getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu);
// } // }
return super.onCreateOptionsMenu(menu); return true;
} }
@Override @Override

2
libaes/build.gradle
View File

@@ -66,7 +66,7 @@ dependencies {
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
// WinBoLL库 nexus.winboll.cc 地址 // WinBoLL库 nexus.winboll.cc 地址
api 'cc.winboll.studio:libappbase:15.20.21' api 'cc.winboll.studio:libappbase:15.20.22'
// 备用库 jitpack.io 地址 // 备用库 jitpack.io 地址
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21' //api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21'

8
libaes/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sun May 24 10:48:48 HKT 2026 #Wed May 27 20:22:45 HKT 2026
stageCount=10 stageCount=11
libraryProject=libaes libraryProject=libaes
baseVersion=15.20 baseVersion=15.20
publishVersion=15.20.9 publishVersion=15.20.10
buildCount=0 buildCount=0
baseBetaVersion=15.20.10 baseBetaVersion=15.20.11

15
libaes/src/main/res/values/styles.xml
View File

@@ -2,6 +2,9 @@
<resources> <resources>
<style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">#FF03AB4E</item>
<item name="colorPrimaryDark">#FF027C39</item>
<item name="colorAccent">#FF3DDC84</item>
<item name="themeDebug">@style/DebugActivityTheme</item> <item name="themeDebug">@style/DebugActivityTheme</item>
<item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item> <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
<item name="aboutViewTextColor">@color/mainWindowTextColor</item> <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
@@ -40,16 +43,16 @@
<style name="AESAToolbar"> <style name="AESAToolbar">
<item name="attrAToolbarTitleTextColor">@color/colorTextColor</item> <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
<item name="attrAToolbarStartColor">@color/colorPrimaryDark</item> <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
<item name="attrAToolbarCenterColor">@color/colorPrimary</item> <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
<item name="attrAToolbarEndColor">@color/colorAccent</item> <item name="attrAToolbarEndColor">?attr/colorAccent</item>
</style> </style>
<style name="AESASupportToolbar"> <style name="AESASupportToolbar">
<item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item> <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
<item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item> <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
<item name="attrASupportToolbarCenterColor">@color/colorPrimary</item> <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
<item name="attrASupportToolbarEndColor">@color/colorAccent</item> <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
</style> </style>
<style name="DepthAESTheme" parent="AESTheme"> <style name="DepthAESTheme" parent="AESTheme">