画板和便签编辑界面ui优化

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) {

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>

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_width="30dp"
-                android:layout_height="40dp"
+                android:layout_height="30dp"
-                android:layout_weight="1"
+                android:layout_marginTop="8dp"
-                android:text="Button" />
+                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_width="28dp"
-                android:layout_height="wrap_content"
+                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_width="40dp"
-                android:layout_height="88dp"
+                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
+            <ImageButton
-                android:id="@+id/iv_alert_icon"
+                android:layout_width="40dp"
-                android:layout_width="wrap_content"
+                android:layout_height="40dp"
-                android:layout_height="wrap_content"
+                android:layout_gravity="center|left"
-                android:layout_gravity="center_vertical"
+                android:layout_marginTop="1dp"
-                android:background="@drawable/title_alert"
+
-                />
+                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