Compare commits

...

7 Commits

Author SHA1 Message Date
8ae36effdd <aes>APK 15.20.10 release Publish. 2026-05-27 20:22:45 +08:00
0cc9b0871e fix: ASupportToolbar/AToolbar 控件颜色不跟随主题切换
- AESASupportToolbar/AESAToolbar 样式的颜色引用从 @color/ 改为
  ?attr/,使其通过主题属性解析,随主题切换而变化
- AESTheme 基主题新增 colorPrimary/colorPrimaryDark/colorAccent
  显式定义,保持默认绿色外观不变
2026-05-27 20:19:54 +08:00
d13c44c666 菜单排列重组 2026-05-27 19:35:01 +08:00
f786d06682 Merge branch 'aes' into merge 2026-05-27 15:21:52 +08:00
168d2e2d60 Merge remote-tracking branch 'origin/projects_keeper_tag' into merge 2026-05-27 15:21:47 +08:00
f303a77e28 更新基础类库 2026-05-27 15:16:12 +08:00
qinglong
f3d723fbee 合并模块APPBase 同步最新时间标签appbase-v15.20.22 2026-05-27 15:00:01 +08:00
8 changed files with 29 additions and 25 deletions

View File

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

View File

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

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sun May 24 09:53:05 HKT 2026
stageCount=22
#Wed May 27 14:51:29 HKT 2026
stageCount=23
libraryProject=libappbase
baseVersion=15.20
publishVersion=15.20.21
publishVersion=15.20.22
buildCount=0
baseBetaVersion=15.20.22
baseBetaVersion=15.20.23

View File

@@ -66,7 +66,7 @@ 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'
// 备用库 jitpack.io 地址
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21'

View File

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

View File

@@ -2,6 +2,9 @@
<resources>
<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="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
<item name="aboutViewTextColor">@color/mainWindowTextColor</item>
@@ -40,16 +43,16 @@
<style name="AESAToolbar">
<item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
<item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
<item name="attrAToolbarCenterColor">@color/colorPrimary</item>
<item name="attrAToolbarEndColor">@color/colorAccent</item>
<item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
<item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
<item name="attrAToolbarEndColor">?attr/colorAccent</item>
</style>
<style name="AESASupportToolbar">
<item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
<item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
<item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
<item name="attrASupportToolbarEndColor">@color/colorAccent</item>
<item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
<item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
<item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
</style>
<style name="DepthAESTheme" parent="AESTheme">

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sun May 24 09:53:05 HKT 2026
stageCount=22
#Wed May 27 14:51:29 HKT 2026
stageCount=23
libraryProject=libappbase
baseVersion=15.20
publishVersion=15.20.21
publishVersion=15.20.22
buildCount=0
baseBetaVersion=15.20.22
baseBetaVersion=15.20.23

View File

@@ -59,7 +59,7 @@ public class DebugSwitchInfoImageView extends ImageView {
final AlertDialog dialog = new AlertDialog.Builder(getContext()).create();
dialog.setTitle("调试Token");
dialog.setMessage(getDebugToken());
dialog.setCanceledOnTouchOutside(true);
dialog.setCanceledOnTouchOutside(false);
dialog.setButton(DialogInterface.BUTTON_POSITIVE, "复制到剪贴板", (DialogInterface.OnClickListener) null);
dialog.setButton(DialogInterface.BUTTON_NEUTRAL, "重置", (DialogInterface.OnClickListener) null);
dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);