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"> - - - - - + android:id="@+id/toolbar"/> + +