FixBug#118#121

Author: RuffianZhong

library/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 31
-        versionCode 16
-        versionName "androidx.v0.0.13"
+        versionCode 17
+        versionName "androidx.v0.0.14"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

library/src/main/java/com/ruffian/library/widget/helper/RBaseHelper.java

@@ -23,12 +23,6 @@
 import android.view.ViewConfiguration;
 import android.view.ViewTreeObserver;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.StyleableRes;
-import androidx.core.text.TextUtilsCompat;
-import androidx.core.view.ViewCompat;
-
 import com.ruffian.library.widget.R;
 import com.ruffian.library.widget.clip.ClipHelper;
 import com.ruffian.library.widget.clip.ClipPathManager;
@@ -38,6 +32,12 @@
 
 import java.util.Locale;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StyleableRes;
+import androidx.core.text.TextUtilsCompat;
+import androidx.core.view.ViewCompat;
+
 
 /**
  * BaseHelper
@@ -374,27 +374,27 @@ private void setupDefaultValue(boolean init) {
         if (mBackgroundColorNormalArray != null && mBackgroundColorNormalArray.length > 0) {
             mBackgroundNormal = setColors(mBackgroundNormal, mBackgroundColorNormalArray);
         } else {
-            mBackgroundNormal.setColor(mBackgroundColorNormal);
+            mBackgroundNormal = setColors(mBackgroundNormal, new int[]{mBackgroundColorNormal, mBackgroundColorNormal});
         }
         if (mBackgroundColorPressedArray != null && mBackgroundColorPressedArray.length > 0) {
             mBackgroundPressed = setColors(mBackgroundPressed, mBackgroundColorPressedArray);
         } else {
-            mBackgroundPressed.setColor(mBackgroundColorPressed);
+            mBackgroundPressed = setColors(mBackgroundPressed, new int[]{mBackgroundColorPressed, mBackgroundColorPressed});
         }
         if (mBackgroundColorUnableArray != null && mBackgroundColorUnableArray.length > 0) {
             mBackgroundUnable = setColors(mBackgroundUnable, mBackgroundColorUnableArray);
         } else {
-            mBackgroundUnable.setColor(mBackgroundColorUnable);
+            mBackgroundUnable = setColors(mBackgroundUnable, new int[]{mBackgroundColorUnable, mBackgroundColorUnable});
         }
         if (mBackgroundColorCheckedArray != null && mBackgroundColorCheckedArray.length > 0) {
             mBackgroundChecked = setColors(mBackgroundChecked, mBackgroundColorCheckedArray);
         } else {
-            mBackgroundChecked.setColor(mBackgroundColorChecked);
+            mBackgroundChecked = setColors(mBackgroundChecked, new int[]{mBackgroundColorChecked, mBackgroundColorChecked});
         }
         if (mBackgroundColorSelectedArray != null && mBackgroundColorSelectedArray.length > 0) {
             mBackgroundSelected = setColors(mBackgroundSelected, mBackgroundColorSelectedArray);
         } else {
-            mBackgroundSelected.setColor(mBackgroundColorSelected);
+            mBackgroundSelected = setColors(mBackgroundSelected, new int[]{mBackgroundColorSelected, mBackgroundColorSelected});
         }
 
         //设置边框默认值

library/src/main/java/com/ruffian/library/widget/helper/RTextViewHelper.java

@@ -13,14 +13,14 @@
 import android.view.MotionEvent;
 import android.widget.TextView;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.StyleableRes;
-import androidx.appcompat.content.res.AppCompatResources;
-
 import com.ruffian.library.widget.R;
 import com.ruffian.library.widget.iface.ITextViewFeature;
 import com.ruffian.library.widget.utils.TextViewUtils;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.StyleableRes;
+import androidx.appcompat.content.res.AppCompatResources;
+
 /**
  * TextView-Helper
  *
@@ -884,6 +884,7 @@ private void setSingleIconWithText() {
         if (translateX < 0) translateX = 0;
         //垂直方向计算
         float textHeight = TextViewUtils.get().getTextHeight(mView, drawableHeight, mPaddingTop, mPaddingBottom, drawablePaddingVertical);
+        textHeight = Math.max(textHeight, Math.max(mIconHeightLeft, mIconHeightRight));//交叉轴存在icon时高度重新计算
         float bodyHeight = textHeight + drawableHeight + drawablePaddingVertical;//内容高度
         float actualHeight = mView.getHeight() - (mPaddingTop + mPaddingBottom);//实际可用高度
         int translateY = (int) (actualHeight - bodyHeight) / 2;
@@ -932,6 +933,7 @@ private void setMultipleIconWithText() {
         if (translateX < 0) translateX = 0;
         //垂直方向计算
         float textHeight = TextViewUtils.get().getTextHeight(mView, drawableHeightFinal, mPaddingTop, mPaddingBottom, drawablePaddingVerticalFinal);
+        textHeight = Math.max(textHeight, Math.max(mIconHeightLeft, mIconHeightRight));//交叉轴存在icon时高度重新计算
         float bodyHeight = textHeight + drawableHeightFinal + drawablePaddingVerticalFinal;//内容高度
         float actualHeight = mView.getHeight() - (mPaddingTop + mPaddingBottom);//实际可用高度
         int translateY = (int) (actualHeight - bodyHeight) / 2;