优化画板ui界面

src/Notes1/app/src/main/AndroidManifest.xml

@@ -84,7 +84,9 @@
                 android:resource="@xml/searchable" />
         </activity>
 
-        <activity android:name=".ui.DrawActivity"
+        <activity
+            android:name=".ui.DrawActivity"
+            android:theme ="@android:style/Theme.NoTitleBar.Fullscreen"
             />
 
         <provider

src/Notes1/app/src/main/java/net/micode/notes/ui/DrawActivity.java

@@ -1,7 +1,5 @@
 package net.micode.notes.ui;
 
-import static net.micode.notes.tool.DataUtils.TAG;
-
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -9,19 +7,20 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.os.Environment;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.Button;
+import android.view.ViewTreeObserver;
+import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
 import net.micode.notes.R;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -31,15 +30,16 @@ public class DrawActivity extends Activity {
     private Canvas canvas;
     private Paint paint;
     // 重置按钮
-    private Button reset_btn;
+    private ImageButton reset_btn;
-    private Button save_paint;
+    private ImageButton save_paint;
+    private boolean if_draw = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_second);
         img = (ImageView) findViewById(R.id.draw);
-        reset_btn = (Button) findViewById(R.id.reset);
+        reset_btn = (ImageButton) findViewById(R.id.reset);
         reset_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -47,14 +47,16 @@ public class DrawActivity extends Activity {
                 showImage();
             }
         });
-        save_paint = (Button)findViewById(R.id.save);
+        save_paint = (ImageButton)findViewById(R.id.save);
         save_paint.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                String path = saveBitmap();
+                if (if_draw) {
-                getIntent().putExtra("path", path);
+                    String path = saveBitmap();
-                setResult(1, getIntent());
+                    getIntent().putExtra("path", path);
-                Log.i(null, path);
+                    setResult(1, getIntent());
+                    Log.i(null, path);
+                }
                 finish();
             }
         });
