From ac93025ac26286d4cf3831e447ca26c614775d52 Mon Sep 17 00:00:00 2001
From: ZhuRuimin <llwz66@foxmail.com>
Date: Mon, 15 May 2023 12:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E9=AB=98=E7=9A=84?=
 =?UTF-8?q?=E7=9A=84API=E7=89=88=E6=9C=AC=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=8F=9C=E5=8D=95=E9=94=AE=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BE=BF=E4=BA=8E=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                       |  4 ++--
 src/main/AndroidManifest.xml                       |  2 +-
 .../java/net/micode/notes/ui/NoteEditActivity.java | 14 +++++++++++++-
 .../net/micode/notes/ui/NotesListActivity.java     | 12 ++++++++++++
 src/main/res/layout/note_edit.xml                  |  8 ++++++++
 src/main/res/layout/note_list.xml                  |  8 ++++++++
 6 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 845436e..384548c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,8 +25,8 @@ android {
 
     defaultConfig {
         applicationId "net.micode.notes"
-        minSdkVersion 14
-        targetSdkVersion 14
+        minSdkVersion 30
+        targetSdkVersion 30
     }
 
     buildTypes {
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index e5c7d47..2306c98 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="30" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..9dfc4dc 100644
--- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -44,6 +44,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
 import android.widget.CheckBox;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
@@ -149,11 +150,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private String mUserQuery;
     private Pattern mPattern;
 
+    private Button menuButton;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.setContentView(R.layout.note_edit);
-
+        menuButton = (Button) findViewById(R.id.btn_show_menu);
+        menuButton.setOnClickListener(new NoteEditActivity.MenuBtnOnClickListener());
         if (savedInstanceState == null && !initActivityState(getIntent())) {
             finish();
             return;
@@ -870,4 +874,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
+
+    private class MenuBtnOnClickListener implements OnClickListener{
+        @Override
+        public void onClick(View v) {
+            openOptionsMenu();
+        }
+    }
+
 }
diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java
index e843aec..3ac508e 100644
--- a/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -105,6 +105,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private Button mAddNewNote;
 
+    private Button menuButton;
+
     private boolean mDispatch;
 
     private int mOriginY;
@@ -223,6 +225,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         mAddNewNote = (Button) findViewById(R.id.btn_new_note);
         mAddNewNote.setOnClickListener(this);
         mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
+        menuButton = (Button) findViewById(R.id.btn_show_menu);
+        menuButton.setOnClickListener(new MenuBtnOnClickListener());
         mDispatch = false;
         mDispatchY = 0;
         mOriginY = 0;
@@ -346,6 +350,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
+
+    private class MenuBtnOnClickListener implements OnClickListener{
+        @Override
+        public void onClick(View v) {
+            openOptionsMenu();
+        }
+    }
+
     private class NewNoteOnTouchListener implements OnTouchListener {
 
         public boolean onTouch(View v, MotionEvent event) {
diff --git a/src/main/res/layout/note_edit.xml b/src/main/res/layout/note_edit.xml
index 10b2aa7..fbe78c6 100644
--- a/src/main/res/layout/note_edit.xml
+++ b/src/main/res/layout/note_edit.xml
@@ -397,4 +397,12 @@
                 android:src="@drawable/selected" />
         </FrameLayout>
     </LinearLayout>
+    <Button
+        android:id="@+id/btn_show_menu"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="bottom|right"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:background="@android:drawable/ic_menu_sort_by_size" />
 </FrameLayout>
diff --git a/src/main/res/layout/note_list.xml b/src/main/res/layout/note_list.xml
index 6b25d38..fdd82ab 100644
--- a/src/main/res/layout/note_list.xml
+++ b/src/main/res/layout/note_list.xml
@@ -55,4 +55,12 @@
         android:layout_height="wrap_content"
         android:focusable="false"
         android:layout_gravity="bottom" />
+    <Button
+        android:id="@+id/btn_show_menu"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="bottom|right"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:background="@android:drawable/ic_menu_sort_by_size" />
 </FrameLayout>