Skip to content

Commit bcb8d2a

Browse files
author
huangziwei
committed
重命名Graffiti->Doodle
1 parent d7f5046 commit bcb8d2a

File tree

92 files changed

+939
-940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+939
-940
lines changed

README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@
2222

2323
### 界面
2424

25-
![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Graffiti/01.png)
26-
![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Graffiti/02.png)
27-
![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Graffiti/03.png)
25+
![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Doodle/01.png)
26+
![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Doodle/02.png)
27+
![IMG](https://raw.githubusercontent.com/1993hzw/common/master/Doodle/03.png)
2828

2929

3030
### 使用
3131
```groovy
32-
compile 'com.hzw.graffiti:graffiti:4.3.1'
32+
compile 'com.hzw.doodle:doodle:4.3.1'
3333
```
3434

3535
```java
3636
// 涂鸦参数
37-
GraffitiParams params = new GraffitiParams();
37+
DoodleParams params = new DoodleParams();
3838
// 图片路径
3939
params.mImagePath = list.get(0);
4040
// 初始画笔大小
4141
params.mPaintSize = 20;
4242
// 启动涂鸦页面
43-
GraffitiActivity.startActivityForResult(MainActivity.this, params, REQ_CODE_GRAFFITI);
43+
DoodleActivity.startActivityForResult(MainActivity.this, params, REQ_CODE_DOODLE);
4444

4545
```
4646

@@ -60,33 +60,33 @@ dependencies {
6060

6161
```java
6262
/**
63-
* 涂鸦界面,根据GraffitiView的接口,提供页面交互
63+
* 涂鸦界面,根据DoodleView的接口,提供页面交互
6464
*
6565
*/
66-
public class GraffitiActivity extends Activity {
66+
public class DoodleActivity extends Activity {
6767
/**
6868
* 启动涂鸦界面
6969
*
7070
* @param activity
7171
* @param params 涂鸦参数
7272
* @param requestCode startActivityForResult的请求码
7373
*/
74-
public static void startActivityForResult(Activity activity, GraffitiParams params, int requestCode) {
75-
Intent intent = new Intent(activity, GraffitiActivity.class);
76-
intent.putExtra(GraffitiActivity.KEY_PARAMS, params);
74+
public static void startActivityForResult(Activity activity, DoodleParams params, int requestCode) {
75+
Intent intent = new Intent(activity, DoodleActivity.class);
76+
intent.putExtra(DoodleActivity.KEY_PARAMS, params);
7777
activity.startActivityForResult(intent, requestCode);
7878
}
7979
}
8080
```
8181

8282
```java
8383
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
84-
if (requestCode == REQ_CODE_GRAFFITI) {
85-
if (resultCode == GraffitiActivity.RESULT_OK) {
84+
if (requestCode == REQ_CODE_DOODLE) {
85+
if (resultCode == DoodleActivity.RESULT_OK) {
8686
// 获取涂鸦后的图片
87-
String path = data.getStringExtra(GraffitiActivity.KEY_IMAGE_PATH);
87+
String path = data.getStringExtra(DoodleActivity.KEY_IMAGE_PATH);
8888
...
89-
} else if (resultCode == GraffitiActivity.RESULT_ERROR) {
89+
} else if (resultCode == DoodleActivity.RESULT_ERROR) {
9090
...
9191
}
9292
}
@@ -97,13 +97,13 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
9797
/**
9898
* 涂鸦参数
9999
*/
100-
public static class GraffitiParams implements Parcelable {
100+
public static class DoodleParams implements Parcelable {
101101
/**
102102
* 图片路径
103103
*/
104104
public String mImagePath;
105105
/**
106-
*  保存路径,如果为null,则图片保存在根目录下/DCIM/Graffiti/
106+
*  保存路径,如果为null,则图片保存在根目录下/DCIM/Doodle/
107107
*/
108108
public String mSavePath;
109109
/**

app/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android {
44
compileSdkVersion COMPILE_SDK_VERSION as int
55

66
defaultConfig {
7-
applicationId "cn.hzw.graffitidemo"
7+
applicationId "cn.hzw.doodledemo"
88
minSdkVersion MIN_SDK_VERSION as int
99
targetSdkVersion TARGET_SDK_VERSION as int
1010
versionCode 1
@@ -21,7 +21,6 @@ android {
2121

2222
dependencies {
2323
compile fileTree(include: ['*.jar'], dir: 'libs')
24-
compile project(':graffiti')
25-
// compile project(':ImageSelctorLib-release')
24+
compile project(':doodle')
2625
compile 'cn.hzw.imageselector:library:1.0'
2726
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="cn.hzw.graffitidemo">
3+
package="cn.hzw.doodledemo">
44

55
<application
66
android:allowBackup="true"

app/src/main/java/cn/hzw/graffitidemo/MainActivity.java renamed to app/src/main/java/cn/hzw/doodledemo/MainActivity.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.hzw.graffitidemo;
1+
package cn.hzw.doodledemo;
22

33
import android.app.Activity;
44
import android.content.Intent;
@@ -11,16 +11,16 @@
1111
import java.util.ArrayList;
1212

1313
import cn.forward.androids.utils.LogUtil;
14-
import cn.hzw.graffiti.GraffitiActivity;
15-
import cn.hzw.graffiti.GraffitiParams;
16-
import cn.hzw.graffiti.GraffitiView;
14+
import cn.hzw.doodle.DoodleActivity;
15+
import cn.hzw.doodle.DoodleParams;
16+
import cn.hzw.doodle.DoodleView;
1717
import cn.hzw.imageselector.ImageLoader;
1818
import cn.hzw.imageselector.ImageSelectorActivity;
1919

2020
public class MainActivity extends Activity {
2121

2222
public static final int REQ_CODE_SELECT_IMAGE = 100;
23-
public static final int REQ_CODE_GRAFFITI = 101;
23+
public static final int REQ_CODE_DOODLE = 101;
2424
private TextView mPath;
2525

2626
@Override
@@ -46,31 +46,31 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
4646
}
4747
ArrayList<String> list = data.getStringArrayListExtra(ImageSelectorActivity.KEY_PATH_LIST);
4848
if (list != null && list.size() > 0) {
49-
LogUtil.d("Graffiti", list.get(0));
49+
LogUtil.d("Doodle", list.get(0));
5050

5151
// 涂鸦参数
52-
GraffitiParams params = new GraffitiParams();
52+
DoodleParams params = new DoodleParams();
5353
params.mIsFullScreen = true;
5454
// 图片路径
5555
params.mImagePath = list.get(0);
5656
// 初始画笔大小
57-
params.mPaintUnitSize = GraffitiView.DEFAULT_SIZE;
57+
params.mPaintUnitSize = DoodleView.DEFAULT_SIZE;
5858
params.mAmplifierScale = 0;
5959
// 启动涂鸦页面
60-
GraffitiActivity.startActivityForResult(MainActivity.this, params, REQ_CODE_GRAFFITI);
60+
DoodleActivity.startActivityForResult(MainActivity.this, params, REQ_CODE_DOODLE);
6161
}
62-
} else if (requestCode == REQ_CODE_GRAFFITI) {
62+
} else if (requestCode == REQ_CODE_DOODLE) {
6363
if (data == null) {
6464
return;
6565
}
66-
if (resultCode == GraffitiActivity.RESULT_OK) {
67-
String path = data.getStringExtra(GraffitiActivity.KEY_IMAGE_PATH);
66+
if (resultCode == DoodleActivity.RESULT_OK) {
67+
String path = data.getStringExtra(DoodleActivity.KEY_IMAGE_PATH);
6868
if (TextUtils.isEmpty(path)) {
6969
return;
7070
}
7171
ImageLoader.getInstance(this).display(findViewById(R.id.img), path);
7272
mPath.setText(path);
73-
} else if (resultCode == GraffitiActivity.RESULT_ERROR) {
73+
} else if (resultCode == DoodleActivity.RESULT_ERROR) {
7474
Toast.makeText(getApplicationContext(), "error", Toast.LENGTH_SHORT).show();
7575
}
7676
}
791 Bytes
Loading
2.75 KB
Loading

app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:paddingLeft="@dimen/activity_horizontal_margin"
1010
android:paddingRight="@dimen/activity_horizontal_margin"
1111
android:paddingTop="@dimen/activity_vertical_margin"
12-
tools:context="cn.hzw.graffitidemo.MainActivity">
12+
tools:context="cn.hzw.doodledemo.MainActivity">
1313

1414
<Button
1515
android:id="@+id/btn_select_image"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">Graffiti</string>
2+
<string name="app_name">Doodle</string>
33
</resources>
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)