优化了画板选项及ui

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

@@ -1,19 +1,30 @@
 package net.micode.notes.ui;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
+import android.widget.Toast;
 
 import net.micode.notes.R;
 
@@ -32,6 +43,8 @@ public class DrawActivity extends Activity {
     // 重置按钮
     private ImageButton reset_btn;
     private ImageButton save_paint;
+    private ImageButton change_thickness;
+    private ImageButton change_color;
     private boolean if_draw = false;
 
     @Override
@@ -60,6 +73,20 @@ public class DrawActivity extends Activity {
                 finish();
             }
         });
+        change_thickness = findViewById(R.id.change_thickness);
+        change_thickness.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                changeThickness();
+            }
+        });
+        change_color = findViewById(R.id.change_pen_color);
+        change_color.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                changeColor();
+            }
+        });
         // 绘图
         showImage();
     }
@@ -86,7 +113,7 @@ public class DrawActivity extends Activity {
                 // 画笔颜色为蓝色
                 paint.setColor(Color.BLUE);
                 // 宽度5个像素
-                paint.setStrokeWidth(5);
+                paint.setStrokeWidth(10);
                 //接缝处圆滑
                 paint.setStrokeCap(Paint.Cap.ROUND);
                 paint.setStrokeJoin(Paint.Join.ROUND);
@@ -112,6 +139,7 @@ public class DrawActivity extends Activity {
                                 int endY = (int) event.getY();
                                 // 在开始和结束坐标间画一条线
                                 canvas.drawLine(startX, startY, endX, endY, paint);
+                                //canvas.drawPath();
                                 // 刷新开始坐标
                                 startX = (int) event.getX();
                                 startY = (int) event.getY();
@@ -125,6 +153,94 @@ public class DrawActivity extends Activity {
         });
     }
 
+    private void showSoftInput() {
+        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (inputMethodManager != null) {
+            inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        }
+    }
+
+    private void hideSoftInput(View view) {
+        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    }
+
+    public void changeThickness(){
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        //输入框控件实例化
+        View view = LayoutInflater.from(this).inflate(R.layout.change_thickness, null);
+        final EditText et_change_color = (EditText) view.findViewById(R.id.et_change_thickness);
+        //显示软件盘
+        showSoftInput();
+        builder.setTitle("Please enter the brush thickness (1-30)");
+        builder.setPositiveButton(android.R.string.ok, null);
+        //设置取消按钮监听
+        builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int which) {
+                hideSoftInput(et_change_color);
+            }
+        });
+        //显示输入框控件
+        final Dialog enter_password_dialog = builder.setView(view).show();
+        final Button positive = (Button)enter_password_dialog.findViewById(android.R.id.button1);
+        positive.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                hideSoftInput(et_change_color);
+                String entered_Thickness = et_change_color.getText().toString();
+                float Thickness = Integer.valueOf(entered_Thickness).floatValue();
+                Log.i(null, String.valueOf(Thickness));
+                paint.setStrokeWidth((Thickness-1) * 10 + 5);
+                enter_password_dialog.dismiss();
+            }
+        });
+    }
+
+    private AlertDialog alertDialog2;
+
+    public void changeColor() {
+        final String[] items = {"Red", "Yellow", "Green", "Blue", "Black", "Pink", "Orange", "Turquoise","Gray"};
+        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(this);
+        alertBuilder.setTitle("Please select the color");
+        alertBuilder.setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                switch (i) {
+                    case 0:
+                        paint.setColor(Color.RED);
+                        break;
+                    case 1:
+                        paint.setColor(getResources().getColor(R.color.gold));
+                        break;
+                    case 2:
+                        paint.setColor(getResources().getColor(R.color.green));
+                        break;
+                    case 3:
+                        paint.setColor(Color.BLUE);
+                        break;
+                    case 4:
+                        paint.setColor(Color.BLACK);
+                        break;
+                    case 5:
+                        paint.setColor(getResources().getColor(R.color.pink));
+                        break;
+                    case 6:
+                        paint.setColor(getResources().getColor(R.color.orange));
+                        break;
+                    case 7:
+                        paint.setColor(getResources().getColor(R.color.turquoise));
+                        break;
+                    case 8:
+                        paint.setColor(getResources().getColor(R.color.darkgray));
+                    default:
+                        break;
+                }
+                alertDialog2.dismiss();
+            }
+        });
+        alertDialog2 = alertBuilder.create();
+        alertDialog2.show();
+    }
+    
     public String saveBitmap(){
         //获得系统当前时间，并以该时间作为文件名
         SimpleDateFormat formatter   =   new SimpleDateFormat("yyyyMMddHHmmss");

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

@@ -1274,7 +1274,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
         return result;
     }
