对外提供更多Paint相关配置

Author: jenly1314

README.md

@@ -35,7 +35,6 @@ DrawBoard 是一个自定义 View实现的画板；方便对图片进行各种
 | android:src | drawable | | 设置图片（画板背景图层） |
 | dbvPaintColor | color |<font color=#FF0000>#FFFF0000</font>| 画笔的颜色 |
 | dbvTouchPointColor | color |<font color=#CCCCCC>#AFCCCCCC</font>| 触摸点的颜色 |
-| dbvDrawTextColor | color |<font color=#FF0000>#FFFF0000</font>| 绘制文本的颜色 |
 | dbvDrawTextSize | dimension | 15sp | 绘制文本的字体大小 |
 | dbvDrawTextBold | boolean | false | 绘制文本是否是粗体 |
 | dbvDrawTextUnderline | boolean | false | 绘制文本是否需要下划线 |
@@ -60,7 +59,7 @@ allprojects {
 
 2. 在Module的 **build.gradle** 里面添加引入依赖项
 ```gradle
-implementation 'com.github.jenly1314:drawboard:1.0.0'
+implementation 'com.github.jenly1314:drawboard:1.0.1'
 
 ```
 
@@ -168,6 +167,9 @@ drawBoardView.getImageBitmap()
 
 ## 版本记录
 
+#### v1.0.1：2022-2-17
+*  对外提供更多Paint相关配置
+
 #### v1.0.0：2021-11-30
 *  DrawBoard初始版本
 

app/release/app-release.apk

@@ -1,5 +1,5 @@
 {
-  "version": 3,
+  "version": 2,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
@@ -10,11 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0.0",
+      "versionCode": 2,
+      "versionName": "1.0.1",
       "outputFile": "app-release.apk"
     }
-  ],
-  "elementType": "File"
+  ]
 }

app/release/output-metadata.json

@@ -25,7 +25,6 @@ import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.FileOutputStream
 import java.lang.Exception
