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-06-02 08:57:30 +08:00
parent e8c5cefeac db804d1897
commit 375635436b
12 changed files with 267 additions and 337 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
#Wed May 27 20:22:45 HKT 2026 #Tue Jun 02 08:54:20 HKT 2026
stageCount=11 stageCount=13
libraryProject=libaes libraryProject=libaes
baseVersion=15.20 baseVersion=15.20
publishVersion=15.20.10 publishVersion=15.20.12
buildCount=0 buildCount=0
baseBetaVersion=15.20.11 baseBetaVersion=15.20.13

4
aes/src/main/java/cc/winboll/studio/aes/App.java
View File

@@ -5,10 +5,11 @@ package cc.winboll.studio.aes;
* @Date 2024/06/13 19:03:58 * @Date 2024/06/13 19:03:58
* @Describe AES应用类 * @Describe AES应用类
*/ */
import android.view.Gravity; import cc.winboll.studio.libaes.utils.AESThemeUtil;
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.ToastUtils; import cc.winboll.studio.libappbase.ToastUtils;
import java.util.ArrayList;
public class App extends GlobalApplication { public class App extends GlobalApplication {
@@ -18,6 +19,7 @@ public class App extends GlobalApplication {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
AESThemeUtil.init(null);
WinBoLLActivityManager.init(this); WinBoLLActivityManager.init(this);
// 初始化 Toast 框架 // 初始化 Toast 框架

4
libaes/build.gradle
View File

@@ -66,9 +66,9 @@ 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.22' //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.20.22'
api fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
} }

8
libaes/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Wed May 27 20:22:45 HKT 2026 #Tue Jun 02 08:54:20 HKT 2026
stageCount=11 stageCount=13
libraryProject=libaes libraryProject=libaes
baseVersion=15.20 baseVersion=15.20
publishVersion=15.20.10 publishVersion=15.20.12
buildCount=0 buildCount=0
baseBetaVersion=15.20.11 baseBetaVersion=15.20.13

191
libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java
View File

@@ -15,6 +15,7 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
@@ -22,8 +23,10 @@ import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import cc.winboll.studio.libaes.DrawerMenuDataAdapter; import cc.winboll.studio.libaes.DrawerMenuDataAdapter;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
import cc.winboll.studio.libaes.models.AESThemeBean; import cc.winboll.studio.libaes.models.AESThemeBean;
import cc.winboll.studio.libaes.models.DrawerMenuBean; import cc.winboll.studio.libaes.models.DrawerMenuBean;
import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.AESThemeUtil;
@@ -34,8 +37,8 @@ import cc.winboll.studio.libaes.views.ADsBannerView;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import com.baoyz.widget.PullRefreshLayout; import com.baoyz.widget.PullRefreshLayout;
import java.util.ArrayList; import java.util.ArrayList;
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener { public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener {
@@ -44,7 +47,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME"; static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE"; static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
//protected Context mContext;
ActivityType mActivityType; ActivityType mActivityType;
ActionBarDrawerToggle mActionBarDrawerToggle; ActionBarDrawerToggle mActionBarDrawerToggle;
DrawerLayout mDrawerLayout; DrawerLayout mDrawerLayout;
@@ -59,13 +61,14 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
public enum ActivityType { Main, Secondary } public enum ActivityType { Main, Secondary }
protected volatile AESThemeBean.ThemeType mThemeType; protected volatile AESThemeBean.ThemeType mThemeType;
protected ArrayList<DrawerMenuBean> malDrawerMenuItem; protected ArrayList<DrawerMenuBean> malDrawerMenuItem;
abstract protected ActivityType initActivityType(); abstract protected ActivityType initActivityType();
//abstract protected View initContentView(LayoutInflater inflater, ViewGroup rootView);
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
// 替换：使用工具类统一应用主题
AESThemeUtil.applyAppCompatTheme(this);
mThemeType = AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext())); mThemeType = AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
WinBoLLActivityManager.getInstance().add(this); WinBoLLActivityManager.getInstance().add(this);
mActivityType = initActivityType(); mActivityType = initActivityType();
@@ -78,53 +81,32 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
return this; return this;
} }
@Override @Override
public String getTag() { public String getTag() {
return TAG; return TAG;
} }
@Override @Override
protected void onDestroy() { protected void onDestroy() {
WinBoLLActivityManager.getInstance().registeRemove(this); WinBoLLActivityManager.getInstance().registeRemove(this);
super.onDestroy(); super.onDestroy();
// 修复：释放广告资源，避免内存泄漏 // 修复：释放广告资源，避免内存泄漏
ADsBannerView adsBannerView = findViewById(R.id.adsbanner); ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
if (adsBannerView != null) { if (adsBannerView != null) {
adsBannerView.releaseAdResources(); adsBannerView.releaseAdResources();
} }
} }
/*@Override
public Intent getIntent() {
// TODO: Implement this method
return super.getIntent();
}
public Context getContext() {
return this.mContext;
}*/
@Override @Override
public MenuInflater getMenuInflater() { public MenuInflater getMenuInflater() {
// TODO: Implement this method
return super.getMenuInflater(); return super.getMenuInflater();
} }
/*public void setSubtitle(CharSequence context) {
// TODO: Implement this method
getSupportActionBar().setSubtitle(context);
}*/
@Override @Override
public void recreate() { public void recreate() {
super.recreate(); super.recreate();
} }
/*@Override
public boolean moveTaskToBack(boolean nonRoot) {
return super.moveTaskToBack(nonRoot);
}*/
@Override @Override
public void startActivity(Intent intent) { public void startActivity(Intent intent) {
super.startActivity(intent); super.startActivity(intent);
@@ -135,26 +117,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
super.startActivityForResult(intent, requestCode, options); super.startActivityForResult(intent, requestCode, options);
} }
/*@Override
public FragmentManager getSupportFragmentManager() {
return super.getSupportFragmentManager();
}
public void setSubtitle(int resId) {
// TODO: Implement this method
getSupportActionBar().setSubtitle(resId);
}
public void setTitle(CharSequence context) {
// TODO: Implement this method
getSupportActionBar().setTitle(context);
}
public void setTitle(int resId) {
// TODO: Implement this method
getSupportActionBar().setTitle(resId);
}*/
@Override @Override
public SharedPreferences getSharedPreferences(String name, int mode) { public SharedPreferences getSharedPreferences(String name, int mode) {
return super.getSharedPreferences(name, mode); return super.getSharedPreferences(name, mode);
@@ -162,7 +124,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
@Override @Override
public Context getApplicationContext() { public Context getApplicationContext() {
// TODO: Implement this method
return super.getApplicationContext(); return super.getApplicationContext();
} }
@@ -173,25 +134,27 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (AESThemeUtil.onAppThemeItemSelected(this, item)) { // 替换为 DrawerFragmentActivity 专属点击处理方法
if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
recreate(); recreate();
} if (DevelopUtils.onDevelopItemSelected(this, item)) { }
LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId())); if (DevelopUtils.onDevelopItemSelected(this, item)) {
} else { LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
return super.onOptionsItemSelected(item); } else {
} return super.onOptionsItemSelected(item);
}
return true; return true;
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
ADsBannerView adsBannerView = findViewById(R.id.adsbanner); ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
if (adsBannerView != null) { if (adsBannerView != null) {
adsBannerView.resumeADs(DrawerFragmentActivity.this); adsBannerView.resumeADs(DrawerFragmentActivity.this);
} }
} }
void initRootView() { void initRootView() {
@@ -213,14 +176,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
mPullRefreshLayout = findViewById(R.id.activitydrawerfragmentPullRefreshLayout1); mPullRefreshLayout = findViewById(R.id.activitydrawerfragmentPullRefreshLayout1);
mPullRefreshLayout.setOnRefreshListener(new PullRefreshLayout.OnRefreshListener() { mPullRefreshLayout.setOnRefreshListener(new PullRefreshLayout.OnRefreshListener() {
@Override @Override
public void onRefresh() { public void onRefresh() {
//LogUtils.d(TAG, "onRefresh"); reinitDrawerMenuItemList(malDrawerMenuItem);
reinitDrawerMenuItemList(malDrawerMenuItem); mDrawerMenuDataAdapter.notifyDataSetChanged();
mDrawerMenuDataAdapter.notifyDataSetChanged(); mPullRefreshLayout.setRefreshing(false);
mPullRefreshLayout.setRefreshing(false); }
} });
});
malDrawerMenuItem = new ArrayList<DrawerMenuBean>(); malDrawerMenuItem = new ArrayList<DrawerMenuBean>();
@@ -236,68 +198,51 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
mActionBarDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.lib_name, R.string.lib_name) { mActionBarDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.lib_name, R.string.lib_name) {
@Override @Override
public void onDrawerOpened(View drawerView) {//完全打开时触发 public void onDrawerOpened(View drawerView) {
super.onDrawerOpened(drawerView); super.onDrawerOpened(drawerView);
mIsDrawerOpened = true; mIsDrawerOpened = true;
mIsDrawerOpening = false; mIsDrawerOpening = false;
//Toast.makeText(MainActivity.this,"onDrawerOpened",Toast.LENGTH_SHORT).show();
} }
@Override @Override
public void onDrawerClosed(View drawerView) {//完全关闭时触发 public void onDrawerClosed(View drawerView) {
super.onDrawerClosed(drawerView); super.onDrawerClosed(drawerView);
mIsDrawerOpened = false; mIsDrawerOpened = false;
mIsDrawerClosing = false; mIsDrawerClosing = false;
//Toast.makeText(MainActivity.this,"onDrawerClosed",Toast.LENGTH_SHORT).show();
} }
/**
* 当抽屉被滑动的时候调用此方法
* slideOffset表示 滑动的幅度（0-1）
*/
@Override @Override
public void onDrawerSlide(View drawerView, float slideOffset) { public void onDrawerSlide(View drawerView, float slideOffset) {
super.onDrawerSlide(drawerView, slideOffset); super.onDrawerSlide(drawerView, slideOffset);
} }
/**
* 当抽屉滑动状态改变的时候被调用
* 状态值是STATE_IDLE（闲置--0）, STATE_DRAGGING（拖拽的--1）, STATE_SETTLING（固定--2）中之一。
*具体状态可以慢慢调试
*/
@Override @Override
public void onDrawerStateChanged(int newState) { public void onDrawerStateChanged(int newState) {
super.onDrawerStateChanged(newState); super.onDrawerStateChanged(newState);
} }
}; };
//设置显示旋转菜单
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
//通过下面这句实现toolbar和Drawer的联动：如果没有这行代码，箭头是不会随着侧滑菜单的开关而变换的（或者没有箭头），
// 可以尝试一下，不影响正常侧滑
mActionBarDrawerToggle.syncState(); mActionBarDrawerToggle.syncState();
mDrawerLayout.setDrawerListener(mActionBarDrawerToggle); mDrawerLayout.setDrawerListener(mActionBarDrawerToggle);
//去掉侧滑的默认图标（动画箭头图标），也可以选择不去，
//不去的话把这一行注释掉或者改成true，然后把toolbar.setNavigationIcon注释掉就行了
//mActionBarDrawerToggle.setDrawerIndicatorEnabled(false);
mToolbar.setNavigationOnClickListener(new View.OnClickListener() { mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (mIsDrawerOpened || mIsDrawerOpening) { if (mIsDrawerOpened || mIsDrawerOpening) {
mIsDrawerClosing = true; mIsDrawerClosing = true;
mIsDrawerOpening = false; mIsDrawerOpening = false;
mDrawerLayout.closeDrawer(mPullRefreshLayout); mDrawerLayout.closeDrawer(mPullRefreshLayout);
return; return;
} }
if (!mIsDrawerOpened || mIsDrawerClosing) { if (!mIsDrawerOpened || mIsDrawerClosing) {
mIsDrawerOpening = true; mIsDrawerOpening = true;
mIsDrawerClosing = false; mIsDrawerClosing = false;
mDrawerLayout.openDrawer(mPullRefreshLayout); mDrawerLayout.openDrawer(mPullRefreshLayout);
return; return;
} }
} }
}); });
initDrawerMenuItemList(malDrawerMenuItem); initDrawerMenuItemList(malDrawerMenuItem);
} }
@@ -305,12 +250,11 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
void initSecondaryRootView() { void initSecondaryRootView() {
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mToolbar.setNavigationOnClickListener(new View.OnClickListener() { mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
//LogUtils.d(TAG, "onClick " + Integer.toString(v.getId())); finish();
finish(); }
} });
});
} }
public <T extends Fragment> int removeFragment(T fragment) { public <T extends Fragment> int removeFragment(T fragment) {
@@ -375,13 +319,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (mActivityType == ActivityType.Main) { if (mActivityType == ActivityType.Main) {
// 主题菜单 // 替换为兼容版菜单加载方法
AESThemeUtil.inflateMenu(this, menu); AESThemeUtil.inflateCompatThemeMenu(this, menu);
// 调试工具菜单 // 调试工具菜单
if (GlobalApplication.isDebugging()) { if (GlobalApplication.isDebugging()) {
DevelopUtils.inflateMenu(this, menu); DevelopUtils.inflateMenu(this, menu);
} }
// 应用信息菜单 // 应用信息菜单
getMenuInflater().inflate(R.menu.toolbar_drawerbase, menu); getMenuInflater().inflate(R.menu.toolbar_drawerbase, menu);
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
@@ -392,3 +336,4 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
super.onActivityResult(who, targetFragment, requestCode); super.onActivityResult(who, targetFragment, requestCode);
} }
} }

