Merge pull request #6 from dimbslmh/master

Fix for handle is not smooth issue

Author: AndroidDeveloperLB

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "com.lb.lollipopcontactsrecyclerviewfastscroller"
         minSdkVersion 11
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -21,6 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:recyclerview-v7:21.0.3'
-    compile 'com.android.support:appcompat-v7:21.0.3'
+    compile 'com.android.support:recyclerview-v7:23.0.1'
+    compile 'com.android.support:appcompat-v7:23.0.1'
 }

app/src/main/java/com/lb/lollipop_contacts_recyclerview_fast_scroller/FastScroller.java

@@ -17,16 +17,13 @@
 
 import com.lb.lollipopcontactsrecyclerviewfastscroller.R;
 
-import static android.support.v7.widget.RecyclerView.OnScrollListener;
-
 public class FastScroller extends LinearLayout{
   private static final int BUBBLE_ANIMATION_DURATION=100;
   private static final int TRACK_SNAP_RANGE=5;
 
   private TextView bubble;
   private View handle;
   private RecyclerView recyclerView;
-  private final ScrollListener scrollListener=new ScrollListener();
   private int height;
 
   private ObjectAnimator currentAnimator=null;
@@ -98,7 +95,18 @@ public boolean onTouchEvent(@NonNull MotionEvent event)
   public void setRecyclerView(RecyclerView recyclerView)
     {
     this.recyclerView=recyclerView;
-    recyclerView.setOnScrollListener(scrollListener);
+    RecyclerView.OnScrollListener onScrollListener = new RecyclerView.OnScrollListener() 
+      {
+      @Override
+      public void onScrolled(final RecyclerView recyclerView, final int dx, final int dy) 
+        {
+        if (handle.isSelected())
+          return;
+        float proportion = (float) recyclerView.computeVerticalScrollOffset() / ((float) recyclerView.computeVerticalScrollRange() - height);
+        setBubbleAndHandlePosition(height * proportion);
+      }
+    };
+    recyclerView.addOnScrollListener(onScrollListener);
     }
 
   private void setRecyclerViewPosition(float y)
@@ -115,7 +123,6 @@ else if(handle.getY()+handle.getHeight()>=height-TRACK_SNAP_RANGE)
         proportion=y/(float)height;
       int targetPos=getValueInRange(0,itemCount-1,(int)(proportion*(float)itemCount));
       ((LinearLayoutManager)recyclerView.getLayoutManager()).scrollToPositionWithOffset(targetPos,0);
-//      recyclerView.oPositionWithOffset(targetPos);
       String bubbleText=((BubbleTextGetter)recyclerView.getAdapter()).getTextToShowInBubble(targetPos);
       bubble.setText(bubbleText);
       }
@@ -169,25 +176,4 @@ public void onAnimationCancel(Animator animation)
     });
     currentAnimator.start();
     }
-
-  private class ScrollListener extends OnScrollListener{
-    @Override
-    public void onScrolled(RecyclerView rv,int dx,int dy)
-      {
-      View firstVisibleView=recyclerView.getChildAt(0);
-      int firstVisiblePosition=recyclerView.getChildPosition(firstVisibleView);
-      int visibleRange=recyclerView.getChildCount();
-      int lastVisiblePosition=firstVisiblePosition+visibleRange;
-      int itemCount=recyclerView.getAdapter().getItemCount();
-      int position;
-      if(firstVisiblePosition==0)
-        position=0;
-      else if(lastVisiblePosition==itemCount)
-        position=itemCount;
-      else
-        position=(int)(((float)firstVisiblePosition/(((float)itemCount-(float)visibleRange)))*(float)itemCount);
-      float proportion=(float)position/(float)itemCount;
-      setBubbleAndHandlePosition(height*proportion);
-      }
-  }
 }