disableClickOnLoading 实现方式修改

Author: FlodCoding

.idea/gradle.xml

@@ -4,6 +4,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
@@ -20,6 +21,7 @@
 import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.CircularProgressDrawable;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 import android.view.View;
 
 
@@ -46,6 +48,7 @@
 @SuppressWarnings({"UnusedReturnValue,SameParameterValue", "unused"})
 public class LoadingButton extends DrawableTextView {
     private int curStatus = STATE.IDE;      //当前的状态
+
     interface STATE {
         int IDE = 0;
         int SHRINKING = 1;
@@ -134,6 +137,8 @@ private void init(Context context, AttributeSet attrs) {
 
     }
 
+
+
     /**
      * 设置收缩动画，主要用来收缩和恢复布局的宽度，动画开始前会保存一些收缩前的参数（文字，其他Drawable等）
      */
@@ -240,9 +245,6 @@ private void restoreStatus() {
         getLayoutParams().width = mRootViewSizeSaved[0];
         getLayoutParams().height = mRootViewSizeSaved[1];
         requestLayout();
-        if (disableClickOnLoading) {
-            super.setEnabled(true);
-        }
 
         addOnLayoutChangeListener(new OnLayoutChangeListener() {
             @Override
@@ -256,6 +258,21 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
     }
 
 
+    /**
+     * 如果disableClickOnLoading==true，点击会无效
+     */
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_UP) {
+            //disable click
+            if (disableClickOnLoading && curStatus != STATE.IDE)
+                return true;
+        }
+        return super.onTouchEvent(event);
+    }
+
+
     /**
      * 开始收缩或恢复
      *
@@ -348,11 +365,6 @@ private void cancelAllRunning(boolean withAnim) {
      * shrink -> startLoading
      */
     public void start() {
-        //disable click
-        if (disableClickOnLoading) {
-            super.setEnabled(false);
-        }
-
         //cancel last loading
         if (curStatus == STATE.SHRINKING || curStatus == STATE.LOADING)
             isCancel = true;

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

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