mirror of
https://gitea.winboll.cc/ZhanGSKen/MyWinBoLL.git
synced 2026-08-15 05:52:09 +08:00
MainActivity: 接入 AESThemeUtil/DevelopUtils 工具类,替换 Toolbar 为 ASupportToolbar
- MainActivity 新增 onCreateOptionsMenu/onOptionsItemSelected, 使用 AESThemeUtil.inflateCompatThemeMenu 加载主题菜单、 DevelopUtils.inflateMenu 加载调试菜单 - 布局文件 Toolbar 替换为 cc.winboll.studio.libaes.views.ASupportToolbar, 移除 AppBarLayout 包裹层 - MyAppTheme 日间/夜间主题增加 aSupportToolbar 属性引用 AESASupportToolbar 样式
This commit is contained in:
@@ -1,13 +1,20 @@
|
|||||||
package cc.winboll.studio.mywinboll;
|
package cc.winboll.studio.mywinboll;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuItem;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
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.LogView;
|
||||||
import cc.winboll.studio.libappbase.ToastUtils;
|
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 class MainActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
public static final String TAG = "MainActivity";
|
||||||
LogView mLogView;
|
LogView mLogView;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -15,11 +22,11 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_main);
|
setContentView(R.layout.activity_main);
|
||||||
|
|
||||||
Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
|
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||||
setSupportActionBar(toolbar);
|
setSupportActionBar(toolbar);
|
||||||
|
|
||||||
mLogView = findViewById(R.id.logview);
|
mLogView = findViewById(R.id.logview);
|
||||||
|
|
||||||
ToastUtils.show("onCreate");
|
ToastUtils.show("onCreate");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,4 +35,27 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
super.onResume();
|
super.onResume();
|
||||||
mLogView.start();
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,18 +6,10 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<com.google.android.material.appbar.AppBarLayout
|
<cc.winboll.studio.libaes.views.ASupportToolbar
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="MyAppTheme" parent="Theme.AppCompat.NoActionBar">
|
<style name="MyAppTheme" parent="Theme.AppCompat.NoActionBar">
|
||||||
|
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||||
<item name="aboutViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
<item name="aboutViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
<item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
|
<item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
|
||||||
@@ -23,4 +24,6 @@
|
|||||||
<item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
|
<item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
<style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||||
|
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||||
<item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
<item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||||
<item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
|
<item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
|
||||||
@@ -31,4 +32,6 @@
|
|||||||
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user