-import kotlin.math.log
 
 class MainActivity : AppCompatActivity() {
 

app/src/main/java/com/king/drawboard/app/MainActivity.kt

@@ -4,17 +4,20 @@
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.BlendMode;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.graphics.PathEffect;
 import android.graphics.PixelFormat;
 import android.graphics.PointF;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
+import android.graphics.Shader;
 import android.graphics.Xfermode;
 import android.graphics.drawable.Drawable;
-import android.text.TextPaint;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
@@ -45,6 +48,7 @@
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
@@ -120,10 +124,6 @@ public class DrawBoardView extends View {
      * 触摸点画笔
      */
     private Paint pointPaint;
-    /**
-     * 文本画笔
-     */
-    private TextPaint textPaint;
     /**
      * 画笔的颜色
      */
@@ -132,10 +132,6 @@ public class DrawBoardView extends View {
      * 触摸点画笔的颜色
      */
     private int touchPointColor = 0xAFCCCCCC;
-    /**
-     * 文本画笔的颜色
-     */
-    private int drawTextColor = Color.RED;
     /**
      * 绘制文本的字体大小
      */
@@ -160,10 +156,26 @@ public class DrawBoardView extends View {
      * 缩放点描边宽度
      */
     private float zoomPointStrokeWidth;
+    /**
+     * 画笔的 Paint.Style
+     */
+    private Paint.Style paintStyle = Paint.Style.STROKE;
+    /**
+     * 画笔的着色器
+     */
+    private Shader paintShader;
     /**
      * 画笔的 Xfermode
      */
     private Xfermode paintXfermode;
+    /**
+     * 画笔的 PathEffect
+     */
+    private PathEffect pathEffect;
+    /**
+     * 画笔的 BlendMode
+     */
+    private BlendMode blendMode;
     /**
      * 绘图模式
      */
@@ -416,8 +428,6 @@ private void init(Context context, @Nullable AttributeSet attrs){
                 paintColor = a.getColor(attr, Color.RED);
             }else if(attr == R.styleable.DrawBoardView_dbvTouchPointColor){
                 touchPointColor = a.getColor(attr, Color.RED);
-            }else if(attr == R.styleable.DrawBoardView_dbvDrawTextColor){
-                drawTextColor = a.getColor(attr, Color.RED);
             }else if(attr == R.styleable.DrawBoardView_dbvDrawTextSize){
                 drawTextSize = a.getDimension(attr, drawTextSize);
             }else if(attr == R.styleable.DrawBoardView_dbvDrawTextBold){
@@ -436,14 +446,6 @@ private void init(Context context, @Nullable AttributeSet attrs){
         pointPaint.setAntiAlias(true);
         pointPaint.setColor(touchPointColor);
 
-        textPaint = new TextPaint();
-        textPaint.setStyle(Paint.Style.FILL_AND_STROKE);
-        textPaint.setAntiAlias(true);
-        textPaint.setColor(drawTextColor);
-        textPaint.setTextSize(drawTextSize);
-        textPaint.setFakeBoldText(isFakeBoldText);
-        textPaint.setUnderlineText(isUnderlineText);
-
         drawList = new LinkedList<>();
         backupDrawList = new ArrayList<>();
         matrix = new Matrix();
@@ -708,7 +710,7 @@ protected void onDraw(Canvas canvas) {
     public void draw(@NonNull Draw draw){
         if(drawingCanvas != null){
             if(draw.getPaint() == null){//如果画笔为空则根据当前配置自动创建画笔，如果draw 是绘制其他有依赖的需自己配置后再传进来
-                draw.setPaint(createPaint(false));
+                draw.setPaint(createPaint(drawMode));
             }
             //进行绘制
             draw.draw(drawingCanvas);
@@ -811,26 +813,45 @@ private void drawTouchPoint(Canvas canvas,float x, float y, float radius){
 
     /**
      * 创建画笔
-     * @param isEraser
+     * @param drawMode
      * @return
      */
-    private Paint createPaint(boolean isEraser){
+    private Paint createPaint(int drawMode){
+
         Paint paint = new Paint();
-        paint.setStyle(Paint.Style.STROKE);
-        if(isEraser){//当为橡皮擦模式时
+        if (drawMode == DrawMode.ERASER) { // 当为橡皮擦模式时
+            paint.setStyle(Paint.Style.STROKE);
             paint.setColor(Color.BLACK);
             paint.setStrokeWidth(eraserStrokeWidth);
             paint.setAntiAlias(false);
             paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));
-        }else{
+        } else if (drawMode == DrawMode.DRAW_TEXT) { // 当为绘制文本时
+            paint.setStyle(Paint.Style.FILL_AND_STROKE);
+            paint.setAntiAlias(true);
+            paint.setColor(paintColor);
+            paint.setTextSize(drawTextSize);
+            paint.setFakeBoldText(isFakeBoldText);
+            paint.setUnderlineText(isUnderlineText);
+        } else {
+            paint.setStyle(paintStyle);
             paint.setColor(paintColor);
             paint.setStrokeWidth(lineStrokeWidth);
             paint.setAntiAlias(true);
             paint.setStrokeJoin(Paint.Join.ROUND);
             paint.setStrokeCap(Paint.Cap.ROUND);
-            if(paintXfermode != null){
+
+            if (paintShader != null) {
+                paint.setShader(paintShader);
+            }
+            if (paintXfermode != null) {
                 paint.setXfermode(paintXfermode);
             }
+            if (pathEffect != null) {
+                paint.setPathEffect(pathEffect);
+            }
+            if (blendMode != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                paint.setBlendMode(blendMode);
+            }
         }
 
         return paint;
@@ -848,7 +869,7 @@ private Draw createDraw(@DrawMode int drawMode){
             try {
                 Draw draw = drawClass.newInstance();
                 if(draw instanceof DrawText){
-                    ((DrawText) draw).setTextPaint(textPaint);
+                    ((DrawText) draw).setTextPaint(paint);
                     ((DrawText) draw).setText(drawText);
                 }else if(draw instanceof DrawBitmap){
                     ((DrawBitmap) draw).setBitmap(drawBitmap);
@@ -876,7 +897,7 @@ public boolean onTouchEvent(MotionEvent event) {
                 if(isDrawEnabled && event.getPointerCount() == 1){//单指
                     isZoom = false;
                     isDraw = false;
-                    paint = createPaint(drawMode == DrawMode.ERASER);
+                    paint = createPaint(drawMode);
                     draw = createDraw(drawMode);
                     draw.setPaint(paint);
                     float x = event.getX();
@@ -1269,10 +1290,37 @@ public int getTouchPointColor() {
         return touchPointColor;
     }
 
+    @NonNull
+    public Paint.Style getPaintStyle() {
+        return paintStyle;
+    }
+
+    /**
+     * 设置画笔的 Paint.Style
+     * @param paintStyle
+     */
+    public void setPaintStyle(@NonNull Paint.Style paintStyle) {
+        this.paintStyle = paintStyle;
+    }
+
+    @Nullable
+    public Shader getPaintShader() {
+        return paintShader;
+    }
+
+    /**
+     * 设置画笔的 Shader
+     * @param paintShader
+     */
+    public void setPaintShader(@Nullable Shader paintShader) {
+        this.paintShader = paintShader;
+    }
+
     /**
-     * 获取画笔的Xfermode
+     * 获取画笔的 Xfermode
      * @return
      */
+    @Nullable
     public Xfermode getPaintXfermode() {
         return paintXfermode;
     }
@@ -1281,10 +1329,38 @@ public Xfermode getPaintXfermode() {
      * 设置画笔的 Xfermode
      * @param xfermode
      */
-    public void setPaintXfermode(Xfermode xfermode) {
+    public void setPaintXfermode(@Nullable Xfermode xfermode) {
         this.paintXfermode = xfermode;
     }
 
+    @Nullable
+    public PathEffect getPathEffect() {
+        return pathEffect;
+    }
+
+    /**
+     * 设置画笔的 PathEffect
+     * @param pathEffect
+     */
+    public void setPathEffect(@Nullable PathEffect pathEffect) {
+        this.pathEffect = pathEffect;
+    }
+
+    @Nullable
+    public BlendMode getBlendMode() {
+        return blendMode;
+    }
+
+    /**
+     * 设置画笔的 BlendMode
+     * @param blendMode
+     */
+    @Nullable
+    @RequiresApi(Build.VERSION_CODES.Q)
+    public void setBlendMode(@Nullable BlendMode blendMode) {
+        this.blendMode = blendMode;
+    }
+
     /**
      * 设置触摸点的颜色
      * @param touchPointColor
@@ -1298,15 +1374,15 @@ public void setTouchPointColor(int touchPointColor) {
      * @return
      */
     public int getDrawTextColor() {
-        return drawTextColor;
+        return paintColor;
     }
 
     /**
      * 设置绘制文本的颜色
      * @param drawTextColor
      */
     public void setDrawTextColor(int drawTextColor) {
-        this.drawTextColor = drawTextColor;
+        this.paintColor = drawTextColor;
     }
 
     /**

drawboard/src/main/java/com/king/drawboard/view/DrawBoardView.java

@@ -11,7 +11,6 @@
         <attr name="android:src" />
         <attr name="dbvPaintColor" format="color"/>
         <attr name="dbvTouchPointColor" format="color"/>
-        <attr name="dbvDrawTextColor" format="color"/>
         <attr name="dbvDrawTextSize" format="dimension"/>
         <attr name="dbvDrawTextBold" format="boolean"/>
         <attr name="dbvDrawTextUnderline" format="boolean"/>

drawboard/src/main/res/values/attrs.xml

@@ -21,8 +21,8 @@ android.enableJetifier = true
 kotlin.code.style      = official
 
 GROUP=com.github.jenly1314
-VERSION_NAME=1.0.0
-VERSION_CODE=1
+VERSION_NAME=1.0.1
+VERSION_CODE=2
 
 POM_DESCRIPTION=DrawBoard for Android
 POM_INCEPTION_YEAR=2021

gradle.properties

@@ -1,7 +1,7 @@
 //App
 def app_version = [:]
-app_version.versionCode = 1
-app_version.versionName = "1.0.0"
+app_version.versionCode = 2
+app_version.versionName = "1.0.1"
 ext.app_version = app_version
 
 //build version