Version 10.1.3

- Fixes #61 - Fixes #51
turing-tech · Aug 7, 2016 · 60f091d · 60f091d
1 parent a0b7b45
commit 60f091d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-def version = '10.1.1'
+def version = '10.1.3'
 
 install {
     repositories.mavenInstaller {

diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java
@@ -149,8 +149,13 @@ public void getCurScrollState() {
         if (materialScrollBar.recyclerView.getLayoutManager() instanceof GridLayoutManager) {
             scrollPosState.rowIndex = scrollPosState.rowIndex / ((GridLayoutManager) materialScrollBar.recyclerView.getLayoutManager()).getSpanCount();
         }
-        scrollPosState.rowTopOffset = materialScrollBar.recyclerView.getLayoutManager().getDecoratedTop(child);
-        scrollPosState.rowHeight = child.getHeight();
+        if(child == null){
+            scrollPosState.rowTopOffset = 0;
+            scrollPosState.rowHeight = 0;
+        } else {
+            scrollPosState.rowTopOffset = materialScrollBar.recyclerView.getLayoutManager().getDecoratedTop(child);
+            scrollPosState.rowHeight = child.getHeight();
+        }
     }
 
 }