Fix center horizontal for rtl languages

app/build.gradle

@@ -5,13 +5,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "29.0.3"
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.hyy.sample"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

app/src/main/java/com/hyy/sample/ui/util/RecyclerViewExt.kt

@@ -31,15 +31,25 @@ fun RecyclerView.setOnItemClickAndLongClickedListener(
             return false
         }
 
-        override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
-            return false
+        override fun onScroll(
+            e1: MotionEvent?,
+            e2: MotionEvent,
+            distanceX: Float,
+            distanceY: Float
+        ): Boolean {
+            TODO("Not yet implemented")
         }
 
         override fun onLongPress(e: MotionEvent) {
 
         }
 
-        override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+        override fun onFling(
+            e1: MotionEvent?,
+            e2: MotionEvent,
+            velocityX: Float,
+            velocityY: Float
+        ): Boolean {
             return false
         }
 

app/src/main/java/com/hyy/sample/ui/view/TriangleView.kt

@@ -40,7 +40,7 @@ class TriangleView constructor(
         typedArray.recycle()
     }
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         path.reset()
         when(direction) {
@@ -49,28 +49,28 @@ class TriangleView constructor(
                 path.lineTo(measuredWidth/2f, 0f.dp)
                 path.lineTo(measuredWidth*1f, measuredHeight*1f)
                 path.close()
-                canvas?.drawPath(path, paint)
+                canvas.drawPath(path, paint)
             }
             DIR.BOTTOM.dir -> {
                 path.moveTo(0f, 0f)
                 path.lineTo(measuredWidth/2f, measuredHeight*1f)
                 path.lineTo(measuredWidth*1f, 0f)
                 path.close()
-                canvas?.drawPath(path, paint)
+                canvas.drawPath(path, paint)
             }
             DIR.LEFT.dir -> {
                 path.moveTo(measuredWidth*1f, 0f)
                 path.lineTo(0f, measuredHeight/2f)
                 path.lineTo(measuredWidth*1f, measuredHeight*1f)
                 path.close()
-                canvas?.drawPath(path, paint)
+                canvas.drawPath(path, paint)
             }
             DIR.RIGHT.dir -> {
                 path.moveTo(0f, 0f)
                 path.lineTo(measuredWidth*1f, measuredHeight/2f)
                 path.lineTo(0f, measuredHeight*1f)
                 path.close()
-                canvas?.drawPath(path, paint)
+                canvas.drawPath(path, paint)
             }
         }
 

app/src/main/res/layout/guide_tips_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -16,7 +16,10 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-medium"
         android:text="@string/click_here_to_next_step"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="wrap_content"
@@ -28,6 +31,8 @@
         android:paddingHorizontal="12dp"
         android:paddingVertical="4dp"
         android:text="@string/step_first"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_tips" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

highlight_pro/build.gradle

@@ -30,8 +30,8 @@ android {
     compileSdkVersion 31
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 31
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 5
         versionName "1.4.0"
 

highlight_pro/src/main/java/com/hyy/highlightpro/view/MaskContainer.kt

@@ -8,13 +8,19 @@ import android.view.Gravity
 import android.view.KeyEvent
 import android.view.View
 import android.widget.FrameLayout
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.toColorInt
+import androidx.core.os.ConfigurationCompat
+import androidx.core.view.ViewCompat
 import androidx.core.view.children
 import androidx.core.view.doOnLayout
 import androidx.core.view.doOnPreDraw
 import com.hyy.highlightpro.parameter.Constraints
 import com.hyy.highlightpro.parameter.HighlightParameter
 import com.hyy.highlightpro.HighlightProImpl
+import com.hyy.highlightpro.R
+import kotlin.math.abs
 
 /**
  *Create by hyy on 2021/2/6
@@ -158,11 +164,18 @@ internal class MaskContainer constructor(context: Context, attributeSet: Attribu
         val margin = parameter.marginOffset
         val highLightRect = parameter.rect
         val gravities = mutableListOf<Int>()
+        val locale = ConfigurationCompat.getLocales(resources.configuration).get(0)?.toLanguageTag()
         parameter.constraints.forEach {
             when (it) {
                 Constraints.StartToStartOfHighlight -> {
-                    layoutParams.leftMargin = (highLightRect.left + margin.start).toInt()
-                    gravities.add(Gravity.START)
+                    if (resources.configuration.layoutDirection == ViewCompat.LAYOUT_DIRECTION_LTR && locale != "ku") {
+                        layoutParams.leftMargin = (highLightRect.left + margin.start).toInt()
+                        gravities.add(Gravity.START)
+                    } else {
+                        layoutParams.rightMargin =
+                            (rootWidth - highLightRect.right + margin.end).toInt()
+                        gravities.add(Gravity.START)
+                    }
                 }
 
                 Constraints.EndToStartOfHighlight -> {
@@ -179,9 +192,14 @@ internal class MaskContainer constructor(context: Context, attributeSet: Attribu
                 }
 
                 Constraints.EndToEndOfHighlight -> {
-                    layoutParams.rightMargin =
-                        (rootWidth - highLightRect.right + margin.end).toInt()
-                    gravities.add(Gravity.END)
+                    if (resources.configuration.layoutDirection == ViewCompat.LAYOUT_DIRECTION_LTR && locale != "ku") {
+                        layoutParams.rightMargin =
+                            (rootWidth - highLightRect.right + margin.end).toInt()
+                        gravities.add(Gravity.END)
+                    } else {
+                        layoutParams.leftMargin = (highLightRect.left + margin.start).toInt()
+                        gravities.add(Gravity.END)
+                    }
                 }
 
                 Constraints.TopToTopOfHighlight -> {
@@ -209,14 +227,16 @@ internal class MaskContainer constructor(context: Context, attributeSet: Attribu
 
                 Constraints.CenterHorizontalOfHighlight -> {
                     val width = layoutParams.width
-
                     if (width <= 0) {
-                        layoutParams.leftMargin =
-                            (highLightRect.left + highLightRect.width() / 2f).toInt()
+                        val transitFromCenter = (highLightRect.left + highLightRect.right - rootWidth)
+                        layoutParams.rightMargin = abs(transitFromCenter).toInt()/2
+                        layoutParams.leftMargin = abs(transitFromCenter).toInt()/2
                         gravities.add(Gravity.START)
                         view.doOnPreDraw { tipsView ->
+                            layoutParams.rightMargin =
+                                (rootWidth - transitFromCenter - tipsView.width).toInt() / 2
                             layoutParams.leftMargin =
-                                (highLightRect.left + highLightRect.width() / 2f - tipsView.width / 2f).toInt()
+                                (rootWidth + transitFromCenter - tipsView.width).toInt() / 2
                             view.layoutParams = layoutParams
                         }
                     } else {