Merge pull request #4 from JDevZone/dev

Dev

Author: JDevZone

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

@@ -12,8 +12,9 @@
             android:layout_margin="30dp"
             app:fpl_backgroundColor="@color/colorRedTrans"
             app:fpl_progressColor="@color/colorGreenTrans"
-            app:fpl_isRounded="false"
+            app:fpl_isRounded="true"
             app:fpl_progress="0"
+            app:fpl_roundedCornerRadius="50"
             app:fpl_progressDuration="3000"
             app:fpl_progressDirection="left_to_right"
             app:fpl_shouldRestart="false"

fillprogresslayout/src/main/java/com/devzone/fillprogresslayout/FillProgressLayout.kt

@@ -119,12 +119,12 @@ class FillProgressLayout : LinearLayout {
 
     private fun initPaint() {
         backgroundPaint.apply {
-            this.style = Paint.Style.FILL
-            this.color = mBackgroundColor
+            style = Paint.Style.FILL
+            color = mBackgroundColor
         }
         progressPaint.apply {
-            this.style = Paint.Style.FILL
-            this.color = mProgressColor
+            style = Paint.Style.FILL
+            color = mProgressColor
         }
 
     }
@@ -166,27 +166,30 @@ class FillProgressLayout : LinearLayout {
     }
 
     private fun drawNormalProgress(canvas: Canvas?) {
-        canvas?.let {
-            it.drawRect(backRectF, backgroundPaint)
-            it.drawRect(progressRectF, progressPaint)
+        canvas?.apply {
+            drawRect(backRectF, backgroundPaint)
+            drawRect(progressRectF, progressPaint)
         }
     }
 
     private fun drawRoundedProgress(canvas: Canvas?) {
-        canvas?.let {
-            it.drawRoundRect(backRectF, mCornerRadius, mCornerRadius, backgroundPaint)
-            it.drawRoundRect(progressRectF, mCornerRadius, mCornerRadius, progressPaint)
+        canvas?.apply {
+            save()
+            drawRoundRect(backRectF, mCornerRadius, mCornerRadius, backgroundPaint)
+            clipPath(clipPath)
+            drawRect(progressRectF, progressPaint)
+            restore()
         }
     }
 
-    override fun dispatchDraw(canvas: Canvas?) {
-        if (isRounded)
-            canvas?.clipPath(clipPath)
-        super.dispatchDraw(canvas)
-    }
 
     private fun isValidRes(res: Int) = res != View.NO_ID
 
+    override fun onDetachedFromWindow() {
+        clearAnimation()
+        super.onDetachedFromWindow()
+    }
+
 //---------------------public setters--------------------------------------------------------------------//
 
     fun setProgress(p: Int) {