1、fix disableClickOnLoading function bug

2、add restoreTextWhenEnd

Author: FlodCoding

.idea/gradle.xml

@@ -63,19 +63,22 @@ interface STATE {
     private boolean mEnableTextInCenterSaved;
     private int[] mRootViewSizeSaved = new int[]{0, 0};
 
-    private boolean disableClickOnLoading;   //Loading中禁用点击
-    private boolean enableShrink;            //是否开启收缩动画
+
+    //Arr
+    private boolean disableClickOnLoading;   //Loading中禁用点击，  默认开启
+    private boolean enableShrink;            //是否开启收缩动画，    默认开启
+    private boolean restoreTextWhenEnd;      //当结束时是否恢复文字， 默认开启
     private ValueAnimator mShrinkAnimator;
-    private int mShrinkDuration;
+    private int mShrinkDuration;             //收缩和恢复的时间，    默认450ms
     private CircularProgressDrawable mLoadingDrawable;
     private OnLoadingListener mOnLoadingListener;
     private EndDrawable mEndDrawable;
     private int mLoadingSize;
     private int mLoadingPosition;
 
-    private boolean isSizeChanging;         //当前布局尺寸正发生改变
-    private boolean nextShrinkReverse;      //下一步是否是恢复动画
-    private boolean isCancel;               //是取消当前动画
+    private boolean isSizeChanging;          //当前布局尺寸正发生改变
+    private boolean nextShrinkReverse;       //下一步是否是恢复动画
+    private boolean isCancel;                //是取消当前动画
     private boolean isFail;
 
 
@@ -100,6 +103,7 @@ private void init(Context context, AttributeSet attrs) {
         TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.LoadingButton);
         enableShrink = array.getBoolean(R.styleable.LoadingButton_enableShrink, true);
         disableClickOnLoading = array.getBoolean(R.styleable.LoadingButton_disableClickOnLoading, true);
+        restoreTextWhenEnd = array.getBoolean(R.styleable.LoadingButton_restoreTextWhenEnd, true);
         mShrinkDuration = array.getInt(R.styleable.LoadingButton_shrinkDuration, 450);
         int loadingDrawableSize = array.getDimensionPixelSize(R.styleable.LoadingButton_loadingEndDrawableSize, (int) (enableShrink ? getTextSize() * 2 : getTextSize()));
         int loadingDrawableColor = array.getColor(R.styleable.LoadingButton_loadingDrawableColor, getTextColors().getDefaultColor());
@@ -241,7 +245,8 @@ private void saveStatus() {
      * 恢复保存的状态
      */
     private void restoreStatus() {
-        setText(mTextSaved);
+        if (restoreTextWhenEnd)
+            setText(mTextSaved);
         setCompoundDrawablePadding(mDrawablePaddingSaved);
         setCompoundDrawablesRelative(mDrawablesSaved[POSITION.START], mDrawablesSaved[POSITION.TOP], mDrawablesSaved[POSITION.END], mDrawablesSaved[POSITION.BOTTOM]);
         setEnableTextInCenter(mEnableTextInCenterSaved);
@@ -262,16 +267,14 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
 
 
     /**
-     * 如果disableClickOnLoading==true，点击会无效
+     * 如果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;
-        }
+        //disable click
+        if (disableClickOnLoading && curStatus != STATE.IDE)
+            return true;
         return super.onTouchEvent(event);
     }
 

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

@@ -16,6 +16,7 @@
     <declare-styleable name="LoadingButton">
         <attr name="enableShrink" format="boolean" />
         <attr name="disableClickOnLoading" format="boolean" />
+        <attr name="restoreTextWhenEnd" format="boolean" />
         <attr name="shrinkDuration" format="integer" />
         <attr name="loadingEndDrawableSize" format="dimension" />
         <attr name="loadingDrawableColor" format="color" />

Loadingbutton/src/main/res/values/attrs.xml

@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="50dp" />
-    <solid android:color="@android:color/holo_red_light" />
-</shape>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="50dp" />
+            <solid android:color="@android:color/holo_red_light" />
+        </shape>
+
+    </item>
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="50dp" />
+            <solid android:color="@android:color/holo_red_dark" />
+        </shape>
+
+    </item>
+
+</selector>
+

app/src/main/res/drawable/selector_btn.xml

@@ -27,6 +27,7 @@
             android:text="Submit"
             android:textColor="@android:color/white"
             android:textSize="14sp"
+            app:restoreTextWhenEnd="false"
             app:enableShrink="true"
             app:endCompleteDrawable="@drawable/ic_successful"
             app:endFailDrawable="@drawable/ic_fail"