29
libaes/src/main/java/cc/winboll/studio/libaes/models/AESThemeBean.java
View File

@@ -10,6 +10,7 @@ import android.util.JsonWriter;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
public class AESThemeBean extends BaseBean { public class AESThemeBean extends BaseBean {
@@ -41,13 +42,28 @@ public class AESThemeBean extends BaseBean {
return name; return name;
} }
} }
public static void fillThemeStyleIDList(ArrayList<Integer> themeStyleIDList) {
if (themeStyleIDList == null) {
themeStyleIDList = new ArrayList<Integer>();
}
themeStyleIDList.clear();
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.AESTheme);
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.DepthAESTheme);
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.SkyAESTheme);
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.GoldenAESTheme);
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.BearingAESTheme);
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.MemorAESTheme);
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.TaoAESTheme);
}
// 保存当前主题 // 保存当前主题
int currentThemeStyleID = getThemeStyleID(ThemeType.AES); int currentThemeStyleID = getThemeStyleID(ThemeType.AES);
public AESThemeBean() { public AESThemeBean() {
} }
public AESThemeBean(int currentThemeStyleID) { public AESThemeBean(int currentThemeStyleID) {
this.currentThemeStyleID = currentThemeStyleID; this.currentThemeStyleID = currentThemeStyleID;
} }
@@ -59,7 +75,7 @@ public class AESThemeBean extends BaseBean {
public int getCurrentThemeTypeID() { public int getCurrentThemeTypeID() {
return this.currentThemeStyleID; return this.currentThemeStyleID;
} }
@Override @Override
public String getName() { public String getName() {
return AESThemeBean.class.getName(); return AESThemeBean.class.getName();
@@ -74,8 +90,7 @@ public class AESThemeBean extends BaseBean {
@Override @Override
public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException { public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
if(super.initObjectsFromJsonReader(jsonReader, name)) { return true; } if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
else{
if (name.equals("currentThemeTypeID")) { if (name.equals("currentThemeTypeID")) {
setCurrentThemeTypeID(jsonReader.nextInt()); setCurrentThemeTypeID(jsonReader.nextInt());
} else { } else {
@@ -90,7 +105,7 @@ public class AESThemeBean extends BaseBean {
jsonReader.beginObject(); jsonReader.beginObject();
while (jsonReader.hasNext()) { while (jsonReader.hasNext()) {
String name = jsonReader.nextName(); String name = jsonReader.nextName();
if(!initObjectsFromJsonReader(jsonReader, name)) { if (!initObjectsFromJsonReader(jsonReader, name)) {
jsonReader.skipValue(); jsonReader.skipValue();
} }
} }

7
libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java
View File

@@ -12,7 +12,6 @@ import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.AESThemeUtil;
import cc.winboll.studio.libaes.views.ASupportToolbar;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity { public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity {
@@ -28,11 +27,12 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
public String getTag() { public String getTag() {
return TAG; return TAG;
} }
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
LogUtils.d(TAG, "onCreate() start"); LogUtils.d(TAG, "onCreate() start");
AESThemeUtil.applyAppTheme(this); // 替换此处：原 applyAppTheme -> 新方法 applyAppCompatTheme
AESThemeUtil.applyAppCompatTheme(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_testasupporttoolbar); setContentView(R.layout.activity_testasupporttoolbar);
LogUtils.d(TAG, "setContentView() done"); LogUtils.d(TAG, "setContentView() done");
@@ -45,3 +45,4 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
LogUtils.d(TAG, "onCreate() end"); LogUtils.d(TAG, "onCreate() end");
} }
} }

6
libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java
View File

@@ -14,10 +14,11 @@ import cc.winboll.studio.libaes.utils.AESThemeUtil;
public class TestAToolbarActivity extends Activity { public class TestAToolbarActivity extends Activity {
public static final String TAG = "TestAToolbarActivity"; public static final String TAG = "TestAToolbarActivity";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
AESThemeUtil.applyAppTheme(this); // 原生Activity 使用 applyTheme
AESThemeUtil.applyTheme(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_testatoolbar); setContentView(R.layout.activity_testatoolbar);
Toolbar toolbar = findViewById(R.id.activitytestatoolbarAToolbar1); Toolbar toolbar = findViewById(R.id.activitytestatoolbarAToolbar1);
@@ -26,3 +27,4 @@ public class TestAToolbarActivity extends Activity {
} }
} }

282
libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
View File

@@ -9,203 +9,165 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
import cc.winboll.studio.libaes.models.AESThemeBean; import cc.winboll.studio.libaes.models.AESThemeBean;
import java.util.ArrayList;
public class AESThemeUtil { public class AESThemeUtil {
public static final String TAG = "AESThemeUtil"; public static final String TAG = "AESThemeUtil";
private static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
private static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME"; // 私有静态集合，外部不可直接修改
static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE"; private static ArrayList<Integer> themeStyleIDList = new ArrayList<>();
protected volatile AESThemeBean.ThemeType mThemeType; // 移除无用实例成员 mThemeType，工具类不保留实例字段
public static <T extends Context> int getThemeTypeID(T context) { /**
AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class); * 初始化主题样式ID集合
return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID(); */
public static void init(ArrayList<Integer> themeStyleIDList) {
if(themeStyleIDList == null) {
themeStyleIDList = new ArrayList<Integer>();
AESThemeBean.fillThemeStyleIDList(themeStyleIDList);
}
AESThemeUtil.themeStyleIDList.clear();
AESThemeUtil.themeStyleIDList.addAll(themeStyleIDList);
} }
public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) { /**
AESThemeBean bean = new AESThemeBean(nThemeTypeID); * 获取当前主题样式ID
*/
public static int getThemeTypeID(Context context) {
AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
return bean == null ? getThemeStyleID(AESThemeBean.ThemeType.AES) : bean.getCurrentThemeTypeID();
}
/**
* 保存主题样式ID
*/
public static void saveThemeStyleID(Context context, int themeTypeID) {
AESThemeBean bean = new AESThemeBean(themeTypeID);
AESThemeBean.saveBean(context, bean); AESThemeBean.saveBean(context, bean);
} }
public static <T extends Activity> void applyAppTheme(T activity) { // ====================== 应用主题 - 规范重载 ======================
/**
* 应用当前持久化主题（通用 Activity）
*/
public static void applyTheme(Activity activity) {
activity.setTheme(getThemeTypeID(activity)); activity.setTheme(getThemeTypeID(activity));
} }
public static <T extends AppCompatActivity> void applyAppCompatTheme(T activity) { /**
* 应用指定主题（通用 Activity）
*/
public static void applyTheme(Activity activity, AESThemeBean.ThemeType themeType) {
activity.setTheme(getThemeStyleID(themeType));
}
/**
* 应用当前持久化主题（AppCompat 兼容 Activity）
*/
public static void applyAppCompatTheme(AppCompatActivity activity) {
activity.setTheme(getThemeTypeID(activity)); activity.setTheme(getThemeTypeID(activity));
} }
/*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(T activity) { /**
activity.setTheme(getThemeTypeID(activity.getApplicationContext())); * 应用指定主题（AppCompat 兼容 Activity）
}*/ */
public static void applyAppCompatTheme(AppCompatActivity activity, AESThemeBean.ThemeType themeType) {
public static <T extends Activity> void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) { activity.setTheme(getThemeStyleID(themeType));
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
} }
public static <T extends AppCompatActivity> void applyAppCompatTheme(Activity activity, AESThemeBean.ThemeType themeType) { // ====================== 加载菜单 ======================
activity.setTheme(AESThemeBean.getThemeStyleID(themeType)); /**
} * 加载主题菜单（通用 Activity）
*/
/*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(Activity activity, AESThemeBean.ThemeType themeType) { public static void inflateThemeMenu(Activity activity, Menu menu) {
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
}*/
public static <T extends Activity> void inflateMenu(T activity, Menu menu) {
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu); activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
} }
public static <T extends AppCompatActivity> void inflateCompatMenu(T activity, Menu menu) { /**
* 加载主题菜单（AppCompat Activity）
*/
public static void inflateCompatThemeMenu(AppCompatActivity activity, Menu menu) {
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu); activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
} }
/*public static <T extends WinBoLLActivity> void inflateWinBoLLMenu(T activity, Menu menu) { // ====================== 菜单点击统一核心逻辑（消除重复代码） ======================
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu); /**
}*/ * 主题菜单项点击统一处理
* @param context 上下文（用于持久化）
public static <T extends Activity> boolean onAppThemeItemSelected(T activity, MenuItem item) { * @param item 点击的菜单项
int nThemeStyleID; * @return 是否消费点击事件
if (R.id.item_depththeme == item.getItemId()) { */
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH); public static boolean handleThemeMenuClick(Context context, MenuItem item) {
saveThemeStyleID(activity, nThemeStyleID); int themeStyleId;
return true; int itemId = item.getItemId();
} else if (R.id.item_skytheme == item.getItemId()) { if (R.id.item_depththeme == itemId) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY); themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
saveThemeStyleID(activity, nThemeStyleID); } else if (R.id.item_skytheme == itemId) {
return true; themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.SKY);
} else if (R.id.item_goldentheme == item.getItemId()) { } else if (R.id.item_goldentheme == itemId) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN); themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
saveThemeStyleID(activity, nThemeStyleID); } else if (R.id.item_bearingtheme == itemId) {
return true; themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.BEARING);
} else if (R.id.item_bearingtheme == item.getItemId()) { } else if (R.id.item_memortheme == itemId) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING); themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
saveThemeStyleID(activity, nThemeStyleID); } else if (R.id.item_taotheme == itemId) {
return true; themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.TAO);
} else if (R.id.item_memortheme == item.getItemId()) { } else if (R.id.item_defaulttheme == itemId) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR); themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.AES);
saveThemeStyleID(activity, nThemeStyleID); } else {
return true; return false;
} else if (R.id.item_taotheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
saveThemeStyleID(activity, nThemeStyleID);
return true;
} else if (R.id.item_defaulttheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
saveThemeStyleID(activity, nThemeStyleID);
return true;
} }
saveThemeStyleID(context, themeStyleId);
return false; return true;
} }
public static <T extends AppCompatActivity> boolean onAppCompatThemeItemSelected(T activity, MenuItem item) { // 对外暴露不同 Activity 类型的入口，内部调用统一核心方法
int nThemeStyleID; public static boolean onThemeItemSelected(Activity activity, MenuItem item) {
if (R.id.item_depththeme == item.getItemId()) { return handleThemeMenuClick(activity, item);
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
saveThemeStyleID(activity, nThemeStyleID);
return true;
} else if (R.id.item_skytheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
saveThemeStyleID(activity, nThemeStyleID);
return true;
} else if (R.id.item_goldentheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
saveThemeStyleID(activity, nThemeStyleID);
return true;
} else if (R.id.item_bearingtheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
saveThemeStyleID(activity, nThemeStyleID);
return true;
} else if (R.id.item_memortheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
saveThemeStyleID(activity, nThemeStyleID);
return true;
} else if (R.id.item_taotheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
saveThemeStyleID(activity, nThemeStyleID);
return true;
} else if (R.id.item_defaulttheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
saveThemeStyleID(activity, nThemeStyleID);
return true;
}
return false;
} }
public static <T extends AppCompatActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) { public static boolean onAppCompatThemeItemSelected(AppCompatActivity activity, MenuItem item) {
int nThemeStyleID; return handleThemeMenuClick(activity, item);
if (R.id.item_depththeme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_skytheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_goldentheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_bearingtheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_memortheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_taotheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_defaulttheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
}
return false;
} }
public static <T extends DrawerFragmentActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) { public static boolean onWinBoLLThemeItemSelected(AppCompatActivity activity, MenuItem item) {
int nThemeStyleID; // 使用 Application 上下文保存，避免 Activity 泄漏
if (R.id.item_depththeme == item.getItemId()) { return handleThemeMenuClick(activity.getApplicationContext(), item);
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH); }
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_skytheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_goldentheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_bearingtheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_memortheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_taotheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
} else if (R.id.item_defaulttheme == item.getItemId()) {
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
return true;
}
return false; public static boolean onWinBoLLThemeItemSelected(DrawerFragmentActivity activity, MenuItem item) {
return handleThemeMenuClick(activity.getApplicationContext(), item);
}
// ====================== 主题类型转换工具 ======================
/**
* 根据枚举获取对应样式ID
*/
public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
return themeStyleIDList.get(themeType.ordinal());
}
/**
* 根据样式ID反向获取主题枚举
*/
public static AESThemeBean.ThemeType getThemeStyleType(int themeStyleID) {
for (int i = 0; i < themeStyleIDList.size(); i++) {
if (themeStyleIDList.get(i) == themeStyleID) {
return AESThemeBean.ThemeType.values()[i];
}
}
return AESThemeBean.ThemeType.values()[0];
} }
} }

