Merge pull request #15 from darzul/master

Factorize positon computation + Removed ViewTreeObserver

Author: AndroidDeveloperLB

Diff for: library/src/main/java/com/lb/recyclerview_fast_scroller/RecyclerViewFastScroller.java

@@ -14,7 +14,6 @@
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -32,12 +31,7 @@ public class RecyclerViewFastScroller extends LinearLayout {
     private final RecyclerView.OnScrollListener onScrollListener = new RecyclerView.OnScrollListener() {
         @Override
         public void onScrolled(final RecyclerView recyclerView, final int dx, final int dy) {
-            if (bubble == null || handle.isSelected())
-                return;
-            final int verticalScrollOffset = recyclerView.computeVerticalScrollOffset();
-            final int verticalScrollRange = recyclerView.computeVerticalScrollRange();
-            float proportion = (float) verticalScrollOffset / ((float) verticalScrollRange - height);
-            setBubbleAndHandlePosition(height * proportion);
+            updateBubbleAndHandlePosition();
         }
     };
 
@@ -81,6 +75,7 @@ public void setViewsToUse(@LayoutRes int layoutResId, @IdRes int bubbleResId, @I
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
         height = h;
+        updateBubbleAndHandlePosition();
     }
 
     @Override
@@ -118,20 +113,6 @@ public void setRecyclerView(final RecyclerView recyclerView) {
                 return;
             recyclerView.addOnScrollListener(onScrollListener);
         }
-        if (recyclerView != null)
-            recyclerView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-                @Override
-                public boolean onPreDraw() {
-                    recyclerView.getViewTreeObserver().removeOnPreDrawListener(this);
-                    if (bubble == null || handle.isSelected())
-                        return true;
-                    final int verticalScrollOffset = recyclerView.computeVerticalScrollOffset();
-                    final int verticalScrollRange = recyclerView.computeVerticalScrollRange();
-                    float proportion = (float) verticalScrollOffset / ((float) verticalScrollRange - height);
-                    setBubbleAndHandlePosition(height * proportion);
-                    return true;
-                }
-            });
     }
 
     @Override
@@ -166,6 +147,16 @@ private int getValueInRange(int min, int max, int value) {
         return Math.min(minimum, max);
     }
 
+    private void updateBubbleAndHandlePosition() {
+        if (bubble == null || handle.isSelected())
+            return;
+
+        final int verticalScrollOffset = recyclerView.computeVerticalScrollOffset();
+        final int verticalScrollRange = recyclerView.computeVerticalScrollRange();
+        float proportion = (float) verticalScrollOffset / ((float) verticalScrollRange - height);
+        setBubbleAndHandlePosition(height * proportion);
+    }
+
     private void setBubbleAndHandlePosition(float y) {
         final int handleHeight = handle.getHeight();
         handle.setY(getValueInRange(0, height - handleHeight, (int) (y - handleHeight / 2)));