fix #1

Author: b.ergashev

app/build.gradle

@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.ebr163.fillableview"
-        minSdkVersion 14
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"

app/src/androidTest/java/com/ebr163/fillableview/ExampleInstrumentedTest.java

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.ebr163.fillableview">
 
     <application
@@ -8,7 +9,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    private Random rnd = new Random();
+    private final Random rnd = new Random();
     private FilledView filledViewLeft;
 
     @Override

app/src/main/java/com/ebr163/fillableview/MainActivity.java

@@ -20,6 +20,7 @@ allprojects {
         buildToolsVersion = "28.0.3"
         androidX = "1.1.0-alpha05"
         constrainLayout = "1.1.3"
+        minSdkVersion = 19
     }
 }
 

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

@@ -6,7 +6,7 @@ android {
     buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
         versionCode 2
         versionName "1.1"

app/src/test/java/com/ebr163/fillableview/ExampleUnitTest.java

@@ -8,7 +8,6 @@
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.graphics.Region;
 import android.util.AttributeSet;
 import android.view.View;
 
@@ -23,7 +22,7 @@ public class FilledView extends View {
     public enum StartMode {
         LEFT(0), TOP(1), RIGHT(2), BOTTOM(3);
 
-        private int mode;
+        private final int mode;
 
         StartMode(int mode) {
             this.mode = mode;
@@ -41,19 +40,19 @@ public int getMode() {
     private int textSize;
     private boolean isShowBorder;
     private int borderSize = 1;
-
-    private final Path textPath = new Path();
-    private final Path croppedProgressPath = new Path();
-    private final Path croppedTextPath = new Path();
-    private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private int width;
     private int height;
     private float percent = 0.1F;
-    private Path progressStrokePath = new Path();
-    private Rect textBounds = new Rect();
 
-    private final Region region = new Region();
-    private final Region textRegion = new Region();
+    private final RectF rectF = new RectF();
+    private final Path textPath = new Path();
+    private final Path croppedTextPath = new Path();
+    private final Path progressPath = new Path();
+    private final Path croppedProgressPath = new Path();
+    private final Path progressStrokePath = new Path();
+
+    private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private final Rect textBounds = new Rect();
 
     public FilledView(Context context) {
         this(context, null);
@@ -133,52 +132,37 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (text != null) {
             paint.getTextPath(text, 0, text.length(), cx, cy, textPath);
         }
-        progressStrokePath = getRoundRectPath(0, 0, width, height, radius);
-
-        computePaths();
+        initRoundRectPath(0, 0, width, height, radius);
+        createPaths();
         setMeasuredDimension(width, height);
     }
 
-    private Path getRoundRectPath(float left, float top, float right, float bottom, float radius) {
-        region.set((int) left, (int) top, (int) right, (int) bottom);
-        Path roundRectPath = new Path();
-        RectF rectF = new RectF();
-        rectF.set(left + borderSize, top + borderSize, right - borderSize, bottom - borderSize);
-        roundRectPath.addRoundRect(rectF, radius, radius, Path.Direction.CCW);
-        region.setPath(roundRectPath, region);
-        return region.getBoundaryPath();
-    }
-
-    public void computeCroppedProgressPath() {
+    private void createPaths() {
         if (startPosition == StartMode.RIGHT.getMode()) {
-            region.set((int) (width * (1F - percent)), 0, width, height);
+            setRectPath(progressPath, width * (1F - percent), 0, width, height);
         } else if (startPosition == StartMode.LEFT.getMode()) {
-            region.set(0, 0, (int) (width * percent), height);
+            setRectPath(progressPath, 0, 0, width * percent, height);
         } else if (startPosition == StartMode.TOP.getMode()) {
-            region.set(0, 0, width, (int) (height * percent));
+            setRectPath(progressPath, 0, 0, width, height * percent);
         } else if (startPosition == StartMode.BOTTOM.getMode()) {
-            region.set(0, (int) (height * (1F - percent)), width, height);
+            setRectPath(progressPath, 0, height * (1F - percent), width, height);
         }
-        region.setPath(progressStrokePath, region);
-        textRegion.setPath(textPath, region);
-        region.op(textRegion, Region.Op.DIFFERENCE);
-        croppedProgressPath.rewind();
-        region.getBoundaryPath(croppedProgressPath);
+        croppedProgressPath.op(progressPath, textPath, Path.Op.DIFFERENCE);
+        croppedProgressPath.op(progressStrokePath, Path.Op.INTERSECT);
+
+        croppedTextPath.op(textPath, progressPath, Path.Op.DIFFERENCE);
     }
 
-    public void computeCroppedTextPath() {
-        if (startPosition == StartMode.RIGHT.getMode()) {
-            region.set(0, 0, (int) (width * (1F - percent)), height);
-        } else if (startPosition == StartMode.LEFT.getMode()) {
-            region.set((int) (width * percent), 0, width, height);
-        } else if (startPosition == StartMode.TOP.getMode()) {
-            region.set(0, (int) (height * percent), width, height);
-        } else if (startPosition == StartMode.BOTTOM.getMode()) {
-            region.set(0, 0, width, (int) (height * (1F - percent)));
-        }
-        textRegion.setPath(textPath, region);
-        croppedTextPath.rewind();
-        textRegion.getBoundaryPath(croppedTextPath);
+    private void initRoundRectPath(float left, float top, float right, float bottom, float radius) {
+        progressStrokePath.reset();
+        rectF.set(left + borderSize, top + borderSize, right - borderSize, bottom - borderSize);
+        progressStrokePath.addRoundRect(rectF, radius, radius, Path.Direction.CW);
+    }
+
+    public void setRectPath(Path path, float left, float top, float right, float bottom) {
+        rectF.set(left, top, right, bottom);
+        path.rewind();
+        path.addRect(rectF, Path.Direction.CW);
     }
 
     @Override
@@ -200,7 +184,7 @@ protected void onDraw(Canvas canvas) {
     public void setProgress(float percent) {
         if (percent >= 0f && percent <= 1F) {
             this.percent = percent;
-            computePaths();
+            createPaths();
             invalidate();
         }
     }
@@ -215,8 +199,8 @@ public void setText(String text) {
         requestLayout();
     }
 
-    public void showBorder(boolean flag) {
-        isShowBorder = flag;
+    public void showBorder(boolean isShowBorder) {
+        this.isShowBorder = isShowBorder;
         invalidate();
     }
 
@@ -230,13 +214,13 @@ public void setRadius(int radius) {
         requestLayout();
     }
 
-    public void setStartMode(StartMode startPosition) {
-        this.startPosition = startPosition.getMode();
+    public void setBorderSize(int borderSize){
+        this.borderSize = borderSize;
         requestLayout();
     }
 
-    private void computePaths() {
-        computeCroppedProgressPath();
-        computeCroppedTextPath();
+    public void setStartMode(StartMode startPosition) {
+        this.startPosition = startPosition.getMode();
+        requestLayout();
     }
 }