16
libaes/src/main/res/values-night/colors.xml
View File

@@ -3,15 +3,15 @@
<color name="colorTextColor">#FFFFFFFF</color> <color name="colorTextColor">#FFFFFFFF</color>
<color name="colorPrimary">#FF03AB4E</color> <color name="colorPrimary">#FF03AB4E</color>
<color name="colorPrimaryDark">#FF027C39</color> <color name="colorPrimaryDark">#FF3DDC84</color>
<color name="colorAccent">#FF3DDC84</color> <color name="colorAccent">#FF027C39</color>
<color name="colorText">#FFFFFB8D</color> <color name="colorText">#FFFFFB8D</color>
<color name="colorToastFrame">#FFA9A9A9</color> <color name="colorToastFrame">#FF555555</color>
<color name="colorToastShadow">#FF000000</color> <color name="colorToastShadow">#FF000000</color>
<color name="colorToastBackgroung">#FFFFFFFF</color> <color name="colorToastBackgroung">#FF3A3A3A</color>
<color name="colorAToolbarStartColor">#FF7D3F12</color> <color name="colorAToolbarStartColor">#FF5A3A1A</color>
<color name="colorAToolbarCenterColor">#FFCC6E2B</color> <color name="colorAToolbarCenterColor">#FFA05A2A</color>
<color name="colorAToolbarEndColor">#FFF4B98F</color> <color name="colorAToolbarEndColor">#FFD4A07A</color>
<color name="colorACardShadow">@color/colorPrimaryDark</color> <color name="colorACardShadow">@color/colorPrimaryDark</color>
<color name="colorACardFrame">@color/colorPrimary</color> <color name="colorACardFrame">@color/colorPrimary</color>
@@ -24,7 +24,7 @@
<color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color> <color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
<color name="colorOHPCTSProgress">@color/colorPrimaryDark</color> <color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>
<color name="toolbarBackgroundColor">#FF03AB4E</color> <color name="toolbarBackgroundColor">#FF3DDC84</color>
<color name="toolbarTextColor">#FFFFFFFF</color> <color name="toolbarTextColor">#FFFFFFFF</color>
<color name="mainWindowBackgroundColor">#FF2C2C2C</color> <color name="mainWindowBackgroundColor">#FF2C2C2C</color>
<color name="mainWindowTextColor">#FFFFFFFF</color> <color name="mainWindowTextColor">#FFFFFFFF</color>

