From 7c72d6cb7cefc4d649d453c5f36bd7a10ff8f313 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 6 Aug 2021 14:50:44 -0400
Subject: [PATCH] Fix scroller getting dragged incorrectly in RTL (fixes #5496)

---
 .../tachiyomi/widget/MaterialFastScroll.kt    | 52 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialFastScroll.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialFastScroll.kt
index 60549d302..671300d9e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialFastScroll.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialFastScroll.kt
@@ -1,11 +1,14 @@
 package eu.kanade.tachiyomi.widget
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
+import androidx.core.view.ViewCompat
 import eu.davidea.fastscroller.FastScroller
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.system.dpToPxEnd
+import eu.kanade.tachiyomi.util.system.isLTR
 
 class MaterialFastScroll @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
     FastScroller(context, attrs) {
@@ -14,14 +17,59 @@ class MaterialFastScroll @JvmOverloads constructor(context: Context, attrs: Attr
         setViewsToUse(
             R.layout.material_fastscroll,
             R.id.fast_scroller_bubble,
-            R.id.fast_scroller_handle
+            R.id.fast_scroller_handle,
         )
         autoHideEnabled = true
         ignoreTouchesOutsideHandle = true
     }
 
+    // Overridden to handle RTL
+    @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        if (isHidden) return false
+        if (recyclerView.computeVerticalScrollRange() <= recyclerView.computeVerticalScrollExtent()) {
+            return super.onTouchEvent(event)
+        }
+
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                // start: handle RTL differently
+                if (
+                    if (context.resources.isLTR) {
+                        event.x < handle.x - ViewCompat.getPaddingStart(handle)
+                    } else {
+                        event.x > handle.width + ViewCompat.getPaddingStart(handle)
+                    }
+                ) return false
+                // end
+
+                if (ignoreTouchesOutsideHandle &&
+                    (event.y < handle.y || event.y > handle.y + handle.height)
+                ) {
+                    return false
+                }
+                handle.isSelected = true
+                notifyScrollStateChange(true)
+                showBubble()
+                showScrollbar()
+                val y = event.y
+                setBubbleAndHandlePosition(y)
+                setRecyclerViewPosition(y)
+                return true
+            }
+            MotionEvent.ACTION_MOVE -> {
+                val y = event.y
+                setBubbleAndHandlePosition(y)
+                setRecyclerViewPosition(y)
+                return true
+            }
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                handle.isSelected = false
+                notifyScrollStateChange(false)
+                hideBubble()
+                if (autoHideEnabled) hideScrollbar()
+                return true
+            }
+        }
         return super.onTouchEvent(event)
     }