Use scroll extent to calculate scroll proportion (#78)

L4Digital · Mar 2, 2022 · c0e5c40 · c0e5c40
1 parent f73d7cc
commit c0e5c40
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/buildSrc/src/main/kotlin/Publish.kt b/buildSrc/src/main/kotlin/Publish.kt
@@ -31,7 +31,7 @@ object Publish {
             override val major = 3
             override val minor = 0
             override val patch = 0
-            override val identifier = "beta.1"
+            override val identifier = "beta.2"
             override fun toString() = version
         }
     }

diff --git a/fastscroll/src/main/java/com/l4digital/fastscroll/FastScroller.kt b/fastscroll/src/main/java/com/l4digital/fastscroll/FastScroller.kt
@@ -175,6 +175,13 @@ class FastScroller : LinearLayout {
         }
     }
 
+    private val RecyclerView.scrollProportion: Float
+        get() {
+            val rangeDiff = computeVerticalScrollRange() - computeVerticalScrollExtent()
+            val proportion = computeVerticalScrollOffset() / if (rangeDiff > 0) rangeDiff.toFloat() else 1f
+            return viewHeight * proportion
+        }
+
     @JvmOverloads
     constructor(context: Context, size: Size = Size.NORMAL) : super(context) {
         context.layout(size = size)
@@ -190,6 +197,10 @@ class FastScroller : LinearLayout {
         )
     }
 
+    override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) = super.onSizeChanged(w, h, oldW, oldH).also {
+        viewHeight = h
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
         val setYPositions: () -> Unit = {
@@ -478,19 +489,6 @@ class FastScroller : LinearLayout {
         bubbleView.textSize = size.toFloat()
     }
 
-    override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) = super.onSizeChanged(w, h, oldW, oldH).also {
-        viewHeight = h
-    }
-
-    private val RecyclerView.scrollProportion: Float
-        get() {
-            val verticalScrollOffset = computeVerticalScrollOffset()
-            val verticalScrollRange = computeVerticalScrollRange()
-            val rangeDiff = (verticalScrollRange - viewHeight).toFloat()
-            val proportion = verticalScrollOffset.toFloat() / if (rangeDiff > 0) rangeDiff else 1f
-            return viewHeight * proportion
-        }
-
     private fun getRecyclerViewTargetPosition(y: Float) = recyclerView?.let { recyclerView ->
         val itemCount = recyclerView.adapter?.itemCount ?: 0