41
libaes/src/main/res/values-night/styles.xml
View File

@@ -2,6 +2,9 @@
<resources> <resources>
<style name="AESTheme" parent="Theme.AppCompat.NoActionBar"> <style name="AESTheme" parent="Theme.AppCompat.NoActionBar">
<item name="colorPrimary">#FF03AB4E</item>
<item name="colorPrimaryDark">#FF3DDC84</item>
<item name="colorAccent">#FF027C39</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,52 +43,52 @@
<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">
<item name="colorPrimary">#FF0065EC</item> <item name="colorPrimary">#FF0065EC</item>
<item name="colorPrimaryDark">#FF004DB4</item> <item name="colorPrimaryDark">#FF4A97FF</item>
<item name="colorAccent">#FF4A97FF</item> <item name="colorAccent">#FF004DB4</item>
</style> </style>
<style name="SkyAESTheme" parent="AESTheme"> <style name="SkyAESTheme" parent="AESTheme">
<item name="colorPrimary">#FF00A6FF</item> <item name="colorPrimary">#FF00A6FF</item>
<item name="colorPrimaryDark">#FF007ABB</item> <item name="colorPrimaryDark">#FF84D4FF</item>
<item name="colorAccent">#FF84D4FF</item> <item name="colorAccent">#FF007ABB</item>
</style> </style>
<style name="GoldenAESTheme" parent="AESTheme"> <style name="GoldenAESTheme" parent="AESTheme">
<item name="colorPrimary">#FFF0CA11</item> <item name="colorPrimary">#FFF0CA11</item>
<item name="colorPrimaryDark">#FFD3AF00</item> <item name="colorPrimaryDark">#FFFFE35C</item>
<item name="colorAccent">#FFFFE35C</item> <item name="colorAccent">#FFD3AF00</item>
</style> </style>
<style name="BearingAESTheme" parent="AESTheme"> <style name="BearingAESTheme" parent="AESTheme">
<item name="colorPrimary">#FF840FFF</item> <item name="colorPrimary">#FF840FFF</item>
<item name="colorPrimaryDark">#FF6900D7</item> <item name="colorPrimaryDark">#FFBA78FF</item>
<item name="colorAccent">#FFBA78FF</item> <item name="colorAccent">#FF6900D7</item>
</style> </style>
<style name="MemorAESTheme" parent="AESTheme"> <style name="MemorAESTheme" parent="AESTheme">
<item name="colorPrimary">#FFFF00F5</item> <item name="colorPrimary">#FFFF00F5</item>
<item name="colorPrimaryDark">#FFE500DC</item> <item name="colorPrimaryDark">#FFFF76FA</item>
<item name="colorAccent">#FFFF76FA</item> <item name="colorAccent">#FFE500DC</item>
</style> </style>
<style name="TaoAESTheme" parent="AESTheme"> <style name="TaoAESTheme" parent="AESTheme">
<item name="colorPrimary">#FFACACAC</item> <item name="colorPrimary">#FF7E7E7E</item>
<item name="colorPrimaryDark">#FF898989</item> <item name="colorPrimaryDark">#FFE2E2E2</item>
<item name="colorAccent">#FFD8D8D8</item> <item name="colorAccent">#FF000000</item>
</style> </style>
<style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog"> <style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog">

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

@@ -86,9 +86,9 @@
</style> </style>
<style name="TaoAESTheme" parent="AESTheme"> <style name="TaoAESTheme" parent="AESTheme">
<item name="colorPrimary">#FFACACAC</item> <item name="colorPrimary">#FF7E7E7E</item>
<item name="colorPrimaryDark">#FF898989</item> <item name="colorPrimaryDark">#FF000000</item>
<item name="colorAccent">#FFD8D8D8</item> <item name="colorAccent">#FFE2E2E2</item>
</style> </style>
<style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog"> <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
@@ -112,4 +112,4 @@
<item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item> <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
</style> </style>
</resources> </resources>