优化资源释放

Author: FlodCoding

.idea/codeStyles/Project.xml

@@ -190,7 +190,7 @@ protected void onDraw(Canvas canvas) {
     @Override
     public void onDrawForeground(Canvas canvas) {
         //再次平移回去
-        canvas.translate(-canvasTransX,-canvasTransY);
+        canvas.translate(-canvasTransX, -canvasTransY);
         super.onDrawForeground(canvas);
     }
 
@@ -272,19 +272,27 @@ public void setText(CharSequence text, BufferType type) {
 
     /**
      * 设置Drawable，并设置宽高
+     * 默认大小为Drawable的{@link Drawable#getBounds()} ,
+     * 如果Bounds宽高为0则，取Drawable的内部固定尺寸{@link Drawable#getIntrinsicHeight()}
      *
      * @param position {@link POSITION}
      * @param drawable Drawable
-     * @param width    DX
-     * @param height   DX
+     * @param width    Px
+     * @param height   Px
      */
     public void setDrawable(@POSITION int position, @Nullable Drawable drawable, @Px int width, @Px int height) {
         mDrawables[position] = drawable;
         if (drawable != null) {
             Rect bounds = new Rect();
             if (width == -1 && height == -1) {
-                bounds.right = drawable.getIntrinsicWidth();
-                bounds.bottom = drawable.getIntrinsicHeight();
+                if (drawable.getBounds().width() > 0 && drawable.getBounds().height() > 0) {
+                    //如果Bounds宽高大于0,则保持默认
+                    final Rect origin = drawable.getBounds();
+                    bounds.set(origin.left, origin.top, origin.right, origin.bottom);
+                } else {
+                    //否则取Drawable的内部大小
+                    bounds.set(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+                }
             } else {
                 bounds.right = width;
                 bounds.bottom = height;
@@ -338,15 +346,19 @@ private void storeDrawables(@Nullable Drawable start, @Nullable Drawable top, @N
     protected Drawable[] copyDrawables(boolean clearOffset) {
         Drawable[] drawables = Arrays.copyOf(getDrawables(), 4);
         //clear offset
-        if (clearOffset) {
-            for (Drawable drawable : drawables) {
-                if (drawable != null) {
-                    Rect bounds = drawable.getBounds();
-                    bounds.offset(-bounds.left, -bounds.top);
-                }
+        if (clearOffset)
+            clearOffset(drawables);
+
+        return drawables;
+    }
+
+    private void clearOffset(Drawable... drawables) {
+        for (Drawable drawable : drawables) {
+            if (drawable != null) {
+                Rect bounds = drawable.getBounds();
+                bounds.offset(-bounds.left, -bounds.top);
             }
         }
-        return drawables;
     }
 
     protected int dp2px(float dpValue) {
@@ -404,18 +416,28 @@ public DrawableTextView setDrawableBottom(Drawable drawableBottom) {
         return this;
     }
 
-    public void setEnableCenterDrawables(boolean enable) {
+    public DrawableTextView setEnableCenterDrawables(boolean enable) {
+        if (enableCenterDrawables) {
+            //清除之前的位移
+            clearOffset(mDrawables);
+        }
         this.enableCenterDrawables = enable;
+        return this;
     }
 
-    public void setEnableTextInCenter(boolean enable) {
+    public DrawableTextView setEnableTextInCenter(boolean enable) {
         this.enableTextInCenter = enable;
+        return this;
     }
 
     public boolean isEnableTextInCenter() {
         return enableTextInCenter;
     }
 
+    public boolean isEnableCenterDrawables() {
+        return enableCenterDrawables;
+    }
+
     public Drawable[] getDrawables() {
         return mDrawables;
     }

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

@@ -171,7 +171,7 @@ public void onAnimationStart(Animator animation) {
                     }
 
                     saveStatus();
-                    LoadingButton.super.setText("",BufferType.NORMAL);
+                    LoadingButton.super.setText("", BufferType.NORMAL);
                     setCompoundDrawablePadding(0);
                     setCompoundDrawablesRelative(mLoadingDrawable, null, null, null);
                     setEnableTextInCenter(false);
@@ -614,7 +614,6 @@ public void setCompoundDrawablePadding(int pad) {
     }
 
 
-
     @Override
     public void setText(CharSequence text, BufferType type) {
         if (enableShrink && isSizeChanging) {
@@ -930,6 +929,19 @@ private Bitmap getBitmap(Drawable drawable) {
         return null;
     }
 
+
+    @Override
+    protected void onDetachedFromWindow() {
+        //release
+        mShrinkAnimator.cancel();
+        mLoadingDrawable.stop();
+        if (mEndDrawable != null)
+            mEndDrawable.mAppearAnimator.cancel();
+
+        super.onDetachedFromWindow();
+
+    }
+
     public interface OnLoadingListener {
         void onLoadingStart();
 

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

@@ -1,6 +1,6 @@
 # LoadingButton [![LoadingButton](https://jitpack.io/v/FlodCoding/LoadingButton.svg)](https://jitpack.io/#FlodCoding/LoadingButton)
 
- 一个小巧灵活的带加载功能的按钮控件，继承自[DrawableTextView](https://github.com/FlodCoding/LoadingButton/blob/master/DrawableText.md)，加载动画来自于[CircularProgressDrawable](https://developer.android.google.cn/reference/android/support/v4/widget/CircularProgressDrawable?hl=en)
+ 一个小巧灵活的带加载功能的按钮控件，继承自[DrawableTextView](https://github.com/FlodCoding/DrawableTextView)，加载动画来自于[CircularProgressDrawable](https://developer.android.google.cn/reference/android/support/v4/widget/CircularProgressDrawable?hl=en)
 
 ## 特性
    * 支持按钮收缩
@@ -23,10 +23,10 @@
 
  	dependencies {
 		//Androidx
-		implementation 'com.github.FlodCoding:LoadingButton:1.0.0-alpha6'
+		implementation 'com.github.FlodCoding:LoadingButton:1.0.0'
 
 		//Support-appcompat
-		implementation 'com.github.FlodCoding:LoadingButton:1.0.0-alpha4-support'
+		implementation 'com.github.FlodCoding:LoadingButton:1.0.0-support'
      	}