From 9f18ba65ab84a3b15531b4d5cc5d906184b2bbd3 Mon Sep 17 00:00:00 2001 From: LaizyBoy Date: Sat, 2 May 2026 20:57:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(MainActivity):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=9B=E5=BB=BA=E6=96=B9=E5=BC=8F=E4=B8=BA?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AE=9E=E7=8E=B0\n\n1.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6\n=20=20=20-=20colorpickerd?= =?UTF-8?q?ialogex/src/main/res/menu/main=5Fmenu.xml:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20app=20=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=9B=BE=E6=A0=87=20@android:drawab?= =?UTF-8?q?le/ic=5Fdialog=5Finfo\n\n2.=20=E9=87=8D=E6=9E=84=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91\n=20=20=20-=20=E7=A7=BB=E9=99=A4=20?= =?UTF-8?q?onCreate()=20=E4=B8=AD=E7=9B=B4=E6=8E=A5=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E4=BB=A3=E7=A0=81\n=20=20=20-=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86=E8=8F=9C=E5=8D=95=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20onCreateOptionsMenu()=20=E5=92=8C=20onOptionsItemSe?= =?UTF-8?q?lected()\n\n=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98:=20=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=9B=BE=E6=A0=87=E7=BC=BA=E5=A4=B1=E3=80=81=E9=9D=9E?= =?UTF-8?q?=E6=A0=87=E5=87=86=E8=8F=9C=E5=8D=95=E5=88=9B=E5=BB=BA=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- colorpickerdialogex/build.properties | 4 ++-- .../colorpickerdialogex/MainActivity.java | 21 +++++++++++++++++-- .../src/main/res/menu/main_menu.xml | 8 +++++++ libcolorpickerdialogex/build.properties | 4 ++-- 4 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 colorpickerdialogex/src/main/res/menu/main_menu.xml diff --git a/colorpickerdialogex/build.properties b/colorpickerdialogex/build.properties index 0dee8ac..1e1d04e 100644 --- a/colorpickerdialogex/build.properties +++ b/colorpickerdialogex/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat May 02 12:22:08 GMT 2026 +#Sat May 02 20:54:37 CST 2026 stageCount=0 libraryProject=libcolorpickerdialogex baseVersion=15.0 publishVersion=15.0.0 -buildCount=20 +buildCount=28 baseBetaVersion=15.0.1 diff --git a/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/MainActivity.java b/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/MainActivity.java index 88944d3..8d41e2e 100644 --- a/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/MainActivity.java +++ b/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/MainActivity.java @@ -2,6 +2,8 @@ package cc.winboll.studio.colorpickerdialogex; import android.content.Intent; import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.widget.LinearLayout; import androidx.appcompat.app.AppCompatActivity; @@ -20,8 +22,8 @@ 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); @@ -39,6 +41,21 @@ public class MainActivity extends AppCompatActivity { } } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.main_menu, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.menu_about) { + startActivity(new Intent(this, AboutActivity.class)); + return true; + } + return super.onOptionsItemSelected(item); + } + public void onSettingBackgroundWithColorPickerDialogEx(View view) { ColorPickerDialogEx dlg = new ColorPickerDialogEx(this, getResources().getColor(R.color.colorPrimary)); dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() { diff --git a/colorpickerdialogex/src/main/res/menu/main_menu.xml b/colorpickerdialogex/src/main/res/menu/main_menu.xml new file mode 100644 index 0000000..b613387 --- /dev/null +++ b/colorpickerdialogex/src/main/res/menu/main_menu.xml @@ -0,0 +1,8 @@ + + + \ No newline at end of file diff --git a/libcolorpickerdialogex/build.properties b/libcolorpickerdialogex/build.properties index 0dee8ac..1e1d04e 100644 --- a/libcolorpickerdialogex/build.properties +++ b/libcolorpickerdialogex/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat May 02 12:22:08 GMT 2026 +#Sat May 02 20:54:37 CST 2026 stageCount=0 libraryProject=libcolorpickerdialogex baseVersion=15.0 publishVersion=15.0.0 -buildCount=20 +buildCount=28 baseBetaVersion=15.0.1