Merge pull request #6 from JDevZone/dev

Dev
JDevZone · Sep 18, 2019 · 0b514e9 · 0b514e9
2 parents aa45ad7 + 8486dbf
commit 0b514e9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/app/src/main/java/com/devzone/fpl_sample/MainActivity.kt b/app/src/main/java/com/devzone/fpl_sample/MainActivity.kt
@@ -2,8 +2,8 @@ package com.devzone.fpl_sample
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AppCompatButton
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
@@ -17,12 +17,13 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun toggleFill(view: View) {
-        val button: AppCompatButton = view as AppCompatButton
+        val button: Button = view as Button
         button.isEnabled = false
 
         isFilled = !isFilled
         fillL.setProgress(if (isFilled) 100 else 0)
-        fillL.setDoOnProgressEnd { v ->
+        fillB.setProgress(if (isFilled) 100 else 0)
+        fillB.setDoOnProgressEnd { v ->
             button.isEnabled = true;button.text = if (isFilled) "Unfill" else "Fill"
         }
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -12,7 +12,8 @@
             android:layout_margin="30dp"
             app:fpl_backgroundColor="@color/colorRedTrans"
             app:fpl_progressColor="@color/colorGreenTrans"
-            app:fpl_isRounded="false"
+            app:fpl_isRounded="true"
+            app:fpl_roundedCornerRadius="100"
             app:fpl_progress="0"
             app:fpl_progressDuration="2000"
             app:fpl_progressDirection="left_to_right"
@@ -44,6 +45,8 @@
         <com.devzone.fillprogresslayout.FillProgressLayout
                 android:layout_alignBottom="@+id/tv"
                 android:layout_alignParentTop="true"
+                app:fpl_roundedCornerRadius="100"
+                app:fpl_isRounded="true"
                 android:id="@+id/fillB"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
@@ -57,7 +60,7 @@
                 android:layout_height="wrap_content"/>
     </RelativeLayout>
 
-    <androidx.appcompat.widget.AppCompatButton
+    <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"

diff --git a/fillprogresslayout/src/main/java/com/devzone/fillprogresslayout/FillProgressLayout.kt b/fillprogresslayout/src/main/java/com/devzone/fillprogresslayout/FillProgressLayout.kt
@@ -190,6 +190,12 @@ class FillProgressLayout : LinearLayout {
         super.onDetachedFromWindow()
     }
 
+    override fun dispatchDraw(canvas: Canvas?) { // child clipping done here
+        if(isRounded)
+            canvas?.clipPath(clipPath)
+        super.dispatchDraw(canvas)
+    }
+
 //---------------------public setters--------------------------------------------------------------------//
 
     fun setProgress(p: Int) {
@@ -210,12 +216,14 @@ class FillProgressLayout : LinearLayout {
     fun setProgressBackgroundColor(@ColorRes resId: Int) {
         if (isValidRes(resId)) {
             mBackgroundColor = ContextCompat.getColor(context, resId)
+            initPaint()
         }
     }
 
     fun setProgressColor(@ColorRes resId: Int) {
         if (isValidRes(resId)) {
             mProgressColor = ContextCompat.getColor(context, resId)
+            initPaint()
         }
     }