区分DrawableText 水平和垂直居中的方式

Author: FlodCoding

DrawableText.md

@@ -0,0 +1 @@
+# 还没开始写

Loadingbutton-support/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 28
         versionCode 100
-        versionName "1.0.0-alpha1"
+        versionName "1.0.0-alpha4"
     }
 
     buildTypes {

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

@@ -27,7 +27,7 @@
  * 2、设置Drawable的大小 √
  * 3、文字居中，图片靠边居中 √
  * 4、多次setCompoundDrawablesRelative,图片会发生偏移 √
- * 5、寻找一个合适的测量文字大小的时机，避免多次测量消耗性能 √
+ * 5、寻找一个合适的测量文字大小的时机，避免多次测量 √
  * 6、在draw时，避免用取出旧的drawable的bounds绘制，需要预先取出并存储起来,还需要注意在存储bounds时是不是有平移过 √
  * 7、
  */
@@ -51,7 +51,8 @@ public class DrawableTextView extends AppCompatTextView {
     private float mTextHeight;
 
     private boolean firstLayout;
-    private boolean isCenter;                   //Gravity是否是居中
+    private boolean isCenterHorizontal;         //Gravity是否水平居中
+    private boolean isCenterVertical;           //Gravity是否垂直居中
     private boolean enableCenterDrawables;      //drawable跟随文本居中
     private boolean enableTextInCenter;         //默认情况下文字与图片共同居中，开启后文字在最中间，图片紧挨
 
@@ -108,8 +109,8 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
         super.onLayout(changed, left, top, right, bottom);
         if (enableCenterDrawables) {
             final int absoluteGravity = Gravity.getAbsoluteGravity(getGravity(), getLayoutDirection());
-            isCenter = (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.CENTER_HORIZONTAL
-                    || (absoluteGravity & Gravity.VERTICAL_GRAVITY_MASK) == Gravity.CENTER_VERTICAL;
+            isCenterHorizontal = (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.CENTER_HORIZONTAL;
+            isCenterVertical = (absoluteGravity & Gravity.VERTICAL_GRAVITY_MASK) == Gravity.CENTER_VERTICAL;
         }
 
         if (!firstLayout) {
@@ -129,7 +130,7 @@ protected void onFirstLayout(int left, int top, int right, int bottom) {
     @Override
     protected void onDraw(Canvas canvas) {
 
-        if (enableCenterDrawables && isCenter) {
+        if (enableCenterDrawables && (isCenterHorizontal | isCenterVertical)) {
 
             //画布的偏移量
             int transX = 0, transY = 0;
@@ -139,7 +140,9 @@ protected void onDraw(Canvas canvas) {
                 int offset = (int) calcOffset(POSITION.START);
                 mDrawables[POSITION.START].setBounds(bounds.left + offset, bounds.top,
                         bounds.right + offset, bounds.bottom);
-                transX -= (mDrawablesBounds[POSITION.START].width() + getCompoundDrawablePadding()) >> 1;
+
+                if (isCenterHorizontal)
+                    transX -= (mDrawablesBounds[POSITION.START].width() + getCompoundDrawablePadding()) >> 1;
             }
 
             if (mDrawables[POSITION.TOP] != null) {
@@ -149,7 +152,8 @@ protected void onDraw(Canvas canvas) {
                 mDrawables[POSITION.TOP].setBounds(bounds.left, bounds.top + offset,
                         bounds.right, bounds.bottom + offset);
 
-                transY -= (mDrawablesBounds[POSITION.TOP].height() + getCompoundDrawablePadding()) >> 1;
+                if (isCenterVertical)
+                    transY -= (mDrawablesBounds[POSITION.TOP].height() + getCompoundDrawablePadding()) >> 1;
             }
 
             if (mDrawables[POSITION.END] != null) {
@@ -158,7 +162,8 @@ protected void onDraw(Canvas canvas) {
                 mDrawables[POSITION.END].setBounds(bounds.left + offset, bounds.top,
                         bounds.right + offset, bounds.bottom);
 
-                transX += (mDrawablesBounds[POSITION.END].width() + getCompoundDrawablePadding()) >> 1;
+                if (isCenterHorizontal)
+                    transX += (mDrawablesBounds[POSITION.END].width() + getCompoundDrawablePadding()) >> 1;
             }
 
             if (mDrawables[POSITION.BOTTOM] != null) {
@@ -167,7 +172,8 @@ protected void onDraw(Canvas canvas) {
                 mDrawables[POSITION.BOTTOM].setBounds(bounds.left, bounds.top + offset,
                         bounds.right, bounds.bottom + offset);
 
-                transY += (mDrawablesBounds[POSITION.BOTTOM].height() + getCompoundDrawablePadding()) >> 1;
+                if (isCenterVertical)
+                    transY += (mDrawablesBounds[POSITION.BOTTOM].height() + getCompoundDrawablePadding()) >> 1;
             }
 
             if (enableTextInCenter) {

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

@@ -97,8 +97,8 @@ private void init(Context context, AttributeSet attrs) {
 
         //getConfig
         TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.LoadingButton);
-        enableShrink = array.getBoolean(R.styleable.LoadingButton_enableShrink, false);
-        disableClickOnLoading = array.getBoolean(R.styleable.LoadingButton_disableClickOnLoading, false);
+        enableShrink = array.getBoolean(R.styleable.LoadingButton_enableShrink, true);
+        disableClickOnLoading = array.getBoolean(R.styleable.LoadingButton_disableClickOnLoading, 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());

README.md

@@ -1,6 +1,6 @@
 # LoadingButton [![LoadingButton](https://jitpack.io/v/FlodCoding/LoadingButton.svg)](https://jitpack.io/#FlodCoding/LoadingButton)
 
- 一个小巧灵活的带加载功能的按钮控件，继承自[DrawableTextView]()，加载动画来自于[CircularProgressDrawable](https://developer.android.google.cn/reference/android/support/v4/widget/CircularProgressDrawable?hl=en)
+ 一个小巧灵活的带加载功能的按钮控件，继承自[DrawableTextView](https://github.com/FlodCoding/LoadingButton/blob/master/DrawableText.md)，加载动画来自于[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-alpha3'
+		implementation 'com.github.FlodCoding:LoadingButton:1.0.0-alpha4'
 
 		//Support-appcompat
-		implementation 'com.github.FlodCoding:LoadingButton:1.0.0-alpha3-support'
+		implementation 'com.github.FlodCoding:LoadingButton:1.0.0-alpha4-support'
      	}