@@ -63,46 +65,62 @@ public class DrawActivity extends Activity {
     }
 
     private void showImage() {
-        // 创建一张空白图片
+        ImageView huabu = (ImageView) findViewById(R.id.draw);
-        mBitmap = Bitmap.createBitmap(720, 1280, Bitmap.Config.ARGB_8888);
+        ViewTreeObserver vto = huabu.getViewTreeObserver();
-        // 创建一张画布
+        vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-        canvas = new Canvas(mBitmap);
-        // 画布背景为白色
-        canvas.drawColor(Color.WHITE);
-        // 创建画笔
-        paint = new Paint();
-        // 画笔颜色为蓝色
-        paint.setColor(Color.BLUE);
-        // 宽度5个像素
-        paint.setStrokeWidth(5);
-        // 先将白色背景画上
-        canvas.drawBitmap(mBitmap, new Matrix(), paint);
-        img.setImageBitmap(mBitmap);
-
-        img.setOnTouchListener(new View.OnTouchListener() {
-            int startX;
-            int startY;
             @Override
-            public boolean onTouch(View v, MotionEvent event) {
+            public void onGlobalLayout() {
-                switch (event.getAction()) {
+                huabu.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                    case MotionEvent.ACTION_DOWN:
+                // 获取线性布局控件的高
-                        // 获取手按下时的坐标
+                int height = huabu.getHeight();
-                        startX = (int) event.getX();
+                // 获取线性布局控件的宽
-                        startY = (int) event.getY();
+                int width = huabu.getWidth();
-                        break;
+                //按照画布控件大小创建画布
-                    case MotionEvent.ACTION_MOVE:
+                mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-                        // 获取手移动后的坐标
+                // 创建一张画布
-                        int endX = (int) event.getX();
+                canvas = new Canvas(mBitmap);
-                        int endY = (int) event.getY();
+                // 画布背景为白色
-                        // 在开始和结束坐标间画一条线
+                canvas.drawColor(Color.WHITE);
-                        canvas.drawLine(startX, startY, endX, endY, paint);
+                // 创建画笔
-                        // 刷新开始坐标
+                paint = new Paint();
-                        startX = (int) event.getX();
+                // 画笔颜色为蓝色
-                        startY = (int) event.getY();
+                paint.setColor(Color.BLUE);
-                        img.setImageBitmap(mBitmap);
+                // 宽度5个像素
-                        break;
+                paint.setStrokeWidth(5);
-                }
+                //接缝处圆滑
-                return true;
+                paint.setStrokeCap(Paint.Cap.ROUND);
+                paint.setStrokeJoin(Paint.Join.ROUND);
+                // 先将白色背景画上
+                canvas.drawBitmap(mBitmap, new Matrix(), paint);
+                img.setImageBitmap(mBitmap);
+
+                img.setOnTouchListener(new View.OnTouchListener() {
+                    int startX;
+                    int startY;
+                    @Override
+                    public boolean onTouch(View v, MotionEvent event) {
+                        if_draw = true;
+                        switch (event.getAction()) {
+                            case MotionEvent.ACTION_DOWN:
+                                // 获取手按下时的坐标
+                                startX = (int) event.getX();
+                                startY = (int) event.getY();
+                                break;
+                            case MotionEvent.ACTION_MOVE:
+                                // 获取手移动后的坐标
+                                int endX = (int) event.getX();
+                                int endY = (int) event.getY();
+                                // 在开始和结束坐标间画一条线
+                                canvas.drawLine(startX, startY, endX, endY, paint);
+                                // 刷新开始坐标
+                                startX = (int) event.getX();
+                                startY = (int) event.getY();
+                                img.setImageBitmap(mBitmap);
+                                break;
+                        }
+                        return true;
+                    }
+                });
             }
         });
     }

src/Notes1/app/src/main/res/layout/activity_second.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/img"
@@ -7,26 +7,47 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-        <ImageView
+    <ImageView
-            android:id="@+id/draw"
+        android:id="@+id/draw"
-            android:layout_width="wrap_content"
+        android:layout_width="500dp"
-            android:layout_height="wrap_content"
+        android:layout_height="660dp"
-            android:layout_weight="2"
+        android:layout_weight="1"
-            tools:src="@tools:sample/backgrounds/scenic" />
+        android:contentDescription="@string/painting"
-        <Button
+
-            android:id="@+id/reset"
+        android:visibility="visible"
-            android:layout_width="200dp"
+        tools:src="@drawable/white"
-            android:layout_height="129dp"
+        tools:visibility="visible" />
-            android:layout_weight="1"
+
-            android:text="Button"
+    <LinearLayout
-            android:layout_gravity="center|center_vertical"/>
+        android:layout_width="fill_parent"
+        android:layout_height="80dp"
+        android:layout_alignBottom="@+id/draw"
+        android:layout_marginBottom="0dp">
 
-        <Button
+        <ImageButton
             android:id="@+id/save"
-            android:layout_width="wrap_content"
+            android:layout_width="67dp"
-            android:layout_height="wrap_content"
+            android:layout_height="66dp"
-            android:layout_weight="2"
+            android:layout_gravity="center"
-            android:text="Button" />
+            android:layout_marginLeft="15dp"
+            android:layout_weight="0"
+            android:background="@drawable/chehui"
+            android:contentDescription="@string/return_note"
+            android:scaleType="centerInside"
+            android:visibility="visible"
+            tools:visibility="visible" />
+
+        <ImageButton
+            android:id="@+id/reset"
+            android:layout_width="87dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="15dp"
+            android:layout_weight="0"
+            android:background="@drawable/qingkong"
+            android:scaleType="centerCrop"
+            android:visibility="visible"
+            tools:visibility="visible" />
 
 
-</LinearLayout>
+    </LinearLayout>
+</RelativeLayout>

src/Notes1/app/src/main/res/layout/note_edit.xml

@@ -83,7 +83,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-
                 android:background="@drawable/bg_btn_set_color" />
 
         </LinearLayout>

src/Notes1/app/src/main/res/values/strings.xml

@@ -128,6 +128,8 @@
     <string name="search">Notes</string>
     <string name="datetime_dialog_ok">set</string>
     <string name="datetime_dialog_cancel">cancel</string>
+    <string name="painting">painting</string>
+    <string name="return_note">return the note</string>
     <plurals name="search_results_title">
          <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->