+
     AlertDialog alertDialog2;
+
     public void showSingleAlertDiglog(){
         final String[] items={"普通","非衬线","衬线","等宽"};
         AlertDialog.Builder alertBuilder=new AlertDialog.Builder(this);

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

@@ -71,4 +71,5 @@
 
 
     </LinearLayout>
+
 </RelativeLayout>

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

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RadioGroup
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/et_change_color"
+    android:layout_width="fill_parent"
+    android:hint="请选择颜色"
+    android:layout_height="fill_parent" >
+
+    <RadioButton
+        android:id="@+id/radioButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:text="Red" />
+
+    <RadioButton
+        android:id="@+id/radioButton2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:text="Yellow" />
+
+    <RadioButton
+        android:id="@+id/radioButton3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:text="Blue" />
+
+    <RadioButton
+        android:id="@+id/radioButton4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:text="Green" />
+
+    <RadioButton
+        android:id="@+id/radioButton5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:text="Purple" />
+
+    <RadioButton
+        android:id="@+id/radioButton6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:text="Pink" />
+
+    <RadioButton
+        android:id="@+id/radioButton7"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:text="Black" />
+</RadioGroup>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<EditText
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/et_change_thickness"
+    android:layout_width="fill_parent"
+    android:hint="请输入画笔粗细"
+    android:layout_height="fill_parent" />

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

@@ -16,5 +16,151 @@
 -->
 
 <resources>
-    <color name="user_query_highlight">#335b5b5b</color>
+        <color name="user_query_highlight">#335b5b5b</color>
+
+        <color name="white">#ffffff</color> <!-- 白色 -->
+        <color name="ivory">#fffff0</color> <!-- 象牙色 -->
+        <color name="lightyellow">#ffffe0</color> <!-- 亮黄色 -->
+        <color name="yellow">#ffff00</color> <!-- 黄色 -->
+        <color name="snow">#fffafa</color> <!-- 雪白色 -->
+        <color name="floralwhite">#fffaf0</color> <!-- 花白色 -->
+        <color name="lemonchiffon">#fffacd</color> <!-- 柠檬绸色 -->
+        <color name="cornsilk">#fff8dc</color> <!-- 米绸色 -->
+        <color name="seaShell">#fff5ee</color> <!-- 海贝色 -->
+        <color name="lavenderblush">#fff0f5</color> <!-- 淡紫红 -->
+        <color name="papayawhip">#ffefd5</color> <!-- 番木色 -->
+        <color name="blanchedalmond">#ffebcd</color> <!-- 白杏色 -->
+        <color name="mistyrose">#ffe4e1</color> <!-- 浅玫瑰色 -->
+        <color name="bisque">#ffe4c4</color> <!-- 桔黄色 -->
+        <color name="moccasin">#ffe4b5</color> <!-- 鹿皮色 -->
+        <color name="navajowhite">#ffdead</color> <!-- 纳瓦白 -->
+        <color name="peachpuff">#ffdab9</color> <!-- 桃色 -->
+        <color name="gold">#ffd700</color> <!-- 金色 -->
+        <color name="pink">#ffc0cb</color> <!-- 粉红色 -->
+        <color name="lightpink">#ffb6c1</color> <!-- 亮粉红色 -->
+        <color name="orange">#ffa500</color> <!-- 橙色 -->
+        <color name="lightsalmon">#ffa07a</color> <!-- 亮肉色 -->
+        <color name="darkorange">#ff8c00</color> <!-- 暗桔黄色 -->
+        <color name="coral">#ff7f50</color> <!-- 珊瑚色 -->
+        <color name="hotpink">#ff69b4</color> <!-- 热粉红色 -->
+        <color name="tomato">#ff6347</color> <!-- 西红柿色 -->
+        <color name="orangered">#ff4500</color> <!-- 红橙色 -->
+        <color name="deeppink">#ff1493</color> <!-- 深粉红色 -->
+        <color name="fuchsia">#ff00ff</color> <!-- 紫红色 -->
+        <color name="magenta">#ff00ff</color> <!-- 红紫色 -->
+        <color name="red">#ff0000</color> <!-- 红色 -->
+        <color name="oldlace">#fdf5e6</color> <!-- 老花色 -->
+        <color name="lightgoldenrodyellow">#fafad2</color> <!-- 亮金黄色 -->
+        <color name="linen">#faf0e6</color> <!-- 亚麻色 -->
+        <color name="antiquewhite">#faebd7</color> <!-- 古董白 -->
+        <color name="salmon">#fa8072</color> <!-- 鲜肉色 -->
+        <color name="ghostwhite">#f8f8ff</color> <!-- 幽灵白 -->
+        <color name="mintcream">#f5fffa</color> <!-- 薄荷色 -->
+        <color name="whitesmoke">#f5f5f5</color> <!-- 烟白色 -->
+        <color name="beige">#f5f5dc</color> <!-- 米色 -->
+        <color name="wheat">#f5deb3</color> <!-- 浅黄色 -->
+        <color name="sandybrown">#f4a460</color> <!-- 沙褐色 -->
+        <color name="azure">#f0ffff</color> <!-- 天蓝色 -->
+        <color name="honeydew">#f0fff0</color> <!-- 蜜色 -->
+        <color name="aliceblue">#f0f8ff</color> <!-- 艾利斯兰 -->
+        <color name="khaki">#f0e68c</color> <!-- 黄褐色 -->
+        <color name="lightcoral">#f08080</color> <!-- 亮珊瑚色 -->
+        <color name="palegoldenrod">#eee8aa</color> <!-- 苍麒麟色 -->
+        <color name="violet">#ee82ee</color> <!-- 紫罗兰色 -->
+        <color name="darksalmon">#e9967a</color> <!-- 暗肉色 -->
+        <color name="lavender">#e6e6fa</color> <!-- 淡紫色 -->
+        <color name="lightcyan">#e0ffff</color> <!-- 亮青色 -->
+        <color name="burlywood">#deb887</color> <!-- 实木色 -->
+        <color name="plum">#dda0dd</color> <!-- 洋李色 -->
+        <color name="gainsboro">#dcdcdc</color> <!-- 淡灰色 -->
+        <color name="crimson">#dc143c</color> <!-- 暗深红色 -->
+        <color name="palevioletred">#db7093</color> <!-- 苍紫罗兰色 -->
+        <color name="goldenrod">#daa520</color> <!-- 金麒麟色 -->
+        <color name="orchid">#da70d6</color> <!-- 淡紫色 -->
+        <color name="thistle">#d8bfd8</color> <!-- 蓟色 -->
+        <color name="lightgray">#d3d3d3</color> <!-- 亮灰色 -->
+        <color name="tan">#d2b48c</color> <!-- 茶色 -->
+        <color name="chocolate">#d2691e</color> <!-- 巧可力色 -->
+        <color name="peru">#cd853f</color> <!-- 秘鲁色 -->
+        <color name="indianred">#cd5c5c</color> <!-- 印第安红 -->
+        <color name="mediumvioletred">#c71585</color> <!-- 中紫罗兰色 -->
+        <color name="silver">#c0c0c0</color> <!-- 银色 -->
+        <color name="darkkhaki">#bdb76b</color> <!-- 暗黄褐色 -->
+        <color name="rosybrown">#bc8f8f</color> <!-- 褐玫瑰红 -->
+        <color name="mediumorchid">#ba55d3</color> <!-- 中粉紫色 -->
+        <color name="darkgoldenrod">#b8860b</color> <!-- 暗金黄色 -->
+        <color name="firebrick">#b22222</color> <!-- 火砖色 -->
+        <color name="powderblue">#b0e0e6</color> <!-- 粉蓝色 -->
+        <color name="lightsteelblue">#b0c4de</color> <!-- 亮钢兰色 -->
+        <color name="paleturquoise">#afeeee</color> <!-- 苍宝石绿 -->
+        <color name="greenyellow">#adff2f</color> <!-- 黄绿色 -->
+        <color name="lightblue">#add8e6</color> <!-- 亮蓝色 -->
+        <color name="darkgray">#a9a9a9</color> <!-- 暗灰色 -->
+        <color name="brown">#a52a2a</color> <!-- 褐色 -->
+        <color name="sienna">#a0522d</color> <!-- 赭色 -->
+        <color name="darkorchid">#9932cc</color> <!-- 暗紫色 -->
+        <color name="palegreen">#98fb98</color> <!-- 苍绿色 -->
+        <color name="darkviolet">#9400d3</color> <!-- 暗紫罗兰色 -->
+        <color name="mediumpurple">#9370db</color> <!-- 中紫色 -->
+        <color name="lightgreen">#90ee90</color> <!-- 亮绿色 -->
+        <color name="darkseagreen">#8fbc8f</color> <!-- 暗海兰色 -->
+        <color name="saddlebrown">#8b4513</color> <!-- 重褐色 -->
+        <color name="darkmagenta">#8b008b</color> <!-- 暗洋红 -->
+        <color name="darkred">#8b0000</color> <!-- 暗红色 -->
+        <color name="blueviolet">#8a2be2</color> <!-- 紫罗兰蓝色 -->
+        <color name="lightskyblue">#87cefa</color> <!-- 亮天蓝色 -->
+        <color name="skyblue">#87ceeb</color> <!-- 天蓝色 -->
+        <color name="gray">#808080</color> <!-- 灰色 -->
+        <color name="grey">#808080</color> <!-- 灰色 -->
+        <color name="olive">#808000</color> <!-- 橄榄色 -->
+        <color name="purple">#800080</color> <!-- 紫色 -->
+        <color name="maroon">#800000</color> <!-- 粟色 -->
+        <color name="aquamarine">#7fffd4</color> <!-- 碧绿色 -->
+        <color name="chartreuse">#7fff00</color> <!-- 黄绿色 -->
+        <color name="lawngreen">#7cfc00</color> <!-- 草绿色 -->
+        <color name="mediumslateblue">#7b68ee</color> <!-- 中暗蓝色 -->
+        <color name="lightslategray">#778899</color> <!-- 亮蓝灰 -->
+        <color name="lightslategrey">#778899</color> <!-- 亮蓝灰 -->
+        <color name="slategray">#708090</color> <!-- 灰石色 -->
+        <color name="slategrey">#708090</color> <!-- 灰石色 -->
+        <color name="olivedrab">#6b8e23</color> <!-- 深绿褐色 -->
+        <color name="slateblue">#6a5acd</color> <!-- 石蓝色 -->
+        <color name="dimgray">#696969</color> <!-- 暗灰色 -->
+        <color name="dimgrey">#696969</color> <!-- 暗灰色 -->
+        <color name="mediumaquamarine">#66cdaa</color> <!-- 中绿色 -->
+        <color name="cornflowerblue">#6495ed</color> <!-- 菊兰色 -->
+        <color name="cadetblue">#5f9ea0</color> <!-- 军兰色 -->
+        <color name="darkolivegreen">#556b2f</color> <!-- 暗橄榄绿 -->
+        <color name="indigo">#4b0082</color> <!-- 靛青色 -->
+        <color name="mediumturquoise">#48d1cc</color> <!-- 中绿宝石 -->
+        <color name="darkslateblue">#483d8b</color> <!-- 暗灰蓝色 -->
+        <color name="steelblue">#4682b4</color> <!-- 钢兰色 -->
+        <color name="royalblue">#4169e1</color> <!-- 皇家蓝 -->
+        <color name="turquoise">#40e0d0</color> <!-- 青绿色 -->
+        <color name="mediumseagreen">#3cb371</color> <!-- 中海蓝 -->
+        <color name="limegreen">#32cd32</color> <!-- 橙绿色 -->
+        <color name="darkslategray">#2f4f4f</color> <!-- 暗瓦灰色 -->
+        <color name="darkslategrey">#2f4f4f</color> <!-- 暗瓦灰色 -->
+        <color name="seagreen">#2e8b57</color> <!-- 海绿色 -->
+        <color name="forestgreen">#228b22</color> <!-- 森林绿 -->
+        <color name="lightseagreen">#20b2aa</color> <!-- 亮海蓝色 -->
+        <color name="dodgerblue">#1e90ff</color> <!-- 闪兰色 -->
+        <color name="midnightblue">#191970</color> <!-- 中灰兰色 -->
+        <color name="aqua">#00ffff</color> <!-- 浅绿色 -->
+        <color name="cyan">#00ffff</color> <!-- 青色 -->
+        <color name="springgreen">#00ff7f</color> <!-- 春绿色 -->
+        <color name="lime">#00ff00</color> <!-- 酸橙色 -->
+        <color name="mediumspringgreen">#00fa9a</color> <!-- 中春绿色 -->
+        <color name="darkturquoise">#00ced1</color> <!-- 暗宝石绿 -->
+        <color name="deepskyblue">#00bfff</color> <!-- 深天蓝色 -->
+        <color name="darkcyan">#008b8b</color> <!-- 暗青色 -->
+        <color name="teal">#008080</color> <!-- 水鸭色 -->
+        <color name="green">#008000</color> <!-- 绿色 -->
+        <color name="darkgreen">#006400</color> <!-- 暗绿色 -->
+        <color name="blue">#0000ff</color> <!-- 蓝色 -->
+        <color name="mediumblue">#0000cd</color> <!-- 中兰色 -->
+        <color name="darkblue">#00008b</color> <!-- 暗蓝色 -->
+        <color name="navy">#000080</color> <!-- 海军色 -->
+        <color name="black">#000000</color> <!-- 黑色 -->
+
 </resources>