add apk

Author: FlodCoding

.gitignore

@@ -1,6 +1,6 @@
 *.iml
 .gradle
-/local.properties
+/local.propertie
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

README.md

@@ -25,7 +25,7 @@
 
  	dependencies {
 		//需要是Androidx
-		implementation 
+		implementation 'com.github.FlodCoding:DrawableTextView:1.0.0'
 
      	}
 

app/.gitignore

@@ -1 +1 @@
-/build
+

app/build/outputs/apk/debug/app-debug.apk

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]

app/build/outputs/apk/debug/output.json

@@ -264,19 +264,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;
@@ -326,28 +334,23 @@ private void storeDrawables(@Nullable Drawable start, @Nullable Drawable top, @N
 
     }
 
-    private void clearDrawableBounds() {
-        for (Drawable drawable : mDrawables) {
-            if (drawable != null) {
-                final Rect bounds = drawable.getBounds();
-                bounds.set(0, 0, bounds.width(), bounds.height());
-            }
-        }
-    }
-
 
     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) {
@@ -408,7 +411,7 @@ public DrawableTextView setDrawableBottom(Drawable drawableBottom) {
     public DrawableTextView setEnableCenterDrawables(boolean enable) {
         if (enableCenterDrawables) {
             //清除之前的位移
-            clearDrawableBounds();
+            clearOffset(mDrawables);
         }
         this.enableCenterDrawables = enable;
         return this;