更换图标

doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java

@@ -492,6 +492,13 @@ public class DoodleActivity extends Activity {
         findViewById(R.id.btn_fill_rect).setOnClickListener(mOnClickListener);
         findViewById(R.id.btn_clear).setOnClickListener(mOnClickListener);
         findViewById(R.id.btn_undo).setOnClickListener(mOnClickListener);
+        findViewById(R.id.btn_undo).setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                findViewById(R.id.btn_clear).performClick();
+                return true;
+            }
+        });
         findViewById(R.id.doodle_selectable_edit).setOnClickListener(mOnClickListener);
         findViewById(R.id.doodle_selectable_remove).setOnClickListener(mOnClickListener);
         findViewById(R.id.doodle_selectable_top).setOnClickListener(mOnClickListener);

doodle/src/main/res/drawable/doodle_shape_circle_normal.xml

@@ -2,7 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" 
     android:shape="oval"
     android:useLevel="false">
-        <solid android:color="#ffffff" /> <!-- 定义填充的颜色值 -->  
+        <stroke
+            android:width="0.5dp"
+            android:color="@color/doodle_btn_border" />
+        <solid android:color="#ffffff" /> <!-- 定义填充的颜色值 -->
         <!--<gradient android:startColor="#dfeeeeee"-->
              <!--android:endColor="#dfcccccc" -->
                      <!--android:angle="270"-->

doodle/src/main/res/drawable/doodle_shape_circle_pressed.xml

@@ -2,5 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval"
     android:useLevel="false">
+        <stroke
+            android:width="0.5dp"
+            android:color="@color/doodle_btn_border" />
         <solid android:color="@color/doodle_btn_pressed_color" /> <!-- 定义填充的颜色值 -->
 </shape>

doodle/src/main/res/drawable/doodle_shape_rect_stroke_normal.xml

@@ -6,7 +6,7 @@
  <!-- 定义填充的颜色值 -->
     <stroke
         android:width="0.5dp"
-        android:color="#aaaaaa" />
+        android:color="@color/doodle_btn_border" />
 
     <corners android:radius="3dp" />
 

doodle/src/main/res/drawable/doodle_shape_rect_stroke_pressed.xml

@@ -4,7 +4,7 @@
         <solid android:color="#bbbbbb" /> <!-- 定义填充的颜色值 -->  
         <stroke
             android:width="0.5dp"
-            android:color="#aaaaaa" />
+            android:color="@color/doodle_btn_border" />
 
         <corners android:radius="3dp" />
 

doodle/src/main/res/layout/doodle_title_bar.xml

@@ -8,13 +8,13 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/title_bar_height"
+        android:layout_height="@dimen/doodle_title_bar_height"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <cn.forward.androids.views.MaskImageView
             android:id="@+id/doodle_btn_back"
-            android:layout_width="@dimen/title_bar_height"
+            android:layout_width="@dimen/doodle_title_bar_height"
             android:layout_height="match_parent"
             android:scaleType="centerInside"
             android:src="@drawable/doodle_btn_back"
@@ -47,8 +47,8 @@
 
         <cn.forward.androids.views.MaskImageView
             android:id="@+id/doodle_btn_rotate"
-            android:layout_width="@dimen/title_bar_height"
-            android:layout_height="@dimen/title_bar_height"
+            android:layout_width="@dimen/doodle_title_bar_height"
+            android:layout_height="@dimen/doodle_title_bar_height"
             android:padding="5dp"
             android:scaleType="fitXY"
             android:src="@drawable/doodle_rotate"
@@ -58,8 +58,8 @@
 
         <cn.forward.androids.views.MaskImageView
             android:id="@+id/doodle_btn_hide_panel"
-            android:layout_width="@dimen/title_bar_height"
-            android:layout_height="@dimen/title_bar_height"
+            android:layout_width="@dimen/doodle_title_bar_height"
+            android:layout_height="@dimen/doodle_title_bar_height"
             android:padding="13dp"
             android:scaleType="fitCenter"
             android:src="@drawable/doodle_btn_effect_panel"
@@ -69,7 +69,7 @@
 
         <cn.forward.androids.views.MaskImageView
             android:id="@+id/doodle_btn_finish"
-            android:layout_width="@dimen/title_bar_height"
+            android:layout_width="@dimen/doodle_title_bar_height"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             android:src="@drawable/doodle_btn_finish"

doodle/src/main/res/values/color.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="doodle_btn_pressed_color">#dfffd943</color>
-
+    <color name="doodle_btn_pressed_color">#ffffd943</color>
     <color name="doodle_btn_text">#000000</color>
+    <color name="doodle_btn_border">#88cccccc</color>
 </resources>
\ No newline at end of file

doodle/src/main/res/values/dimen.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="title_bar_height">50dp</dimen>
+    <dimen name="doodle_title_bar_height">50dp</dimen>
+    <dimen name="doodle_btn_pen_size">32dp</dimen>
+    <dimen name="doodle_btn_shape_size">30dp</dimen>
 </resources>
\ No newline at end of file