changed the attr progress name, probably has one conflict with new an…

…droid stuido 3.6 or lastest.
Paulimjr · Mar 10, 2020 · 9f0f0af · 9f0f0af
1 parent 99e1572
commit 9f0f0af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/com/circleprogressbar/MainActivity.kt b/app/src/main/java/com/circleprogressbar/MainActivity.kt
@@ -15,8 +15,8 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        progress_circular.setProgressAnimation(40f,2000)
         progress_circular.runProgress(progressListener)
+        progress_circular.setProgressAnimation(40f,2000)
     }
 
     private val progressListener = object : CircleProgressBar.CircleProgressBarCallback {

diff --git a/circleprogressbar/src/main/java/com/pcamilojr/circleprogressbar/CircleProgressBar.kt b/circleprogressbar/src/main/java/com/pcamilojr/circleprogressbar/CircleProgressBar.kt
@@ -64,7 +64,7 @@ class CircleProgressBar(context: Context?, attrs: AttributeSet?) : View(context,
 
             typedArray?.let {
                 try {
-                    progress = it.getFloat(R.styleable.CircleProgressBar_progress, progress)
+                    progress = it.getFloat(R.styleable.CircleProgressBar_progressCircleBar, progress)
                     color = it.getInt(R.styleable.CircleProgressBar_progressColor, color)
                     max = it.getInt(R.styleable.CircleProgressBar_maxProgress, max)
                     min = it.getInt(R.styleable.CircleProgressBar_minProgress, min)
@@ -173,7 +173,9 @@ class CircleProgressBar(context: Context?, attrs: AttributeSet?) : View(context,
             }
 
             override fun onAnimationEnd(animation: Animator?) {
-                mListener?.onProgressEnd()
+                mListener?.let {
+                    it.onProgressEnd()
+                }
             }
 
             override fun onAnimationStart(animation: Animator?) {

diff --git a/circleprogressbar/src/main/res/values/attrs.xml b/circleprogressbar/src/main/res/values/attrs.xml
@@ -10,7 +10,7 @@
         <!-- Sets the stroke width of progress -->
         <attr name="strokeWidth" format="integer"/>
         <!-- Sets the value of progress -->
-        <attr name="progress" format="integer"/>
+        <attr name="progressCircleBar" format="integer"/>
         <!-- Sets the color of progress -->
         <attr name="progressColor" format="color"/>
         <!-- Sets the identifier of progress -->