diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties index 3258555..7a0f917 100644 --- a/mymessagemanager/build.properties +++ b/mymessagemanager/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue May 20 20:39:06 HKT 2025 +#Thu Jul 03 04:37:09 GMT 2025 stageCount=6 libraryProject= baseVersion=15.2 publishVersion=15.2.5 -buildCount=0 +buildCount=2 baseBetaVersion=15.2.6 diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java index de3c945..4468eb9 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java @@ -128,7 +128,7 @@ public class MainActivity extends BaseActivity { mToolbar = findViewById(R.id.activitymainASupportToolbar1); mToolbar.setSubtitle(getString(R.string.activity_name_main)); setSupportActionBar(mToolbar); - + boolean isEnableService = mAppConfigUtil.mAppConfigBean.isEnableService(); msvEnableService = findViewById(R.id.activitymainSwitchView1); msvEnableService.setChecked(isEnableService); @@ -269,17 +269,9 @@ public class MainActivity extends BaseActivity { public boolean onCreateOptionsMenu(Menu menu) { //return super.onCreateOptionsMenu(menu); getMenuInflater().inflate(R.menu.toolbar_main, menu); - - /*ThemeUtil.BaseTheme baseTheme = ThemeUtil.getTheme(mAppConfigUtil.mAppConfigBean.getAppThemeID()); - if (baseTheme == ThemeUtil.BaseTheme.DEFAULT) { - menu.findItem(R.id.app_defaulttheme).setChecked(true); - } else if (baseTheme == ThemeUtil.BaseTheme.SKY) { - menu.findItem(R.id.app_skytheme).setChecked(true); - } else if (baseTheme == ThemeUtil.BaseTheme.GOLDEN) { - menu.findItem(R.id.app_goldentheme).setChecked(true); - }*/ - - return super.onCreateOptionsMenu(menu); + super.onCreateOptionsMenu(menu); + getMenuInflater().inflate(R.menu.toolbar_main2, menu); + return true; } public static void reloadSMS() { @@ -324,7 +316,7 @@ public class MainActivity extends BaseActivity { i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(i); } - + return super.onOptionsItemSelected(item); } diff --git a/mymessagemanager/src/main/res/menu/toolbar_main.xml b/mymessagemanager/src/main/res/menu/toolbar_main.xml index 347c8cd..84b6807 100644 --- a/mymessagemanager/src/main/res/menu/toolbar_main.xml +++ b/mymessagemanager/src/main/res/menu/toolbar_main.xml @@ -17,26 +17,4 @@ - - - - - - - - - - diff --git a/mymessagemanager/src/main/res/menu/toolbar_main2.xml b/mymessagemanager/src/main/res/menu/toolbar_main2.xml new file mode 100644 index 0000000..e60fde9 --- /dev/null +++ b/mymessagemanager/src/main/res/menu/toolbar_main2.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + +