fixing startAnimation on create bug (#137)

Author: leandroBorgesFerreira

loading-button-android/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'org.jmailen.kotlinter'
 
 // Bintray depends on this global variable to set the library version!
-version = "2.1.1"
+version = "2.1.3"
 group = 'br.com.simplepass'
 
 android {

loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/CircularProgressButton.kt

@@ -59,6 +59,8 @@ open class CircularProgressButton : AppCompatButton, ProgressButton {
 
     override lateinit var drawableBackground: Drawable
 
+    private var savedAnimationEndListener: () -> Unit = {}
+
     private val presenter = ProgressButtonPresenter(this)
 
     private val morphAnimator by lazy {
@@ -124,10 +126,12 @@ open class CircularProgressButton : AppCompatButton, ProgressButton {
     }
 
     override fun startMorphAnimation() {
+        applyAnimationEndListener(morphAnimator, savedAnimationEndListener)
         morphAnimator.start()
     }
 
     override fun startMorphRevertAnimation() {
+        applyAnimationEndListener(morphAnimator, savedAnimationEndListener)
         morphRevertAnimator.start()
     }
 
@@ -140,14 +144,12 @@ open class CircularProgressButton : AppCompatButton, ProgressButton {
     }
 
     override fun startAnimation(onAnimationEndListener: () -> Unit) {
-        applyAnimationEndListener(morphAnimator, onAnimationEndListener)
-
+        savedAnimationEndListener = onAnimationEndListener
         presenter.startAnimation()
     }
 
     override fun revertAnimation(onAnimationEndListener: () -> Unit) {
-        applyAnimationEndListener(morphRevertAnimator, onAnimationEndListener)
-
+        savedAnimationEndListener = onAnimationEndListener
         presenter.revertAnimation()
     }
 

loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/CircularProgressImageButton.kt

@@ -58,6 +58,8 @@ open class CircularProgressImageButton : AppCompatImageButton, ProgressButton {
 
     override lateinit var drawableBackground: Drawable
 
+    private var savedAnimationEndListener: () -> Unit = {}
+
     private val presenter = ProgressButtonPresenter(this)
 
     private val morphAnimator by lazy {
@@ -113,10 +115,12 @@ open class CircularProgressImageButton : AppCompatImageButton, ProgressButton {
     }
 
     override fun startMorphAnimation() {
+        applyAnimationEndListener(morphAnimator, savedAnimationEndListener)
         morphAnimator.start()
     }
 
     override fun startMorphRevertAnimation() {
+        applyAnimationEndListener(morphAnimator, savedAnimationEndListener)
         morphRevertAnimator.start()
     }
 
@@ -129,14 +133,12 @@ open class CircularProgressImageButton : AppCompatImageButton, ProgressButton {
     }
 
     override fun startAnimation(onAnimationEndListener: () -> Unit) {
-        applyAnimationEndListener(morphAnimator, onAnimationEndListener)
-
+        savedAnimationEndListener = onAnimationEndListener
         presenter.startAnimation()
     }
 
     override fun revertAnimation(onAnimationEndListener: () -> Unit) {
-        applyAnimationEndListener(morphRevertAnimator, onAnimationEndListener)
-
+        savedAnimationEndListener = onAnimationEndListener
         presenter.revertAnimation()
     }
 

loading-button-android/src/main/java/br/com/simplepass/loadingbutton/presentation/ProgressButtonPresenter.kt

@@ -54,13 +54,15 @@ internal class ProgressButtonPresenter(private val view: ProgressButton) {
     }
 
     fun onDraw(canvas: Canvas) {
-        if (state == State.BEFORE_DRAW) {
-            state = State.IDLE
-            view.saveInitialState()
-        }
-
         when (state) {
-            State.WAITING_PROGRESS -> view.startMorphAnimation()
+            State.BEFORE_DRAW -> {
+                state = State.IDLE
+                view.saveInitialState()
+            }
+            State.WAITING_PROGRESS -> {
+                view.saveInitialState()
+                view.startMorphAnimation()
+            }
             State.PROGRESS -> view.drawProgress(canvas)
             State.DONE -> view.drawDoneAnimation(canvas)
             else -> return