From fe511e56323174f87535ef0b4d957fb97a27658c Mon Sep 17 00:00:00 2001
From: CYZ <2782394648@qq.com>
Date: Fri, 28 Oct 2022 16:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E6=9D=BF=E5=92=8C=E4=BE=BF=E7=AD=BE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2ui=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/micode/notes/ui/NoteEditActivity.java |  19 +----
 .../app/src/main/res/drawable-hdpi/baocun.png | Bin 0 -> 5790 bytes
 .../src/main/res/drawable-hdpi/xiangce.png    | Bin 0 -> 6825 bytes
 .../main/res/drawable-hdpi/xiantiaocuxi.png   | Bin 0 -> 12291 bytes
 .../src/main/res/layout/activity_second.xml   |  29 ++++++--
 .../app/src/main/res/layout/note_edit.xml     |  67 +++++++++++-------
 6 files changed, 68 insertions(+), 47 deletions(-)
 create mode 100644 src/Notes1/app/src/main/res/drawable-hdpi/baocun.png
 create mode 100644 src/Notes1/app/src/main/res/drawable-hdpi/xiangce.png
 create mode 100644 src/Notes1/app/src/main/res/drawable-hdpi/xiantiaocuxi.png

diff --git a/src/Notes1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 1c72b07..3e84c5e 100644
--- a/src/Notes1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -16,7 +16,6 @@
 
 package net.micode.notes.ui;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
@@ -43,7 +42,6 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.text.Editable;
@@ -74,7 +72,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.graphics.Typeface;
 
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
@@ -82,8 +79,6 @@ import android.speech.tts.TextToSpeech.OnInitListener;
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.TextNote;
-import net.micode.notes.gtask.data.Task;
-import net.micode.notes.gtask.data.TaskList;
 import net.micode.notes.model.WorkingNote;
 import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
 import net.micode.notes.tool.DataUtils;
@@ -96,25 +91,15 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.security.Timestamp;
-import java.util.Date;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Stack;
 import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -138,7 +123,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
         public ImageButton note_Read;
 
-        public Button note_revoke;
+        public ImageButton note_revoke;
     }
 
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
@@ -477,7 +462,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
         mNoteHeaderHolder.startDraw = (ImageButton) findViewById(R.id.imageButton2);
         mNoteHeaderHolder.note_Read = (ImageButton) findViewById(R.id.menu_note_read);
-        mNoteHeaderHolder.note_revoke = (Button) findViewById(R.id.action_undo);
+        mNoteHeaderHolder.note_revoke = (ImageButton) findViewById(R.id.action_undo);
         mNoteHeaderHolder.note_revoke.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/src/Notes1/app/src/main/res/drawable-hdpi/baocun.png b/src/Notes1/app/src/main/res/drawable-hdpi/baocun.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf1e79019c1f7f8a6c5218a55ab98a7a47e7118b
GIT binary patch
literal 5790
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

literal 0
HcmV?d00001

