From 08a47768a14db4fa9e47ee5009a445a7ff9433de Mon Sep 17 00:00:00 2001
From: BigPickle <BigPickle@WinBoLL.CC>
Date: Thu, 2 Jul 2026 01:26:50 +0800
Subject: [PATCH] =?UTF-8?q?MainActivity:=20=E6=8E=A5=E5=85=A5=20AESThemeUt?=
 =?UTF-8?q?il/DevelopUtils=20=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=8C=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=20Toolbar=20=E4=B8=BA=20ASupportToolbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MainActivity 新增 onCreateOptionsMenu/onOptionsItemSelected，
  使用 AESThemeUtil.inflateCompatThemeMenu 加载主题菜单、
  DevelopUtils.inflateMenu 加载调试菜单
- 布局文件 Toolbar 替换为 cc.winboll.studio.libaes.views.ASupportToolbar，
  移除 AppBarLayout 包裹层
- MyAppTheme 日间/夜间主题增加 aSupportToolbar 属性引用 AESASupportToolbar 样式
---
 .../studio/mywinboll/MainActivity.java        | 36 +++++++++++++++++--
 .../src/main/res/layout/activity_main.xml     | 12 ++-----
 .../src/main/res/values-night/styles.xml      |  3 ++
 mywinboll/src/main/res/values/styles.xml      |  3 ++
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/mywinboll/src/main/java/cc/winboll/studio/mywinboll/MainActivity.java b/mywinboll/src/main/java/cc/winboll/studio/mywinboll/MainActivity.java
index 8825c54..60a82e9 100644
--- a/mywinboll/src/main/java/cc/winboll/studio/mywinboll/MainActivity.java
+++ b/mywinboll/src/main/java/cc/winboll/studio/mywinboll/MainActivity.java
@@ -1,13 +1,20 @@
 package cc.winboll.studio.mywinboll;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.DevelopUtils;
 
 public class MainActivity extends AppCompatActivity {
 
+    public static final String TAG = "MainActivity";
     LogView mLogView;
 
     @Override
@@ -15,11 +22,11 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
 
         mLogView = findViewById(R.id.logview);
-        
+
         ToastUtils.show("onCreate");
     }
 
@@ -28,4 +35,27 @@ public class MainActivity extends AppCompatActivity {
         super.onResume();
         mLogView.start();
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        AESThemeUtil.inflateCompatThemeMenu(this, menu);
+        if (GlobalApplication.isDebugging()) {
+            DevelopUtils.inflateMenu(this, menu);
+        }
+        getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_drawerbase, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
+            recreate();
+        }
+        if (DevelopUtils.onDevelopItemSelected(this, item)) {
+            LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+        return true;
+    }
 }
diff --git a/mywinboll/src/main/res/layout/activity_main.xml b/mywinboll/src/main/res/layout/activity_main.xml
index 18765ec..7982dc8 100644
--- a/mywinboll/src/main/res/layout/activity_main.xml
+++ b/mywinboll/src/main/res/layout/activity_main.xml
@@ -6,18 +6,10 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<com.google.android.material.appbar.AppBarLayout
+	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
-			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-	</com.google.android.material.appbar.AppBarLayout>
+		android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		android:orientation="vertical"
diff --git a/mywinboll/src/main/res/values-night/styles.xml b/mywinboll/src/main/res/values-night/styles.xml
index 850d4c4..ae07b68 100644
--- a/mywinboll/src/main/res/values-night/styles.xml
+++ b/mywinboll/src/main/res/values-night/styles.xml
@@ -1,6 +1,7 @@
 <resources>
 
     <style name="MyAppTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
         <item name="themeDebug">@style/MyDebugActivityTheme</item>
         <item name="aboutViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
         <item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
@@ -23,4 +24,6 @@
         <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
     </style>
 
+    <style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
+
 </resources>
\ No newline at end of file
diff --git a/mywinboll/src/main/res/values/styles.xml b/mywinboll/src/main/res/values/styles.xml
index 9a676c0..0d3b8fa 100644
--- a/mywinboll/src/main/res/values/styles.xml
+++ b/mywinboll/src/main/res/values/styles.xml
@@ -1,6 +1,7 @@
 <resources>
 
     <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
         <item name="themeDebug">@style/MyDebugActivityTheme</item>
         <item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
         <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
@@ -31,4 +32,6 @@
         <item name="toolbarTextColor">@color/toolbarTextColor</item>
     </style>
 
+    <style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
+
 </resources>