Merge pull request #6 from AbdElraoufSabri/develop

fix fading area in ruler on RTL
abd3lraouf · Feb 7, 2020 · 22628e5 · 22628e5
2 parents 8092d0b + 4c05f6c
commit 22628e5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/ruler/build.gradle b/ruler/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 9
-        versionName "1.4.0"
+        versionCode 10
+        versionName "1.4.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/ObservableHorizontalScrollView.kt b/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/ObservableHorizontalScrollView.kt
@@ -46,11 +46,11 @@ class ObservableHorizontalScrollView : HorizontalScrollView {
     }
 
     override fun getRightFadingEdgeStrength(): Float {
-        return 0F
+        return  if (isRtl()) 2F else 0F
     }
 
     override fun getLeftFadingEdgeStrength(): Float {
-        return 2F
+        return  if (isRtl()) 0F else 2F
     }
 
     private var disposable: Disposable? = null

diff --git a/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/Utils.kt b/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/Utils.kt
@@ -0,0 +1,7 @@
+package io.abdelraoufsabri.learn.ruler
+
+import android.text.TextUtils
+import androidx.core.view.ViewCompat
+import java.util.*
+
+fun isRtl() = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL
diff --git a/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/widget/FancyRuler.kt b/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/widget/FancyRuler.kt
@@ -23,6 +23,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import io.abdelraoufsabri.learn.ruler.ObservableHorizontalScrollView
 import io.abdelraoufsabri.learn.ruler.R
+import io.abdelraoufsabri.learn.ruler.isRtl
 import kotlinx.android.synthetic.main.units.view.*
 import java.util.*
 import kotlin.math.abs
@@ -369,7 +370,6 @@ class FancyRuler : LinearLayout {
         return value
     }
 
-    private fun isRtl() = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL
 
     override fun onSaveInstanceState(): Parcelable? {
         val bundle = Bundle()