Merge branch 'mymessagemanager' into appbase

mymessagemanager/build.gradle

@@ -45,9 +45,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libaes:15.8.0'
+    api 'cc.winboll.studio:libaes:15.9.2'
-    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libapputils:15.8.4'
-    api 'cc.winboll.studio:libappbase:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.4'
     
 	api 'io.github.medyo:android-about-page:2.0.0'
     api 'com.github.getActivity:ToastUtils:10.5'

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:55:38 GMT 2025
 stageCount=6
 libraryProject=
 baseVersion=15.2
 publishVersion=15.2.5
-buildCount=0
+buildCount=9
 baseBetaVersion=15.2.6

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java

@@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import cc.winboll.studio.mymessagemanager.App;
 import cc.winboll.studio.mymessagemanager.R;
 
-public class AboutActivity extends WinBollActivity implements IWinBoLLActivity {
+public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
@@ -79,11 +79,11 @@ public class AboutActivity extends WinBollActivity implements IWinBoLLActivity {
         appInfo.setAppName(getString(R.string.app_name));
         appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
         appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("APP");
+        appInfo.setAppGitName("APPBase");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=MyMessageManager");
+        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=5&extra=page%3D1");
         appInfo.setAppAPKName("MyMessageManager");
         appInfo.setAppAPKFolderName("MyMessageManager");
         return new AboutView(mContext, appInfo);

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java

@@ -103,6 +103,9 @@ abstract public class BaseActivity extends AppCompatActivity {
         } else if (R.id.item_defaulttheme == item.getItemId()) {
             AESThemeUtil.saveThemeStyleID(this, R.style.MyAppTheme);
             recreate();
+        } else if (R.id.item_defaulttheme == item.getItemId()) {
+            AESThemeUtil.saveThemeStyleID(this, R.style.MyAppTheme);
+            recreate();
         }
         //ToastUtils.show("nThemeStyleID " + Integer.toString(nThemeStyleID));
 

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java

@@ -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);
-
+        super.onCreateOptionsMenu(menu);
-        /*ThemeUtil.BaseTheme baseTheme = ThemeUtil.getTheme(mAppConfigUtil.mAppConfigBean.getAppThemeID());
+		getMenuInflater().inflate(R.menu.toolbar_main2, menu);
-        if (baseTheme == ThemeUtil.BaseTheme.DEFAULT) {
+		return true;
-            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);
     }
 
     public static void reloadSMS() {
@@ -306,7 +298,7 @@ public class MainActivity extends BaseActivity {
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(i);
 		} else if (nItemId ==  R.id.app_log) {
-            //App.getWinBoLLActivityManager().startLogActivity(this);
+            App.getWinBoLLActivityManager().startLogActivity(this);
         } else if (nItemId ==  R.id.app_unittest) {
             Intent i = new Intent(MainActivity.this, UnitTestActivity.class);
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBoLLActivity.java

@@ -13,9 +13,9 @@ import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivity {
+public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
 
-    public static final String TAG = "WinBollActivity";
+    public static final String TAG = "WinBoLLActivity";
 
     protected volatile AESThemeBean.ThemeType mThemeType;
 

mymessagemanager/src/main/res/layout/activity_unittest.xml

@@ -34,7 +34,7 @@
 
 	</ScrollView>
 
-	<cc.winboll.studio.shared.log.LogView
+	<cc.winboll.studio.libappbase.LogView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"

mymessagemanager/src/main/res/menu/toolbar_main.xml

@@ -17,26 +17,4 @@
     <item
         android:id="@+id/app_smsrule"
         android:title="@string/text_smsrule"/>
-    <item android:title="@string/app_developoptions">
-        <menu>
-            <item
-                android:id="@+id/app_log"
-                android:title="@string/app_log"/>
-            <item
-                android:id="@+id/app_unittest"
-                android:title="@string/app_unittest"/>
-            <item
-                android:id="@+id/app_crashtest"
-                android:title="@string/app_crashtest"/>
-        </menu>
-    </item>
-    <item
-        android:id="@+id/app_appsettings"
-        android:title="@string/text_appsettings"/>
-    <item
-        android:id="@+id/app_about"
-        android:title="@string/app_about"/>
-    <item
-        android:id="@+id/app_smsrecycle"
-        android:title="@string/app_smsrecycle"/>
 </menu>

mymessagemanager/src/main/res/menu/toolbar_main2.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+	<item android:title="@string/app_developoptions">
+        <menu>
+            <item
+                android:id="@+id/app_log"
+                android:title="@string/app_log"/>
+            <item
+                android:id="@+id/app_unittest"
+                android:title="@string/app_unittest"/>
+            <item
+                android:id="@+id/app_crashtest"
+                android:title="@string/app_crashtest"/>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/app_appsettings"
+        android:title="@string/text_appsettings"/>
+    <item
+        android:id="@+id/app_about"
+        android:title="@string/app_about"/>
+    <item
+        android:id="@+id/app_smsrecycle"
+        android:title="@string/app_smsrecycle"/>
+</menu>