修复未设置EndDrawable出现的无法结束loading的错误，

修复无文字时的错误

Author: FlodCoding

Loadingbutton-support/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 28
-        versionCode 103
-        versionName "1.0.3"
+        versionCode 104
+        versionName "1.0.4"
     }
 
     buildTypes {

Loadingbutton-support/src/main/java/com/flod/loadingbutton/LoadingButton.java

@@ -186,6 +186,7 @@ public void onAnimationStart(Animator animation) {
                 } else {
                     //begin restore
                     curStatus = STATUS.RESTORING;
+                    stopLoading();
                     if (mOnLoadingListener != null) {
                         mOnLoadingListener.onRestoring();
                     }
@@ -203,11 +204,10 @@ public void onAnimationEnd(Animator animation) {
 
                 } else {
                     //restore over
-                    curStatus = STATUS.IDE;
                     isSizeChanging = false;
-                    restoreStatus();
-                    endCallbackListener();
                     nextShrinkReverse = false;
+                    toIde();
+
                 }
             }
 
@@ -221,7 +221,7 @@ public void onAnimationEnd(Animator animation) {
      * @param isReverse true：恢复 ，false：收缩
      * @param lastFrame 是否只显示最后一帧
      */
-    private void beginShrinkAnim(boolean isReverse, boolean lastFrame) {
+    private void beginChangeSize(boolean isReverse, boolean lastFrame) {
         if (enableShrink) {
             if (mShrinkAnimator.isRunning()) {
                 //如果上一个动画还在执行，就结束到最后一帧
@@ -293,6 +293,13 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
 
     }
 
+    private void toIde() {
+        curStatus = STATUS.IDE;
+        restoreStatus();
+        endCallbackListener();
+
+    }
+
 
     /**
      * 如果disableClickOnLoading==true，且不是闲置状态，点击会无效
@@ -312,19 +319,27 @@ public boolean onTouchEvent(MotionEvent event) {
      */
     private void startLoading() {
         curStatus = STATUS.LOADING;
-        mLoadingDrawable.start();
+
+        if (!mLoadingDrawable.isRunning()) {
+            mLoadingDrawable.start();
+        }
 
         if (mOnLoadingListener != null) {
             mOnLoadingListener.onLoadingStart();
         }
-
     }
 
     /**
      * 停止加载
      */
     private void stopLoading() {
-        mLoadingDrawable.stop();
+        if (mLoadingDrawable.isRunning()) {
+            mLoadingDrawable.stop();
+            if (mOnLoadingListener != null) {
+                mOnLoadingListener.onLoadingStop();
+            }
+        }
+
     }
 
     /**
@@ -335,24 +350,20 @@ private void stopLoading() {
     private void cancelAllRunning(boolean withAnim) {
         switch (curStatus) {
             case STATUS.SHRINKING:
-                beginShrinkAnim(true, !withAnim);
-                stopLoading();
+                beginChangeSize(true, !withAnim);
                 break;
             case STATUS.LOADING:
-                stopLoading();
                 if (enableShrink) {
-                    beginShrinkAnim(true, !withAnim);
+                    beginChangeSize(true, !withAnim);
                 } else {
-                    endCallbackListener();
-                    restoreStatus();
-                    curStatus = STATUS.IDE;
+                    toIde();
                 }
                 break;
             case STATUS.END_DRAWABLE_SHOWING:
                 if (mEndDrawable != null) {
                     mEndDrawable.cancel(withAnim);
                 } else {
-                    beginShrinkAnim(true, !withAnim);
+                    beginChangeSize(true, !withAnim);
                 }
                 break;
             case STATUS.RESTORING:
@@ -376,12 +387,13 @@ private void cancelAllRunning(boolean withAnim) {
      */
     public void start() {
         //cancel last loading
+
         if (curStatus == STATUS.SHRINKING || curStatus == STATUS.LOADING)
             isCancel = true;
         cancelAllRunning(false);
 
         if (enableShrink) {
-            beginShrinkAnim(false, false);
+            beginChangeSize(false, false);
         } else {
             saveStatus();
             if (TextUtils.isEmpty(getText())) {
@@ -403,32 +415,26 @@ public void start() {
      */
     private void end(boolean isFail) {
 
-        //end running Shrinking
-        if (mShrinkAnimator.isRunning()) {
-            mShrinkAnimator.end();
-        }
-
-        //StopLoading
-        stopLoading();
-        if (!enableShrink && mOnLoadingListener != null) {
-            mOnLoadingListener.onLoadingStop();
-        }
-
         if (mEndDrawable != null) {
+            if (mShrinkAnimator.isRunning())
+                mShrinkAnimator.end();
+
+            stopLoading();
             mEndDrawable.show(isFail);
         } else {
             //No EndDrawable,enableShrink
+            this.isFail = isFail;
+
             if (enableShrink) {
                 if (curStatus == STATUS.LOADING)
-                    beginShrinkAnim(true, false);
+                    beginChangeSize(true, false);
                 else
-                    beginShrinkAnim(true, true);
+                    beginChangeSize(true, true);
 
             } else {
                 //No EndDrawable,disableShrink
-                curStatus = STATUS.IDE;
-                restoreStatus();
-                endCallbackListener();
+                stopLoading();
+                toIde();
             }
 
 
@@ -734,11 +740,9 @@ private void init() {
                 public void run() {
                     setAnimValue(0);
                     if (enableShrink)
-                        beginShrinkAnim(true, !nextShrinkReverse);
+                        beginChangeSize(true, !nextShrinkReverse);
                     else {
-                        curStatus = STATUS.IDE;
-                        restoreStatus();
-                        endCallbackListener();
+                        toIde();
                     }
                     isShowing = false;
                 }
@@ -789,16 +793,16 @@ private void show(boolean isFail) {
          */
         private void cancel(boolean withAnim) {
             isShowing = false;
+
+            getHandler().removeCallbacks(mRunnable);
             if (mAppearAnimator.isRunning()) {
                 mAppearAnimator.end();
             }
-            getHandler().removeCallbacks(mRunnable);
+
             if (enableShrink)
-                beginShrinkAnim(true, !withAnim);
+                beginChangeSize(true, !withAnim);
             else {
-                endCallbackListener();
-                restoreStatus();
-                curStatus = STATUS.IDE;
+                toIde();
             }
             setAnimValue(0);
         }

README.md

@@ -23,10 +23,10 @@
 
  	dependencies {
 		//Androidx
-		implementation 'com.github.FlodCoding:LoadingButton:1.0.3'
+		implementation 'com.github.FlodCoding:LoadingButton:1.0.4'
 
 		//Support-appcompat
-		implementation 'com.github.FlodCoding:LoadingButton:1.0.3-support'
+		implementation 'com.github.FlodCoding:LoadingButton:1.0.4-support'
      	}
 
 

app/src/main/java/com/flod/loadingbutton/app/MainActivity.java

@@ -215,27 +215,38 @@ private void initLoadingButton() {
                 .setOnLoadingListener(new LoadingButton.OnLoadingListenerAdapter() {
                     @Override
                     public void onCanceled() {
+                        Log.d("LoadingButton","onCanceled");
                         Toast.makeText(getApplicationContext(), "onCanceled", Toast.LENGTH_SHORT).show();
                     }
 
                     @Override
                     public void onFailed() {
+                        Log.d("LoadingButton","onFailed");
                         Toast.makeText(getApplicationContext(), "onFailed", Toast.LENGTH_SHORT).show();
+
                         loadingBtn.setText("Submit");
                     }
 
                     @Override
                     public void onCompleted() {
+                        Log.d("LoadingButton","onCompleted");
                         Toast.makeText(getApplicationContext(), "onCompleted", Toast.LENGTH_SHORT).show();
                     }
 
                     @Override
                     public void onLoadingStart() {
+                        Log.d("LoadingButton","onLoadingStart");
                         loadingBtn.setText(loadingText);
                     }
 
+                    @Override
+                    public void onLoadingStop() {
+                        Log.d("LoadingButton","onLoadingStop");
+                    }
+
                     @Override
                     public void onEndDrawableAppear(boolean isSuccess, LoadingButton.EndDrawable endDrawable) {
+                        Log.d("LoadingButton","onEndDrawableAppear");
                         if (isSuccess) {
                             loadingBtn.setText(completeText);
                         } else {