diff --git a/src/Notes1/app/src/main/res/drawable-hdpi/xiangce.png b/src/Notes1/app/src/main/res/drawable-hdpi/xiangce.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e3ae841d44eec5c06152a2b183f237551de79e4
GIT binary patch
literal 6825
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
LP5FG;XTkpk2cCd{

literal 0
HcmV?d00001

diff --git a/src/Notes1/app/src/main/res/drawable-hdpi/xiantiaocuxi.png b/src/Notes1/app/src/main/res/drawable-hdpi/xiantiaocuxi.png
new file mode 100644
index 0000000000000000000000000000000000000000..1275c36fcb1dc47a7cc2b5b01bbd64f26f889ce3
GIT binary patch
literal 12291
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
WfkFCu#g%|DkrZS;N|#C+2mT+Z5%ux_

literal 0
HcmV?d00001

diff --git a/src/Notes1/app/src/main/res/layout/activity_second.xml b/src/Notes1/app/src/main/res/layout/activity_second.xml
index ab34f08..dd392bd 100644
--- a/src/Notes1/app/src/main/res/layout/activity_second.xml
+++ b/src/Notes1/app/src/main/res/layout/activity_second.xml
@@ -22,16 +22,17 @@
         android:layout_width="fill_parent"
         android:layout_height="80dp"
         android:layout_alignBottom="@+id/draw"
-        android:layout_marginBottom="0dp">
+        android:layout_marginBottom="-5dp">
 
         <ImageButton
             android:id="@+id/save"
             android:layout_width="67dp"
-            android:layout_height="66dp"
+            android:layout_height="70dp"
             android:layout_gravity="center"
-            android:layout_marginLeft="15dp"
+            android:layout_marginLeft="37dp"
+            android:layout_marginTop="1dp"
             android:layout_weight="0"
-            android:background="@drawable/chehui"
+            android:background="@drawable/baocun"
             android:contentDescription="@string/return_note"
             android:scaleType="centerInside"
             android:visibility="visible"
@@ -48,6 +49,26 @@
             android:visibility="visible"
             tools:visibility="visible" />
 
+        <ImageButton
+            android:id="@+id/change_pen_color"
+            android:layout_width="63dp"
+            android:layout_height="63dp"
+            android:layout_gravity="center"
+            android:layout_marginLeft="15dp"
+            android:layout_weight="0"
+
+            android:background="@drawable/huihua"
+            android:scaleType="centerCrop" />
+
+        <ImageButton
+            android:id="@+id/change_thickness"
+            android:layout_width="80dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginLeft="15dp"
+            android:layout_weight="0"
+            android:background="@drawable/xiantiaocuxi" />
+
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/Notes1/app/src/main/res/layout/note_edit.xml b/src/Notes1/app/src/main/res/layout/note_edit.xml
index b193374..1ff3a27 100644
--- a/src/Notes1/app/src/main/res/layout/note_edit.xml
+++ b/src/Notes1/app/src/main/res/layout/note_edit.xml
@@ -16,7 +16,6 @@
 -->
 
 <FrameLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/list_background"
@@ -36,39 +35,60 @@
                 android:id="@+id/tv_modified_date"
                 android:layout_width="73dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="left|center_vertical"
+                android:layout_gravity="start|center_vertical"
                 android:layout_marginRight="8dip"
                 android:layout_weight="1"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
-            <Button
+            <ImageView
+                android:id="@+id/iv_alert_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="3dp"
+                android:layout_marginRight="12dp"
+                android:background="@drawable/title_alert" />
+
+            <ImageButton
                 android:id="@+id/action_undo"
-                android:layout_width="20dp"
-                android:layout_height="40dp"
-                android:layout_weight="1"
-                android:text="Button" />
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="10dp"
+                android:layout_weight="0"
+                android:background="@drawable/chehui"
+                android:scaleType="centerInside"
+                 />
 
             <ImageButton
                 android:id="@+id/menu_note_read"
-                android:layout_width="40dp"
-                android:layout_height="wrap_content"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
                 android:layout_weight="0"
-                android:src="@android:drawable/ic_notification_overlay" />
+                android:layout_gravity="center"
+                android:layout_marginTop="3dp"
+                android:layout_marginRight="6dp"
+                android:scaleType="centerCrop"
+                android:background="@drawable/kaishi" />
 
             <ImageButton
                 android:id="@+id/imageButton2"
-                android:layout_width="67dp"
-                android:layout_height="88dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_weight="0"
-                tools:src="@tools:sample/avatars" />
+                android:layout_marginRight="3dp"
+                android:background="@drawable/w_huaban"
+                android:scaleType="centerInside" />
 
-            <ImageView
-                android:id="@+id/iv_alert_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:background="@drawable/title_alert"
-                />
+            <ImageButton
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center|left"
+                android:layout_marginTop="1dp"
+
+                android:background="@drawable/beijingyanse"
+
+                android:scaleType="centerCrop" />
 
             <TextView
                 android:id="@+id/tv_alert_date"
@@ -79,12 +99,6 @@
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/bg_btn_set_color" />
-
         </LinearLayout>
 
         <LinearLayout
@@ -147,6 +161,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right"
+
         android:background="@drawable/bg_color_btn_mask" />
 
     <LinearLayout