diff --git a/README.md b/README.md
index f2e132b..e3f52ab 100644
--- a/README.md
+++ b/README.md
@@ -22,25 +22,25 @@
     
 ### 界面
 
- ![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Graffiti/01.png)
- ![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Graffiti/02.png)
- ![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Graffiti/03.png)
+ ![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Doodle/01.png)
+ ![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Doodle/02.png)
+ ![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Doodle/03.png)
 
 
 ### 使用
 ```groovy
-compile 'com.hzw.graffiti:graffiti:4.3.1'
+compile 'com.hzw.doodle:doodle:4.3.1'
 ```
 
 ```java
 // 涂鸦参数
-GraffitiParams params = new GraffitiParams();
+DoodleParams params = new DoodleParams();
 // 图片路径
 params.mImagePath = list.get(0);
 // 初始画笔大小
 params.mPaintSize = 20;
 // 启动涂鸦页面
-GraffitiActivity.startActivityForResult(MainActivity.this, params, REQ_CODE_GRAFFITI);
+DoodleActivity.startActivityForResult(MainActivity.this, params, REQ_CODE_DOODLE);
 
 ```
 
@@ -60,10 +60,10 @@ dependencies {
 
 ```java
 /**
- * 涂鸦界面，根据GraffitiView的接口，提供页面交互
+ * 涂鸦界面，根据DoodleView的接口，提供页面交互
  *
  */
-public class GraffitiActivity extends Activity {
+public class DoodleActivity extends Activity {
 /**
      * 启动涂鸦界面
      *
@@ -71,9 +71,9 @@ public class GraffitiActivity extends Activity {
      * @param params      涂鸦参数
      * @param requestCode startActivityForResult的请求码
      */
-    public static void startActivityForResult(Activity activity, GraffitiParams params, int requestCode) {
-        Intent intent = new Intent(activity, GraffitiActivity.class);
-        intent.putExtra(GraffitiActivity.KEY_PARAMS, params);
+    public static void startActivityForResult(Activity activity, DoodleParams params, int requestCode) {
+        Intent intent = new Intent(activity, DoodleActivity.class);
+        intent.putExtra(DoodleActivity.KEY_PARAMS, params);
         activity.startActivityForResult(intent, requestCode);
     }
  }
@@ -81,12 +81,12 @@ public class GraffitiActivity extends Activity {
 
 ```java
 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-   if (requestCode == REQ_CODE_GRAFFITI) {
-        if (resultCode == GraffitiActivity.RESULT_OK) {
+   if (requestCode == REQ_CODE_DOODLE) {
+        if (resultCode == DoodleActivity.RESULT_OK) {
         // 获取涂鸦后的图片
-            String path = data.getStringExtra(GraffitiActivity.KEY_IMAGE_PATH);
+            String path = data.getStringExtra(DoodleActivity.KEY_IMAGE_PATH);
             ...
-        } else if (resultCode == GraffitiActivity.RESULT_ERROR) {
+        } else if (resultCode == DoodleActivity.RESULT_ERROR) {
            ...
         }
     }
@@ -97,13 +97,13 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
  /**
  * 涂鸦参数
  */
-public static class GraffitiParams implements Parcelable {
+public static class DoodleParams implements Parcelable {
     /**
      * 图片路径
      */
     public String mImagePath;
     /**
-     * 　保存路径，如果为null，则图片保存在根目录下/DCIM/Graffiti/
+     * 　保存路径，如果为null，则图片保存在根目录下/DCIM/Doodle/
      */
     public String mSavePath;
     /**
diff --git a/app/build.gradle b/app/build.gradle
index ba715db..5c84acf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion COMPILE_SDK_VERSION as int
 
     defaultConfig {
-        applicationId "cn.hzw.graffitidemo"
+        applicationId "cn.hzw.doodledemo"
         minSdkVersion MIN_SDK_VERSION as int
         targetSdkVersion TARGET_SDK_VERSION as int
         versionCode 1
@@ -21,7 +21,6 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':graffiti')
-//    compile project(':ImageSelctorLib-release')
+    compile project(':doodle')
     compile 'cn.hzw.imageselector:library:1.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6121e5b..6d182e2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="cn.hzw.graffitidemo">
+          package="cn.hzw.doodledemo">
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/cn/hzw/graffitidemo/MainActivity.java b/app/src/main/java/cn/hzw/doodledemo/MainActivity.java
similarity index 74%
rename from app/src/main/java/cn/hzw/graffitidemo/MainActivity.java
rename to app/src/main/java/cn/hzw/doodledemo/MainActivity.java
index c7d5f9b..f72bd2e 100644
--- a/app/src/main/java/cn/hzw/graffitidemo/MainActivity.java
+++ b/app/src/main/java/cn/hzw/doodledemo/MainActivity.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffitidemo;
+package cn.hzw.doodledemo;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -11,16 +11,16 @@
 import java.util.ArrayList;
 
 import cn.forward.androids.utils.LogUtil;
-import cn.hzw.graffiti.GraffitiActivity;
-import cn.hzw.graffiti.GraffitiParams;
-import cn.hzw.graffiti.GraffitiView;
+import cn.hzw.doodle.DoodleActivity;
+import cn.hzw.doodle.DoodleParams;
+import cn.hzw.doodle.DoodleView;
 import cn.hzw.imageselector.ImageLoader;
 import cn.hzw.imageselector.ImageSelectorActivity;
 
 public class MainActivity extends Activity {
 
     public static final int REQ_CODE_SELECT_IMAGE = 100;
-    public static final int REQ_CODE_GRAFFITI = 101;
+    public static final int REQ_CODE_DOODLE = 101;
     private TextView mPath;
 
     @Override
@@ -46,31 +46,31 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             }
             ArrayList<String> list = data.getStringArrayListExtra(ImageSelectorActivity.KEY_PATH_LIST);
             if (list != null && list.size() > 0) {
-                LogUtil.d("Graffiti", list.get(0));
+                LogUtil.d("Doodle", list.get(0));
 
                 // 涂鸦参数
-                GraffitiParams params = new GraffitiParams();
+                DoodleParams params = new DoodleParams();
                 params.mIsFullScreen = true;
                 // 图片路径
                 params.mImagePath = list.get(0);
                 // 初始画笔大小
-                params.mPaintUnitSize = GraffitiView.DEFAULT_SIZE;
+                params.mPaintUnitSize = DoodleView.DEFAULT_SIZE;
                 params.mAmplifierScale = 0;
                 // 启动涂鸦页面
-                GraffitiActivity.startActivityForResult(MainActivity.this, params, REQ_CODE_GRAFFITI);
+                DoodleActivity.startActivityForResult(MainActivity.this, params, REQ_CODE_DOODLE);
             }
-        } else if (requestCode == REQ_CODE_GRAFFITI) {
+        } else if (requestCode == REQ_CODE_DOODLE) {
             if (data == null) {
                 return;
             }
-            if (resultCode == GraffitiActivity.RESULT_OK) {
-                String path = data.getStringExtra(GraffitiActivity.KEY_IMAGE_PATH);
+            if (resultCode == DoodleActivity.RESULT_OK) {
+                String path = data.getStringExtra(DoodleActivity.KEY_IMAGE_PATH);
                 if (TextUtils.isEmpty(path)) {
                     return;
                 }
                 ImageLoader.getInstance(this).display(findViewById(R.id.img), path);
                 mPath.setText(path);
-            } else if (resultCode == GraffitiActivity.RESULT_ERROR) {
+            } else if (resultCode == DoodleActivity.RESULT_ERROR) {
                 Toast.makeText(getApplicationContext(), "error", Toast.LENGTH_SHORT).show();
             }
         }
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
index 324e72c..bc261a2 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png
index cde69bc..ef07251 100644
Binary files a/app/src/main/res/drawable/ic_launcher.png and b/app/src/main/res/drawable/ic_launcher.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6a65e5b..db4b621 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="cn.hzw.graffitidemo.MainActivity">
+    tools:context="cn.hzw.doodledemo.MainActivity">
 
     <Button
         android:id="@+id/btn_select_image"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6b0cd0..0696ec7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Graffiti</string>
+    <string name="app_name">Doodle</string>
 </resources>
diff --git a/graffiti/.gitignore b/doodle/.gitignore
similarity index 100%
rename from graffiti/.gitignore
rename to doodle/.gitignore
diff --git a/graffiti/build.gradle b/doodle/build.gradle
similarity index 100%
rename from graffiti/build.gradle
rename to doodle/build.gradle
diff --git a/graffiti/proguard-rules.pro b/doodle/proguard-rules.pro
similarity index 100%
rename from graffiti/proguard-rules.pro
rename to doodle/proguard-rules.pro
diff --git a/graffiti/src/main/AndroidManifest.xml b/doodle/src/main/AndroidManifest.xml
similarity index 85%
rename from graffiti/src/main/AndroidManifest.xml
rename to doodle/src/main/AndroidManifest.xml
index 7ac652b..fbb229a 100644
--- a/graffiti/src/main/AndroidManifest.xml
+++ b/doodle/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="cn.hzw.graffiti">
+          package="cn.hzw.doodle">
 
     <!-- 在SDCard中创建与删除文件权限 -->
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
             >
-        <activity android:name=".GraffitiActivity"
+        <activity android:name=".DoodleActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|navigation|keyboard"
             />
     </application>
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/CopyLocation.java b/doodle/src/main/java/cn/hzw/doodle/CopyLocation.java
similarity index 97%
rename from graffiti/src/main/java/cn/hzw/graffiti/CopyLocation.java
rename to doodle/src/main/java/cn/hzw/doodle/CopyLocation.java
index d31fe11..bccc1cc 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/CopyLocation.java
+++ b/doodle/src/main/java/cn/hzw/doodle/CopyLocation.java
@@ -1,10 +1,10 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.PointF;
 
-import static cn.hzw.graffiti.util.DrawUtil.drawCircle;
+import static cn.hzw.doodle.util.DrawUtil.drawCircle;
 
 /**
  * 仿制的定位器
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiActivity.java b/doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java
similarity index 66%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiActivity.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java
index 29c84ac..5ba227d 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiActivity.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.animation.ValueAnimator;
 import android.app.Activity;
@@ -36,23 +36,23 @@
 import cn.forward.androids.utils.LogUtil;
 import cn.forward.androids.utils.StatusBarUtil;
 import cn.forward.androids.utils.Util;
-import cn.hzw.graffiti.core.IGraffiti;
-import cn.hzw.graffiti.core.IGraffitiColor;
-import cn.hzw.graffiti.core.IGraffitiSelectableItem;
-import cn.hzw.graffiti.core.IGraffitiTouchDetector;
-import cn.hzw.graffiti.dialog.ColorPickerDialog;
-import cn.hzw.graffiti.dialog.DialogController;
-import cn.hzw.graffiti.imagepicker.ImageSelectorView;
-import cn.hzw.graffiti.util.DrawUtil;
+import cn.hzw.doodle.core.IDoodle;
+import cn.hzw.doodle.core.IDoodleColor;
+import cn.hzw.doodle.core.IDoodleSelectableItem;
+import cn.hzw.doodle.core.IDoodleTouchDetector;
+import cn.hzw.doodle.dialog.ColorPickerDialog;
+import cn.hzw.doodle.dialog.DialogController;
+import cn.hzw.doodle.imagepicker.ImageSelectorView;
+import cn.hzw.doodle.util.DrawUtil;
 
 /**
- * 涂鸦界面，根据GraffitiView的接口，提供页面交互
- * （这边代码和ui比较粗糙，主要目的是告诉大家GraffitiView的接口具体能实现什么功能，实际需求中的ui和交互需另提别论）
+ * 涂鸦界面，根据DoodleView的接口，提供页面交互
+ * （这边代码和ui比较粗糙，主要目的是告诉大家DoodleView的接口具体能实现什么功能，实际需求中的ui和交互需另提别论）
  * Created by huangziwei(154330138@qq.com) on 2016/9/3.
  */
-public class GraffitiActivity extends Activity {
+public class DoodleActivity extends Activity {
 
-    public static final String TAG = "Graffiti";
+    public static final String TAG = "Doodle";
     public final static int DEFAULT_COPY_SIZE = 20; // 默认仿制大小
     public final static int DEFAULT_TEXT_SIZE = 17; // 默认文字大小
     public final static int DEFAULT_BITMAP_SIZE = 80; // 默认贴图大小
@@ -65,11 +65,11 @@ public class GraffitiActivity extends Activity {
      * @param activity
      * @param params      涂鸦参数
      * @param requestCode startActivityForResult的请求码
-     * @see GraffitiParams
+     * @see DoodleParams
      */
-    public static void startActivityForResult(Activity activity, GraffitiParams params, int requestCode) {
-        Intent intent = new Intent(activity, GraffitiActivity.class);
-        intent.putExtra(GraffitiActivity.KEY_PARAMS, params);
+    public static void startActivityForResult(Activity activity, DoodleParams params, int requestCode) {
+        Intent intent = new Intent(activity, DoodleActivity.class);
+        intent.putExtra(DoodleActivity.KEY_PARAMS, params);
         activity.startActivityForResult(intent, requestCode);
     }
 
@@ -84,7 +84,7 @@ public static void startActivityForResult(Activity activity, GraffitiParams para
      */
     @Deprecated
     public static void startActivityForResult(Activity activity, String imagePath, String savePath, boolean isDir, int requestCode) {
-        GraffitiParams params = new GraffitiParams();
+        DoodleParams params = new DoodleParams();
         params.mImagePath = imagePath;
         params.mSavePath = savePath;
         params.mSavePathIsDir = isDir;
@@ -92,23 +92,23 @@ public static void startActivityForResult(Activity activity, String imagePath, S
     }
 
     /**
-     * {@link GraffitiActivity#startActivityForResult(Activity, String, String, boolean, int)}
+     * {@link DoodleActivity#startActivityForResult(Activity, String, String, boolean, int)}
      */
     @Deprecated
     public static void startActivityForResult(Activity activity, String imagePath, int requestCode) {
-        GraffitiParams params = new GraffitiParams();
+        DoodleParams params = new DoodleParams();
         params.mImagePath = imagePath;
         startActivityForResult(activity, params, requestCode);
     }
 
-    public static final String KEY_PARAMS = "key_graffiti_params";
+    public static final String KEY_PARAMS = "key_doodle_params";
     public static final String KEY_IMAGE_PATH = "key_image_path";
 
     private String mImagePath;
 
     private FrameLayout mFrameLayout;
-    private IGraffiti mGraffiti;
-    private GraffitiView mGraffitiView;
+    private IDoodle mDoodle;
+    private DoodleView mDoodleView;
 
     private View.OnClickListener mOnClickListener;
 
@@ -125,48 +125,48 @@ public static void startActivityForResult(Activity activity, String imagePath, i
 
     private AlphaAnimation mViewShowAnimation, mViewHideAnimation; // view隐藏和显示时用到的渐变动画
 
-    private GraffitiParams mGraffitiParams;
+    private DoodleParams mDoodleParams;
 
     // 触摸屏幕超过一定时间才判断为需要隐藏设置面板
     private Runnable mHideDelayRunnable;
     // 触摸屏幕超过一定时间才判断为需要显示设置面板
     private Runnable mShowDelayRunnable;
 
-    private GraffitiOnTouchGestureListener mTouchGestureListener;
+    private DoodleOnTouchGestureListener mTouchGestureListener;
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putParcelable(KEY_PARAMS, mGraffitiParams);
+        outState.putParcelable(KEY_PARAMS, mDoodleParams);
     }
 
     @Override
     public void onRestoreInstanceState(Bundle savedInstanceState, PersistableBundle persistentState) {
         super.onRestoreInstanceState(savedInstanceState, persistentState);
-        mGraffitiParams = savedInstanceState.getParcelable(KEY_PARAMS);
+        mDoodleParams = savedInstanceState.getParcelable(KEY_PARAMS);
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarTranslucent(this, true, false);
-        if (mGraffitiParams == null) {
-            mGraffitiParams = getIntent().getExtras().getParcelable(KEY_PARAMS);
+        if (mDoodleParams == null) {
+            mDoodleParams = getIntent().getExtras().getParcelable(KEY_PARAMS);
         }
-        if (mGraffitiParams == null) {
-            LogUtil.e("TAG", "mGraffitiParams is null!");
+        if (mDoodleParams == null) {
+            LogUtil.e("TAG", "mDoodleParams is null!");
             this.finish();
             return;
         }
 
-        mImagePath = mGraffitiParams.mImagePath;
+        mImagePath = mDoodleParams.mImagePath;
         if (mImagePath == null) {
             LogUtil.e("TAG", "mImagePath is null!");
             this.finish();
             return;
         }
         LogUtil.d("TAG", mImagePath);
-        if (mGraffitiParams.mIsFullScreen) {
+        if (mDoodleParams.mIsFullScreen) {
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
         Bitmap bitmap = ImageUtils.createBitmapFromPath(mImagePath, this);
@@ -177,32 +177,32 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.layout_graffiti);
-        mFrameLayout = (FrameLayout) findViewById(R.id.graffiti_container);
+        setContentView(R.layout.doodle_layout);
+        mFrameLayout = (FrameLayout) findViewById(R.id.doodle_container);
 
-        mGraffiti = mGraffitiView = new GraffitiView(this, bitmap, new IGraffitiListener() {
+        mDoodle = mDoodleView = new DoodleView(this, bitmap, new IDoodleListener() {
             @Override
             public void onSaved(Bitmap bitmap, Runnable callback) { // 保存图片为jpg格式
-                File graffitiFile = null;
+                File doodleFile = null;
                 File file = null;
-                String savePath = mGraffitiParams.mSavePath;
-                boolean isDir = mGraffitiParams.mSavePathIsDir;
+                String savePath = mDoodleParams.mSavePath;
+                boolean isDir = mDoodleParams.mSavePathIsDir;
                 if (TextUtils.isEmpty(savePath)) {
                     File dcimFile = new File(Environment.getExternalStorageDirectory(), "DCIM");
-                    graffitiFile = new File(dcimFile, "Graffiti");
+                    doodleFile = new File(dcimFile, "Doodle");
                     //　保存的路径
-                    file = new File(graffitiFile, System.currentTimeMillis() + ".jpg");
+                    file = new File(doodleFile, System.currentTimeMillis() + ".jpg");
                 } else {
                     if (isDir) {
-                        graffitiFile = new File(savePath);
+                        doodleFile = new File(savePath);
                         //　保存的路径
-                        file = new File(graffitiFile, System.currentTimeMillis() + ".jpg");
+                        file = new File(doodleFile, System.currentTimeMillis() + ".jpg");
                     } else {
                         file = new File(savePath);
-                        graffitiFile = file.getParentFile();
+                        doodleFile = file.getParentFile();
                     }
                 }
-                graffitiFile.mkdirs();
+                doodleFile.mkdirs();
 
                 FileOutputStream outputStream = null;
                 try {
@@ -215,7 +215,7 @@ public void onSaved(Bitmap bitmap, Runnable callback) { // 保存图片为jpg格
                     finish();
                 } catch (Exception e) {
                     e.printStackTrace();
-                    onError(GraffitiView.ERROR_SAVE, e.getMessage());
+                    onError(DoodleView.ERROR_SAVE, e.getMessage());
                 } finally {
                     Util.closeQuietly(outputStream);
                 }
@@ -229,33 +229,33 @@ public void onError(int i, String msg) {
 
             @Override
             public void onReady() {
-                float size = mGraffitiParams.mPaintUnitSize > 0 ? mGraffitiParams.mPaintUnitSize * mGraffiti.getSizeUnit() : 0;
+                float size = mDoodleParams.mPaintUnitSize > 0 ? mDoodleParams.mPaintUnitSize * mDoodle.getSizeUnit() : 0;
                 if (size <= 0) {
-                    size = mGraffitiParams.mPaintPixelSize > 0 ? mGraffitiParams.mPaintPixelSize : mGraffiti.getSize();
+                    size = mDoodleParams.mPaintPixelSize > 0 ? mDoodleParams.mPaintPixelSize : mDoodle.getSize();
                 }
                 // 设置初始值
-                mGraffiti.setSize(size);
-                mPaintSizeBar.setProgress((int) (mGraffiti.getSize() + 0.5f));
-                mPaintSizeBar.setMax(Math.min(mGraffitiView.getWidth(), mGraffitiView.getHeight()));
+                mDoodle.setSize(size);
+                mPaintSizeBar.setProgress((int) (mDoodle.getSize() + 0.5f));
+                mPaintSizeBar.setMax(Math.min(mDoodleView.getWidth(), mDoodleView.getHeight()));
                 mPaintSizeView.setText("" + mPaintSizeBar.getProgress());
                 // 当设置面板隐藏时才显示放大器
-                mGraffiti.setAmplifierScale(mGraffitiParams.mAmplifierScale);
+                mDoodle.setAmplifierScale(mDoodleParams.mAmplifierScale);
                 // 选择画笔
                 findViewById(R.id.btn_pen_hand).performClick();
                 findViewById(R.id.btn_hand_write).performClick();
             }
         }, null);
 
-        mTouchGestureListener = new GraffitiOnTouchGestureListener(mGraffitiView, new GraffitiOnTouchGestureListener.ISelectionListener() {
+        mTouchGestureListener = new DoodleOnTouchGestureListener(mDoodleView, new DoodleOnTouchGestureListener.ISelectionListener() {
             @Override
-            public void onSelectedItem(IGraffitiSelectableItem selectableItem, boolean selected) {
+            public void onSelectedItem(IDoodleSelectableItem selectableItem, boolean selected) {
                 if (selected) {
-                    GraffitiColor color = null;
-                    if (selectableItem.getColor() instanceof GraffitiColor) {
-                        color = (GraffitiColor) selectableItem.getColor();
+                    DoodleColor color = null;
+                    if (selectableItem.getColor() instanceof DoodleColor) {
+                        color = (DoodleColor) selectableItem.getColor();
                     }
                     if (color != null) {
-                        if (color.getType() == GraffitiColor.Type.BITMAP) {
+                        if (color.getType() == DoodleColor.Type.BITMAP) {
                             mBtnColor.setBackgroundDrawable(new BitmapDrawable(color.getBitmap()));
                         } else {
                             mBtnColor.setBackgroundColor(color.getColor());
@@ -264,47 +264,47 @@ public void onSelectedItem(IGraffitiSelectableItem selectableItem, boolean selec
                     mPaintSizeBar.setProgress((int) (selectableItem.getSize() + 0.5f));
                     mSelectedTextEditContainer.setVisibility(View.VISIBLE);
                 } else {
-                    GraffitiColor color = null;
-                    if (mGraffiti.getColor() instanceof GraffitiColor) {
-                        color = (GraffitiColor) mGraffiti.getColor();
+                    DoodleColor color = null;
+                    if (mDoodle.getColor() instanceof DoodleColor) {
+                        color = (DoodleColor) mDoodle.getColor();
                     }
                     if (color != null) {
-                        if (color.getType() == GraffitiColor.Type.BITMAP) {
+                        if (color.getType() == DoodleColor.Type.BITMAP) {
                             mBtnColor.setBackgroundDrawable(new BitmapDrawable(color.getBitmap()));
                         } else {
                             mBtnColor.setBackgroundColor(color.getColor());
                         }
                     }
 
-                    mPaintSizeBar.setProgress((int) (mGraffiti.getSize() + 0.5f));
+                    mPaintSizeBar.setProgress((int) (mDoodle.getSize() + 0.5f));
                     mSelectedTextEditContainer.setVisibility(View.GONE);
                 }
             }
 
             @Override
             public void onCreateSelectableItem(float x, float y) {
-                if (mGraffiti.getPen() == GraffitiPen.TEXT) {
-                    createGraffitiText(null, x, y);
-                } else if (mGraffiti.getPen() == GraffitiPen.BITMAP) {
-                    createGraffitiBitmap(null, x, y);
+                if (mDoodle.getPen() == DoodlePen.TEXT) {
+                    createDoodleText(null, x, y);
+                } else if (mDoodle.getPen() == DoodlePen.BITMAP) {
+                    createDoodleBitmap(null, x, y);
                 }
             }
         });
 
-        IGraffitiTouchDetector detector = new GraffitiTouchDetector(getApplicationContext(), mTouchGestureListener);
-        mGraffitiView.setDefaultTouchDetector(detector);
+        IDoodleTouchDetector detector = new DoodleTouchDetector(getApplicationContext(), mTouchGestureListener);
+        mDoodleView.setDefaultTouchDetector(detector);
 
-        mGraffiti.setIsDrawableOutside(mGraffitiParams.mIsDrawableOutside);
-        mFrameLayout.addView(mGraffitiView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-        mOnClickListener = new GraffitiOnClickListener();
-        mGraffiti.setGraffitiMinScale(mGraffitiParams.mMinScale);
-        mGraffiti.setGraffitiMaxScale(mGraffitiParams.mMaxScale);
+        mDoodle.setIsDrawableOutside(mDoodleParams.mIsDrawableOutside);
+        mFrameLayout.addView(mDoodleView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+        mOnClickListener = new DoodleOnClickListener();
+        mDoodle.setDoodleMinScale(mDoodleParams.mMinScale);
+        mDoodle.setDoodleMaxScale(mDoodleParams.mMaxScale);
 
         initView();
     }
 
     // 添加文字
-    private void createGraffitiText(final GraffitiText graffitiText, final float x, final float y) {
+    private void createDoodleText(final DoodleText doodleText, final float x, final float y) {
         Activity activity = this;
         if (isFinishing()) {
             return;
@@ -334,7 +334,7 @@ public void onViewDetachedFromWindow(View v) {
             }
         });
 
-        ViewGroup container = (ViewGroup) View.inflate(getApplicationContext(), R.layout.graffiti_create_text, null);
+        ViewGroup container = (ViewGroup) View.inflate(getApplicationContext(), R.layout.doodle_create_text, null);
         final Dialog finalDialog = dialog;
         container.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -348,9 +348,9 @@ public void onClick(View v) {
             DrawUtil.assistActivity(dialog.getWindow());
         }
 
-        final EditText textView = (EditText) container.findViewById(R.id.graffiti_selectable_edit);
-        final View cancelBtn = container.findViewById(R.id.graffiti_text_cancel_btn);
-        final TextView enterBtn = (TextView) container.findViewById(R.id.graffiti_text_enter_btn);
+        final EditText textView = (EditText) container.findViewById(R.id.doodle_selectable_edit);
+        final View cancelBtn = container.findViewById(R.id.doodle_text_cancel_btn);
+        final TextView enterBtn = (TextView) container.findViewById(R.id.doodle_text_enter_btn);
 
         textView.addTextChangedListener(new TextWatcher() {
             @Override
@@ -375,7 +375,7 @@ public void afterTextChanged(Editable s) {
 
             }
         });
-        textView.setText(graffitiText == null ? "" : graffitiText.getText());
+        textView.setText(doodleText == null ? "" : doodleText.getText());
 
         cancelBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -407,24 +407,24 @@ public void onDismiss(DialogInterface dialog) {
                 if (TextUtils.isEmpty(text)) {
                     return;
                 }
-                if (graffitiText == null) {
-                    IGraffitiSelectableItem item = new GraffitiText(mGraffiti, text, mGraffiti.getSize(), mGraffiti.getColor().copy(), x, y);
-                    mGraffiti.addItem(item);
+                if (doodleText == null) {
+                    IDoodleSelectableItem item = new DoodleText(mDoodle, text, mDoodle.getSize(), mDoodle.getColor().copy(), x, y);
+                    mDoodle.addItem(item);
                     mTouchGestureListener.setSelectedItem(item);
                 } else {
-                    graffitiText.setText(text);
+                    doodleText.setText(text);
                 }
-                mGraffiti.invalidate();
+                mDoodle.invalidate();
             }
         });
 
-        if (graffitiText == null) {
+        if (doodleText == null) {
             mSettingsPanel.removeCallbacks(mHideDelayRunnable);
         }
     }
 
     // 添加贴图
-    private void createGraffitiBitmap(final GraffitiBitmap graffitiBitmap, final float x, final float y) {
+    private void createDoodleBitmap(final DoodleBitmap doodleBitmap, final float x, final float y) {
         Activity activity = this;
 
         boolean fullScreen = (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0;
@@ -438,7 +438,7 @@ private void createGraffitiBitmap(final GraffitiBitmap graffitiBitmap, final flo
         }
         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
         dialog.show();
-        ViewGroup container = (ViewGroup) View.inflate(getApplicationContext(), R.layout.graffiti_create_bitmap, null);
+        ViewGroup container = (ViewGroup) View.inflate(getApplicationContext(), R.layout.doodle_create_bitmap, null);
         final Dialog finalDialog = dialog;
         container.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -448,7 +448,7 @@ public void onClick(View v) {
         });
         dialog.setContentView(container);
 
-        ViewGroup selectorContainer = (ViewGroup) finalDialog.findViewById(R.id.graffiti_image_selector_container);
+        ViewGroup selectorContainer = (ViewGroup) finalDialog.findViewById(R.id.doodle_image_selector_container);
         ImageSelectorView selectorView = new ImageSelectorView(this, false, 1, null, new ImageSelectorView.ImageSelectorListener() {
             @Override
             public void onCancel() {
@@ -458,16 +458,16 @@ public void onCancel() {
             @Override
             public void onEnter(List<String> pathList) {
                 finalDialog.dismiss();
-                Bitmap bitmap = ImageUtils.createBitmapFromPath(pathList.get(0), mGraffitiView.getWidth() / 4, mGraffitiView.getHeight() / 4);
+                Bitmap bitmap = ImageUtils.createBitmapFromPath(pathList.get(0), mDoodleView.getWidth() / 4, mDoodleView.getHeight() / 4);
 
-                if (graffitiBitmap == null) {
-                    IGraffitiSelectableItem item = new GraffitiBitmap(mGraffiti, bitmap, mGraffiti.getSize(), new GraffitiColor(Color.TRANSPARENT), x, y);
-                    mGraffiti.addItem(item);
+                if (doodleBitmap == null) {
+                    IDoodleSelectableItem item = new DoodleBitmap(mDoodle, bitmap, mDoodle.getSize(), new DoodleColor(Color.TRANSPARENT), x, y);
+                    mDoodle.addItem(item);
                     mTouchGestureListener.setSelectedItem(item);
                 } else {
-                    graffitiBitmap.setBitmap(bitmap);
+                    doodleBitmap.setBitmap(bitmap);
                 }
-                mGraffiti.invalidate();
+                mDoodle.invalidate();
             }
         });
         selectorView.setColumnCount(4);
@@ -493,31 +493,31 @@ private void initView() {
         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.graffiti_selectable_edit).setOnClickListener(mOnClickListener);
-        findViewById(R.id.graffiti_selectable_remove).setOnClickListener(mOnClickListener);
-        findViewById(R.id.graffiti_selectable_top).setOnClickListener(mOnClickListener);
-        findViewById(R.id.graffiti_selectable_bottom).setOnClickListener(mOnClickListener);
-        findViewById(R.id.graffiti_btn_rotate).setOnClickListener(mOnClickListener);
+        findViewById(R.id.doodle_selectable_edit).setOnClickListener(mOnClickListener);
+        findViewById(R.id.doodle_selectable_remove).setOnClickListener(mOnClickListener);
+        findViewById(R.id.doodle_selectable_top).setOnClickListener(mOnClickListener);
+        findViewById(R.id.doodle_selectable_bottom).setOnClickListener(mOnClickListener);
+        findViewById(R.id.doodle_btn_rotate).setOnClickListener(mOnClickListener);
         mShapeModeContainer = findViewById(R.id.bar_shape_mode);
-        mSelectedTextEditContainer = findViewById(R.id.graffiti_selectable_edit_container);
-        mBtnHidePanel = findViewById(R.id.graffiti_btn_hide_panel);
+        mSelectedTextEditContainer = findViewById(R.id.doodle_selectable_edit_container);
+        mBtnHidePanel = findViewById(R.id.doodle_btn_hide_panel);
         mBtnHidePanel.setOnClickListener(mOnClickListener);
-        findViewById(R.id.graffiti_btn_finish).setOnClickListener(mOnClickListener);
-        findViewById(R.id.graffiti_btn_back).setOnClickListener(mOnClickListener);
+        findViewById(R.id.doodle_btn_finish).setOnClickListener(mOnClickListener);
+        findViewById(R.id.doodle_btn_back).setOnClickListener(mOnClickListener);
         mBtnColor = findViewById(R.id.btn_set_color);
         mBtnColorContainer = findViewById(R.id.btn_set_color_container);
         mBtnColor.setOnClickListener(mOnClickListener);
-        mSettingsPanel = findViewById(R.id.graffiti_panel);
-        mColorContainer = findViewById(R.id.graffiti_color_container);
+        mSettingsPanel = findViewById(R.id.doodle_panel);
+        mColorContainer = findViewById(R.id.doodle_color_container);
 
-        GraffitiColor color = null;
-        if (mGraffiti.getColor() instanceof GraffitiColor) {
-            color = (GraffitiColor) mGraffiti.getColor();
+        DoodleColor color = null;
+        if (mDoodle.getColor() instanceof DoodleColor) {
+            color = (DoodleColor) mDoodle.getColor();
         }
         if (color != null) {
-            if (color.getType() == GraffitiColor.Type.COLOR) {
+            if (color.getType() == DoodleColor.Type.COLOR) {
                 mBtnColor.setBackgroundColor(color.getColor());
-            } else if (color.getType() == GraffitiColor.Type.BITMAP) {
+            } else if (color.getType() == DoodleColor.Type.BITMAP) {
                 mBtnColor.setBackgroundDrawable(new BitmapDrawable(color.getBitmap()));
             }
         }
@@ -532,7 +532,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                     return;
                 }
                 mPaintSizeView.setText("" + progress);
-                mGraffiti.setSize(progress);
+                mDoodle.setSize(progress);
                 if (mTouchGestureListener.getSelectedItem() != null) {
                     mTouchGestureListener.getSelectedItem().setSize(progress);
                 }
@@ -545,26 +545,26 @@ public void onStopTrackingTouch(SeekBar seekBar) {
             }
         });
 
-        mGraffitiView.setOnTouchListener(new View.OnTouchListener() {
+        mDoodleView.setOnTouchListener(new View.OnTouchListener() {
 
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 // 隐藏设置面板
                 if (!mBtnHidePanel.isSelected()  // 设置面板没有被隐藏
-                        && mGraffitiParams.mChangePanelVisibilityDelay > 0) {
+                        && mDoodleParams.mChangePanelVisibilityDelay > 0) {
                     switch (event.getAction() & MotionEvent.ACTION_MASK) {
                         case MotionEvent.ACTION_DOWN:
                             mSettingsPanel.removeCallbacks(mHideDelayRunnable);
                             mSettingsPanel.removeCallbacks(mShowDelayRunnable);
                             //触摸屏幕超过一定时间才判断为需要隐藏设置面板
-                            mSettingsPanel.postDelayed(mHideDelayRunnable, mGraffitiParams.mChangePanelVisibilityDelay);
+                            mSettingsPanel.postDelayed(mHideDelayRunnable, mDoodleParams.mChangePanelVisibilityDelay);
                             break;
                         case MotionEvent.ACTION_CANCEL:
                         case MotionEvent.ACTION_UP:
                             mSettingsPanel.removeCallbacks(mHideDelayRunnable);
                             mSettingsPanel.removeCallbacks(mShowDelayRunnable);
                             //离开屏幕超过一定时间才判断为需要显示设置面板
-                            mSettingsPanel.postDelayed(mShowDelayRunnable, mGraffitiParams.mChangePanelVisibilityDelay);
+                            mSettingsPanel.postDelayed(mShowDelayRunnable, mDoodleParams.mChangePanelVisibilityDelay);
                             break;
                     }
                 }
@@ -574,18 +574,18 @@ public boolean onTouch(View v, MotionEvent event) {
         });
 
         // 长按标题栏显示原图
-        findViewById(R.id.graffiti_txt_title).setOnTouchListener(new View.OnTouchListener() {
+        findViewById(R.id.doodle_txt_title).setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 switch (event.getAction() & MotionEvent.ACTION_MASK) {
                     case MotionEvent.ACTION_DOWN:
                         v.setPressed(true);
-                        mGraffiti.setShowOriginal(true);
+                        mDoodle.setShowOriginal(true);
                         break;
                     case MotionEvent.ACTION_UP:
                     case MotionEvent.ACTION_CANCEL:
                         v.setPressed(false);
-                        mGraffiti.setShowOriginal(false);
+                        mDoodle.setShowOriginal(false);
                         break;
                 }
                 return true;
@@ -609,7 +609,7 @@ public void run() {
         };
     }
 
-    private class GraffitiOnClickListener implements View.OnClickListener {
+    private class DoodleOnClickListener implements View.OnClickListener {
 
         private View mLastPenView, mLastShapeView;
         private boolean mDone = false;
@@ -619,67 +619,67 @@ private class GraffitiOnClickListener implements View.OnClickListener {
         public void onClick(final View v) {
             mDone = false;
             if (v.getId() == R.id.btn_pen_hand) {
-                if (mGraffiti.getPen() != GraffitiPen.HAND) {
+                if (mDoodle.getPen() != DoodlePen.HAND) {
                     mBtnColorContainer.setVisibility(View.VISIBLE);
                     mShapeModeContainer.setVisibility(View.VISIBLE);
                     mColorContainer.setVisibility(View.VISIBLE);
                     mTouchGestureListener.setSelectedItem(null);
-                    mGraffiti.setPen(GraffitiPen.HAND);
+                    mDoodle.setPen(DoodlePen.HAND);
                     Drawable colorBg = mBtnColor.getBackground();
                     if (colorBg instanceof ColorDrawable) {
-                        mGraffiti.setColor(new GraffitiColor(((ColorDrawable) colorBg).getColor()));
+                        mDoodle.setColor(new DoodleColor(((ColorDrawable) colorBg).getColor()));
                     } else {
-                        mGraffiti.setColor(new GraffitiColor(((BitmapDrawable) colorBg).getBitmap()));
+                        mDoodle.setColor(new DoodleColor(((BitmapDrawable) colorBg).getBitmap()));
                     }
-                    mPaintSizeBar.setProgress((int) (GraffitiView.DEFAULT_SIZE * mGraffiti.getSizeUnit()));
+                    mPaintSizeBar.setProgress((int) (DoodleView.DEFAULT_SIZE * mDoodle.getSizeUnit()));
                 }
                 mDone = true;
             } else if (v.getId() == R.id.btn_pen_copy) {
-                if (mGraffiti.getPen() != GraffitiPen.COPY) {
+                if (mDoodle.getPen() != DoodlePen.COPY) {
                     mBtnColorContainer.setVisibility(View.GONE);
                     mShapeModeContainer.setVisibility(View.VISIBLE);
                     mColorContainer.setVisibility(View.VISIBLE);
                     mTouchGestureListener.setSelectedItem(null);
-                    mGraffiti.setPen(GraffitiPen.COPY);
-                    mGraffiti.setColor(new GraffitiColor(mGraffiti.getBitmap()));
-                    mPaintSizeBar.setProgress((int) (DEFAULT_COPY_SIZE * mGraffiti.getSizeUnit()));
+                    mDoodle.setPen(DoodlePen.COPY);
+                    mDoodle.setColor(new DoodleColor(mDoodle.getBitmap()));
+                    mPaintSizeBar.setProgress((int) (DEFAULT_COPY_SIZE * mDoodle.getSizeUnit()));
                 }
                 mDone = true;
             } else if (v.getId() == R.id.btn_pen_eraser) {
-                if (mGraffiti.getPen() != GraffitiPen.ERASER) {
+                if (mDoodle.getPen() != DoodlePen.ERASER) {
                     mBtnColorContainer.setVisibility(View.GONE);
                     mShapeModeContainer.setVisibility(View.VISIBLE);
                     mColorContainer.setVisibility(View.VISIBLE);
                     mTouchGestureListener.setSelectedItem(null);
-                    mGraffiti.setPen(GraffitiPen.ERASER);
-                    mGraffiti.setColor(new GraffitiColor(mGraffiti.getBitmap()));
-                    mPaintSizeBar.setProgress((int) (GraffitiView.DEFAULT_SIZE * mGraffiti.getSizeUnit()));
+                    mDoodle.setPen(DoodlePen.ERASER);
+                    mDoodle.setColor(new DoodleColor(mDoodle.getBitmap()));
+                    mPaintSizeBar.setProgress((int) (DoodleView.DEFAULT_SIZE * mDoodle.getSizeUnit()));
                 }
                 mDone = true;
             } else if (v.getId() == R.id.btn_pen_text) {
-                if (mGraffiti.getPen() != GraffitiPen.TEXT) {
+                if (mDoodle.getPen() != DoodlePen.TEXT) {
                     mBtnColorContainer.setVisibility(View.VISIBLE);
                     mShapeModeContainer.setVisibility(View.GONE);
                     mColorContainer.setVisibility(View.VISIBLE);
                     mTouchGestureListener.setSelectedItem(null);
-                    mGraffiti.setPen(GraffitiPen.TEXT);
+                    mDoodle.setPen(DoodlePen.TEXT);
                     Drawable colorBg = mBtnColor.getBackground();
                     if (colorBg instanceof ColorDrawable) {
-                        mGraffiti.setColor(new GraffitiColor(((ColorDrawable) colorBg).getColor()));
+                        mDoodle.setColor(new DoodleColor(((ColorDrawable) colorBg).getColor()));
                     } else {
-                        mGraffiti.setColor(new GraffitiColor(((BitmapDrawable) colorBg).getBitmap()));
+                        mDoodle.setColor(new DoodleColor(((BitmapDrawable) colorBg).getBitmap()));
                     }
-                    mPaintSizeBar.setProgress((int) (DEFAULT_TEXT_SIZE * mGraffiti.getSizeUnit() + 0.5f));
+                    mPaintSizeBar.setProgress((int) (DEFAULT_TEXT_SIZE * mDoodle.getSizeUnit() + 0.5f));
                 }
                 mDone = true;
             } else if (v.getId() == R.id.btn_pen_bitmap) {
-                if (mGraffiti.getPen() != GraffitiPen.BITMAP) {
+                if (mDoodle.getPen() != DoodlePen.BITMAP) {
                     mBtnColorContainer.setVisibility(View.GONE);
                     mShapeModeContainer.setVisibility(View.GONE);
                     mColorContainer.setVisibility(View.VISIBLE);
                     mTouchGestureListener.setSelectedItem(null);
-                    mGraffiti.setPen(GraffitiPen.BITMAP);
-                    mPaintSizeBar.setProgress((int) (DEFAULT_BITMAP_SIZE * mGraffiti.getSizeUnit() + 0.5f));
+                    mDoodle.setPen(DoodlePen.BITMAP);
+                    mPaintSizeBar.setProgress((int) (DEFAULT_BITMAP_SIZE * mDoodle.getSizeUnit() + 0.5f));
                 }
                 mDone = true;
             }
@@ -693,14 +693,14 @@ public void onClick(final View v) {
             }
 
             if (v.getId() == R.id.btn_clear) {
-                if (!(GraffitiParams.getDialogInterceptor() != null
-                        && GraffitiParams.getDialogInterceptor().onShow(GraffitiActivity.this, mGraffiti, GraffitiParams.DialogType.CLEAR_ALL))) {
-                    DialogController.showEnterCancelDialog(GraffitiActivity.this,
-                            getString(R.string.graffiti_clear_screen), getString(R.string.graffiti_cant_undo_after_clearing),
+                if (!(DoodleParams.getDialogInterceptor() != null
+                        && DoodleParams.getDialogInterceptor().onShow(DoodleActivity.this, mDoodle, DoodleParams.DialogType.CLEAR_ALL))) {
+                    DialogController.showEnterCancelDialog(DoodleActivity.this,
+                            getString(R.string.doodle_clear_screen), getString(R.string.doodle_cant_undo_after_clearing),
                             new View.OnClickListener() {
                                 @Override
                                 public void onClick(View v) {
-                                    mGraffiti.clear();
+                                    mDoodle.clear();
                                     mTouchGestureListener.setSelectedItem(null);
                                 }
                             }, null
@@ -708,28 +708,28 @@ public void onClick(View v) {
                 }
                 mDone = true;
             } else if (v.getId() == R.id.btn_undo) {
-                if (!mGraffiti.undo()) {
-                    Toast.makeText(GraffitiActivity.this, "", Toast.LENGTH_SHORT).show();
+                if (!mDoodle.undo()) {
+                    Toast.makeText(DoodleActivity.this, "", Toast.LENGTH_SHORT).show();
                 }
                 mTouchGestureListener.setSelectedItem(null);
                 mDone = true;
             } else if (v.getId() == R.id.btn_set_color) {
-                GraffitiColor color = null;
-                if (mGraffiti.getColor() instanceof GraffitiColor) {
-                    color = (GraffitiColor) mGraffiti.getColor();
+                DoodleColor color = null;
+                if (mDoodle.getColor() instanceof DoodleColor) {
+                    color = (DoodleColor) mDoodle.getColor();
                 }
                 if (color != null) {
-                    if (!(GraffitiParams.getDialogInterceptor() != null
-                            && GraffitiParams.getDialogInterceptor().onShow(GraffitiActivity.this, mGraffiti, GraffitiParams.DialogType.COLOR_PICKER))) {
-                        new ColorPickerDialog(GraffitiActivity.this, color.getColor(), "画笔颜色",
+                    if (!(DoodleParams.getDialogInterceptor() != null
+                            && DoodleParams.getDialogInterceptor().onShow(DoodleActivity.this, mDoodle, DoodleParams.DialogType.COLOR_PICKER))) {
+                        new ColorPickerDialog(DoodleActivity.this, color.getColor(), "画笔颜色",
                                 new ColorPickerDialog.OnColorChangedListener() {
                                     public void colorChanged(int color) {
                                         mBtnColor.setBackgroundColor(color);
-                                        mGraffiti.setColor(new GraffitiColor(color));
+                                        mDoodle.setColor(new DoodleColor(color));
                                         if (mTouchGestureListener.getSelectedItem() != null) {
-                                            IGraffitiColor c = mTouchGestureListener.getSelectedItem().getColor();
-                                            if (c instanceof GraffitiColor) {
-                                                ((GraffitiColor) c).setColor(color);
+                                            IDoodleColor c = mTouchGestureListener.getSelectedItem().getColor();
+                                            if (c instanceof DoodleColor) {
+                                                ((DoodleColor) c).setColor(color);
                                             }
                                         }
                                     }
@@ -738,11 +738,11 @@ public void colorChanged(int color) {
                                     public void colorChanged(Drawable color) {
                                         mBtnColor.setBackgroundDrawable(color);
                                         Bitmap bitmap = ImageUtils.getBitmapFromDrawable(color);
-                                        mGraffiti.setColor(new GraffitiColor(bitmap));
+                                        mDoodle.setColor(new DoodleColor(bitmap));
                                         if (mTouchGestureListener.getSelectedItem() != null) {
-                                            IGraffitiColor c = mTouchGestureListener.getSelectedItem().getColor();
-                                            if (c instanceof GraffitiColor) {
-                                                ((GraffitiColor) c).setColor(bitmap);
+                                            IDoodleColor c = mTouchGestureListener.getSelectedItem().getColor();
+                                            if (c instanceof DoodleColor) {
+                                                ((DoodleColor) c).setColor(bitmap);
                                             }
                                         }
                                     }
@@ -755,7 +755,7 @@ public void colorChanged(Drawable color) {
                 return;
             }
 
-            if (v.getId() == R.id.graffiti_btn_hide_panel) {
+            if (v.getId() == R.id.doodle_btn_hide_panel) {
                 mSettingsPanel.removeCallbacks(mHideDelayRunnable);
                 mSettingsPanel.removeCallbacks(mShowDelayRunnable);
                 v.setSelected(!v.isSelected());
@@ -765,20 +765,20 @@ public void colorChanged(Drawable color) {
                     hideView(mSettingsPanel);
                 }
                 mDone = true;
-            } else if (v.getId() == R.id.graffiti_btn_finish) {
-                mGraffiti.save();
+            } else if (v.getId() == R.id.doodle_btn_finish) {
+                mDoodle.save();
                 mDone = true;
-            } else if (v.getId() == R.id.graffiti_btn_back) {
-                if (mGraffiti.getAllItem() == null || mGraffiti.getAllItem().size() == 0) {
+            } else if (v.getId() == R.id.doodle_btn_back) {
+                if (mDoodle.getAllItem() == null || mDoodle.getAllItem().size() == 0) {
                     finish();
                     return;
                 }
-                if (!(GraffitiParams.getDialogInterceptor() != null
-                        && GraffitiParams.getDialogInterceptor().onShow(GraffitiActivity.this, mGraffiti, GraffitiParams.DialogType.SAVE))) {
-                    DialogController.showEnterCancelDialog(GraffitiActivity.this, getString(R.string.graffiti_saving_picture), null, new View.OnClickListener() {
+                if (!(DoodleParams.getDialogInterceptor() != null
+                        && DoodleParams.getDialogInterceptor().onShow(DoodleActivity.this, mDoodle, DoodleParams.DialogType.SAVE))) {
+                    DialogController.showEnterCancelDialog(DoodleActivity.this, getString(R.string.doodle_saving_picture), null, new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            mGraffiti.save();
+                            mDoodle.save();
                         }
                     }, new View.OnClickListener() {
                         @Override
@@ -788,7 +788,7 @@ public void onClick(View v) {
                     });
                 }
                 mDone = true;
-            } else if (v.getId() == R.id.graffiti_btn_rotate) {
+            } else if (v.getId() == R.id.doodle_btn_rotate) {
                 // 旋转图片
                 if (mRotateAnimator == null) {
                     mRotateAnimator = new ValueAnimator();
@@ -796,7 +796,7 @@ public void onClick(View v) {
                         @Override
                         public void onAnimationUpdate(ValueAnimator animation) {
                             int value = (int) animation.getAnimatedValue();
-                            mGraffiti.setGraffitiRotation(value);
+                            mDoodle.setDoodleRotation(value);
                         }
                     });
                     mRotateAnimator.setDuration(250);
@@ -804,7 +804,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 if (mRotateAnimator.isRunning()) {
                     return;
                 }
-                mRotateAnimator.setIntValues(mGraffiti.getGraffitiRotation(), mGraffiti.getGraffitiRotation() + 90);
+                mRotateAnimator.setIntValues(mDoodle.getDoodleRotation(), mDoodle.getDoodleRotation() + 90);
                 mRotateAnimator.start();
 
                 mDone = true;
@@ -813,22 +813,22 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 return;
             }
 
-            if (v.getId() == R.id.graffiti_selectable_edit) {
-                if (mTouchGestureListener.getSelectedItem() instanceof GraffitiText) {
-                    createGraffitiText((GraffitiText) mTouchGestureListener.getSelectedItem(), -1, -1);
-                } else if (mTouchGestureListener.getSelectedItem() instanceof GraffitiBitmap) {
-                    createGraffitiBitmap((GraffitiBitmap) mTouchGestureListener.getSelectedItem(), -1, -1);
+            if (v.getId() == R.id.doodle_selectable_edit) {
+                if (mTouchGestureListener.getSelectedItem() instanceof DoodleText) {
+                    createDoodleText((DoodleText) mTouchGestureListener.getSelectedItem(), -1, -1);
+                } else if (mTouchGestureListener.getSelectedItem() instanceof DoodleBitmap) {
+                    createDoodleBitmap((DoodleBitmap) mTouchGestureListener.getSelectedItem(), -1, -1);
                 }
                 mDone = true;
-            } else if (v.getId() == R.id.graffiti_selectable_remove) {
-                mGraffiti.removeItem(mTouchGestureListener.getSelectedItem());
+            } else if (v.getId() == R.id.doodle_selectable_remove) {
+                mDoodle.removeItem(mTouchGestureListener.getSelectedItem());
                 mTouchGestureListener.setSelectedItem(null);
                 mDone = true;
-            } else if (v.getId() == R.id.graffiti_selectable_top) {
-                mGraffiti.topItem(mTouchGestureListener.getSelectedItem());
+            } else if (v.getId() == R.id.doodle_selectable_top) {
+                mDoodle.topItem(mTouchGestureListener.getSelectedItem());
                 mDone = true;
-            } else if (v.getId() == R.id.graffiti_selectable_bottom) {
-                mGraffiti.bottomItem(mTouchGestureListener.getSelectedItem());
+            } else if (v.getId() == R.id.doodle_selectable_bottom) {
+                mDoodle.bottomItem(mTouchGestureListener.getSelectedItem());
                 mDone = true;
             }
             if (mDone) {
@@ -836,19 +836,19 @@ public void onAnimationUpdate(ValueAnimator animation) {
             }
 
             if (v.getId() == R.id.btn_hand_write) {
-                mGraffiti.setShape(GraffitiShape.HAND_WRITE);
+                mDoodle.setShape(DoodleShape.HAND_WRITE);
             } else if (v.getId() == R.id.btn_arrow) {
-                mGraffiti.setShape(GraffitiShape.ARROW);
+                mDoodle.setShape(DoodleShape.ARROW);
             } else if (v.getId() == R.id.btn_line) {
-                mGraffiti.setShape(GraffitiShape.LINE);
+                mDoodle.setShape(DoodleShape.LINE);
             } else if (v.getId() == R.id.btn_holl_circle) {
-                mGraffiti.setShape(GraffitiShape.HOLLOW_CIRCLE);
+                mDoodle.setShape(DoodleShape.HOLLOW_CIRCLE);
             } else if (v.getId() == R.id.btn_fill_circle) {
-                mGraffiti.setShape(GraffitiShape.FILL_CIRCLE);
+                mDoodle.setShape(DoodleShape.FILL_CIRCLE);
             } else if (v.getId() == R.id.btn_holl_rect) {
-                mGraffiti.setShape(GraffitiShape.HOLLOW_RECT);
+                mDoodle.setShape(DoodleShape.HOLLOW_RECT);
             } else if (v.getId() == R.id.btn_fill_rect) {
-                mGraffiti.setShape(GraffitiShape.FILL_RECT);
+                mDoodle.setShape(DoodleShape.FILL_RECT);
             }
 
             if (mLastShapeView != null) {
@@ -861,7 +861,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
 
     @Override
     public void onBackPressed() { // 返回键监听
-        findViewById(R.id.graffiti_btn_back).performClick();
+        findViewById(R.id.doodle_btn_back).performClick();
     }
 
     private void showView(View view) {
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiBitmap.java b/doodle/src/main/java/cn/hzw/doodle/DoodleBitmap.java
similarity index 75%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiBitmap.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleBitmap.java
index 887c81d..1e78bf4 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiBitmap.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleBitmap.java
@@ -1,25 +1,25 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 
-import cn.hzw.graffiti.core.IGraffiti;
-import cn.hzw.graffiti.core.IGraffitiColor;
+import cn.hzw.doodle.core.IDoodle;
+import cn.hzw.doodle.core.IDoodleColor;
 
 /**
  * 图片item
  * Created by huangziwei on 2017/3/16.
  */
 
-public class GraffitiBitmap extends GraffitiRotatableItemBase {
+public class DoodleBitmap extends DoodleRotatableItemBase {
 
     private Bitmap mBitmap;
     private Rect mSrcRect = new Rect();
     private Rect mDstRect = new Rect();
 
-    public GraffitiBitmap(IGraffiti graffiti, Bitmap bitmap, float size, IGraffitiColor color, float x, float y) {
-        super(graffiti, -graffiti.getGraffitiRotation(), x, y);
+    public DoodleBitmap(IDoodle doodle, Bitmap bitmap, float size, IDoodleColor color, float x, float y) {
+        super(doodle, -doodle.getDoodleRotation(), x, y);
         this.mBitmap = bitmap;
         setSize(size);
         setColor(color);
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiColor.java b/doodle/src/main/java/cn/hzw/doodle/DoodleColor.java
similarity index 76%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiColor.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleColor.java
index af75592..9e510d0 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiColor.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleColor.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
@@ -6,13 +6,13 @@
 import android.graphics.Paint;
 import android.graphics.Shader;
 
-import cn.hzw.graffiti.core.IGraffitiColor;
-import cn.hzw.graffiti.core.IGraffitiItem;
+import cn.hzw.doodle.core.IDoodleColor;
+import cn.hzw.doodle.core.IDoodleItem;
 
 /**
  * 涂鸦画笔颜色，用于手绘
  */
-public class GraffitiColor implements IGraffitiColor {
+public class DoodleColor implements IDoodleColor {
 
     public enum Type {
         COLOR, // 颜色值
@@ -28,19 +28,19 @@ public enum Type {
     private Shader.TileMode mTileX = Shader.TileMode.MIRROR;
     private Shader.TileMode mTileY = Shader.TileMode.MIRROR;  // 镜像
 
-    public GraffitiColor(int color) {
+    public DoodleColor(int color) {
         mType = Type.COLOR;
         mColor = color;
     }
 
-    public GraffitiColor(Bitmap bitmap) {
+    public DoodleColor(Bitmap bitmap) {
         this(bitmap, null);
     }
-    public GraffitiColor(Bitmap bitmap, Matrix matrix) {
+    public DoodleColor(Bitmap bitmap, Matrix matrix) {
         this(bitmap, matrix, Shader.TileMode.MIRROR, Shader.TileMode.MIRROR);
     }
 
-    public GraffitiColor(Bitmap bitmap, Matrix matrix, Shader.TileMode tileX, Shader.TileMode tileY) {
+    public DoodleColor(Bitmap bitmap, Matrix matrix, Shader.TileMode tileX, Shader.TileMode tileY) {
         mType = Type.BITMAP;
         mMatrix = matrix;
         mBitmap = bitmap;
@@ -49,8 +49,8 @@ public GraffitiColor(Bitmap bitmap, Matrix matrix, Shader.TileMode tileX, Shader
     }
 
     @Override
-    public void config(IGraffitiItem item, Paint paint) {
-        GraffitiItemBase graffitiItem = (GraffitiItemBase) item;
+    public void config(IDoodleItem item, Paint paint) {
+        DoodleItemBase doodleItem = (DoodleItemBase) item;
         if (mType == Type.COLOR) {
             paint.setColor(mColor);
         } else if (mType == Type.BITMAP) {
@@ -105,12 +105,12 @@ public Type getType() {
     }
 
     @Override
-    public IGraffitiColor copy() {
-        GraffitiColor color = null;
+    public IDoodleColor copy() {
+        DoodleColor color = null;
         if (mType == Type.COLOR) {
-            color = new GraffitiColor(mColor);
+            color = new DoodleColor(mColor);
         } else {
-            color = new GraffitiColor(mBitmap);
+            color = new DoodleColor(mBitmap);
         }
         color.mTileX = mTileX;
         color.mTileY = mTileY;
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiItemBase.java b/doodle/src/main/java/cn/hzw/doodle/DoodleItemBase.java
similarity index 73%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiItemBase.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleItemBase.java
index 7b871c2..1c0fe7c 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiItemBase.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleItemBase.java
@@ -1,39 +1,39 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Canvas;
 import android.graphics.PointF;
 
-import cn.hzw.graffiti.core.IGraffiti;
-import cn.hzw.graffiti.core.IGraffitiColor;
-import cn.hzw.graffiti.core.IGraffitiItem;
-import cn.hzw.graffiti.core.IGraffitiPen;
-import cn.hzw.graffiti.core.IGraffitiShape;
+import cn.hzw.doodle.core.IDoodle;
+import cn.hzw.doodle.core.IDoodleColor;
+import cn.hzw.doodle.core.IDoodleItem;
+import cn.hzw.doodle.core.IDoodlePen;
+import cn.hzw.doodle.core.IDoodleShape;
 
 /**
  * Created on 29/06/2018.
  */
 
-public abstract class GraffitiItemBase implements IGraffitiItem {
+public abstract class DoodleItemBase implements IDoodleItem {
 
     private float mItemRotate; // item的旋转角度
 
-    private IGraffiti mGraffiti;
+    private IDoodle mDoodle;
 
     private PointF mLocation = new PointF();
 
-    private IGraffitiPen mPen; // 画笔类型
-    private IGraffitiShape mShape; // 画笔形状
+    private IDoodlePen mPen; // 画笔类型
+    private IDoodleShape mShape; // 画笔形状
     private float mSize; // 大小
-    private IGraffitiColor mColor; // 颜色
+    private IDoodleColor mColor; // 颜色
     private boolean mIsDrawOptimize = false; //优化绘制
     private boolean mIsNeedClipOutside = true; // 是否需要裁剪图片区域外的部分
 
-    public GraffitiItemBase(IGraffiti graffiti) {
-        this(graffiti, null);
+    public DoodleItemBase(IDoodle doodle) {
+        this(doodle, null);
     }
 
-    public GraffitiItemBase(IGraffiti graffiti, GraffitiPaintAttrs attrs) {
-        setGraffiti(graffiti);
+    public DoodleItemBase(IDoodle doodle, DoodlePaintAttrs attrs) {
+        setDoodle(doodle);
         if (attrs != null) {
             mPen = attrs.pen();
             mShape = attrs.shape();
@@ -43,19 +43,19 @@ public GraffitiItemBase(IGraffiti graffiti, GraffitiPaintAttrs attrs) {
     }
 
     @Override
-    public void setGraffiti(IGraffiti graffiti) {
-        if (graffiti != null && mGraffiti != null) { // 不能重复赋予非空值
-            throw new RuntimeException("item's graffiti object is not null");
+    public void setDoodle(IDoodle doodle) {
+        if (doodle != null && mDoodle != null) { // 不能重复赋予非空值
+            throw new RuntimeException("item's doodle object is not null");
         }
-        mGraffiti = graffiti;
-        if (graffiti == null) {
+        mDoodle = doodle;
+        if (doodle == null) {
             return;
         }
     }
 
     @Override
-    public IGraffiti getGraffiti() {
-        return mGraffiti;
+    public IDoodle getDoodle() {
+        return mDoodle;
     }
 
     @Override
@@ -80,22 +80,22 @@ public PointF getLocation() {
     }
 
     @Override
-    public IGraffitiPen getPen() {
+    public IDoodlePen getPen() {
         return mPen;
     }
 
     @Override
-    public void setPen(IGraffitiPen pen) {
+    public void setPen(IDoodlePen pen) {
         mPen = pen;
     }
 
     @Override
-    public IGraffitiShape getShape() {
+    public IDoodleShape getShape() {
         return mShape;
     }
 
     @Override
-    public void setShape(IGraffitiShape shape) {
+    public void setShape(IDoodleShape shape) {
         mShape = shape;
     }
 
@@ -110,12 +110,12 @@ public void setSize(float size) {
     }
 
     @Override
-    public IGraffitiColor getColor() {
+    public IDoodleColor getColor() {
         return mColor;
     }
 
     @Override
-    public void setColor(IGraffitiColor color) {
+    public void setColor(IDoodleColor color) {
         mColor = color;
     }
 
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiOnTouchGestureListener.java b/doodle/src/main/java/cn/hzw/doodle/DoodleOnTouchGestureListener.java
similarity index 52%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiOnTouchGestureListener.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleOnTouchGestureListener.java
index 37f0d67..ca6378d 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiOnTouchGestureListener.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleOnTouchGestureListener.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.animation.ValueAnimator;
 import android.graphics.Path;
@@ -10,17 +10,17 @@
 import java.util.List;
 
 import cn.forward.androids.TouchGestureDetector;
-import cn.hzw.graffiti.core.IGraffitiItem;
-import cn.hzw.graffiti.core.IGraffitiSelectableItem;
+import cn.hzw.doodle.core.IDoodleItem;
+import cn.hzw.doodle.core.IDoodleSelectableItem;
 
-import static cn.hzw.graffiti.util.DrawUtil.computeAngle;
+import static cn.hzw.doodle.util.DrawUtil.computeAngle;
 
 /**
- * GraffitiView的涂鸦手势监听
+ * DoodleView的涂鸦手势监听
  * Created on 30/06/2018.
  */
 
-public class GraffitiOnTouchGestureListener extends TouchGestureDetector.OnTouchGestureListener {
+public class DoodleOnTouchGestureListener extends TouchGestureDetector.OnTouchGestureListener {
     private static final float VALUE = 1f;
 
     // 触摸的相关信息
@@ -38,10 +38,10 @@ public class GraffitiOnTouchGestureListener extends TouchGestureDetector.OnTouch
     private float mRotateTextDiff; // 开始旋转图片时的差值（当前图片与触摸点的角度）
 
     private Path mCurrPath; // 当前手写的路径
-    private GraffitiPath mCurrGraffitiPath;
+    private DoodlePath mCurrDoodlePath;
     private CopyLocation mCopyLocation;
 
-    private GraffitiView mGraffiti;
+    private DoodleView mDoodle;
 
     // 动画相关
     private ValueAnimator mScaleAnimator;
@@ -49,19 +49,19 @@ public class GraffitiOnTouchGestureListener extends TouchGestureDetector.OnTouch
     private ValueAnimator mTranslateAnimator;
     private float mTransAnimOldY, mTransAnimY;
 
-    private IGraffitiSelectableItem mSelectedItem; // 当前选中的item
+    private IDoodleSelectableItem mSelectedItem; // 当前选中的item
     private ISelectionListener mSelectionListener;
 
-    public GraffitiOnTouchGestureListener(GraffitiView graffiti, ISelectionListener listener) {
-        mGraffiti = graffiti;
-        mCopyLocation = GraffitiPen.COPY.getCopyLocation();
+    public DoodleOnTouchGestureListener(DoodleView doodle, ISelectionListener listener) {
+        mDoodle = doodle;
+        mCopyLocation = DoodlePen.COPY.getCopyLocation();
         mCopyLocation.reset();
-        mCopyLocation.updateLocation(graffiti.getBitmap().getWidth() / 2, graffiti.getBitmap().getHeight() / 2);
+        mCopyLocation.updateLocation(doodle.getBitmap().getWidth() / 2, doodle.getBitmap().getHeight() / 2);
         mSelectionListener = listener;
     }
 
-    public void setSelectedItem(IGraffitiSelectableItem selectedItem) {
-        IGraffitiSelectableItem old = mSelectedItem;
+    public void setSelectedItem(IDoodleSelectableItem selectedItem) {
+        IDoodleSelectableItem old = mSelectedItem;
         mSelectedItem = selectedItem;
 
         if (old != null) { // 取消选定
@@ -75,7 +75,7 @@ public void setSelectedItem(IGraffitiSelectableItem selectedItem) {
 
     }
 
-    public IGraffitiSelectableItem getSelectedItem() {
+    public IDoodleSelectableItem getSelectedItem() {
         return mSelectedItem;
     }
 
@@ -83,7 +83,7 @@ public IGraffitiSelectableItem getSelectedItem() {
     public boolean onDown(MotionEvent e) {
         mTouchX = mTouchDownX = e.getX();
         mTouchY = mTouchDownY = e.getY();
-        mGraffiti.enableAmplifier(false); // 关闭放大镜
+        mDoodle.enableAmplifier(false); // 关闭放大镜
         return true;
     }
 
@@ -97,48 +97,48 @@ public void onScrollBegin(MotionEvent event) {
         mLastTouchX = mTouchX = event.getX();
         mLastTouchY = mTouchY = event.getY();
 
-        if (mGraffiti.getPen().isSelectable()) {
+        if (mDoodle.getPen().isSelectable()) {
             // 判断是否点中选择区域
             if (mSelectedItem != null) {
                 PointF xy = mSelectedItem.getLocation();
                 mSelectedItemX = xy.x;
                 mSelectedItemY = xy.y;
-                if (mSelectedItem instanceof GraffitiRotatableItemBase
-                        && (((GraffitiRotatableItemBase)mSelectedItem).canRotate(mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY)))) {
-                        ((GraffitiRotatableItemBase) mSelectedItem).setIsRotating(true);
+                if (mSelectedItem instanceof DoodleRotatableItemBase
+                        && (((DoodleRotatableItemBase)mSelectedItem).canRotate(mDoodle.toX(mTouchX), mDoodle.toY(mTouchY)))) {
+                        ((DoodleRotatableItemBase) mSelectedItem).setIsRotating(true);
                         mRotateTextDiff = mSelectedItem.getItemRotate() -
-                                computeAngle(xy.x, xy.y, mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY));
+                                computeAngle(xy.x, xy.y, mDoodle.toX(mTouchX), mDoodle.toY(mTouchY));
                 }
             }
         } else {
-            mGraffiti.enableAmplifier(true); // 涂鸦时开启放大镜
+            mDoodle.enableAmplifier(true); // 涂鸦时开启放大镜
             // 点击copy
-            if (mGraffiti.getPen() == GraffitiPen.COPY && mCopyLocation.contains(mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY), mGraffiti.getSize())) {
+            if (mDoodle.getPen() == DoodlePen.COPY && mCopyLocation.contains(mDoodle.toX(mTouchX), mDoodle.toY(mTouchY), mDoodle.getSize())) {
                 mCopyLocation.setRelocating(true);
                 mCopyLocation.setCopying(false);
             } else {
-                if (mGraffiti.getPen() == GraffitiPen.COPY) {
+                if (mDoodle.getPen() == DoodlePen.COPY) {
                     mCopyLocation.setRelocating(false);
                     if (!mCopyLocation.isCopying()) {
                         mCopyLocation.setCopying(true);
-                        mCopyLocation.setStartPosition(mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY));
+                        mCopyLocation.setStartPosition(mDoodle.toX(mTouchX), mDoodle.toY(mTouchY));
                     }
                 }
 
                 // 初始化绘制
                 mCurrPath = new Path();
-                mCurrPath.moveTo(mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY));
-                if (mGraffiti.getShape() == GraffitiShape.HAND_WRITE) { // 手写
-                    mCurrGraffitiPath = GraffitiPath.toPath(mGraffiti, mCurrPath);
+                mCurrPath.moveTo(mDoodle.toX(mTouchX), mDoodle.toY(mTouchY));
+                if (mDoodle.getShape() == DoodleShape.HAND_WRITE) { // 手写
+                    mCurrDoodlePath = DoodlePath.toPath(mDoodle, mCurrPath);
                 } else {  // 画图形
-                    mCurrGraffitiPath = GraffitiPath.toShape(mGraffiti,
-                            mGraffiti.toX(mTouchDownX), mGraffiti.toY(mTouchDownY), mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY));
+                    mCurrDoodlePath = DoodlePath.toShape(mDoodle,
+                            mDoodle.toX(mTouchDownX), mDoodle.toY(mTouchDownY), mDoodle.toX(mTouchX), mDoodle.toY(mTouchY));
                 }
-//                mCurrGraffitiPath.setDrawOptimize(false);
-                mGraffiti.addItem(mCurrGraffitiPath);
+//                mCurrDoodlePath.setDrawOptimize(false);
+                mDoodle.addItem(mCurrDoodlePath);
             }
         }
-        mGraffiti.invalidate();
+        mDoodle.invalidate();
     }
 
     @Override
@@ -148,19 +148,19 @@ public void onScrollEnd(MotionEvent e) {
         mTouchX = e.getX();
         mTouchY = e.getY();
 
-        if (mGraffiti.getPen().isSelectable()) {
-            if(mSelectedItem instanceof GraffitiRotatableItemBase) {
-                ((GraffitiRotatableItemBase)mSelectedItem).setIsRotating(false);
+        if (mDoodle.getPen().isSelectable()) {
+            if(mSelectedItem instanceof DoodleRotatableItemBase) {
+                ((DoodleRotatableItemBase)mSelectedItem).setIsRotating(false);
             }
         } else {
-            if (mCurrGraffitiPath != null) {
-                /*mCurrGraffitiPath.setDrawOptimize(true);
-                mGraffiti.invalidate(mCurrGraffitiPath);*/
-                mCurrGraffitiPath = null;
+            if (mCurrDoodlePath != null) {
+                /*mCurrDoodlePath.setDrawOptimize(true);
+                mDoodle.invalidate(mCurrDoodlePath);*/
+                mCurrDoodlePath = null;
             }
         }
-        mGraffiti.enableAmplifier(false); // 关闭放大镜
-        mGraffiti.invalidate();
+        mDoodle.enableAmplifier(false); // 关闭放大镜
+        mDoodle.invalidate();
     }
 
     @Override
@@ -170,41 +170,41 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float d
         mTouchX = e2.getX();
         mTouchY = e2.getY();
 
-        if (mGraffiti.getPen().isSelectable()) { //画笔是否是可选择的
+        if (mDoodle.getPen().isSelectable()) { //画笔是否是可选择的
             if (mSelectedItem != null) {
-                if ((mSelectedItem instanceof GraffitiRotatableItemBase)&&(((GraffitiRotatableItemBase)mSelectedItem).isRotating())) { // 旋转item
+                if ((mSelectedItem instanceof DoodleRotatableItemBase)&&(((DoodleRotatableItemBase)mSelectedItem).isRotating())) { // 旋转item
                     PointF xy = mSelectedItem.getLocation();
                     mSelectedItem.setItemRotate(mRotateTextDiff + computeAngle(
-                            xy.x, xy.y, mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY)
+                            xy.x, xy.y, mDoodle.toX(mTouchX), mDoodle.toY(mTouchY)
                     ));
                 } else { // 移动item
                     mSelectedItem.setLocation(
-                            mSelectedItemX + mGraffiti.toX(mTouchX) - mGraffiti.toX(mTouchDownX),
-                            mSelectedItemY + mGraffiti.toY(mTouchY) - mGraffiti.toY(mTouchDownY));
+                            mSelectedItemX + mDoodle.toX(mTouchX) - mDoodle.toX(mTouchDownX),
+                            mSelectedItemY + mDoodle.toY(mTouchY) - mDoodle.toY(mTouchDownY));
                 }
             }
         } else {
-            if (mGraffiti.getPen() == GraffitiPen.COPY && mCopyLocation.isRelocating()) {
+            if (mDoodle.getPen() == DoodlePen.COPY && mCopyLocation.isRelocating()) {
                 // 正在定位location
-                mCopyLocation.updateLocation(mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY));
+                mCopyLocation.updateLocation(mDoodle.toX(mTouchX), mDoodle.toY(mTouchY));
             } else {
-                if (mGraffiti.getPen() == GraffitiPen.COPY) {
-                    mCopyLocation.updateLocation(mCopyLocation.getCopyStartX() + mGraffiti.toX(mTouchX) - mCopyLocation.getTouchStartX(),
-                            mCopyLocation.getCopyStartY() + mGraffiti.toY(mTouchY) - mCopyLocation.getTouchStartY());
+                if (mDoodle.getPen() == DoodlePen.COPY) {
+                    mCopyLocation.updateLocation(mCopyLocation.getCopyStartX() + mDoodle.toX(mTouchX) - mCopyLocation.getTouchStartX(),
+                            mCopyLocation.getCopyStartY() + mDoodle.toY(mTouchY) - mCopyLocation.getTouchStartY());
                 }
-                if (mGraffiti.getShape() == GraffitiShape.HAND_WRITE) { // 手写
+                if (mDoodle.getShape() == DoodleShape.HAND_WRITE) { // 手写
                     mCurrPath.quadTo(
-                            mGraffiti.toX(mLastTouchX),
-                            mGraffiti.toY(mLastTouchY),
-                            mGraffiti.toX((mTouchX + mLastTouchX) / 2),
-                            mGraffiti.toY((mTouchY + mLastTouchY) / 2));
-                    mCurrGraffitiPath.updatePath(mCurrPath);
+                            mDoodle.toX(mLastTouchX),
+                            mDoodle.toY(mLastTouchY),
+                            mDoodle.toX((mTouchX + mLastTouchX) / 2),
+                            mDoodle.toY((mTouchY + mLastTouchY) / 2));
+                    mCurrDoodlePath.updatePath(mCurrPath);
                 } else {  // 画图形
-                    mCurrGraffitiPath.updateXY(mGraffiti.toX(mTouchDownX), mGraffiti.toY(mTouchDownY), mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY));
+                    mCurrDoodlePath.updateXY(mDoodle.toX(mTouchDownX), mDoodle.toY(mTouchDownY), mDoodle.toX(mTouchX), mDoodle.toY(mTouchY));
                 }
             }
         }
-        mGraffiti.invalidate();
+        mDoodle.invalidate();
         return true;
     }
 
@@ -216,18 +216,18 @@ public boolean onSingleTapUp(MotionEvent e) {
         mTouchX = e.getX();
         mTouchY = e.getY();
 
-        if (mGraffiti.getPen().isSelectable()) {
+        if (mDoodle.getPen().isSelectable()) {
             boolean found = false;
-            IGraffitiSelectableItem item;
-            List<IGraffitiItem> items = mGraffiti.getAllItem();
+            IDoodleSelectableItem item;
+            List<IDoodleItem> items = mDoodle.getAllItem();
             for (int i = items.size() - 1; i >= 0; i--) {
-                IGraffitiItem elem = items.get(i);
-                if (!(elem instanceof IGraffitiSelectableItem)) {
+                IDoodleItem elem = items.get(i);
+                if (!(elem instanceof IDoodleSelectableItem)) {
                     continue;
                 }
-                item = (IGraffitiSelectableItem) elem;
+                item = (IDoodleSelectableItem) elem;
 
-                if (item.contains(mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY))) {
+                if (item.contains(mDoodle.toX(mTouchX), mDoodle.toY(mTouchY))) {
                     found = true;
                     setSelectedItem(item);
                     PointF xy = item.getLocation();
@@ -238,11 +238,11 @@ public boolean onSingleTapUp(MotionEvent e) {
             }
             if (!found) {
                 if (mSelectedItem != null) { // 取消选定
-                    IGraffitiSelectableItem old = mSelectedItem;
+                    IDoodleSelectableItem old = mSelectedItem;
                     setSelectedItem(null);
                     mSelectionListener.onSelectedItem(old, false);
                 } else {
-                    mSelectionListener.onCreateSelectableItem(mGraffiti.toX(mTouchX), mGraffiti.toY(mTouchY));
+                    mSelectionListener.onCreateSelectableItem(mDoodle.toX(mTouchX), mDoodle.toY(mTouchY));
                 }
             }
         } else {
@@ -251,7 +251,7 @@ public boolean onSingleTapUp(MotionEvent e) {
             onScroll(e, e, 0, 0);
             onScrollEnd(e);
         }
-        mGraffiti.invalidate();
+        mDoodle.invalidate();
         return true;
     }
 
@@ -259,7 +259,7 @@ public boolean onSingleTapUp(MotionEvent e) {
     public boolean onScaleBegin(ScaleGestureDetector detector) {
         mLastFocusX = null;
         mLastFocusY = null;
-        mGraffiti.enableAmplifier(false);
+        mDoodle.enableAmplifier(false);
         return true;
     }
 
@@ -276,8 +276,8 @@ public boolean onScale(ScaleGestureDetector detector) {
             final float dy = mTouchCentreY - mLastFocusY;
             // 移动图片
             if (Math.abs(dx) > 1 || Math.abs(dy) > 1) {
-                mGraffiti.setGraffitiTranslationX(mGraffiti.getGraffitiTranslationX() + dx + pendingX);
-                mGraffiti.setGraffitiTranslationY(mGraffiti.getGraffitiTranslationY() + dy + pendingY);
+                mDoodle.setDoodleTranslationX(mDoodle.getDoodleTranslationX() + dx + pendingX);
+                mDoodle.setDoodleTranslationY(mDoodle.getDoodleTranslationY() + dy + pendingY);
                 pendingX = pendingY = 0;
             } else {
                 pendingX += dx;
@@ -287,8 +287,8 @@ public boolean onScale(ScaleGestureDetector detector) {
 
         if (Math.abs(1 - detector.getScaleFactor()) > 0.005f) {
             // 缩放图片
-            float scale = mGraffiti.getGraffitiScale() * detector.getScaleFactor() * pendingScale;
-            mGraffiti.setGraffitiScale(scale, mGraffiti.toX(mTouchCentreX), mGraffiti.toY(mTouchCentreY));
+            float scale = mDoodle.getDoodleScale() * detector.getScaleFactor() * pendingScale;
+            mDoodle.setDoodleScale(scale, mDoodle.toX(mTouchCentreX), mDoodle.toY(mTouchCentreY));
             pendingScale = 1;
         } else {
             pendingScale *= detector.getScaleFactor();
@@ -302,7 +302,7 @@ public boolean onScale(ScaleGestureDetector detector) {
 
     @Override
     public void onScaleEnd(ScaleGestureDetector detector) {
-        if (mGraffiti.getGraffitiScale() < 1) { //
+        if (mDoodle.getDoodleScale() < 1) { //
             if (mScaleAnimator == null) {
                 mScaleAnimator = new ValueAnimator();
                 mScaleAnimator.setDuration(100);
@@ -311,15 +311,15 @@ public void onScaleEnd(ScaleGestureDetector detector) {
                     public void onAnimationUpdate(ValueAnimator animation) {
                         float value = (float) animation.getAnimatedValue();
                         float fraction = animation.getAnimatedFraction();
-                        mGraffiti.setGraffitiScale(value, mGraffiti.toX(mTouchCentreX), mGraffiti.toY(mTouchCentreY));
-                        mGraffiti.setGraffitiTranslation(mScaleAnimTransX * (1 - fraction), mScaleAnimTranY * (1 - fraction));
+                        mDoodle.setDoodleScale(value, mDoodle.toX(mTouchCentreX), mDoodle.toY(mTouchCentreY));
+                        mDoodle.setDoodleTranslation(mScaleAnimTransX * (1 - fraction), mScaleAnimTranY * (1 - fraction));
                     }
                 });
             }
             mScaleAnimator.cancel();
-            mScaleAnimTransX = mGraffiti.getGraffitiTranslationX();
-            mScaleAnimTranY = mGraffiti.getGraffitiTranslationY();
-            mScaleAnimator.setFloatValues(mGraffiti.getGraffitiScale(), 1);
+            mScaleAnimTransX = mDoodle.getDoodleTranslationX();
+            mScaleAnimTranY = mDoodle.getDoodleTranslationY();
+            mScaleAnimator.setFloatValues(mDoodle.getDoodleScale(), 1);
             mScaleAnimator.start();
         } else { //
             limitBound(true);
@@ -332,49 +332,49 @@ public void onAnimationUpdate(ValueAnimator animation) {
      * @param anim 动画效果
      */
     public void limitBound(boolean anim) {
-        if (mGraffiti.getGraffitiRotation() % 90 != 0) { // 只处理0,90,180,270
+        if (mDoodle.getDoodleRotation() % 90 != 0) { // 只处理0,90,180,270
             return;
         }
 
-        final float oldX = mGraffiti.getGraffitiTranslationX(), oldY = mGraffiti.getGraffitiTranslationY();
-        RectF bound = mGraffiti.getGraffitiBound();
-        float x = mGraffiti.getGraffitiTranslationX(), y = mGraffiti.getGraffitiTranslationY();
-        float width = mGraffiti.getCenterWidth() * mGraffiti.getRotateScale(), height = mGraffiti.getCenterHeight() * mGraffiti.getRotateScale();
+        final float oldX = mDoodle.getDoodleTranslationX(), oldY = mDoodle.getDoodleTranslationY();
+        RectF bound = mDoodle.getDoodleBound();
+        float x = mDoodle.getDoodleTranslationX(), y = mDoodle.getDoodleTranslationY();
+        float width = mDoodle.getCenterWidth() * mDoodle.getRotateScale(), height = mDoodle.getCenterHeight() * mDoodle.getRotateScale();
 
         // 上下都在屏幕内
-        if (bound.height() <= mGraffiti.getHeight()) {
-            if (mGraffiti.getGraffitiRotation() == 0 || mGraffiti.getGraffitiRotation() == 180) {
-                y = (height - height * mGraffiti.getGraffitiScale()) / 2;
+        if (bound.height() <= mDoodle.getHeight()) {
+            if (mDoodle.getDoodleRotation() == 0 || mDoodle.getDoodleRotation() == 180) {
+                y = (height - height * mDoodle.getDoodleScale()) / 2;
             } else {
-                x = (width - width * mGraffiti.getGraffitiScale()) / 2;
+                x = (width - width * mDoodle.getDoodleScale()) / 2;
             }
         } else {
             float heightDiffTop = bound.top;
             // 只有上在屏幕内
-            if (bound.top > 0 && bound.bottom >= mGraffiti.getHeight()) {
-                if (mGraffiti.getGraffitiRotation() == 0 || mGraffiti.getGraffitiRotation() == 180) {
-                    if (mGraffiti.getGraffitiRotation() == 0) {
+            if (bound.top > 0 && bound.bottom >= mDoodle.getHeight()) {
+                if (mDoodle.getDoodleRotation() == 0 || mDoodle.getDoodleRotation() == 180) {
+                    if (mDoodle.getDoodleRotation() == 0) {
                         y = y - heightDiffTop;
                     } else {
                         y = y + heightDiffTop;
                     }
                 } else {
-                    if (mGraffiti.getGraffitiRotation() == 90) {
+                    if (mDoodle.getDoodleRotation() == 90) {
                         x = x - heightDiffTop;
                     } else {
                         x = x + heightDiffTop;
                     }
                 }
-            } else if (bound.bottom < mGraffiti.getHeight() && bound.top <= 0) { // 只有下在屏幕内
-                float heightDiffBottom = mGraffiti.getHeight() - bound.bottom;
-                if (mGraffiti.getGraffitiRotation() == 0 || mGraffiti.getGraffitiRotation() == 180) {
-                    if (mGraffiti.getGraffitiRotation() == 0) {
+            } else if (bound.bottom < mDoodle.getHeight() && bound.top <= 0) { // 只有下在屏幕内
+                float heightDiffBottom = mDoodle.getHeight() - bound.bottom;
+                if (mDoodle.getDoodleRotation() == 0 || mDoodle.getDoodleRotation() == 180) {
+                    if (mDoodle.getDoodleRotation() == 0) {
                         y = y + heightDiffBottom;
                     } else {
                         y = y - heightDiffBottom;
                     }
                 } else {
-                    if (mGraffiti.getGraffitiRotation() == 90) {
+                    if (mDoodle.getDoodleRotation() == 90) {
                         x = x + heightDiffBottom;
                     } else {
                         x = x - heightDiffBottom;
@@ -384,39 +384,39 @@ public void limitBound(boolean anim) {
         }
 
         // 左右都在屏幕内
-        if (bound.width() <= mGraffiti.getWidth()) {
-            if (mGraffiti.getGraffitiRotation() == 0 || mGraffiti.getGraffitiRotation() == 180) {
-                x = (width - width * mGraffiti.getGraffitiScale()) / 2;
+        if (bound.width() <= mDoodle.getWidth()) {
+            if (mDoodle.getDoodleRotation() == 0 || mDoodle.getDoodleRotation() == 180) {
+                x = (width - width * mDoodle.getDoodleScale()) / 2;
             } else {
-                y = (height - height * mGraffiti.getGraffitiScale()) / 2;
+                y = (height - height * mDoodle.getDoodleScale()) / 2;
             }
         } else {
             float widthDiffLeft = bound.left;
             // 只有左在屏幕内
-            if (bound.left > 0 && bound.right >= mGraffiti.getWidth()) {
-                if (mGraffiti.getGraffitiRotation() == 0 || mGraffiti.getGraffitiRotation() == 180) {
-                    if (mGraffiti.getGraffitiRotation() == 0) {
+            if (bound.left > 0 && bound.right >= mDoodle.getWidth()) {
+                if (mDoodle.getDoodleRotation() == 0 || mDoodle.getDoodleRotation() == 180) {
+                    if (mDoodle.getDoodleRotation() == 0) {
                         x = x - widthDiffLeft;
                     } else {
                         x = x + widthDiffLeft;
                     }
                 } else {
-                    if (mGraffiti.getGraffitiRotation() == 90) {
+                    if (mDoodle.getDoodleRotation() == 90) {
                         y = y + widthDiffLeft;
                     } else {
                         y = y - widthDiffLeft;
                     }
                 }
-            } else if (bound.right < mGraffiti.getWidth() && bound.left <= 0) { // 只有右在屏幕内
-                float widthDiffRight = mGraffiti.getWidth() - bound.right;
-                if (mGraffiti.getGraffitiRotation() == 0 || mGraffiti.getGraffitiRotation() == 180) {
-                    if (mGraffiti.getGraffitiRotation() == 0) {
+            } else if (bound.right < mDoodle.getWidth() && bound.left <= 0) { // 只有右在屏幕内
+                float widthDiffRight = mDoodle.getWidth() - bound.right;
+                if (mDoodle.getDoodleRotation() == 0 || mDoodle.getDoodleRotation() == 180) {
+                    if (mDoodle.getDoodleRotation() == 0) {
                         x = x + widthDiffRight;
                     } else {
                         x = x - widthDiffRight;
                     }
                 } else {
-                    if (mGraffiti.getGraffitiRotation() == 90) {
+                    if (mDoodle.getDoodleRotation() == 90) {
                         y = y - widthDiffRight;
                     } else {
                         y = y + widthDiffRight;
@@ -433,7 +433,7 @@ public void limitBound(boolean anim) {
                     public void onAnimationUpdate(ValueAnimator animation) {
                         float value = (float) animation.getAnimatedValue();
                         float fraction = animation.getAnimatedFraction();
-                        mGraffiti.setGraffitiTranslation(value, mTransAnimOldY + (mTransAnimY - mTransAnimOldY) * fraction);
+                        mDoodle.setDoodleTranslation(value, mTransAnimOldY + (mTransAnimY - mTransAnimOldY) * fraction);
                     }
                 });
             }
@@ -442,12 +442,12 @@ public void onAnimationUpdate(ValueAnimator animation) {
             mTransAnimY = y;
             mTranslateAnimator.start();
         } else {
-            mGraffiti.setGraffitiTranslation(x, y);
+            mDoodle.setDoodleTranslation(x, y);
         }
     }
 
-    public void setSelectionListener(ISelectionListener graffitiListener) {
-        mSelectionListener = graffitiListener;
+    public void setSelectionListener(ISelectionListener doodleListener) {
+        mSelectionListener = doodleListener;
     }
 
     public ISelectionListener getSelectionListener() {
@@ -460,7 +460,7 @@ public interface ISelectionListener {
          *
          * @param selected 是否选中，false表示从选中变成不选中
          */
-        void onSelectedItem(IGraffitiSelectableItem selectableItem, boolean selected);
+        void onSelectedItem(IDoodleSelectableItem selectableItem, boolean selected);
 
         /**
          * 新建一个可选的item
diff --git a/doodle/src/main/java/cn/hzw/doodle/DoodlePaintAttrs.java b/doodle/src/main/java/cn/hzw/doodle/DoodlePaintAttrs.java
new file mode 100644
index 0000000..d06a0dd
--- /dev/null
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodlePaintAttrs.java
@@ -0,0 +1,57 @@
+package cn.hzw.doodle;
+
+import cn.hzw.doodle.core.IDoodleColor;
+import cn.hzw.doodle.core.IDoodlePen;
+import cn.hzw.doodle.core.IDoodleShape;
+
+/**
+ * 画笔属性
+ * Created on 29/06/2018.
+ */
+
+public class DoodlePaintAttrs {
+    private IDoodlePen mPen; // 画笔类型
+    private IDoodleShape mShape; // 画笔形状
+    private float mSize; // 大小
+    private IDoodleColor mColor; // 颜色
+
+    public IDoodlePen pen() {
+        return mPen;
+    }
+
+    public DoodlePaintAttrs pen(IDoodlePen pen) {
+        mPen = pen;
+        return this;
+    }
+
+    public IDoodleShape shape() {
+        return mShape;
+    }
+
+    public DoodlePaintAttrs shape(IDoodleShape shape) {
+        mShape = shape;
+        return this;
+    }
+
+    public float size() {
+        return mSize;
+    }
+
+    public DoodlePaintAttrs size(float size) {
+        mSize = size;
+        return this;
+    }
+
+    public IDoodleColor color() {
+        return mColor;
+    }
+
+    public DoodlePaintAttrs color(IDoodleColor color) {
+        mColor = color;
+        return this;
+    }
+
+    public static DoodlePaintAttrs create() {
+        return new DoodlePaintAttrs();
+    }
+}
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiParams.java b/doodle/src/main/java/cn/hzw/doodle/DoodleParams.java
similarity index 85%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiParams.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleParams.java
index 65df181..39bf4c6 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiParams.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleParams.java
@@ -1,23 +1,23 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 
 import android.app.Activity;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import cn.hzw.graffiti.core.IGraffiti;
+import cn.hzw.doodle.core.IDoodle;
 
 /**
  * 涂鸦参数
  */
-public class GraffitiParams implements Parcelable {
+public class DoodleParams implements Parcelable {
 
     /**
      * 图片路径
      */
     public String mImagePath;
     /**
-     * 　保存路径，如果为null，则图片保存在根目录下/DCIM/Graffiti/
+     * 　保存路径，如果为null，则图片保存在根目录下/DCIM/Doodle/
      */
     public String mSavePath;
     /**
@@ -64,13 +64,13 @@ public class GraffitiParams implements Parcelable {
     /**
      * 画布的最小/最大缩放倍数
      */
-    public float mMinScale = GraffitiView.MIN_SCALE;
-    public float mMaxScale = GraffitiView.MAX_SCALE;
+    public float mMinScale = DoodleView.MIN_SCALE;
+    public float mMaxScale = DoodleView.MAX_SCALE;
 
-    public static final Creator<GraffitiParams> CREATOR = new Creator<GraffitiParams>() {
+    public static final Creator<DoodleParams> CREATOR = new Creator<DoodleParams>() {
         @Override
-        public GraffitiParams createFromParcel(Parcel in) {
-            GraffitiParams params = new GraffitiParams();
+        public DoodleParams createFromParcel(Parcel in) {
+            DoodleParams params = new DoodleParams();
             params.mImagePath = in.readString();
             params.mSavePath = in.readString();
             params.mSavePathIsDir = in.readInt() == 1;
@@ -87,8 +87,8 @@ public GraffitiParams createFromParcel(Parcel in) {
         }
 
         @Override
-        public GraffitiParams[] newArray(int size) {
-            return new GraffitiParams[size];
+        public DoodleParams[] newArray(int size) {
+            return new DoodleParams[size];
         }
     };
 
@@ -133,10 +133,10 @@ public enum DialogType {
     public interface DialogInterceptor {
         /**
          * @param activity
-         * @param graffiti
+         * @param doodle
          * @param dialogType   对话框类型
          * @return 返回true表示拦截
          */
-        boolean onShow(Activity activity, IGraffiti graffiti, DialogType dialogType);
+        boolean onShow(Activity activity, IDoodle doodle, DialogType dialogType);
     }
 }
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiPath.java b/doodle/src/main/java/cn/hzw/doodle/DoodlePath.java
similarity index 59%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiPath.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodlePath.java
index 0e64c4c..078a8fd 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiPath.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodlePath.java
@@ -1,18 +1,18 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
 
-import cn.hzw.graffiti.core.IGraffiti;
+import cn.hzw.doodle.core.IDoodle;
 
 /**
  * 涂鸦轨迹
  * Created by huangziwei on 2017/3/16.
  */
 
-public class GraffitiPath extends GraffitiItemBase {
+public class DoodlePath extends DoodleItemBase {
     private Path mPath; // 画笔的路径
 
     private PointF mSxy = new PointF(); // 映射后的起始坐标，（手指点击）
@@ -22,12 +22,12 @@ public class GraffitiPath extends GraffitiItemBase {
 
     private CopyLocation mCopyLocation;
 
-    public GraffitiPath(IGraffiti graffiti) {
-        super(graffiti);
+    public DoodlePath(IDoodle doodle) {
+        super(doodle);
     }
 
-    public GraffitiPath(IGraffiti graffiti, GraffitiPaintAttrs attrs) {
-        super(graffiti, attrs);
+    public DoodlePath(IDoodle doodle, DoodlePaintAttrs attrs) {
+        super(doodle, attrs);
     }
 
     public void updateXY(float sx, float sy, float dx, float dy) {
@@ -62,33 +62,33 @@ public PointF getSxy() {
         return mSxy;
     }
 
-    public static GraffitiPath toShape(IGraffiti graffiti, float sx, float sy, float dx, float dy) {
-        GraffitiPath path = new GraffitiPath(graffiti);
-        path.setPen(graffiti.getPen().copy());
-        path.setShape(graffiti.getShape().copy());
-        path.setSize(graffiti.getSize());
-        path.setColor(graffiti.getColor().copy());
+    public static DoodlePath toShape(IDoodle doodle, float sx, float sy, float dx, float dy) {
+        DoodlePath path = new DoodlePath(doodle);
+        path.setPen(doodle.getPen().copy());
+        path.setShape(doodle.getShape().copy());
+        path.setSize(doodle.getSize());
+        path.setColor(doodle.getColor().copy());
 
         path.mSxy.set(sx, sy);
         path.mDxy.set(dx, dy);
-        if(path.getPen()==GraffitiPen.COPY) {
-            if (graffiti instanceof GraffitiView) {
-                path.mCopyLocation = GraffitiPen.COPY.getCopyLocation().copy();
+        if(path.getPen()==DoodlePen.COPY) {
+            if (doodle instanceof DoodleView) {
+                path.mCopyLocation = DoodlePen.COPY.getCopyLocation().copy();
             }
         }
         return path;
     }
 
-    public static GraffitiPath toPath(IGraffiti graffiti, Path p) {
-        GraffitiPath path = new GraffitiPath(graffiti);
-        path.setPen(graffiti.getPen().copy());
-        path.setShape(graffiti.getShape().copy());
-        path.setSize(graffiti.getSize());
-        path.setColor(graffiti.getColor().copy());
+    public static DoodlePath toPath(IDoodle doodle, Path p) {
+        DoodlePath path = new DoodlePath(doodle);
+        path.setPen(doodle.getPen().copy());
+        path.setShape(doodle.getShape().copy());
+        path.setSize(doodle.getSize());
+        path.setColor(doodle.getColor().copy());
 
         path.mPath = p;
-        if (graffiti instanceof GraffitiView) {
-            path.mCopyLocation = GraffitiPen.COPY.getCopyLocation().copy();
+        if (doodle instanceof DoodleView) {
+            path.mCopyLocation = DoodlePen.COPY.getCopyLocation().copy();
         } else {
             path.mCopyLocation = null;
         }
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiPen.java b/doodle/src/main/java/cn/hzw/doodle/DoodlePen.java
similarity index 67%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiPen.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodlePen.java
index c54fa1f..102a93a 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiPen.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodlePen.java
@@ -1,17 +1,17 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 
-import cn.hzw.graffiti.core.IGraffiti;
-import cn.hzw.graffiti.core.IGraffitiItem;
-import cn.hzw.graffiti.core.IGraffitiPen;
+import cn.hzw.doodle.core.IDoodle;
+import cn.hzw.doodle.core.IDoodleItem;
+import cn.hzw.doodle.core.IDoodlePen;
 
 /**
  * 常用画笔
  */
-public enum GraffitiPen implements IGraffitiPen {
+public enum DoodlePen implements IDoodlePen {
 
     HAND, // 手绘
     COPY, // 仿制
@@ -23,22 +23,22 @@ public enum GraffitiPen implements IGraffitiPen {
     private CopyLocation mCopyLocation;
     private Matrix mMatrix;
 
-    GraffitiPen() {
+    DoodlePen() {
         this(false);
     }
 
-    GraffitiPen(boolean isSelectable) {
+    DoodlePen(boolean isSelectable) {
         mIsSelectable = isSelectable;
     }
 
     @Override
-    public void config(IGraffitiItem item, Paint paint) {
-        GraffitiItemBase graffitiItem = (GraffitiItemBase) item;
-        if (graffitiItem.getPen() == GraffitiPen.COPY) { // 仿制需要偏移图片
+    public void config(IDoodleItem item, Paint paint) {
+        DoodleItemBase doodleItem = (DoodleItemBase) item;
+        if (doodleItem.getPen() == DoodlePen.COPY) { // 仿制需要偏移图片
             // 根据旋转值获取正确的旋转底图
             float transX = 0, transY = 0;
             float transXSpan = 0, transYSpan = 0;
-            CopyLocation copyLocation = ((GraffitiPath) item).getCopyLocation();
+            CopyLocation copyLocation = ((DoodlePath) item).getCopyLocation();
             // 仿制时需要偏移图片
             if (copyLocation != null) {
                 transXSpan = copyLocation.getTouchStartX() - copyLocation.getCopyStartX();
@@ -46,8 +46,8 @@ public void config(IGraffitiItem item, Paint paint) {
             }
             mMatrix.reset();
             mMatrix.postTranslate(-transX + transXSpan, -transY + transYSpan);
-            if (item.getColor() instanceof GraffitiColor) {
-                ((GraffitiColor) item.getColor()).setMatrix(mMatrix);
+            if (item.getColor() instanceof DoodleColor) {
+                ((DoodleColor) item.getColor()).setMatrix(mMatrix);
             }
         }
     }
@@ -77,14 +77,14 @@ public CopyLocation getCopyLocation() {
     }
 
     @Override
-    public void drawHelpers(Canvas canvas, IGraffiti graffiti) {
+    public void drawHelpers(Canvas canvas, IDoodle doodle) {
         if (this == COPY) {
-            mCopyLocation.drawItSelf(canvas, graffiti.getSize());
+            mCopyLocation.drawItSelf(canvas, doodle.getSize());
         }
     }
 
     @Override
-    public IGraffitiPen copy() {
+    public IDoodlePen copy() {
         return this;
     }
 }
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiRotatableItemBase.java b/doodle/src/main/java/cn/hzw/doodle/DoodleRotatableItemBase.java
similarity index 67%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiRotatableItemBase.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleRotatableItemBase.java
index 4b54d83..e0f1272 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiRotatableItemBase.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleRotatableItemBase.java
@@ -1,36 +1,36 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.PointF;
 import android.graphics.Rect;
 
-import cn.hzw.graffiti.core.IGraffiti;
+import cn.hzw.doodle.core.IDoodle;
 
-import static cn.hzw.graffiti.util.DrawUtil.rotatePoint;
+import static cn.hzw.doodle.util.DrawUtil.rotatePoint;
 
 /**
  * 可旋转的item
  */
-public abstract class GraffitiRotatableItemBase extends GraffitiSelectableItemBase {
+public abstract class DoodleRotatableItemBase extends DoodleSelectableItemBase {
 
     private PointF mTemp = new PointF();
     private Rect mRectTemp = new Rect();
     private boolean mIsRotating = false;
     private Paint mPaint = new Paint();
 
-    public GraffitiRotatableItemBase(IGraffiti graffiti, int itemRotate, float x, float y) {
-        super(graffiti, itemRotate, x, y);
+    public DoodleRotatableItemBase(IDoodle doodle, int itemRotate, float x, float y) {
+        super(doodle, itemRotate, x, y);
     }
 
-    public GraffitiRotatableItemBase(IGraffiti graffiti, GraffitiPaintAttrs attrs, int itemRotate, float x, float y) {
-        super(graffiti, attrs, itemRotate, x, y);
+    public DoodleRotatableItemBase(IDoodle doodle, DoodlePaintAttrs attrs, int itemRotate, float x, float y) {
+        super(doodle, attrs, itemRotate, x, y);
     }
 
     @Override
     public void doDrawSelectedBackground(Canvas canvas) {
         mRectTemp.set(getBounds());
-        float unit = getGraffiti().getSizeUnit();
+        float unit = getDoodle().getSizeUnit();
         mRectTemp.left -= 10 * unit;
         mRectTemp.top -= 10 * unit;
         mRectTemp.right += 10 * unit;
@@ -64,14 +64,14 @@ public void doDrawSelectedBackground(Canvas canvas) {
         mPaint.setStyle(Paint.Style.STROKE);
         mPaint.setStrokeWidth(2 * unit);
         canvas.drawLine(mRectTemp.right, mRectTemp.top + mRectTemp.height() / 2,
-                mRectTemp.right + (GraffitiSelectableItemBase.ITEM_CAN_ROTATE_BOUND - 16) * unit, mRectTemp.top + mRectTemp.height() / 2, mPaint);
-        canvas.drawCircle(mRectTemp.right + (GraffitiSelectableItemBase.ITEM_CAN_ROTATE_BOUND - 8) * unit, mRectTemp.top + mRectTemp.height() / 2, 8 * unit, mPaint);
+                mRectTemp.right + (DoodleSelectableItemBase.ITEM_CAN_ROTATE_BOUND - 16) * unit, mRectTemp.top + mRectTemp.height() / 2, mPaint);
+        canvas.drawCircle(mRectTemp.right + (DoodleSelectableItemBase.ITEM_CAN_ROTATE_BOUND - 8) * unit, mRectTemp.top + mRectTemp.height() / 2, 8 * unit, mPaint);
         // rotation line
         mPaint.setColor(0x44888888);
         mPaint.setStrokeWidth(0.8f * unit);
         canvas.drawLine(mRectTemp.right, mRectTemp.top + mRectTemp.height() / 2,
-                mRectTemp.right + (GraffitiSelectableItemBase.ITEM_CAN_ROTATE_BOUND - 16) * unit, mRectTemp.top + mRectTemp.height() / 2, mPaint);
-        canvas.drawCircle(mRectTemp.right + (GraffitiSelectableItemBase.ITEM_CAN_ROTATE_BOUND - 8) * unit, mRectTemp.top + mRectTemp.height() / 2, 8 * unit, mPaint);
+                mRectTemp.right + (DoodleSelectableItemBase.ITEM_CAN_ROTATE_BOUND - 16) * unit, mRectTemp.top + mRectTemp.height() / 2, mPaint);
+        canvas.drawCircle(mRectTemp.right + (DoodleSelectableItemBase.ITEM_CAN_ROTATE_BOUND - 8) * unit, mRectTemp.top + mRectTemp.height() / 2, 8 * unit, mPaint);
 
     }
 
@@ -79,7 +79,7 @@ public void doDrawSelectedBackground(Canvas canvas) {
      * 是否可以旋转
      */
     public boolean canRotate(float x, float y) {
-        IGraffiti graffiti = getGraffiti();
+        IDoodle doodle = getDoodle();
         PointF location = getLocation();
         // 把触摸点转换成在item坐标系（即以item起始点作为坐标原点）内的点
         x = x - location.x;
@@ -88,12 +88,12 @@ public boolean canRotate(float x, float y) {
         PointF xy = rotatePoint(mTemp, (int) -getItemRotate(), x, y, 0, 0);
 
         mRectTemp.set(getBounds());
-        float unit = graffiti.getSizeUnit();
+        float unit = doodle.getSizeUnit();
         mRectTemp.left -= 13 * unit;
         mRectTemp.top -= 13 * unit;
         mRectTemp.right += 13 * unit;
         mRectTemp.bottom += 13 * unit;
-        return xy.x >= mRectTemp.right && xy.x <= mRectTemp.right + ITEM_CAN_ROTATE_BOUND * graffiti.getSizeUnit()
+        return xy.x >= mRectTemp.right && xy.x <= mRectTemp.right + ITEM_CAN_ROTATE_BOUND * doodle.getSizeUnit()
                 && xy.y >= mRectTemp.top && xy.y <= mRectTemp.bottom;
     }
 
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiSelectableItemBase.java b/doodle/src/main/java/cn/hzw/doodle/DoodleSelectableItemBase.java
similarity index 80%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiSelectableItemBase.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleSelectableItemBase.java
index f41c497..9c57369 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiSelectableItemBase.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleSelectableItemBase.java
@@ -1,21 +1,21 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.PointF;
 import android.graphics.Rect;
 
-import cn.hzw.graffiti.core.IGraffiti;
-import cn.hzw.graffiti.core.IGraffitiSelectableItem;
+import cn.hzw.doodle.core.IDoodle;
+import cn.hzw.doodle.core.IDoodleSelectableItem;
 
-import static cn.hzw.graffiti.util.DrawUtil.rotatePoint;
+import static cn.hzw.doodle.util.DrawUtil.rotatePoint;
 
 /**
  * 可选择的涂鸦item，例如文字、图片
  * Created by huangziwei on 2017/7/16.
  */
 
-public abstract class GraffitiSelectableItemBase extends GraffitiItemBase implements IGraffitiSelectableItem {
+public abstract class DoodleSelectableItemBase extends DoodleItemBase implements IDoodleSelectableItem {
 
     public final static int ITEM_CAN_ROTATE_BOUND = 70;
 
@@ -26,12 +26,12 @@ public abstract class GraffitiSelectableItemBase extends GraffitiItemBase implem
     private PointF mTemp = new PointF();
     private boolean mIsSelected = false;
 
-    public GraffitiSelectableItemBase(IGraffiti graffiti, int itemRotate, float x, float y) {
-        this(graffiti, null, itemRotate, x, y);
+    public DoodleSelectableItemBase(IDoodle doodle, int itemRotate, float x, float y) {
+        this(doodle, null, itemRotate, x, y);
     }
 
-    public GraffitiSelectableItemBase(IGraffiti graffiti, GraffitiPaintAttrs attrs, int itemRotate, float x, float y) {
-        super(graffiti, attrs);
+    public DoodleSelectableItemBase(IDoodle doodle, DoodlePaintAttrs attrs, int itemRotate, float x, float y) {
+        super(doodle, attrs);
         setLocation(x, y);
         setItemRotate(itemRotate);
 
@@ -62,7 +62,7 @@ public boolean contains(float x, float y) {
         // 把变换后相对于矩形的触摸点，还原回未变换前的点，然后判断是否矩形中
         mTemp = rotatePoint(mTemp, (int) -getItemRotate(), x, y, 0, 0);
         mRectTemp.set(mRect);
-        float unit = getGraffiti().getSizeUnit();
+        float unit = getDoodle().getSizeUnit();
         mRectTemp.left -= 10 * unit;
         mRectTemp.top -= 10 * unit;
         mRectTemp.right += 10 * unit;
@@ -96,7 +96,7 @@ public void drawSelectedBackground(Canvas canvas) {
 
     public void doDrawSelectedBackground(Canvas canvas) {
         mRectTemp.set(getBounds());
-        float unit = getGraffiti().getSizeUnit();
+        float unit = getDoodle().getSizeUnit();
         mRectTemp.left -= 10 * unit;
         mRectTemp.top -= 10 * unit;
         mRectTemp.right += 10 * unit;
@@ -127,8 +127,8 @@ public boolean isSelected() {
     public void setSelected(boolean isSelected) {
         mIsSelected = isSelected;
         setNeedClipOutside(!isSelected);
-        if (getGraffiti() != null) {
-            getGraffiti().invalidate();
+        if (getDoodle() != null) {
+            getDoodle().invalidate();
         }
     }
 
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiShape.java b/doodle/src/main/java/cn/hzw/doodle/DoodleShape.java
similarity index 55%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiShape.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleShape.java
index 9b373a2..c845aa2 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiShape.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleShape.java
@@ -1,22 +1,22 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.PointF;
 
-import cn.hzw.graffiti.core.IGraffitiColor;
-import cn.hzw.graffiti.core.IGraffitiItem;
-import cn.hzw.graffiti.core.IGraffitiShape;
+import cn.hzw.doodle.core.IDoodleColor;
+import cn.hzw.doodle.core.IDoodleItem;
+import cn.hzw.doodle.core.IDoodleShape;
 
-import static cn.hzw.graffiti.util.DrawUtil.drawArrow;
-import static cn.hzw.graffiti.util.DrawUtil.drawCircle;
-import static cn.hzw.graffiti.util.DrawUtil.drawLine;
-import static cn.hzw.graffiti.util.DrawUtil.drawRect;
+import static cn.hzw.doodle.util.DrawUtil.drawArrow;
+import static cn.hzw.doodle.util.DrawUtil.drawCircle;
+import static cn.hzw.doodle.util.DrawUtil.drawLine;
+import static cn.hzw.doodle.util.DrawUtil.drawRect;
 
 /**
  * 常用图形
  */
-public enum GraffitiShape implements IGraffitiShape {
+public enum DoodleShape implements IDoodleShape {
     HAND_WRITE, // 手绘
     ARROW, // 箭头
     LINE, // 直线
@@ -27,18 +27,18 @@ public enum GraffitiShape implements IGraffitiShape {
 
 
     @Override
-    public void draw(Canvas canvas, IGraffitiItem graffitiItem, Paint paint) {
-        GraffitiPath graffitiPath = (GraffitiPath) graffitiItem;
-        if (this == GraffitiShape.HAND_WRITE) { // 手写
-            canvas.drawPath(graffitiPath.getPath(), paint);
+    public void draw(Canvas canvas, IDoodleItem doodleItem, Paint paint) {
+        DoodlePath doodlePath = (DoodlePath) doodleItem;
+        if (this == DoodleShape.HAND_WRITE) { // 手写
+            canvas.drawPath(doodlePath.getPath(), paint);
         } else { // 画图形
-            PointF mSxy = graffitiPath.getSxy();
-            PointF mDxy = graffitiPath.getDxy();
-            draw(canvas, paint, (GraffitiShape) graffitiItem.getShape(), mSxy.x, mSxy.y, mDxy.x, mDxy.y);
+            PointF mSxy = doodlePath.getSxy();
+            PointF mDxy = doodlePath.getDxy();
+            draw(canvas, paint, (DoodleShape) doodleItem.getShape(), mSxy.x, mSxy.y, mDxy.x, mDxy.y);
         }
     }
 
-    private void draw(Canvas canvas, Paint paint, GraffitiShape shape, float sx, float sy, float dx, float dy) {
+    private void draw(Canvas canvas, Paint paint, DoodleShape shape, float sx, float sy, float dx, float dy) {
         switch (shape) { // 绘制图形
             case ARROW:
                 paint.setStyle(Paint.Style.FILL);
@@ -64,7 +64,7 @@ private void draw(Canvas canvas, Paint paint, GraffitiShape shape, float sx, flo
     }
 
     @Override
-    public IGraffitiShape copy() {
+    public IDoodleShape copy() {
         return this;
     }
 }
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiText.java b/doodle/src/main/java/cn/hzw/doodle/DoodleText.java
similarity index 75%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiText.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleText.java
index 167b68b..45fc307 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiText.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleText.java
@@ -1,26 +1,26 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.text.TextUtils;
 
-import cn.hzw.graffiti.core.IGraffiti;
-import cn.hzw.graffiti.core.IGraffitiColor;
+import cn.hzw.doodle.core.IDoodle;
+import cn.hzw.doodle.core.IDoodleColor;
 
 /**
  * 文字item
  * Created by huangziwei on 2017/3/16.
  */
 
-public class GraffitiText extends GraffitiRotatableItemBase {
+public class DoodleText extends DoodleRotatableItemBase {
 
 
     private final Paint mPaint = new Paint();
     private String mText;
 
-    public GraffitiText(IGraffiti graffiti, String text, float size, IGraffitiColor color, float x, float y) {
-        super(graffiti, -graffiti.getGraffitiRotation(), x, y);
+    public DoodleText(IDoodle doodle, String text, float size, IDoodleColor color, float x, float y) {
+        super(doodle, -doodle.getDoodleRotation(), x, y);
         this.mText = text;
         setSize(size);
         setColor(color);
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiTouchDetector.java b/doodle/src/main/java/cn/hzw/doodle/DoodleTouchDetector.java
similarity index 51%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiTouchDetector.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleTouchDetector.java
index c30e36d..d424430 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiTouchDetector.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleTouchDetector.java
@@ -1,12 +1,12 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.content.Context;
 
 import cn.forward.androids.TouchGestureDetector;
-import cn.hzw.graffiti.core.IGraffitiTouchDetector;
+import cn.hzw.doodle.core.IDoodleTouchDetector;
 
-public class GraffitiTouchDetector extends TouchGestureDetector implements IGraffitiTouchDetector {
-    public GraffitiTouchDetector(Context context, IOnTouchGestureListener listener) {
+public class DoodleTouchDetector extends TouchGestureDetector implements IDoodleTouchDetector {
+    public DoodleTouchDetector(Context context, IOnTouchGestureListener listener) {
         super(context, listener);
         this.setScaleSpanSlop(1);
         this.setScaleMinSpan(1);
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiView.java b/doodle/src/main/java/cn/hzw/doodle/DoodleView.java
similarity index 71%
rename from graffiti/src/main/java/cn/hzw/graffiti/GraffitiView.java
rename to doodle/src/main/java/cn/hzw/doodle/DoodleView.java
index ce80afd..b13c7de 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiView.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleView.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -23,21 +23,21 @@
 
 import cn.forward.androids.utils.ImageUtils;
 import cn.forward.androids.utils.Util;
-import cn.hzw.graffiti.core.IGraffiti;
-import cn.hzw.graffiti.core.IGraffitiColor;
-import cn.hzw.graffiti.core.IGraffitiItem;
-import cn.hzw.graffiti.core.IGraffitiPen;
-import cn.hzw.graffiti.core.IGraffitiShape;
-import cn.hzw.graffiti.core.IGraffitiTouchDetector;
+import cn.hzw.doodle.core.IDoodle;
+import cn.hzw.doodle.core.IDoodleColor;
+import cn.hzw.doodle.core.IDoodleItem;
+import cn.hzw.doodle.core.IDoodlePen;
+import cn.hzw.doodle.core.IDoodleShape;
+import cn.hzw.doodle.core.IDoodleTouchDetector;
 
-import static cn.hzw.graffiti.util.DrawUtil.drawCircle;
-import static cn.hzw.graffiti.util.DrawUtil.rotatePoint;
+import static cn.hzw.doodle.util.DrawUtil.drawCircle;
+import static cn.hzw.doodle.util.DrawUtil.rotatePoint;
 
 /**
  * 涂鸦框架
  * Created by huangziwei on 2016/9/3.
  */
-public class GraffitiView extends FrameLayout implements IGraffiti {
+public class DoodleView extends FrameLayout implements IDoodle {
 
     // ACTION
     public final static int ACTION_ROTATION = 1; // 旋转
@@ -52,10 +52,10 @@ public class GraffitiView extends FrameLayout implements IGraffiti {
     public static final int ERROR_INIT = -1;
     public static final int ERROR_SAVE = -2;
 
-    private IGraffitiListener mGraffitiListener;
+    private IDoodleListener mDoodleListener;
 
     private Bitmap mBitmap; // 当前涂鸦的原图（旋转后）
-    private Bitmap mGraffitiBitmap; // 绘制涂鸦的图片
+    private Bitmap mDoodleBitmap; // 绘制涂鸦的图片
     private Canvas mBitmapCanvas;
 
     private float mCenterScale; // 图片适应屏幕时的缩放倍数
@@ -72,7 +72,7 @@ public class GraffitiView extends FrameLayout implements IGraffiti {
 
     private Paint mPaint;
     private float mSize;
-    private IGraffitiColor mColor; // 画笔底色
+    private IDoodleColor mColor; // 画笔底色
 
     private boolean isJustDrawOriginal; // 是否只绘制原图
 
@@ -83,10 +83,10 @@ public class GraffitiView extends FrameLayout implements IGraffiti {
     private boolean mEnableAmplifier = false; // 放大镜功能
 
     // 保存涂鸦操作，便于撤销
-    private CopyOnWriteArrayList<IGraffitiItem> mItemStack = new CopyOnWriteArrayList<IGraffitiItem>();
+    private CopyOnWriteArrayList<IDoodleItem> mItemStack = new CopyOnWriteArrayList<IDoodleItem>();
 
-    private IGraffitiPen mPen;
-    private IGraffitiShape mShape;
+    private IDoodlePen mPen;
+    private IDoodleShape mShape;
 
     private float mAmplifierRadius;
     private Path mAmplifierPath;
@@ -94,20 +94,20 @@ public class GraffitiView extends FrameLayout implements IGraffiti {
     private Paint mAmplifierPaint;
     private int mAmplifierHorizonX; // 放大器的位置的x坐标，使其水平居中
 
-    private float mGraffitiSizeUnit = 1; // 长度单位，不同大小的图片的长度单位不一样。该单位的意义同dp的作用类似，独立于图片之外的单位长度
-    private int mGraffitiRotateDegree = 0; // 相对于初始图片旋转的角度
+    private float mDoodleSizeUnit = 1; // 长度单位，不同大小的图片的长度单位不一样。该单位的意义同dp的作用类似，独立于图片之外的单位长度
+    private int mDoodleRotateDegree = 0; // 相对于初始图片旋转的角度
 
-    private List<WeakReference<IGraffitiViewListener>> mListenerList = new CopyOnWriteArrayList<>();
+    private List<WeakReference<IDoodleViewListener>> mListenerList = new CopyOnWriteArrayList<>();
 
     // 手势相关
-    private IGraffitiTouchDetector mDefaultTouchDetector;
-    private Map<IGraffitiPen, IGraffitiTouchDetector> mTouchDetectorMap = new HashMap<>();
+    private IDoodleTouchDetector mDefaultTouchDetector;
+    private Map<IDoodlePen, IDoodleTouchDetector> mTouchDetectorMap = new HashMap<>();
 
-    private GraffitiViewInner mInner;
-    private RectF mGraffitiBound = new RectF();
+    private DoodleViewInner mInner;
+    private RectF mDoodleBound = new RectF();
     private PointF mTempPoint = new PointF();
 
-    public GraffitiView(Context context, Bitmap bitmap, IGraffitiListener listener) {
+    public DoodleView(Context context, Bitmap bitmap, IDoodleListener listener) {
         this(context, bitmap, listener, null);
     }
 
@@ -117,7 +117,7 @@ public GraffitiView(Context context, Bitmap bitmap, IGraffitiListener listener)
      * @param listener
      * @param defaultDetector 默认手势识别器
      */
-    public GraffitiView(Context context, Bitmap bitmap, IGraffitiListener listener, IGraffitiTouchDetector defaultDetector) {
+    public DoodleView(Context context, Bitmap bitmap, IDoodleListener listener, IDoodleTouchDetector defaultDetector) {
         super(context);
 
         // 关闭硬件加速，因为bitmap的Canvas不支持硬件加速
@@ -126,24 +126,24 @@ public GraffitiView(Context context, Bitmap bitmap, IGraffitiListener listener,
         }
 
         mBitmap = bitmap;
-        mGraffitiListener = listener;
-        if (mGraffitiListener == null) {
-            throw new RuntimeException("IGraffitiListener is null!!!");
+        mDoodleListener = listener;
+        if (mDoodleListener == null) {
+            throw new RuntimeException("IDoodleListener is null!!!");
         }
         if (mBitmap == null) {
             throw new RuntimeException("Bitmap is null!!!");
         }
 
         mScale = 1f;
-        mColor = new GraffitiColor(Color.RED);
+        mColor = new DoodleColor(Color.RED);
         mPaint = new Paint();
         mPaint.setStrokeWidth(mSize);
         mPaint.setAntiAlias(true);
         mPaint.setStrokeJoin(Paint.Join.ROUND);
         mPaint.setStrokeCap(Paint.Cap.ROUND);// 圆滑
 
-        mPen = GraffitiPen.HAND;
-        mShape = GraffitiShape.HAND_WRITE;
+        mPen = DoodlePen.HAND;
+        mShape = DoodleShape.HAND_WRITE;
 
         mAmplifierPaint = new Paint();
         mAmplifierPaint.setColor(0xaaffffff);
@@ -155,7 +155,7 @@ public GraffitiView(Context context, Bitmap bitmap, IGraffitiListener listener,
 
         mDefaultTouchDetector = defaultDetector;
 
-        mInner = new GraffitiViewInner(context);
+        mInner = new DoodleViewInner(context);
         addView(mInner);
         setClipChildren(false);
     }
@@ -164,9 +164,9 @@ public GraffitiView(Context context, Bitmap bitmap, IGraffitiListener listener,
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
         initCanvas();
-        initGraffitiBitmap();
+        initDoodleBitmap();
         if (!mReady) {
-            mGraffitiListener.onReady();
+            mDoodleListener.onReady();
             mReady = true;
         }
     }
@@ -178,7 +178,7 @@ public boolean dispatchTouchEvent(MotionEvent event) {
         mTouchX = event.getX();
         mTouchY = event.getY();
 
-        if (mGraffitiRotateDegree == 0 || mGraffitiRotateDegree == 180) {
+        if (mDoodleRotateDegree == 0 || mDoodleRotateDegree == 180) {
             return super.dispatchTouchEvent(event);
         } else {
             // 把事件转发给innerView，避免在区域外不可点击
@@ -187,7 +187,7 @@ public boolean dispatchTouchEvent(MotionEvent event) {
 //        final float offsetY = mInner.getScrollY() - mInner.getTop();
 //        transformedEvent.offsetLocation(offsetX, offsetY);
             mTouchEventMatrix.reset();
-            mTouchEventMatrix.setRotate(-mGraffitiRotateDegree, mInner.getWidth() / 2, mInner.getHeight() / 2);
+            mTouchEventMatrix.setRotate(-mDoodleRotateDegree, mInner.getWidth() / 2, mInner.getHeight() / 2);
             transformedEvent.transform(mTouchEventMatrix);
             boolean handled = mInner.dispatchTouchEvent(transformedEvent);
             transformedEvent.recycle();
@@ -196,7 +196,7 @@ public boolean dispatchTouchEvent(MotionEvent event) {
         }
     }
 
-    private void initGraffitiBitmap() {// 不用resize preview
+    private void initDoodleBitmap() {// 不用resize preview
         int w = mBitmap.getWidth();
         int h = mBitmap.getHeight();
         float nw = w * 1f / getWidth();
@@ -219,10 +219,10 @@ private void initGraffitiBitmap() {// 不用resize preview
         mAmplifierPath.addCircle(mAmplifierRadius, mAmplifierRadius, mAmplifierRadius, Path.Direction.CCW);
         mAmplifierHorizonX = (int) (Math.min(getWidth(), getHeight()) / 2 - mAmplifierRadius);
 
-        mGraffitiSizeUnit = Util.dp2px(getContext(), 1) / mCenterScale;
+        mDoodleSizeUnit = Util.dp2px(getContext(), 1) / mCenterScale;
 
         if (!mReady) { // 只有初始化时才需要设置画笔大小
-            mSize = DEFAULT_SIZE * mGraffitiSizeUnit;
+            mSize = DEFAULT_SIZE * mDoodleSizeUnit;
         }
         // 居中适应屏幕
         mTransX = mTransY = 0;
@@ -235,31 +235,31 @@ private void initGraffitiBitmap() {// 不用resize preview
      * 获取当前图片在View坐标系中的巨型区域
      * @return
      */
-    public RectF getGraffitiBound() {
+    public RectF getDoodleBound() {
         float width = mCenterWidth * mRotateScale * mScale;
         float height = mCenterHeight * mRotateScale * mScale;
-        if (mGraffitiRotateDegree % 90 == 0) { // 对0,90,180，270度旋转做简化计算
-            if (mGraffitiRotateDegree == 0) {
+        if (mDoodleRotateDegree % 90 == 0) { // 对0,90,180，270度旋转做简化计算
+            if (mDoodleRotateDegree == 0) {
                 mTempPoint.x = toTouchX(0);
                 mTempPoint.y = toTouchY(0);
-            } else if (mGraffitiRotateDegree == 90) {
+            } else if (mDoodleRotateDegree == 90) {
                 mTempPoint.x = toTouchX(0);
                 mTempPoint.y = toTouchY(mBitmap.getHeight());
                 float t = width;
                 width = height;
                 height = t;
-            } else if (mGraffitiRotateDegree == 180) {
+            } else if (mDoodleRotateDegree == 180) {
                 mTempPoint.x = toTouchX(mBitmap.getWidth());
                 mTempPoint.y = toTouchY(mBitmap.getHeight());
-            } else if (mGraffitiRotateDegree == 270) {
+            } else if (mDoodleRotateDegree == 270) {
                 mTempPoint.x = toTouchX(mBitmap.getWidth());
                 mTempPoint.y = toTouchY(0);
                 float t = width;
                 width = height;
                 height = t;
             }
-            rotatePoint(mTempPoint, mGraffitiRotateDegree, mTempPoint.x, mTempPoint.y, mInner.getWidth() / 2, mInner.getHeight() / 2);
-            mGraffitiBound.set(mTempPoint.x, mTempPoint.y, mTempPoint.x + width, mTempPoint.y + height);
+            rotatePoint(mTempPoint, mDoodleRotateDegree, mTempPoint.x, mTempPoint.y, mInner.getWidth() / 2, mInner.getHeight() / 2);
+            mDoodleBound.set(mTempPoint.x, mTempPoint.y, mTempPoint.x + width, mTempPoint.y + height);
         } else {
             // 转换成屏幕坐标
             // 左上
@@ -276,30 +276,30 @@ public RectF getGraffitiBound() {
             float rtY = toTouchY(0);
 
             //转换到View坐标系
-            rotatePoint(mTempPoint, mGraffitiRotateDegree, ltX,ltY, mInner.getWidth() / 2, mInner.getHeight() / 2);
+            rotatePoint(mTempPoint, mDoodleRotateDegree, ltX,ltY, mInner.getWidth() / 2, mInner.getHeight() / 2);
             ltX = mTempPoint.x;
             ltY = mTempPoint.y;
-            rotatePoint(mTempPoint, mGraffitiRotateDegree, rbX,rbY, mInner.getWidth() / 2, mInner.getHeight() / 2);
+            rotatePoint(mTempPoint, mDoodleRotateDegree, rbX,rbY, mInner.getWidth() / 2, mInner.getHeight() / 2);
             rbX = mTempPoint.x;
             rbY = mTempPoint.y;
-            rotatePoint(mTempPoint, mGraffitiRotateDegree, lbX,lbY, mInner.getWidth() / 2, mInner.getHeight() / 2);
+            rotatePoint(mTempPoint, mDoodleRotateDegree, lbX,lbY, mInner.getWidth() / 2, mInner.getHeight() / 2);
             lbX = mTempPoint.x;
             lbY = mTempPoint.y;
-            rotatePoint(mTempPoint, mGraffitiRotateDegree, rtX,rtY, mInner.getWidth() / 2, mInner.getHeight() / 2);
+            rotatePoint(mTempPoint, mDoodleRotateDegree, rtX,rtY, mInner.getWidth() / 2, mInner.getHeight() / 2);
             rtX = mTempPoint.x;
             rtY = mTempPoint.y;
 
-            mGraffitiBound.left = Math.min(Math.min(ltX, rbX), Math.min(lbX, rtX));
-            mGraffitiBound.top = Math.min(Math.min(ltY, rbY), Math.min(lbY, rtY));
-            mGraffitiBound.right = Math.max(Math.max(ltX, rbX), Math.max(lbX, rtX));
-            mGraffitiBound.bottom = Math.max(Math.max(ltY, rbY), Math.max(lbY, rtY));
+            mDoodleBound.left = Math.min(Math.min(ltX, rbX), Math.min(lbX, rtX));
+            mDoodleBound.top = Math.min(Math.min(ltY, rbY), Math.min(lbY, rtY));
+            mDoodleBound.right = Math.max(Math.max(ltX, rbX), Math.max(lbX, rtX));
+            mDoodleBound.bottom = Math.max(Math.max(ltY, rbY), Math.max(lbY, rtY));
         }
-        return mGraffitiBound;
+        return mDoodleBound;
     }
 
     @Override
     protected void dispatchDraw(Canvas canvas) {
-        if (mBitmap.isRecycled() || mGraffitiBitmap.isRecycled()) {
+        if (mBitmap.isRecycled() || mDoodleBitmap.isRecycled()) {
             return;
         }
 
@@ -309,7 +309,7 @@ protected void dispatchDraw(Canvas canvas) {
         mPaint.setStyle(Paint.Style.STROKE);
         mPaint.setColor(Color.BLUE);
         mPaint.setStrokeWidth(20);
-        canvas.drawRect(getGraffitiBound(), mPaint);*/
+        canvas.drawRect(getDoodleBound(), mPaint);*/
 
         if (mEnableAmplifier && mAmplifierScale > 0) { //启用放大镜
             canvas.save();
@@ -350,7 +350,7 @@ private void doDraw(Canvas canvas) {
             return;
         }
         // 绘制涂鸦后的图片
-        canvas.drawBitmap(mGraffitiBitmap, 0, 0, null);
+        canvas.drawBitmap(mDoodleBitmap, 0, 0, null);
 
         boolean canvasClipped = false;
         canvas.save(); // 1
@@ -358,9 +358,9 @@ private void doDraw(Canvas canvas) {
             canvasClipped = true;
             canvas.clipRect(0, 0, mBitmap.getWidth(), mBitmap.getHeight());
         }
-        for (IGraffitiItem item : mItemStack) {
-            if (item instanceof GraffitiItemBase) {
-                if (((GraffitiItemBase) item).isDrawOptimize()) { // 优化绘制
+        for (IDoodleItem item : mItemStack) {
+            if (item instanceof DoodleItemBase) {
+                if (((DoodleItemBase) item).isDrawOptimize()) { // 优化绘制
 
                 } else { //画在view的画布上
                     if (!item.isNeedClipOutside()) { // 1.不需要裁剪
@@ -368,18 +368,18 @@ private void doDraw(Canvas canvas) {
                             canvas.restore();
                         }
 
-                        ((GraffitiItemBase) item).drawBefore(canvas);
+                        ((DoodleItemBase) item).drawBefore(canvas);
                         item.draw(canvas);
-                        ((GraffitiItemBase) item).drawAfter(canvas);
+                        ((DoodleItemBase) item).drawAfter(canvas);
 
                         if (canvasClipped) { // 2.恢复裁剪
                             canvas.save();
                             canvas.clipRect(0, 0, mBitmap.getWidth(), mBitmap.getHeight());
                         }
                     } else {
-                        ((GraffitiItemBase) item).drawBefore(canvas);
+                        ((DoodleItemBase) item).drawBefore(canvas);
                         item.draw(canvas);
-                        ((GraffitiItemBase) item).drawAfter(canvas);
+                        ((DoodleItemBase) item).drawAfter(canvas);
                     }
                 }
             } else {
@@ -436,24 +436,24 @@ public final float toTouchY(float y) {
      * （公式由toX()中的公式推算出）
      *
      * @param touchX    触摸坐标
-     * @param graffitiX 在涂鸦图片中的坐标
+     * @param doodleX 在涂鸦图片中的坐标
      * @return 偏移量
      */
-    public final float toTransX(float touchX, float graffitiX) {
-        return -graffitiX * getAllScale() + touchX - mCentreTranX - mRotateTranX;
+    public final float toTransX(float touchX, float doodleX) {
+        return -doodleX * getAllScale() + touchX - mCentreTranX - mRotateTranX;
     }
 
-    public final float toTransY(float touchY, float graffitiY) {
-        return -graffitiY * getAllScale() + touchY - mCentreTranY - mRotateTranY;
+    public final float toTransY(float touchY, float doodleY) {
+        return -doodleY * getAllScale() + touchY - mCentreTranY - mRotateTranY;
     }
 
 
     private void initCanvas() {
-        if (mGraffitiBitmap != null) {
-            mGraffitiBitmap.recycle();
+        if (mDoodleBitmap != null) {
+            mDoodleBitmap.recycle();
         }
-        mGraffitiBitmap = mBitmap.copy(Bitmap.Config.RGB_565, true);
-        mBitmapCanvas = new Canvas(mGraffitiBitmap);
+        mDoodleBitmap = mBitmap.copy(Bitmap.Config.RGB_565, true);
+        mBitmapCanvas = new Canvas(mDoodleBitmap);
     }
 
     /**
@@ -462,7 +462,7 @@ private void initCanvas() {
      * @param pen
      * @param detector
      */
-    public void bindTouchDetector(IGraffitiPen pen, IGraffitiTouchDetector detector) {
+    public void bindTouchDetector(IDoodlePen pen, IDoodleTouchDetector detector) {
         if (pen == null) {
             return;
         }
@@ -474,7 +474,7 @@ public void bindTouchDetector(IGraffitiPen pen, IGraffitiTouchDetector detector)
      *
      * @param pen
      */
-    public IGraffitiTouchDetector getDefaultTouchDetector(IGraffitiPen pen) {
+    public IDoodleTouchDetector getDefaultTouchDetector(IDoodlePen pen) {
         return mTouchDetectorMap.get(pen);
     }
 
@@ -483,7 +483,7 @@ public IGraffitiTouchDetector getDefaultTouchDetector(IGraffitiPen pen) {
      *
      * @param pen
      */
-    public void removeTouchDetector(IGraffitiPen pen) {
+    public void removeTouchDetector(IDoodlePen pen) {
         if (pen == null) {
             return;
         }
@@ -495,7 +495,7 @@ public void removeTouchDetector(IGraffitiPen pen) {
      *
      * @param touchGestureDetector
      */
-    public void setDefaultTouchDetector(IGraffitiTouchDetector touchGestureDetector) {
+    public void setDefaultTouchDetector(IDoodleTouchDetector touchGestureDetector) {
         mDefaultTouchDetector = touchGestureDetector;
     }
 
@@ -504,7 +504,7 @@ public void setDefaultTouchDetector(IGraffitiTouchDetector touchGestureDetector)
      *
      * @return
      */
-    public IGraffitiTouchDetector getDefaultTouchDetector() {
+    public IDoodleTouchDetector getDefaultTouchDetector() {
         return mDefaultTouchDetector;
     }
 
@@ -516,9 +516,9 @@ public IGraffitiTouchDetector getDefaultTouchDetector() {
     public void invalidateForce() {
         initCanvas();
         // 重新绘制到图片上
-        for (IGraffitiItem item : mItemStack) {
-            if (item instanceof GraffitiItemBase) {
-                if (((GraffitiItemBase) item).isDrawOptimize()) { // 优化绘制
+        for (IDoodleItem item : mItemStack) {
+            if (item instanceof DoodleItemBase) {
+                if (((DoodleItemBase) item).isDrawOptimize()) { // 优化绘制
                     item.draw(mBitmapCanvas);
                 } else { //画在view的画布上
 
@@ -530,11 +530,11 @@ public void invalidateForce() {
         invalidate();
     }
 
-    public void invalidate(IGraffitiItem item) {
+    public void invalidate(IDoodleItem item) {
         if (!mItemStack.contains(item)) {
-            throw new RuntimeException("graffiti doesn't include the item");
+            throw new RuntimeException("doodle doesn't include the item");
         }
-        if (((GraffitiItemBase) item).isDrawOptimize()) { // 优化绘制,保存到图片上
+        if (((DoodleItemBase) item).isDrawOptimize()) { // 优化绘制,保存到图片上
             item.draw(mBitmapCanvas);
         } else {
 
@@ -543,8 +543,8 @@ public void invalidate(IGraffitiItem item) {
     }
 
     @Override
-    public int getGraffitiRotation() {
-        return mGraffitiRotateDegree;
+    public int getDoodleRotation() {
+        return mDoodleRotateDegree;
     }
 
     /**
@@ -554,15 +554,15 @@ public int getGraffitiRotation() {
      */
 
     @Override
-    public void setGraffitiRotation(int degree) {
-        mGraffitiRotateDegree = degree;
-        mGraffitiRotateDegree = mGraffitiRotateDegree % 360;
+    public void setDoodleRotation(int degree) {
+        mDoodleRotateDegree = degree;
+        mDoodleRotateDegree = mDoodleRotateDegree % 360;
         mInner.setPivotX(mInner.getWidth() / 2);
         mInner.setPivotY(mInner.getHeight() / 2);
-        mInner.setRotation(mGraffitiRotateDegree);
+        mInner.setRotation(mDoodleRotateDegree);
 
         // 居中
-        RectF rectF = getGraffitiBound();
+        RectF rectF = getDoodleBound();
         int w = (int) (rectF.width() / getAllScale());
         int h = (int) (rectF.height() / getAllScale());
         float nw = w * 1f / getWidth();
@@ -599,22 +599,22 @@ public void setGraffitiRotation(int degree) {
     }
 
     /**
-     * 保存, 回调GraffitiListener.onSaved()的线程和调用save()的线程相同
+     * 保存, 回调DoodleListener.onSaved()的线程和调用save()的线程相同
      */
     @Override
     public void save() {
-        for (IGraffitiItem item : mItemStack) {
-            if (item instanceof GraffitiItemBase) {
-                if (((GraffitiItemBase) item).isDrawOptimize()) { // 优化绘制，addItem时已经保存在图片上
+        for (IDoodleItem item : mItemStack) {
+            if (item instanceof DoodleItemBase) {
+                if (((DoodleItemBase) item).isDrawOptimize()) { // 优化绘制，addItem时已经保存在图片上
 
                 } else { // 最终保存到图片上
                     item.draw(mBitmapCanvas);
                 }
             }
         }
-        mGraffitiBitmap = ImageUtils.rotate(mGraffitiBitmap, mGraffitiRotateDegree, true);
+        mDoodleBitmap = ImageUtils.rotate(mDoodleBitmap, mDoodleRotateDegree, true);
 
-        mGraffitiListener.onSaved(mGraffitiBitmap, new Runnable() {
+        mDoodleListener.onSaved(mDoodleBitmap, new Runnable() {
             @Override
             public void run() {
                 // 还原涂鸦图片，确保在ui线程刷新
@@ -649,7 +649,7 @@ public boolean undo(int step) {
 
         if (mItemStack.size() > 0) {
             step = Math.min(mItemStack.size(), step);
-            IGraffitiItem item = mItemStack.get(mItemStack.size() - step);
+            IDoodleItem item = mItemStack.get(mItemStack.size() - step);
             removeItem(item);
             notifyActionOccur(ACTION_UNDO, item);
             return true;
@@ -687,13 +687,13 @@ public boolean isShowOriginal() {
      * @param color
      */
     @Override
-    public void setColor(IGraffitiColor color) {
+    public void setColor(IDoodleColor color) {
         mColor = color;
         invalidate();
     }
 
     @Override
-    public IGraffitiColor getColor() {
+    public IDoodleColor getColor() {
         return mColor;
     }
 
@@ -706,7 +706,7 @@ public IGraffitiColor getColor() {
      * @param pivotY
      */
     @Override
-    public void setGraffitiScale(float scale, float pivotX, float pivotY) {
+    public void setDoodleScale(float scale, float pivotX, float pivotY) {
         if (scale < mMinScale) {
             scale = mMinScale;
         } else if (scale > mMaxScale) {
@@ -725,7 +725,7 @@ public void setGraffitiScale(float scale, float pivotX, float pivotY) {
     }
 
     @Override
-    public float getGraffitiScale() {
+    public float getDoodleScale() {
         return mScale;
     }
 
@@ -735,17 +735,17 @@ public float getGraffitiScale() {
      * @param pen
      */
     @Override
-    public void setPen(IGraffitiPen pen) {
+    public void setPen(IDoodlePen pen) {
         if (pen == null) {
             throw new RuntimeException("Pen can't be null");
         }
-        IGraffitiPen old = mPen;
+        IDoodlePen old = mPen;
         mPen = pen;
         invalidate();
     }
 
     @Override
-    public IGraffitiPen getPen() {
+    public IDoodlePen getPen() {
         return mPen;
     }
 
@@ -755,7 +755,7 @@ public IGraffitiPen getPen() {
      * @param shape
      */
     @Override
-    public void setShape(IGraffitiShape shape) {
+    public void setShape(IDoodleShape shape) {
         if (shape == null) {
             throw new RuntimeException("Shape can't be null");
         }
@@ -764,12 +764,12 @@ public void setShape(IGraffitiShape shape) {
     }
 
     @Override
-    public IGraffitiShape getShape() {
+    public IDoodleShape getShape() {
         return mShape;
     }
 
     @Override
-    public void setGraffitiTranslation(float transX, float transY) {
+    public void setDoodleTranslation(float transX, float transY) {
         mTransX = transX;
         mTransY = transY;
         invalidate();
@@ -781,24 +781,24 @@ public void setGraffitiTranslation(float transX, float transY) {
      * @param transX
      */
     @Override
-    public void setGraffitiTranslationX(float transX) {
+    public void setDoodleTranslationX(float transX) {
         this.mTransX = transX;
         invalidate();
     }
 
     @Override
-    public float getGraffitiTranslationX() {
+    public float getDoodleTranslationX() {
         return mTransX;
     }
 
     @Override
-    public void setGraffitiTranslationY(float transY) {
+    public void setDoodleTranslationY(float transY) {
         this.mTransY = transY;
         invalidate();
     }
 
     @Override
-    public float getGraffitiTranslationY() {
+    public float getDoodleTranslationY() {
         return mTransY;
     }
 
@@ -865,79 +865,79 @@ public boolean isEnableAmplifier() {
     }
 
     @Override
-    public void topItem(IGraffitiItem item) {
+    public void topItem(IDoodleItem item) {
         mItemStack.remove(item);
         mItemStack.add(item);
         invalidate();
     }
 
     @Override
-    public void bottomItem(IGraffitiItem item) {
+    public void bottomItem(IDoodleItem item) {
         mItemStack.remove(item);
         mItemStack.add(0, item);
         invalidate();
     }
 
     @Override
-    public void setGraffitiMinScale(float minScale) {
+    public void setDoodleMinScale(float minScale) {
         mMinScale = minScale;
-        setGraffitiScale(mScale, 0, 0);
+        setDoodleScale(mScale, 0, 0);
     }
 
     @Override
-    public float getGraffitiMinScale() {
+    public float getDoodleMinScale() {
         return mMinScale;
     }
 
     @Override
-    public void setGraffitiMaxScale(float maxScale) {
+    public void setDoodleMaxScale(float maxScale) {
         mMaxScale = maxScale;
-        setGraffitiScale(mScale, 0, 0);
+        setDoodleScale(mScale, 0, 0);
     }
 
     @Override
-    public float getGraffitiMaxScale() {
+    public float getDoodleMaxScale() {
         return mMaxScale;
     }
 
     @Override
     public float getSizeUnit() {
-        return mGraffitiSizeUnit;
+        return mDoodleSizeUnit;
     }
 
     @Override
-    public void addItem(IGraffitiItem graffitiItem) {
-        if (this != graffitiItem.getGraffiti()) {
-            throw new RuntimeException("the object Graffiti is illegal");
+    public void addItem(IDoodleItem doodleItem) {
+        if (this != doodleItem.getDoodle()) {
+            throw new RuntimeException("the object Doodle is illegal");
         }
-        if (mItemStack.contains(graffitiItem)) {
+        if (mItemStack.contains(doodleItem)) {
             throw new RuntimeException("the item has been added");
         }
-        mItemStack.add(graffitiItem);
-        graffitiItem.onAdd();
+        mItemStack.add(doodleItem);
+        doodleItem.onAdd();
 
-        if (((GraffitiItemBase) graffitiItem).isDrawOptimize()) { // // 优化绘制
-            graffitiItem.draw(mBitmapCanvas); // 提前保存到图片中
+        if (((DoodleItemBase) doodleItem).isDrawOptimize()) { // // 优化绘制
+            doodleItem.draw(mBitmapCanvas); // 提前保存到图片中
         }
         invalidate();
     }
 
     @Override
-    public void removeItem(IGraffitiItem graffitiItem) {
-        if (!mItemStack.remove(graffitiItem)) {
+    public void removeItem(IDoodleItem doodleItem) {
+        if (!mItemStack.remove(doodleItem)) {
             return;
         }
-        graffitiItem.onRemove();
+        doodleItem.onRemove();
 
-        if (graffitiItem instanceof GraffitiItemBase &&
-                ((GraffitiItemBase) graffitiItem).isDrawOptimize()) { // 由于优化绘制，需要重新绘制抹掉图片上的痕迹
+        if (doodleItem instanceof DoodleItemBase &&
+                ((DoodleItemBase) doodleItem).isDrawOptimize()) { // 由于优化绘制，需要重新绘制抹掉图片上的痕迹
             invalidateForce();
         }
         invalidate();
     }
 
     @Override
-    public List<IGraffitiItem> getAllItem() {
+    public List<IDoodleItem> getAllItem() {
         return mItemStack;
     }
 
@@ -947,8 +947,8 @@ public Bitmap getBitmap() {
     }
 
     @Override
-    public Bitmap getGraffitiBitmap() {
-        return mGraffitiBitmap;
+    public Bitmap getDoodleBitmap() {
+        return mDoodleBitmap;
     }
 
 
@@ -957,7 +957,7 @@ public Bitmap getGraffitiBitmap() {
      *
      * @param listener
      */
-    public void addGraffitiViewListener(IGraffitiViewListener listener) {
+    public void addDoodleViewListener(IDoodleViewListener listener) {
         if (listener == null || mListenerList.contains(listener)) {
             return;
         }
@@ -969,9 +969,9 @@ public void addGraffitiViewListener(IGraffitiViewListener listener) {
      *
      * @param listener
      */
-    public void removeGraffitiViewListener(IGraffitiViewListener listener) {
-        IGraffitiViewListener callBack;
-        for (WeakReference<IGraffitiViewListener> ref : mListenerList) {
+    public void removeDoodleViewListener(IDoodleViewListener listener) {
+        IDoodleViewListener callBack;
+        for (WeakReference<IDoodleViewListener> ref : mListenerList) {
             callBack = ref.get();
             if (callBack == null || callBack == listener) {
                 mListenerList.remove(ref);
@@ -1013,8 +1013,8 @@ public float getRotateTranY() {
     }
 
     private void notifyActionOccur(int action, Object obj) {
-        IGraffitiViewListener callBack;
-        for (WeakReference<IGraffitiViewListener> ref : mListenerList) {
+        IDoodleViewListener callBack;
+        for (WeakReference<IDoodleViewListener> ref : mListenerList) {
             callBack = ref.get();
             if (callBack != null) {
                 callBack.onActionOccur(action, obj);
@@ -1027,7 +1027,7 @@ private void notifyActionOccur(int action, Object obj) {
     /**
      * 监听涂鸦中的事件
      */
-    public interface IGraffitiViewListener {
+    public interface IDoodleViewListener {
 
         /**
          * 操作发生后回调
@@ -1038,9 +1038,9 @@ public interface IGraffitiViewListener {
         public void onActionOccur(int action, Object obj);
     }
 
-    private class GraffitiViewInner extends View {
+    private class DoodleViewInner extends View {
 
-        public GraffitiViewInner(Context context) {
+        public DoodleViewInner(Context context) {
             super(context);
         }
 
@@ -1058,7 +1058,7 @@ public boolean dispatchTouchEvent(MotionEvent event) {
         @Override
         public boolean onTouchEvent(MotionEvent event) {
             // 綁定的识别器
-            IGraffitiTouchDetector detector = mTouchDetectorMap.get(mPen);
+            IDoodleTouchDetector detector = mTouchDetectorMap.get(mPen);
             if (detector != null) {
                 return detector.onTouchEvent(event);
             }
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/IGraffitiListener.java b/doodle/src/main/java/cn/hzw/doodle/IDoodleListener.java
similarity index 65%
rename from graffiti/src/main/java/cn/hzw/graffiti/IGraffitiListener.java
rename to doodle/src/main/java/cn/hzw/doodle/IDoodleListener.java
index 89bfbb7..5457423 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/IGraffitiListener.java
+++ b/doodle/src/main/java/cn/hzw/doodle/IDoodleListener.java
@@ -1,23 +1,23 @@
-package cn.hzw.graffiti;
+package cn.hzw.doodle;
 
 import android.graphics.Bitmap;
 
-import cn.hzw.graffiti.core.IGraffitiSelectableItem;
+import cn.hzw.doodle.core.IDoodleSelectableItem;
 
 /**
  * 涂鸦框架相关的回调
  * Created by huangziwei on 2017/3/17.
  */
 
-public interface IGraffitiListener {
+public interface IDoodleListener {
 
     /**
      * 保存图片
      *
-     * @param graffitiBitmap       涂鸦后的图片
+     * @param doodleBitmap       涂鸦后的图片
      * @param callback  保存后的回调，如果需要继续涂鸦，必须调用该回调
      */
-    void onSaved(Bitmap graffitiBitmap, Runnable callback);
+    void onSaved(Bitmap doodleBitmap, Runnable callback);
 
     /**
      * 出错
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffiti.java b/doodle/src/main/java/cn/hzw/doodle/core/IDoodle.java
similarity index 71%
rename from graffiti/src/main/java/cn/hzw/graffiti/core/IGraffiti.java
rename to doodle/src/main/java/cn/hzw/doodle/core/IDoodle.java
index b014609..2b9cdec 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffiti.java
+++ b/doodle/src/main/java/cn/hzw/doodle/core/IDoodle.java
@@ -1,16 +1,16 @@
-package cn.hzw.graffiti.core;
+package cn.hzw.doodle.core;
 
 import android.graphics.Bitmap;
 
 import java.util.List;
 
-import cn.hzw.graffiti.GraffitiColor;
+import cn.hzw.doodle.DoodleColor;
 
 /**
  * Created on 27/06/2018.
  */
 
-public interface IGraffiti {
+public interface IDoodle {
     /**
      * 获取当前涂鸦坐标系中的单位大小，该单位参考dp，独立于图片
      *
@@ -23,14 +23,14 @@ public interface IGraffiti {
      *
      * @param degree
      */
-    public void setGraffitiRotation(int degree);
+    public void setDoodleRotation(int degree);
 
     /**
      * 获取图片旋转值
      *
      * @return
      */
-    public int getGraffitiRotation();
+    public int getDoodleRotation();
 
     /**
      * 设置图片缩放倍数
@@ -39,43 +39,43 @@ public interface IGraffiti {
      * @param pivotX
      * @param pivotY
      */
-    public void setGraffitiScale(float scale, float pivotX, float pivotY);
+    public void setDoodleScale(float scale, float pivotX, float pivotY);
 
     /**
      * 获取图片缩放倍数
      */
-    public float getGraffitiScale();
+    public float getDoodleScale();
 
     /**
      * 设置画笔
      *
      * @param pen
      */
-    public void setPen(IGraffitiPen pen);
+    public void setPen(IDoodlePen pen);
 
     /**
      * 获取画笔
      */
-    public IGraffitiPen getPen();
+    public IDoodlePen getPen();
 
     /**
      * 设置画笔形状
      *
      * @param shape
      */
-    public void setShape(IGraffitiShape shape);
+    public void setShape(IDoodleShape shape);
 
     /**
      * 获取画笔形状
      */
-    public IGraffitiShape getShape();
+    public IDoodleShape getShape();
 
     /**
      * 设置图片偏移量x
      *
      * @param transX
      */
-    public void setGraffitiTranslation(float transX, float transY);
+    public void setDoodleTranslation(float transX, float transY);
 
 
     /**
@@ -83,28 +83,28 @@ public interface IGraffiti {
      *
      * @param transX
      */
-    public void setGraffitiTranslationX(float transX);
+    public void setDoodleTranslationX(float transX);
 
     /**
      * 获取图片偏移量x
      *
      * @return
      */
-    public float getGraffitiTranslationX();
+    public float getDoodleTranslationX();
 
     /**
      * 设置图片偏移量y
      *
      * @param transY
      */
-    public void setGraffitiTranslationY(float transY);
+    public void setDoodleTranslationY(float transY);
 
     /**
      * 获取图片偏移量y
      *
      * @return
      */
-    public float getGraffitiTranslationY();
+    public float getDoodleTranslationY();
 
     /**
      * 设置大小
@@ -125,63 +125,63 @@ public interface IGraffiti {
      *
      * @param color
      */
-    public void setColor(IGraffitiColor color);
+    public void setColor(IDoodleColor color);
 
     /**
      * 获取颜色
      *
      * @return
      */
-    public IGraffitiColor getColor();
+    public IDoodleColor getColor();
 
     /**
      * 最小缩放倍数限制
      *
      * @param minScale
      */
-    public void setGraffitiMinScale(float minScale);
+    public void setDoodleMinScale(float minScale);
 
     /**
      * 最小缩放倍数限制
      *
      * @return
      */
-    public float getGraffitiMinScale();
+    public float getDoodleMinScale();
 
     /**
      * 最大缩放倍数限制
      *
      * @param maxScale
      */
-    public void setGraffitiMaxScale(float maxScale);
+    public void setDoodleMaxScale(float maxScale);
 
     /**
      * 最大缩放倍数限制
      *
      * @return
      */
-    public float getGraffitiMaxScale();
+    public float getDoodleMaxScale();
 
     /**
      * 添加item
      *
-     * @param graffitiItem
+     * @param doodleItem
      */
-    public void addItem(IGraffitiItem graffitiItem);
+    public void addItem(IDoodleItem doodleItem);
 
     /**
      * 移除item
      *
-     * @param graffitiItem
+     * @param doodleItem
      */
-    public void removeItem(IGraffitiItem graffitiItem);
+    public void removeItem(IDoodleItem doodleItem);
 
     /**
      * 获取所有的涂鸦
      *
      * @return
      */
-    public List<IGraffitiItem> getAllItem();
+    public List<IDoodleItem> getAllItem();
 
     /**
      * 设置放大镜倍数
@@ -237,14 +237,14 @@ public interface IGraffiti {
      *
      * @param item
      */
-    public void topItem(IGraffitiItem item);
+    public void topItem(IDoodleItem item);
 
     /**
      * 置底item
      *
      * @param item
      */
-    public void bottomItem(IGraffitiItem item);
+    public void bottomItem(IDoodleItem item);
 
     /**
      * 撤销一步
@@ -273,7 +273,7 @@ public interface IGraffiti {
      *
      * @return
      */
-    public Bitmap getGraffitiBitmap();
+    public Bitmap getDoodleBitmap();
 
     /**
      * 刷新
diff --git a/doodle/src/main/java/cn/hzw/doodle/core/IDoodleColor.java b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleColor.java
new file mode 100644
index 0000000..cbc14e9
--- /dev/null
+++ b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleColor.java
@@ -0,0 +1,19 @@
+package cn.hzw.doodle.core;
+
+import android.graphics.Paint;
+
+public interface IDoodleColor {
+
+    /**
+     * 配置画笔
+     * @param doodleItem
+     * @param paint
+     */
+    public void config(IDoodleItem doodleItem, Paint paint);
+
+    /**
+     * 深度拷贝
+     * @return
+     */
+    public IDoodleColor copy();
+}
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiItem.java b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleItem.java
similarity index 78%
rename from graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiItem.java
rename to doodle/src/main/java/cn/hzw/doodle/core/IDoodleItem.java
index 625952d..2510d13 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiItem.java
+++ b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleItem.java
@@ -1,43 +1,43 @@
-package cn.hzw.graffiti.core;
+package cn.hzw.doodle.core;
 
 import android.graphics.Canvas;
 import android.graphics.PointF;
 
-import cn.hzw.graffiti.GraffitiColor;
+import cn.hzw.doodle.DoodleColor;
 
 /**
  * Created on 27/06/2018.
  */
 
-public interface IGraffitiItem {
+public interface IDoodleItem {
 
-    public void setGraffiti(IGraffiti graffiti);
+    public void setDoodle(IDoodle doodle);
 
-    public IGraffiti getGraffiti();
+    public IDoodle getDoodle();
 
     /**
      * 获取画笔
      * @return
      */
-    public IGraffitiPen getPen();
+    public IDoodlePen getPen();
 
     /**
      * 设置画笔
      * @param pen
      */
-    public void setPen(IGraffitiPen pen);
+    public void setPen(IDoodlePen pen);
 
     /**
      * 获取画笔形状
      * @return
      */
-    public IGraffitiShape getShape();
+    public IDoodleShape getShape();
 
     /**
      * 设置画笔形状
      * @param shape
      */
-    public void setShape(IGraffitiShape shape);
+    public void setShape(IDoodleShape shape);
 
     /**
      * 获取大小
@@ -55,13 +55,13 @@ public interface IGraffitiItem {
      * 获取颜色
      * @return
      */
-    public IGraffitiColor getColor();
+    public IDoodleColor getColor();
 
     /**
      * 设置颜色
      * @param color
      */
-    public void setColor(IGraffitiColor color);
+    public void setColor(IDoodleColor color);
 
     /**
      * 绘制item
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiPen.java b/doodle/src/main/java/cn/hzw/doodle/core/IDoodlePen.java
similarity index 54%
rename from graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiPen.java
rename to doodle/src/main/java/cn/hzw/doodle/core/IDoodlePen.java
index 34cf717..b436900 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiPen.java
+++ b/doodle/src/main/java/cn/hzw/doodle/core/IDoodlePen.java
@@ -1,16 +1,16 @@
-package cn.hzw.graffiti.core;
+package cn.hzw.doodle.core;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
 
-public interface IGraffitiPen {
+public interface IDoodlePen {
 
     /**
      * 配置画笔
-     * @param graffitiItem
+     * @param doodleItem
      * @param paint
      */
-    public void config(IGraffitiItem graffitiItem, Paint paint);
+    public void config(IDoodleItem doodleItem, Paint paint);
 
     /**
      * 画笔制作的item是否可选，用于旋转、移动等特定操作
@@ -20,18 +20,18 @@ public interface IGraffitiPen {
     public boolean isSelectable();
 
     /**
-     * 绘制画笔辅助工具，由IGraffiti绘制，不属于IGraffitiItem的内容
+     * 绘制画笔辅助工具，由IDoodle绘制，不属于IDoodleItem的内容
      * 比如可以用于仿制功能时 定位器的绘制
      *
      * @param canvas
-     * @param graffiti
+     * @param doodle
      */
-    public void drawHelpers(Canvas canvas, IGraffiti graffiti);
+    public void drawHelpers(Canvas canvas, IDoodle doodle);
 
     /**
      * 深度拷贝
      * @return
      */
-    public IGraffitiPen copy();
+    public IDoodlePen copy();
 
 }
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiSelectableItem.java b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleSelectableItem.java
similarity index 87%
rename from graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiSelectableItem.java
rename to doodle/src/main/java/cn/hzw/doodle/core/IDoodleSelectableItem.java
index 9488db4..5bec544 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiSelectableItem.java
+++ b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleSelectableItem.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti.core;
+package cn.hzw.doodle.core;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -7,7 +7,7 @@
  * Created on 27/06/2018.
  */
 
-public interface IGraffitiSelectableItem extends IGraffitiItem {
+public interface IDoodleSelectableItem extends IDoodleItem {
 
     /**
      * 设置是否选中
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiShape.java b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleShape.java
similarity index 53%
rename from graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiShape.java
rename to doodle/src/main/java/cn/hzw/doodle/core/IDoodleShape.java
index bb452ea..d5cad51 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiShape.java
+++ b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleShape.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti.core;
+package cn.hzw.doodle.core;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -6,19 +6,19 @@
 /**
  * 图形
  */
-public interface IGraffitiShape {
+public interface IDoodleShape {
 
      /**
       * 绘制
       * @param canvas
-      * @param graffitiItem
+      * @param doodleItem
       * @param paint 绘制的画笔
       */
-     public void draw(Canvas canvas, IGraffitiItem graffitiItem, Paint paint);
+     public void draw(Canvas canvas, IDoodleItem doodleItem, Paint paint);
 
      /**
       * 深度拷贝
       * @return
       */
-     public IGraffitiShape copy();
+     public IDoodleShape copy();
 }
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiTouchDetector.java b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleTouchDetector.java
similarity index 55%
rename from graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiTouchDetector.java
rename to doodle/src/main/java/cn/hzw/doodle/core/IDoodleTouchDetector.java
index 3438cc1..57808c5 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiTouchDetector.java
+++ b/doodle/src/main/java/cn/hzw/doodle/core/IDoodleTouchDetector.java
@@ -1,7 +1,7 @@
-package cn.hzw.graffiti.core;
+package cn.hzw.doodle.core;
 
 import android.view.MotionEvent;
 
-public interface IGraffitiTouchDetector {
+public interface IDoodleTouchDetector {
     public boolean onTouchEvent(MotionEvent event);
 }
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/dialog/ColorPickerDialog.java b/doodle/src/main/java/cn/hzw/doodle/dialog/ColorPickerDialog.java
similarity index 98%
rename from graffiti/src/main/java/cn/hzw/graffiti/dialog/ColorPickerDialog.java
rename to doodle/src/main/java/cn/hzw/doodle/dialog/ColorPickerDialog.java
index 94a0804..5eaf06f 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/dialog/ColorPickerDialog.java
+++ b/doodle/src/main/java/cn/hzw/doodle/dialog/ColorPickerDialog.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti.dialog;
+package cn.hzw.doodle.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -18,7 +18,7 @@
 import android.widget.ImageView;
 
 import cn.forward.androids.utils.Util;
-import cn.hzw.graffiti.R;
+import cn.hzw.doodle.R;
 
 public class ColorPickerDialog extends Dialog {
     private final boolean debug = true;
@@ -366,7 +366,7 @@ public void show() {
         int width = Util.dp2px(context, 180);
         ColorPickerView myView = new ColorPickerView(context, height, width);
 
-        ViewGroup viewGroup = (ViewGroup) View.inflate(context, R.layout.graffiti_color_selector_dialog, null);
+        ViewGroup viewGroup = (ViewGroup) View.inflate(context, R.layout.doodle_color_selector_dialog, null);
         View.OnClickListener listener = new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -376,12 +376,12 @@ public void onClick(View v) {
             }
         };
 
-        ViewGroup shaderContainer = (ViewGroup) viewGroup.findViewById(R.id.graffiti_shader_container);
+        ViewGroup shaderContainer = (ViewGroup) viewGroup.findViewById(R.id.doodle_shader_container);
         for (int i = 0; i < shaderContainer.getChildCount(); i++) {
             shaderContainer.getChildAt(i).setOnClickListener(listener);
         }
 
-        ViewGroup container = (ViewGroup) viewGroup.findViewById(R.id.graffiti_color_selector_container);
+        ViewGroup container = (ViewGroup) viewGroup.findViewById(R.id.doodle_color_selector_container);
         container.addView(myView, 0, new ViewGroup.LayoutParams(height, width));
 
         setContentView(viewGroup, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/dialog/DialogController.java b/doodle/src/main/java/cn/hzw/doodle/dialog/DialogController.java
similarity index 93%
rename from graffiti/src/main/java/cn/hzw/graffiti/dialog/DialogController.java
rename to doodle/src/main/java/cn/hzw/doodle/dialog/DialogController.java
index 43ee6d0..dd938db 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/dialog/DialogController.java
+++ b/doodle/src/main/java/cn/hzw/doodle/dialog/DialogController.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti.dialog;
+package cn.hzw.doodle.dialog;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -10,7 +10,7 @@
 
 import cn.forward.androids.base.InjectionLayoutInflater;
 import cn.forward.androids.utils.StatusBarUtil;
-import cn.hzw.graffiti.R;
+import cn.hzw.doodle.R;
 
 /**
  * Created by huangziwei on 2017/4/21.
@@ -18,13 +18,13 @@
 
 public class DialogController {
     public static Dialog showEnterCancelDialog(Activity activity, String title, String msg, final View.OnClickListener enterClick, final View.OnClickListener cancelClick) {
-        return showMsgDialog(activity, title, msg, activity.getString(R.string.graffiti_cancel),
-                activity.getString(R.string.graffiti_enter), enterClick, cancelClick);
+        return showMsgDialog(activity, title, msg, activity.getString(R.string.doodle_cancel),
+                activity.getString(R.string.doodle_enter), enterClick, cancelClick);
     }
 
     public static Dialog showEnterDialog(Activity activity, String title, String msg, final View.OnClickListener enterClick) {
         return showMsgDialog(activity, title, msg, null,
-                activity.getString(R.string.graffiti_enter), enterClick, null);
+                activity.getString(R.string.doodle_enter), enterClick, null);
     }
 
     public static Dialog showMsgDialog(Activity activity, String title, String msg, String btn01, String btn02, final View.OnClickListener enterClick, final View.OnClickListener cancelClick) {
@@ -56,7 +56,7 @@ public void onClick(View v) {
         };
 
 
-        View view = InjectionLayoutInflater.from(activity).inflate(R.layout.graffiti_dialog, null,
+        View view = InjectionLayoutInflater.from(activity).inflate(R.layout.doodle_dialog, null,
                 InjectionLayoutInflater.getViewOnClickListenerInjector(onClickListener));
         dialog.setContentView(view);
 
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageLoader.java b/doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageLoader.java
similarity index 92%
rename from graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageLoader.java
rename to doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageLoader.java
index 0a30d6a..58a4c7c 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageLoader.java
+++ b/doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageLoader.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti.imagepicker;
+package cn.hzw.doodle.imagepicker;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -8,7 +8,7 @@
 import cn.forward.androids.Image.ImageLoaderConfig;
 import cn.forward.androids.Image.ImageLoaderGroup;
 import cn.forward.androids.Image.LocalImagerLoader;
-import cn.hzw.graffiti.R;
+import cn.hzw.doodle.R;
 
 
 /**
@@ -38,7 +38,7 @@ private ImageLoader(Context context) {
         mImageLoaderGroup = new ImageLoaderGroup(context, memoryCacheSize, 25 * 1024 * 1024);
         mImageLoaderGroup.addImageLoader(new LocalImagerLoader(context));
         ImageLoaderConfig config = mImageLoaderGroup.getImageLoaderConfig();
-        config.setLoadingDrawable(context.getResources().getDrawable(R.drawable.graffit_imageselector_loading));
+        config.setLoadingDrawable(context.getResources().getDrawable(R.drawable.doodle_imageselector_loading));
         config.setLoadFailedDrawable(new ColorDrawable(Color.RED));
     }
 
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageSelectorAdapter.java b/doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageSelectorAdapter.java
similarity index 92%
rename from graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageSelectorAdapter.java
rename to doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageSelectorAdapter.java
index cd610d8..711f9a9 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageSelectorAdapter.java
+++ b/doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageSelectorAdapter.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti.imagepicker;
+package cn.hzw.doodle.imagepicker;
 
 import android.content.Context;
 import android.view.View;
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import cn.hzw.graffiti.R;
+import cn.hzw.doodle.R;
 
 
 /**
@@ -73,10 +73,10 @@ public long getItemId(int position) {
     public View getView(int position, View convertView, ViewGroup parent) {
         ViewHolder holder;
         if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.graffiti_imageselector_item, null);
+            convertView = View.inflate(mContext, R.layout.doodle_imageselector_item, null);
             holder = new ViewHolder();
-            holder.mImage = (ImageView) convertView.findViewById(R.id.graffiti_image);
-            holder.mImageSelected = (ImageView) convertView.findViewById(R.id.graffiti_image_selected);
+            holder.mImage = (ImageView) convertView.findViewById(R.id.doodle_image);
+            holder.mImageSelected = (ImageView) convertView.findViewById(R.id.doodle_image_selected);
             convertView.setTag(holder);
             holder.mImage.setTag("" + ++id);
         } else {
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageSelectorView.java b/doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageSelectorView.java
similarity index 98%
rename from graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageSelectorView.java
rename to doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageSelectorView.java
index b96d43b..b0dc3b7 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageSelectorView.java
+++ b/doodle/src/main/java/cn/hzw/doodle/imagepicker/ImageSelectorView.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti.imagepicker;
+package cn.hzw.doodle.imagepicker;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -23,7 +23,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.hzw.graffiti.R;
+import cn.hzw.doodle.R;
 
 
 /**
@@ -54,7 +54,7 @@ public class ImageSelectorView extends FrameLayout implements View.OnClickListen
 
     public ImageSelectorView(Context context, boolean isMultipleChoice, int maxCount, final List<String> pathList, ImageSelectorListener listener) {
         super(context);
-        View view = LayoutInflater.from(getContext()).inflate(R.layout.graffit_layout_image_selector, null);
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.doodle_layout_image_selector, null);
         addView(view, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
 
         mIsMultipleChoice = isMultipleChoice;
@@ -64,7 +64,7 @@ public ImageSelectorView(Context context, boolean isMultipleChoice, int maxCount
             mMaxCount = 1;
         }
         mSelectorListener = listener;
-        mGridView = (GridView) findViewById(R.id.graffiti_list_image);
+        mGridView = (GridView) findViewById(R.id.doodle_list_image);
         mBtnEnter = (TextView) findViewById(R.id.btn_enter);
         mBtnEnter.setOnClickListener(this);
         findViewById(R.id.btn_back).setOnClickListener(this);
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/util/DrawUtil.java b/doodle/src/main/java/cn/hzw/doodle/util/DrawUtil.java
similarity index 98%
rename from graffiti/src/main/java/cn/hzw/graffiti/util/DrawUtil.java
rename to doodle/src/main/java/cn/hzw/doodle/util/DrawUtil.java
index 19a6433..815cfc3 100644
--- a/graffiti/src/main/java/cn/hzw/graffiti/util/DrawUtil.java
+++ b/doodle/src/main/java/cn/hzw/doodle/util/DrawUtil.java
@@ -1,4 +1,4 @@
-package cn.hzw.graffiti.util;
+package cn.hzw.doodle.util;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -18,7 +18,7 @@
 public class DrawUtil {
 
     // 涂鸦系统中的单位，根据图片居中时缩放倍数决定。一单位在视觉上的尺寸相同
-//    public static float GRAFFITI_PIXEL_UNIT = 1;
+//    public static float DOODLE_PIXEL_UNIT = 1;
 
     public static void drawArrow(Canvas canvas, float sx, float sy, float ex,
                                  float ey, Paint paint) {
@@ -161,7 +161,7 @@ public static PointF rotatePoint(PointF coords, int degree, float x, float y, fl
 
     public static void main(String[] args) {
         /*PointF pointF = new PointF(0,0);
-        restoreRotatePointInGraffiti(pointF,90,0,0,0,100,100);
+        restoreRotatePointInDoodle(pointF,90,0,0,0,100,100);
         System.out.printf(pointF.toString());*/
     }
 
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_bar_background.9.png b/doodle/src/main/res/drawable-xxhdpi/doodle_bar_background.9.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_bar_background.9.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_bar_background.9.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_bar_progress.9.png b/doodle/src/main/res/drawable-xxhdpi/doodle_bar_progress.9.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_bar_progress.9.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_bar_progress.9.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_btn_add.png b/doodle/src/main/res/drawable-xxhdpi/doodle_btn_add.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_btn_add.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_btn_add.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_btn_back.png b/doodle/src/main/res/drawable-xxhdpi/doodle_btn_back.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_btn_back.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_btn_back.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_btn_finish.png b/doodle/src/main/res/drawable-xxhdpi/doodle_btn_finish.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_btn_finish.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_btn_finish.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_btn_sub.png b/doodle/src/main/res/drawable-xxhdpi/doodle_btn_sub.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_btn_sub.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_btn_sub.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_hide_panel.png b/doodle/src/main/res/drawable-xxhdpi/doodle_hide_panel.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_hide_panel.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_hide_panel.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_hide_panel_pressed.png b/doodle/src/main/res/drawable-xxhdpi/doodle_hide_panel_pressed.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_hide_panel_pressed.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_hide_panel_pressed.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_imageselector_image_selected.png b/doodle/src/main/res/drawable-xxhdpi/doodle_imageselector_image_selected.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_imageselector_image_selected.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_imageselector_image_selected.png
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_imageselector_loading.9.png b/doodle/src/main/res/drawable-xxhdpi/doodle_imageselector_loading.9.png
new file mode 100644
index 0000000..8b27e2a
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_imageselector_loading.9.png differ
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_rotate.png b/doodle/src/main/res/drawable-xxhdpi/doodle_rotate.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_rotate.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_rotate.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_shader1.jpg b/doodle/src/main/res/drawable-xxhdpi/doodle_shader1.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_shader1.jpg
rename to doodle/src/main/res/drawable-xxhdpi/doodle_shader1.jpg
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_shader2.jpg b/doodle/src/main/res/drawable-xxhdpi/doodle_shader2.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_shader2.jpg
rename to doodle/src/main/res/drawable-xxhdpi/doodle_shader2.jpg
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_shader3.jpg b/doodle/src/main/res/drawable-xxhdpi/doodle_shader3.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_shader3.jpg
rename to doodle/src/main/res/drawable-xxhdpi/doodle_shader3.jpg
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_shader4.jpg b/doodle/src/main/res/drawable-xxhdpi/doodle_shader4.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_shader4.jpg
rename to doodle/src/main/res/drawable-xxhdpi/doodle_shader4.jpg
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_shader5.jpg b/doodle/src/main/res/drawable-xxhdpi/doodle_shader5.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_shader5.jpg
rename to doodle/src/main/res/drawable-xxhdpi/doodle_shader5.jpg
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_thumb_normal.png b/doodle/src/main/res/drawable-xxhdpi/doodle_thumb_normal.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_thumb_normal.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_thumb_normal.png
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffiti_thumb_pressed.png b/doodle/src/main/res/drawable-xxhdpi/doodle_thumb_pressed.png
similarity index 100%
rename from graffiti/src/main/res/drawable-xxhdpi/graffiti_thumb_pressed.png
rename to doodle/src/main/res/drawable-xxhdpi/doodle_thumb_pressed.png
diff --git a/doodle/src/main/res/drawable/doodle_btn_effect_panel.xml b/doodle/src/main/res/drawable/doodle_btn_effect_panel.xml
new file mode 100644
index 0000000..45bf64d
--- /dev/null
+++ b/doodle/src/main/res/drawable/doodle_btn_effect_panel.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/doodle_hide_panel_pressed" android:state_selected="true"/>
+    <item android:drawable="@drawable/doodle_hide_panel"/>
+</selector>
\ No newline at end of file
diff --git a/graffiti/src/main/res/drawable/graffiti_btn_effect_rect_line.xml b/doodle/src/main/res/drawable/doodle_btn_effect_rect_line.xml
similarity index 60%
rename from graffiti/src/main/res/drawable/graffiti_btn_effect_rect_line.xml
rename to doodle/src/main/res/drawable/doodle_btn_effect_rect_line.xml
index 752b6c3..0d4b646 100644
--- a/graffiti/src/main/res/drawable/graffiti_btn_effect_rect_line.xml
+++ b/doodle/src/main/res/drawable/doodle_btn_effect_rect_line.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/graffiti_shape_rect_stroke_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/graffiti_shape_rect_stroke_pressed"/>
-    <item android:drawable="@drawable/graffiti_shape_rect_stroke_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/doodle_shape_rect_stroke_pressed" />
+    <item android:state_selected="true" android:drawable="@drawable/doodle_shape_rect_stroke_pressed"/>
+    <item android:drawable="@drawable/doodle_shape_rect_stroke_normal" />
 </selector>
 
diff --git a/doodle/src/main/res/drawable/doodle_btn_effect_rect_pressed_black.xml b/doodle/src/main/res/drawable/doodle_btn_effect_rect_pressed_black.xml
new file mode 100644
index 0000000..9759f0e
--- /dev/null
+++ b/doodle/src/main/res/drawable/doodle_btn_effect_rect_pressed_black.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/doodle_shape_rect_pressed_black" android:state_pressed="true" />
+    <item android:drawable="@drawable/doodle_shape_rect_pressed_black" android:state_selected="true" />
+    <item android:drawable="@drawable/doodle_shape_rect_pressed_black" android:state_checked="true" />
+</selector>
+
diff --git a/graffiti/src/main/res/drawable/graffiti_btn_effect_round.xml b/doodle/src/main/res/drawable/doodle_btn_effect_round.xml
similarity index 86%
rename from graffiti/src/main/res/drawable/graffiti_btn_effect_round.xml
rename to doodle/src/main/res/drawable/doodle_btn_effect_round.xml
index 5639b6f..358f7be 100644
--- a/graffiti/src/main/res/drawable/graffiti_btn_effect_round.xml
+++ b/doodle/src/main/res/drawable/doodle_btn_effect_round.xml
@@ -16,8 +16,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/graffiti_shape_circle_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/graffiti_shape_circle_pressed"/>
-    <item android:drawable="@drawable/graffiti_shape_circle_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/doodle_shape_circle_pressed" />
+    <item android:state_selected="true" android:drawable="@drawable/doodle_shape_circle_pressed"/>
+    <item android:drawable="@drawable/doodle_shape_circle_normal" />
 </selector>
 
diff --git a/doodle/src/main/res/drawable/doodle_btn_effect_round_pressed_yellow.xml b/doodle/src/main/res/drawable/doodle_btn_effect_round_pressed_yellow.xml
new file mode 100644
index 0000000..55e958b
--- /dev/null
+++ b/doodle/src/main/res/drawable/doodle_btn_effect_round_pressed_yellow.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/doodle_shape_circle_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/doodle_shape_circle_pressed" android:state_selected="true" />
+    <item android:drawable="@drawable/doodle_shape_circle_pressed" android:state_checked="true" />
+</selector>
+
diff --git a/graffiti/src/main/res/drawable/graffiti_seekbar_bg.xml b/doodle/src/main/res/drawable/doodle_seekbar_bg.xml
similarity index 79%
rename from graffiti/src/main/res/drawable/graffiti_seekbar_bg.xml
rename to doodle/src/main/res/drawable/doodle_seekbar_bg.xml
index 748ded7..f2db508 100644
--- a/graffiti/src/main/res/drawable/graffiti_seekbar_bg.xml
+++ b/doodle/src/main/res/drawable/doodle_seekbar_bg.xml
@@ -3,7 +3,7 @@
     <item
         android:id="@android:id/background">
         <nine-patch
-            android:src="@drawable/graffiti_bar_background"/>
+            android:src="@drawable/doodle_bar_background"/>
     </item>
     <item
         android:id="@android:id/progress">
@@ -11,7 +11,7 @@
               android:clipOrientation="horizontal"
               android:gravity="left">
             <nine-patch
-                android:src="@drawable/graffiti_bar_progress"/>
+                android:src="@drawable/doodle_bar_progress"/>
         </clip>
     </item>
 </layer-list>
diff --git a/graffiti/src/main/res/drawable/graffiti_shape_circle_normal.xml b/doodle/src/main/res/drawable/doodle_shape_circle_normal.xml
similarity index 100%
rename from graffiti/src/main/res/drawable/graffiti_shape_circle_normal.xml
rename to doodle/src/main/res/drawable/doodle_shape_circle_normal.xml
diff --git a/graffiti/src/main/res/drawable/graffiti_shape_circle_pressed.xml b/doodle/src/main/res/drawable/doodle_shape_circle_pressed.xml
similarity index 62%
rename from graffiti/src/main/res/drawable/graffiti_shape_circle_pressed.xml
rename to doodle/src/main/res/drawable/doodle_shape_circle_pressed.xml
index a49e53a..d2e8d6f 100644
--- a/graffiti/src/main/res/drawable/graffiti_shape_circle_pressed.xml
+++ b/doodle/src/main/res/drawable/doodle_shape_circle_pressed.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval"
     android:useLevel="false">
-        <solid android:color="@color/graffiti_btn_pressed_color" /> <!-- 定义填充的颜色值 -->
+        <solid android:color="@color/doodle_btn_pressed_color" /> <!-- 定义填充的颜色值 -->
 </shape>
diff --git a/graffiti/src/main/res/drawable/graffiti_shape_rect_pressed_black.xml b/doodle/src/main/res/drawable/doodle_shape_rect_pressed_black.xml
similarity index 100%
rename from graffiti/src/main/res/drawable/graffiti_shape_rect_pressed_black.xml
rename to doodle/src/main/res/drawable/doodle_shape_rect_pressed_black.xml
diff --git a/graffiti/src/main/res/drawable/graffiti_shape_rect_stroke_normal.xml b/doodle/src/main/res/drawable/doodle_shape_rect_stroke_normal.xml
similarity index 100%
rename from graffiti/src/main/res/drawable/graffiti_shape_rect_stroke_normal.xml
rename to doodle/src/main/res/drawable/doodle_shape_rect_stroke_normal.xml
diff --git a/graffiti/src/main/res/drawable/graffiti_shape_rect_stroke_pressed.xml b/doodle/src/main/res/drawable/doodle_shape_rect_stroke_pressed.xml
similarity index 100%
rename from graffiti/src/main/res/drawable/graffiti_shape_rect_stroke_pressed.xml
rename to doodle/src/main/res/drawable/doodle_shape_rect_stroke_pressed.xml
diff --git a/graffiti/src/main/res/drawable/graffiti_thumb_seekbarr.xml b/doodle/src/main/res/drawable/doodle_thumb_seekbarr.xml
similarity index 56%
rename from graffiti/src/main/res/drawable/graffiti_thumb_seekbarr.xml
rename to doodle/src/main/res/drawable/doodle_thumb_seekbarr.xml
index bb0dacd..689d457 100644
--- a/graffiti/src/main/res/drawable/graffiti_thumb_seekbarr.xml
+++ b/doodle/src/main/res/drawable/doodle_thumb_seekbarr.xml
@@ -2,11 +2,11 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@drawable/graffiti_thumb_pressed" />
+          android:drawable="@drawable/doodle_thumb_pressed" />
     <!-- 焦点状态 -->
     <item android:state_focused="true"
-          android:drawable="@drawable/graffiti_thumb_normal" />
+          android:drawable="@drawable/doodle_thumb_normal" />
     <!-- 默认状态 -->
-    <item android:drawable="@drawable/graffiti_thumb_normal" />
+    <item android:drawable="@drawable/doodle_thumb_normal" />
 </selector>
 
diff --git a/graffiti/src/main/res/layout/graffiti_color_selector_dialog.xml b/doodle/src/main/res/layout/doodle_color_selector_dialog.xml
similarity index 83%
rename from graffiti/src/main/res/layout/graffiti_color_selector_dialog.xml
rename to doodle/src/main/res/layout/doodle_color_selector_dialog.xml
index 803ee86..9f56b0a 100644
--- a/graffiti/src/main/res/layout/graffiti_color_selector_dialog.xml
+++ b/doodle/src/main/res/layout/doodle_color_selector_dialog.xml
@@ -6,7 +6,7 @@
 
 
     <LinearLayout
-        android:id="@+id/graffiti_color_selector_container"
+        android:id="@+id/doodle_color_selector_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -14,7 +14,7 @@
         >
 
         <LinearLayout
-            android:id="@+id/graffiti_shader_container"
+            android:id="@+id/doodle_shader_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -25,7 +25,7 @@
                 android:background="#ffffff"
                 android:padding="1dp"
                 android:scaleType="centerCrop"
-                android:src="@drawable/graffiti_shader1"/>
+                android:src="@drawable/doodle_shader1"/>
 
             <ImageView
                 android:layout_width="30dp"
@@ -34,7 +34,7 @@
                 android:background="#ffffff"
                 android:padding="1dp"
                 android:scaleType="centerCrop"
-                android:src="@drawable/graffiti_shader2"/>
+                android:src="@drawable/doodle_shader2"/>
 
             <ImageView
                 android:layout_width="30dp"
@@ -43,7 +43,7 @@
                 android:background="#ffffff"
                 android:padding="1dp"
                 android:scaleType="centerCrop"
-                android:src="@drawable/graffiti_shader3"/>
+                android:src="@drawable/doodle_shader3"/>
 
             <ImageView
                 android:layout_width="30dp"
@@ -52,7 +52,7 @@
                 android:background="#ffffff"
                 android:padding="1dp"
                 android:scaleType="centerCrop"
-                android:src="@drawable/graffiti_shader4"/>
+                android:src="@drawable/doodle_shader4"/>
 
             <ImageView
                 android:layout_width="30dp"
@@ -61,7 +61,7 @@
                 android:background="#ffffff"
                 android:padding="1dp"
                 android:scaleType="centerCrop"
-                android:src="@drawable/graffiti_shader5"/>
+                android:src="@drawable/doodle_shader5"/>
         </LinearLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/graffiti/src/main/res/layout/graffiti_create_bitmap.xml b/doodle/src/main/res/layout/doodle_create_bitmap.xml
similarity index 90%
rename from graffiti/src/main/res/layout/graffiti_create_bitmap.xml
rename to doodle/src/main/res/layout/doodle_create_bitmap.xml
index 4e26337..888acd3 100644
--- a/graffiti/src/main/res/layout/graffiti_create_bitmap.xml
+++ b/doodle/src/main/res/layout/doodle_create_bitmap.xml
@@ -10,7 +10,7 @@
         android:layout_weight="1"/>
 
     <FrameLayout
-        android:id="@+id/graffiti_image_selector_container"
+        android:id="@+id/doodle_image_selector_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
diff --git a/graffiti/src/main/res/layout/graffiti_create_text.xml b/doodle/src/main/res/layout/doodle_create_text.xml
similarity index 86%
rename from graffiti/src/main/res/layout/graffiti_create_text.xml
rename to doodle/src/main/res/layout/doodle_create_text.xml
index 664a448..5ff4cba 100644
--- a/graffiti/src/main/res/layout/graffiti_create_text.xml
+++ b/doodle/src/main/res/layout/doodle_create_text.xml
@@ -11,7 +11,7 @@
         android:orientation="vertical">
 
         <EditText
-            android:id="@+id/graffiti_selectable_edit"
+            android:id="@+id/doodle_selectable_edit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
@@ -30,24 +30,24 @@
             android:paddingRight="5dp">
 
             <TextView
-                android:id="@+id/graffiti_text_cancel_btn"
+                android:id="@+id/doodle_text_cancel_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="bottom|left"
                 android:gravity="center"
                 android:padding="10dp"
-                android:text="@string/graffiti_cancel"
+                android:text="@string/doodle_cancel"
                 android:textColor="#232323"
                 android:textSize="16dp" />
 
             <TextView
-                android:id="@+id/graffiti_text_enter_btn"
+                android:id="@+id/doodle_text_enter_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="bottom|right"
                 android:gravity="center"
                 android:padding="10dp"
-                android:text="@string/graffiti_enter"
+                android:text="@string/doodle_enter"
                 android:textColor="#232323"
                 android:textSize="16dp" />
         </FrameLayout>
diff --git a/graffiti/src/main/res/layout/graffiti_dialog.xml b/doodle/src/main/res/layout/doodle_dialog.xml
similarity index 100%
rename from graffiti/src/main/res/layout/graffiti_dialog.xml
rename to doodle/src/main/res/layout/doodle_dialog.xml
diff --git a/graffiti/src/main/res/layout/graffiti_imageselector_item.xml b/doodle/src/main/res/layout/doodle_imageselector_item.xml
similarity index 83%
rename from graffiti/src/main/res/layout/graffiti_imageselector_item.xml
rename to doodle/src/main/res/layout/doodle_imageselector_item.xml
index 52c0dfd..52d80b5 100644
--- a/graffiti/src/main/res/layout/graffiti_imageselector_item.xml
+++ b/doodle/src/main/res/layout/doodle_imageselector_item.xml
@@ -5,7 +5,7 @@
                 android:layout_height="match_parent">
 
     <cn.forward.androids.views.RatioImageView
-        android:id="@+id/graffiti_image"
+        android:id="@+id/doodle_image"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
@@ -13,7 +13,7 @@
         />
 
     <ImageView
-        android:id="@+id/graffiti_image_selected"
+        android:id="@+id/doodle_image_selected"
         android:layout_width="45dp"
         android:layout_height="45dp"
         android:layout_alignParentRight="true"
@@ -21,6 +21,6 @@
         android:layout_marginRight="10dp"
         android:layout_marginTop="10dp"
         android:scaleType="fitXY"
-        android:src="@drawable/graffiti_imageselector_image_selected"
+        android:src="@drawable/doodle_imageselector_image_selected"
         />
 </RelativeLayout>
\ No newline at end of file
diff --git a/graffiti/src/main/res/layout/layout_graffiti.xml b/doodle/src/main/res/layout/doodle_layout.xml
similarity index 82%
rename from graffiti/src/main/res/layout/layout_graffiti.xml
rename to doodle/src/main/res/layout/doodle_layout.xml
index 6bbe00b..0254d80 100644
--- a/graffiti/src/main/res/layout/layout_graffiti.xml
+++ b/doodle/src/main/res/layout/doodle_layout.xml
@@ -12,20 +12,20 @@
 
 
         <include
-            android:id="@+id/graffiti_title_bar"
-            layout="@layout/graffiti_title_bar" />
+            android:id="@+id/doodle_title_bar"
+            layout="@layout/doodle_title_bar" />
 
         <FrameLayout
-            android:id="@+id/graffiti_container"
+            android:id="@+id/doodle_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/graffiti_title_bar" />
+            android:layout_below="@id/doodle_title_bar" />
 
         <RelativeLayout
-            android:id="@+id/graffiti_panel"
+            android:id="@+id/doodle_panel"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:layout_below="@id/graffiti_title_bar">
+            android:layout_below="@id/doodle_title_bar">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -49,7 +49,7 @@
                             android:id="@+id/btn_pen_hand"
                             android:layout_width="50dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_round"
+                            android:background="@drawable/doodle_btn_effect_round"
                             android:scaleType="centerCrop"
                             android:text="手绘"
                             android:textColor="#000000"
@@ -60,7 +60,7 @@
                             android:id="@+id/btn_pen_copy"
                             android:layout_width="50dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_round"
+                            android:background="@drawable/doodle_btn_effect_round"
                             android:scaleType="centerCrop"
                             android:text="仿制"
                             android:textColor="#000000"
@@ -71,7 +71,7 @@
                             android:id="@+id/btn_pen_eraser"
                             android:layout_width="50dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_round"
+                            android:background="@drawable/doodle_btn_effect_round"
 
                             android:scaleType="centerCrop"
                             android:text="橡皮擦"
@@ -83,7 +83,7 @@
                             android:id="@+id/btn_pen_text"
                             android:layout_width="50dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_round"
+                            android:background="@drawable/doodle_btn_effect_round"
                             android:scaleType="centerCrop"
                             android:text="文字"
                             android:textColor="#000000"
@@ -94,7 +94,7 @@
                             android:id="@+id/btn_pen_bitmap"
                             android:layout_width="50dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_round"
+                            android:background="@drawable/doodle_btn_effect_round"
                             android:scaleType="centerCrop"
                             android:text="贴图"
                             android:textColor="#000000"
@@ -111,7 +111,7 @@
                             android:id="@+id/btn_clear"
                             android:layout_width="40dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_round"
+                            android:background="@drawable/doodle_btn_effect_round"
                             android:text="清屏"
                             android:textColor="#000000"
                             android:textSize="13dp" />
@@ -120,7 +120,7 @@
                             android:id="@+id/btn_undo"
                             android:layout_width="40dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_round"
+                            android:background="@drawable/doodle_btn_effect_round"
                             android:text="撤销"
                             android:textColor="#000000"
                             android:textSize="13dp" />
@@ -145,7 +145,7 @@
                             android:id="@+id/btn_hand_write"
                             android:layout_width="45dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_rect_line"
+                            android:background="@drawable/doodle_btn_effect_rect_line"
                             android:text="手绘"
                             android:textColor="#000000"
                             android:textSize="10dp"
@@ -155,7 +155,7 @@
                             android:id="@+id/btn_arrow"
                             android:layout_width="45dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_rect_line"
+                            android:background="@drawable/doodle_btn_effect_rect_line"
 
                             android:text="箭头"
                             android:textColor="#000000"
@@ -166,7 +166,7 @@
                             android:id="@+id/btn_line"
                             android:layout_width="45dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_rect_line"
+                            android:background="@drawable/doodle_btn_effect_rect_line"
 
                             android:text="直线"
                             android:textColor="#000000"
@@ -177,7 +177,7 @@
                             android:id="@+id/btn_holl_circle"
                             android:layout_width="45dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_rect_line"
+                            android:background="@drawable/doodle_btn_effect_rect_line"
 
                             android:scaleType="centerCrop"
                             android:text="空心圆"
@@ -189,7 +189,7 @@
                             android:id="@+id/btn_fill_circle"
                             android:layout_width="45dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_rect_line"
+                            android:background="@drawable/doodle_btn_effect_rect_line"
 
                             android:scaleType="centerCrop"
                             android:text="实心圆"
@@ -201,7 +201,7 @@
                             android:id="@+id/btn_holl_rect"
                             android:layout_width="45dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_rect_line"
+                            android:background="@drawable/doodle_btn_effect_rect_line"
                             android:scaleType="centerCrop"
                             android:text="空心矩形"
                             android:textColor="#000000"
@@ -212,7 +212,7 @@
                             android:id="@+id/btn_fill_rect"
                             android:layout_width="45dp"
                             android:layout_height="match_parent"
-                            android:background="@drawable/graffiti_btn_effect_rect_line"
+                            android:background="@drawable/doodle_btn_effect_rect_line"
 
                             android:scaleType="centerCrop"
                             android:text="实心矩形"
@@ -222,7 +222,7 @@
                     </LinearLayout>
                 </HorizontalScrollView>
                 <LinearLayout
-                    android:id="@+id/graffiti_color_container"
+                    android:id="@+id/doodle_color_container"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
@@ -233,7 +233,7 @@
                         android:id="@+id/btn_set_color_container"
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:background="@drawable/graffiti_btn_effect_rect_line"
+                        android:background="@drawable/doodle_btn_effect_rect_line"
                         android:padding="2dp">
 
                         <ImageView
@@ -251,8 +251,8 @@
                         android:minHeight="33dp"
                         android:paddingLeft="12dp"
                         android:paddingRight="10dp"
-                        android:progressDrawable="@drawable/graffiti_seekbar_bg"
-                        android:thumb="@drawable/graffiti_thumb_seekbarr"
+                        android:progressDrawable="@drawable/doodle_seekbar_bg"
+                        android:thumb="@drawable/doodle_thumb_seekbarr"
                         android:thumbOffset="0dp" />
 
                     <TextView
@@ -269,7 +269,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/graffiti_selectable_edit_container"
+                android:id="@+id/doodle_selectable_edit_container"
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/title_bar_height"
                 android:layout_alignParentBottom="true"
@@ -279,46 +279,46 @@
                 android:visibility="gone">
 
                 <TextView
-                    android:id="@+id/graffiti_selectable_edit"
+                    android:id="@+id/doodle_selectable_edit"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/graffiti_btn_effect_rect_pressed_black"
+                    android:background="@drawable/doodle_btn_effect_rect_pressed_black"
                     android:gravity="center"
-                    android:text="@string/graffiti_edit"
+                    android:text="@string/doodle_edit"
                     android:textColor="#ffffff"
                     android:textSize="16dp" />
 
                 <TextView
-                    android:id="@+id/graffiti_selectable_bottom"
+                    android:id="@+id/doodle_selectable_bottom"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/graffiti_btn_effect_rect_pressed_black"
+                    android:background="@drawable/doodle_btn_effect_rect_pressed_black"
                     android:gravity="center"
-                    android:text="@string/graffiti_bottom"
+                    android:text="@string/doodle_bottom"
                     android:textColor="#ffffff"
                     android:textSize="16dp" />
 
                 <TextView
-                    android:id="@+id/graffiti_selectable_top"
+                    android:id="@+id/doodle_selectable_top"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/graffiti_btn_effect_rect_pressed_black"
+                    android:background="@drawable/doodle_btn_effect_rect_pressed_black"
                     android:gravity="center"
-                    android:text="@string/graffiti_top"
+                    android:text="@string/doodle_top"
                     android:textColor="#ffffff"
                     android:textSize="16dp" />
 
                 <TextView
-                    android:id="@+id/graffiti_selectable_remove"
+                    android:id="@+id/doodle_selectable_remove"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/graffiti_btn_effect_rect_pressed_black"
+                    android:background="@drawable/doodle_btn_effect_rect_pressed_black"
                     android:gravity="center"
-                    android:text="@string/graffiti_remove"
+                    android:text="@string/doodle_remove"
                     android:textColor="#ffffff"
                     android:textSize="16dp" />
             </LinearLayout>
diff --git a/graffiti/src/main/res/layout/graffit_layout_image_selector.xml b/doodle/src/main/res/layout/doodle_layout_image_selector.xml
similarity index 98%
rename from graffiti/src/main/res/layout/graffit_layout_image_selector.xml
rename to doodle/src/main/res/layout/doodle_layout_image_selector.xml
index a9911f9..b88901c 100644
--- a/graffiti/src/main/res/layout/graffit_layout_image_selector.xml
+++ b/doodle/src/main/res/layout/doodle_layout_image_selector.xml
@@ -61,7 +61,7 @@
         android:background="#aaaaaa"/>
 
     <GridView
-        android:id="@+id/graffiti_list_image"
+        android:id="@+id/doodle_list_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
diff --git a/graffiti/src/main/res/layout/graffiti_title_bar.xml b/doodle/src/main/res/layout/doodle_title_bar.xml
similarity index 85%
rename from graffiti/src/main/res/layout/graffiti_title_bar.xml
rename to doodle/src/main/res/layout/doodle_title_bar.xml
index b8bc54a..447f659 100644
--- a/graffiti/src/main/res/layout/graffiti_title_bar.xml
+++ b/doodle/src/main/res/layout/doodle_title_bar.xml
@@ -13,11 +13,11 @@
         android:orientation="horizontal">
 
         <cn.forward.androids.views.MaskImageView
-            android:id="@+id/graffiti_btn_back"
+            android:id="@+id/doodle_btn_back"
             android:layout_width="@dimen/title_bar_height"
             android:layout_height="match_parent"
             android:scaleType="centerInside"
-            android:src="@drawable/graffiti_btn_back"
+            android:src="@drawable/doodle_btn_back"
             android:visibility="visible"
             app:miv_is_ignore_alpha="true"
             app:miv_mask_color="#a8a8a8"/>
@@ -30,7 +30,7 @@
             android:background="#101010"/>
 
         <cn.forward.androids.views.STextView
-            android:id="@+id/graffiti_txt_title"
+            android:id="@+id/doodle_txt_title"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_marginLeft="12dp"
@@ -46,33 +46,33 @@
 
 
         <cn.forward.androids.views.MaskImageView
-            android:id="@+id/graffiti_btn_rotate"
+            android:id="@+id/doodle_btn_rotate"
             android:layout_width="@dimen/title_bar_height"
             android:layout_height="@dimen/title_bar_height"
             android:padding="5dp"
             android:scaleType="fitXY"
-            android:src="@drawable/graffiti_rotate"
+            android:src="@drawable/doodle_rotate"
             android:textSize="20dp"
             app:miv_is_ignore_alpha="true"
             app:miv_mask_color="#a8a8a8"/>
 
         <cn.forward.androids.views.MaskImageView
-            android:id="@+id/graffiti_btn_hide_panel"
+            android:id="@+id/doodle_btn_hide_panel"
             android:layout_width="@dimen/title_bar_height"
             android:layout_height="@dimen/title_bar_height"
             android:padding="13dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/graffiti_btn_effect_panel"
+            android:src="@drawable/doodle_btn_effect_panel"
             android:visibility="visible"
             app:miv_is_ignore_alpha="true"
             app:miv_mask_color="#a8a8a8"/>
 
         <cn.forward.androids.views.MaskImageView
-            android:id="@+id/graffiti_btn_finish"
+            android:id="@+id/doodle_btn_finish"
             android:layout_width="@dimen/title_bar_height"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            android:src="@drawable/graffiti_btn_finish"
+            android:src="@drawable/doodle_btn_finish"
             android:visibility="visible"
             app:miv_is_ignore_alpha="true"
             app:miv_mask_color="#a8a8a8"/>
diff --git a/doodle/src/main/res/values/color.xml b/doodle/src/main/res/values/color.xml
new file mode 100644
index 0000000..0dd14bc
--- /dev/null
+++ b/doodle/src/main/res/values/color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="doodle_btn_pressed_color">#dfffd943</color>
+
+    <color name="doodle_btn_text">#000000</color>
+</resources>
\ No newline at end of file
diff --git a/graffiti/src/main/res/values/dimen.xml b/doodle/src/main/res/values/dimen.xml
similarity index 100%
rename from graffiti/src/main/res/values/dimen.xml
rename to doodle/src/main/res/values/dimen.xml
diff --git a/doodle/src/main/res/values/strings.xml b/doodle/src/main/res/values/strings.xml
new file mode 100644
index 0000000..25f9acc
--- /dev/null
+++ b/doodle/src/main/res/values/strings.xml
@@ -0,0 +1,16 @@
+<resources>
+    <string name="doodle_app_name">Doodle</string>
+
+    <string name="doodle_clear_screen">清屏</string>
+    <string name="doodle_cant_undo_after_clearing">清屏后不可撤销</string>
+    <string name="doodle_saving_picture">保存图片</string>
+    <string name="doodle_enter">确定</string>
+    <string name="doodle_cancel">取消</string>
+    <string name="doodle_success">成功</string>
+    <string name="doodle_failed">失败</string>
+
+    <string name="doodle_edit">编辑</string>
+    <string name="doodle_remove">移除</string>
+    <string name="doodle_top">置顶</string>
+    <string name="doodle_bottom">置底</string>
+</resources>
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiPaintAttrs.java b/graffiti/src/main/java/cn/hzw/graffiti/GraffitiPaintAttrs.java
deleted file mode 100644
index e3472e5..0000000
--- a/graffiti/src/main/java/cn/hzw/graffiti/GraffitiPaintAttrs.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.hzw.graffiti;
-
-import cn.hzw.graffiti.core.IGraffitiColor;
-import cn.hzw.graffiti.core.IGraffitiPen;
-import cn.hzw.graffiti.core.IGraffitiShape;
-
-/**
- * 画笔属性
- * Created on 29/06/2018.
- */
-
-public class GraffitiPaintAttrs {
-    private IGraffitiPen mPen; // 画笔类型
-    private IGraffitiShape mShape; // 画笔形状
-    private float mSize; // 大小
-    private IGraffitiColor mColor; // 颜色
-
-    public IGraffitiPen pen() {
-        return mPen;
-    }
-
-    public GraffitiPaintAttrs pen(IGraffitiPen pen) {
-        mPen = pen;
-        return this;
-    }
-
-    public IGraffitiShape shape() {
-        return mShape;
-    }
-
-    public GraffitiPaintAttrs shape(IGraffitiShape shape) {
-        mShape = shape;
-        return this;
-    }
-
-    public float size() {
-        return mSize;
-    }
-
-    public GraffitiPaintAttrs size(float size) {
-        mSize = size;
-        return this;
-    }
-
-    public IGraffitiColor color() {
-        return mColor;
-    }
-
-    public GraffitiPaintAttrs color(IGraffitiColor color) {
-        mColor = color;
-        return this;
-    }
-
-    public static GraffitiPaintAttrs create() {
-        return new GraffitiPaintAttrs();
-    }
-}
diff --git a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiColor.java b/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiColor.java
deleted file mode 100644
index 47c7c33..0000000
--- a/graffiti/src/main/java/cn/hzw/graffiti/core/IGraffitiColor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.hzw.graffiti.core;
-
-import android.graphics.Paint;
-
-public interface IGraffitiColor {
-
-    /**
-     * 配置画笔
-     * @param graffitiItem
-     * @param paint
-     */
-    public void config(IGraffitiItem graffitiItem, Paint paint);
-
-    /**
-     * 深度拷贝
-     * @return
-     */
-    public IGraffitiColor copy();
-}
diff --git a/graffiti/src/main/res/drawable-xxhdpi/graffit_imageselector_loading.9.png b/graffiti/src/main/res/drawable-xxhdpi/graffit_imageselector_loading.9.png
deleted file mode 100644
index 1829541..0000000
Binary files a/graffiti/src/main/res/drawable-xxhdpi/graffit_imageselector_loading.9.png and /dev/null differ
diff --git a/graffiti/src/main/res/drawable/graffiti_btn_effect_panel.xml b/graffiti/src/main/res/drawable/graffiti_btn_effect_panel.xml
deleted file mode 100644
index c05a639..0000000
--- a/graffiti/src/main/res/drawable/graffiti_btn_effect_panel.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/graffiti_hide_panel_pressed" android:state_selected="true"/>
-    <item android:drawable="@drawable/graffiti_hide_panel"/>
-</selector>
\ No newline at end of file
diff --git a/graffiti/src/main/res/drawable/graffiti_btn_effect_rect_pressed_black.xml b/graffiti/src/main/res/drawable/graffiti_btn_effect_rect_pressed_black.xml
deleted file mode 100644
index c1807fd..0000000
--- a/graffiti/src/main/res/drawable/graffiti_btn_effect_rect_pressed_black.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/graffiti_shape_rect_pressed_black" android:state_pressed="true" />
-    <item android:drawable="@drawable/graffiti_shape_rect_pressed_black" android:state_selected="true" />
-    <item android:drawable="@drawable/graffiti_shape_rect_pressed_black" android:state_checked="true" />
-</selector>
-
diff --git a/graffiti/src/main/res/drawable/graffiti_btn_effect_round_pressed_yellow.xml b/graffiti/src/main/res/drawable/graffiti_btn_effect_round_pressed_yellow.xml
deleted file mode 100644
index 5ba1e7b..0000000
--- a/graffiti/src/main/res/drawable/graffiti_btn_effect_round_pressed_yellow.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/graffiti_shape_circle_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/graffiti_shape_circle_pressed" android:state_selected="true" />
-    <item android:drawable="@drawable/graffiti_shape_circle_pressed" android:state_checked="true" />
-</selector>
-
diff --git a/graffiti/src/main/res/values/color.xml b/graffiti/src/main/res/values/color.xml
deleted file mode 100644
index b912b84..0000000
--- a/graffiti/src/main/res/values/color.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="graffiti_btn_pressed_color">#dfffd943</color>
-
-    <color name="graffiti_btn_text">#000000</color>
-</resources>
\ No newline at end of file
diff --git a/graffiti/src/main/res/values/strings.xml b/graffiti/src/main/res/values/strings.xml
deleted file mode 100644
index 1f29579..0000000
--- a/graffiti/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources>
-    <string name="graffiti_app_name">Graffiti</string>
-
-    <string name="graffiti_clear_screen">清屏</string>
-    <string name="graffiti_cant_undo_after_clearing">清屏后不可撤销</string>
-    <string name="graffiti_saving_picture">保存图片</string>
-    <string name="graffiti_enter">确定</string>
-    <string name="graffiti_cancel">取消</string>
-    <string name="graffiti_success">成功</string>
-    <string name="graffiti_failed">失败</string>
-
-    <string name="graffiti_edit">编辑</string>
-    <string name="graffiti_remove">移除</string>
-    <string name="graffiti_top">置顶</string>
-    <string name="graffiti_bottom">置底</string>
-</resources>
diff --git a/settings.gradle b/settings.gradle
index 57c322e..982841e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':graffiti'
+include ':app', ':doodle'