Support Rtl

Author: RuffianZhong

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

@@ -25,13 +25,17 @@
 
 import androidx.annotation.ColorInt;
 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;
 import com.ruffian.library.widget.clip.IClip;
 import com.ruffian.library.widget.shadow.ShadowDrawable;
 
+import java.util.Locale;
+
 
 /**
  * BaseHelper
@@ -1607,4 +1611,13 @@ public void onGlobalLayout() {
         //初始化clip
         initClip();
     }
+
+    /**
+     * 是否从右到左布局
+     *
+     * @return
+     */
+    protected static boolean isRtl() {
+        return TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL;
+    }
 }

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

@@ -166,7 +166,7 @@ private void initAttributeSet(Context context, AttributeSet attrs) {
         mIconSelected = getDrawable(context, a, R.styleable.RTextView_icon_src_selected);
         mIconChecked = getDrawable(context, a, R.styleable.RTextView_icon_src_checked);
         //兼容逻辑(优先级 drawableStart > drawableLeft > icon_normal_left)
-        if (!TextViewUtils.isRight2Left()) {
+        if (!isRtl()) {
             if (drawableStart != null) drawableLeft = drawableStart;
             if (drawableEnd != null) drawableRight = drawableEnd;
         } else {
@@ -818,8 +818,9 @@ private void setCompoundDrawables(Drawable drawableLeft, Drawable drawableRight,
             drawableTop.setBounds(0, 0, mIconWidthTop, mIconHeightTop);
         if (drawableBottom != null)
             drawableBottom.setBounds(0, 0, mIconWidthBottom, mIconHeightBottom);
+        boolean rtl = isRtl();
         //setDrawable
-        mView.setCompoundDrawables(drawableLeft, drawableTop, drawableRight, drawableBottom);
+        mView.setCompoundDrawables(rtl ? drawableRight : drawableLeft, drawableTop, rtl ? drawableLeft : drawableRight, drawableBottom);
     }
 
     /**
@@ -834,12 +835,21 @@ private void setCompoundDrawables(Drawable drawableLeft, Drawable drawableRight,
     private void setSingleCompoundDrawable(Drawable drawable, int drawableWidth, int drawableHeight, int direction) {
         if (drawable != null)
             drawable.setBounds(0, 0, drawableWidth, drawableHeight);
-        mView.setCompoundDrawables(
-                direction == ICON_DIR_LEFT ? drawable : null,
-                direction == ICON_DIR_TOP ? drawable : null,
-                direction == ICON_DIR_RIGHT ? drawable : null,
-                direction == ICON_DIR_BOTTOM ? drawable : null);
 
+        boolean rtl = isRtl();
+        if (rtl) {
+            mView.setCompoundDrawables(
+                    direction == ICON_DIR_RIGHT ? drawable : null,
+                    direction == ICON_DIR_TOP ? drawable : null,
+                    direction == ICON_DIR_LEFT ? drawable : null,
+                    direction == ICON_DIR_BOTTOM ? drawable : null);
+        } else {
+            mView.setCompoundDrawables(
+                    direction == ICON_DIR_LEFT ? drawable : null,
+                    direction == ICON_DIR_TOP ? drawable : null,
+                    direction == ICON_DIR_RIGHT ? drawable : null,
+                    direction == ICON_DIR_BOTTOM ? drawable : null);
+        }
     }
 
 

library/src/main/java/com/ruffian/library/widget/utils/TextViewUtils.java

@@ -1,16 +1,10 @@
 package com.ruffian.library.widget.utils;
 
 import android.graphics.Paint;
-import android.os.Build;
-import android.text.TextUtils;
-import android.view.View;
 import android.widget.TextView;
 
-import androidx.annotation.RequiresApi;
-
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Locale;
 
 /**
  * TextView工具类
@@ -108,17 +102,4 @@ public float getTextHeight(TextView view, int drawableHeight, int paddingTop, in
         return textHeight;
     }
 
-    /**
-     * 是否从右到左布局
-     *
-     * @return
-     */
-    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
-    public static boolean isRight2Left() {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            return TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL;
-        }
-        return false;
-    }
-
 }