1、修复一个5.0以下Drawable位移错误的问题

2、修复cancel后Loading没有结束的问题
3、修复错误使用硬件加速的问题

Author: FlodCoding

Loadingbutton-support/build.gradle

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

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

@@ -101,7 +101,7 @@ private void init(Context context, AttributeSet attrs) {
             bottomBounds.bottom = (int) array.getDimension(R.styleable.DrawableTextView_drawableBottomHeight, drawables[POSITION.BOTTOM].getIntrinsicHeight());
         }
         array.recycle();
-        setCompoundDrawablesRelative(drawables[POSITION.START], drawables[POSITION.TOP], drawables[POSITION.END], drawables[POSITION.BOTTOM]);
+        setCompoundDrawables(drawables[POSITION.START], drawables[POSITION.TOP], drawables[POSITION.END], drawables[POSITION.BOTTOM]);
     }
 
 
@@ -304,7 +304,7 @@ public void setDrawable(@POSITION int position, @Nullable Drawable drawable, @Px
             mDrawables[position].setBounds(bounds.left, bounds.top, bounds.right, bounds.bottom);
             mDrawablesBounds[position] = bounds;
         }
-        super.setCompoundDrawablesRelative(mDrawables[POSITION.START], mDrawables[POSITION.TOP], mDrawables[POSITION.END], mDrawables[POSITION.BOTTOM]);
+        super.setCompoundDrawables(mDrawables[POSITION.START], mDrawables[POSITION.TOP], mDrawables[POSITION.END], mDrawables[POSITION.BOTTOM]);
     }
 
 

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

@@ -26,7 +26,6 @@
 import android.view.View;
 
 
-
 /**
  * SimpleDes:
  * Creator: Flood
@@ -218,7 +217,7 @@ public void onAnimationEnd(Animator animation) {
     /**
      * 开始收缩或恢复
      *
-     * @param isReverse true：恢复 ，false：收缩
+     * @param isReverse true：恢复，且开始时停止Loading false：收缩，且结束时开始Loading
      * @param lastFrame 是否只显示最后一帧
      */
     private void beginChangeSize(boolean isReverse, boolean lastFrame) {
@@ -356,6 +355,7 @@ private void cancelAllRunning(boolean withAnim) {
                 if (enableShrink) {
                     beginChangeSize(true, !withAnim);
                 } else {
+                    stopLoading();
                     toIde();
                 }
                 break;
@@ -731,7 +731,7 @@ private EndDrawable(@DrawableRes int completeResId, @DrawableRes int failResId)
         }
 
         private void init() {
-            setLayerType(LAYER_TYPE_HARDWARE, null);
+            //setLayerType(LAYER_TYPE_HARDWARE, null);
             mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
             mCirclePath = new Path();
             mAppearAnimator = ObjectAnimator.ofFloat(this, "animValue", 1.0f);

app/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.flod.loadingbutton.app"
-        minSdkVersion 19
+        minSdkVersion 17
         targetSdkVersion 28
         versionCode 100
         versionName "1.0.0"