1、修复foreground受平移影响

2、修复只有hint时文字大小没有测量的问题

Author: FlodCoding

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

@@ -29,7 +29,8 @@
  * 4、多次setCompoundDrawablesRelative,图片会发生偏移 √
  * 5、寻找一个合适的测量文字大小的时机，避免多次测量消耗性能 √
  * 6、在draw时，避免用取出旧的drawable的bounds绘制，需要预先取出并存储起来,还需要注意在存储bounds时是不是有平移过 √
- * 7、
+ * 7、foreground会受平移影响 √
+ * 8、如果是只有hint没有Text需要也需要测量出文字大小√
  */
 @SuppressWarnings({"UnusedReturnValue", "unused", "SameParameterValue"})
 public class DrawableTextView extends AppCompatTextView {
@@ -118,6 +119,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
         }
     }
 
+
     protected void onFirstLayout(int left, int top, int right, int bottom) {
         measureTextWidth();
         measureTextHeight();
@@ -176,10 +178,16 @@ protected void onDraw(Canvas canvas) {
                 this.canvasTransY = transY;
             }
         }
-
         super.onDraw(canvas);
     }
 
+    @Override
+    public void onDrawForeground(Canvas canvas) {
+        //再次平移回去
+        canvas.translate(-canvasTransX,-canvasTransY);
+        super.onDrawForeground(canvas);
+    }
+
     /**
      * 计算drawable居中还需距离
      * 如果左右两边都有图片，左图片居中则需要加上右侧图片占用的空间{@link #getCompoundPaddingEnd()},其他同理
@@ -219,7 +227,13 @@ protected int getCanvasTransY() {
     protected void measureTextWidth() {
         final Rect textBounds = new Rect();
         getLineBounds(0, textBounds);
-        final float width = getPaint().measureText(getText().toString());
+        String text = "";
+        if (getText() != null && getText().length() > 0) {
+            text = getText().toString();
+        } else if (getHint() != null && getHint().length() > 0) {
+            text = getHint().toString();
+        }
+        final float width = getPaint().measureText(text);
         final float maxWidth = textBounds.width();
         mTextWidth = width <= maxWidth || maxWidth == 0 ? width : maxWidth;
     }
@@ -228,7 +242,8 @@ protected void measureTextWidth() {
      * 获取文本的高度，通过{@link #getLineHeight}乘文本的行数
      */
     protected void measureTextHeight() {
-        if (getText().length() > 0)
+        if ((getText() != null && getText().length() > 0)
+                || (getHint() != null && getHint().length() > 0))
             mTextHeight = getLineHeight() * getLineCount();
         else
             mTextHeight = 0;

app/src/main/res/drawable-v21/common_ripple_grey_mask_white.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#9e9e9e">
+    <item android:id="@android:id/mask"
+        android:drawable="@android:color/white"/>
+</ripple>