Version 9.1.0

turing-tech · turing-tech · commit 050333022192 · 2016-03-27T21:38:40.000-04:00
- Added name of offending adapter class to AdapterNotSetupForIndicatorExceptions for easier dev debugging.

- The DragScrollBar handle will now stop jerking the centre of itself to the finger when pressed but instead remember where on itself it was pressed and allow user to drag from there. Indicator offsets to extend from the fingertip. Disabled if dev has activated draggableFromAnywhere.

- Indicators moved upward to move out from under finger.

- Instead of inverting indicators now simply stick to the top of the screen when user goes above level which would otherwise hide the indicator.

- Indicators for RecyclerViews with GridLayoutManagers will now request data for the first element of the first visible row instead of the incorrect element.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.turingtechnologies.materialscrollbardemo"
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 4
-        versionName "4.0"
+        versionCode 5
+        versionName "5.0"
     }
     buildTypes {
         release {
@@ -21,10 +21,7 @@ android {
 
 dependencies {
     compile project(':lib')
-    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
-    compile 'org.apache.commons:commons-lang3:3.4'
-    compile 'com.pnikosis:materialish-progress:1.5'
+    compile 'com.pnikosis:materialish-progress:1.7'
     compile "com.android.support:appcompat-v7:${supportLibVersion}"
-    androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.2.1'
 }
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/IconActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/IconActivity.java
@@ -24,6 +24,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.turingtechnologies.materialscrollbar.CustomIndicator;
 import com.turingtechnologies.materialscrollbar.TouchScrollBar;
 
 public class IconActivity extends AppCompatActivity {
@@ -36,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
         RecyclerView recyclerView = ((RecyclerView)findViewById(R.id.recyclerView));
         recyclerView.setAdapter(new IconAdapter(this));
         recyclerView.setLayoutManager(new GridLayoutManager(this, 4));
-        new TouchScrollBar(this, recyclerView, true).setHandleOffColour(Utils.fetchAccentColor(this));
+        new TouchScrollBar(this, recyclerView, true).setHandleOffColour(Utils.fetchAccentColor(this)).addIndicator(new CustomIndicator(this), true);
     }
 
     @Override
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/IconAdapter.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/IconAdapter.java
@@ -9,14 +9,21 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-public class IconAdapter extends RecyclerView.Adapter<IconAdapter.ViewHolder> {
+import com.turingtechnologies.materialscrollbar.ICustomAdapter;
+
+public class IconAdapter extends RecyclerView.Adapter<IconAdapter.ViewHolder> implements ICustomAdapter {
 
     private Activity act;
 
     IconAdapter(Activity a){
         act = a;
     }
 
+    @Override
+    public String getCustomStringForElement(int element) {
+        return SplashActivity.pkgLabelList.get(element);
+    }
+
     public static class ViewHolder extends RecyclerView.ViewHolder {
         // each data item is just a string in this case
         public ImageView icon;
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.11.3'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.android.tools.build:gradle:2.0.0-beta7'
 
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 
-def version = '9.0.0'
+def version = '9.1.0'
 
 ext {
     bintrayRepo = 'maven'
@@ -33,13 +33,12 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 20
+        versionCode 21
         versionName version
     }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
 }
 
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/AlphabetIndicator.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/AlphabetIndicator.java
@@ -49,7 +49,7 @@ int getIndicatorWidth() {
     @Override
     void testAdapter(RecyclerView.Adapter adapter) {
         if(!(adapter instanceof INameableAdapter)){
-            throw new CustomExceptions.AdapterNotSetupForIndicatorException("INameableAdapter");
+            throw new CustomExceptions.AdapterNotSetupForIndicatorException(adapter.getClass(), "INameableAdapter");
         }
     }
 
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/CustomExceptions.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/CustomExceptions.java
@@ -22,8 +22,8 @@ class CustomExceptions {
 
     static class AdapterNotSetupForIndicatorException extends RuntimeException {
 
-        AdapterNotSetupForIndicatorException(String shouldExtend){
-            super("In order to add this indicator, the adapter for your recyclerView MUST implement " + shouldExtend + ".");
+        AdapterNotSetupForIndicatorException(Class aClass, String shouldExtend){
+            super("In order to add this indicator, the adapter for your recyclerView, " + aClass.getName() + ", MUST implement " + shouldExtend + ".");
         }
 
     }
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/CustomIndicator.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/CustomIndicator.java
@@ -64,7 +64,7 @@ int getIndicatorWidth() {
     @Override
     void testAdapter(RecyclerView.Adapter adapter) {
         if(!(adapter instanceof ICustomAdapter)){
-            throw new CustomExceptions.AdapterNotSetupForIndicatorException("ICustomAdapter");
+            throw new CustomExceptions.AdapterNotSetupForIndicatorException(adapter.getClass(), "ICustomAdapter");
         }
     }
 
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/DateAndTimeIndicator.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/DateAndTimeIndicator.java
@@ -110,7 +110,7 @@ int getIndicatorWidth() {
     @Override
     void testAdapter(RecyclerView.Adapter adapter) {
         if(!(adapter instanceof IDateableAdapter)){
-            throw new CustomExceptions.AdapterNotSetupForIndicatorException("IDateableAdapter");
+            throw new CustomExceptions.AdapterNotSetupForIndicatorException(adapter.getClass(), "IDateableAdapter");
         }
     }
 
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/DragScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/DragScrollBar.java
@@ -16,12 +16,8 @@
 
 package com.turingtechnologies.materialscrollbar;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.os.Build;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
@@ -31,6 +27,8 @@
 public class DragScrollBar extends MaterialScrollBar<DragScrollBar>{
 
     Boolean draggableFromAnywhere = false;
+    float handleOffset = 0;
+    float indicatorOffset = 0;
 
     public DragScrollBar(Context context, RecyclerView recyclerView, boolean lightOnTouch){
         super(context, recyclerView, lightOnTouch);
@@ -58,64 +56,28 @@ private boolean validTouch(MotionEvent event){
 
     @Override
     void setTouchIntercept() {
+        final Handle handle = super.handle;
         OnTouchListener otl = new OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
             if (!hiddenByUser) {
                 if(event.getAction() == MotionEvent.ACTION_DOWN && validTouch(event)){
                     held = true;
+
+                    indicatorOffset = event.getY() - handle.getY() - handle.getLayoutParams().height / 2;
+                    float offset2 = event.getY() - handle.getY();
+                    float balance = handle.getY() / scrollUtils.getAvailableScrollBarHeight();
+                    handleOffset = (offset2 * balance) + (indicatorOffset * (1 - balance));
                 }
+                //On Down
                 if ((event.getAction() == MotionEvent.ACTION_MOVE || event.getAction() == MotionEvent.ACTION_DOWN) && held) {
-                    if (indicator != null && indicator.getVisibility() == INVISIBLE) {
-                        indicator.setVisibility(VISIBLE);
-                        if(Build.VERSION.SDK_INT >= 12){
-                            indicator.setAlpha(0F);
-                            indicator.animate().alpha(1F).setDuration(150).setListener(new AnimatorListenerAdapter() {
-                                @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-                                @Override
-                                public void onAnimationEnd(Animator animation) {
-                                    super.onAnimationEnd(animation);
-
-                                    indicator.setAlpha(1F);
-                                }
-                            });
-                        }
-                    }
-                    int top = handle.getHeight() / 2;
-                    int bottom = recyclerView.getHeight() - Utils.getDP(72, recyclerView.getContext());
-                    float boundedY = Math.max(top, Math.min(bottom, event.getY()));
-                    scrollUtils.scrollToPositionAtProgress((boundedY - top) / (bottom - top));
-                    scrollUtils.scrollHandleAndIndicator();
-                    recyclerView.onScrolled(0, 0);
-
-                    if (lightOnTouch) {
-                        handle.setBackgroundColor(handleColour);
-                    }
-
+                    onDown(event);
                     fadeIn();
+                //On Up
                 } else {
+                    onUp();
+
                     held = false;
-                    if (indicator != null && indicator.getVisibility() == VISIBLE) {
-                        if (Build.VERSION.SDK_INT <= 12) {
-                            indicator.clearAnimation();
-                        }
-                        if(Build.VERSION.SDK_INT >= 12){
-                            indicator.animate().alpha(0F).setDuration(150).setListener(new AnimatorListenerAdapter() {
-                                @Override
-                                public void onAnimationEnd(Animator animation) {
-                                    super.onAnimationEnd(animation);
-
-                                    indicator.setVisibility(INVISIBLE);
-                                }
-                            });
-                        } else {
-                            indicator.setVisibility(INVISIBLE);
-                        }
-                    }
-
-                    if (lightOnTouch) {
-                        handle.setBackgroundColor(handleOffColour);
-                    }
 
                     fadeOut();
                 }
@@ -151,4 +113,14 @@ boolean getHide() {
 
     @Override
     void implementFlavourPreferences(TypedArray a) {}
+
+    @Override
+    float getHandleOffset(){
+        return draggableFromAnywhere ? 0 : handleOffset;
+    }
+
+    @Override
+    float getIndicatorOffset(){
+        return draggableFromAnywhere ? 0 : indicatorOffset;
+    }
 }
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/Indicator.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/Indicator.java
@@ -32,11 +32,13 @@ abstract class Indicator extends RelativeLayout{
     protected TextView textView;
     protected Context context;
     private boolean addSpace;
+    private MaterialScrollBar materialScrollBar;
 
     public Indicator(Context context) {
         super(context);
         this.context = context;
         textView = new TextView(context);
+        setVisibility(INVISIBLE);
     }
 
     public void setSizeCustom(int size){
@@ -49,7 +51,7 @@ public void setSizeCustom(int size){
         setLayoutParams(lp);
     }
 
-    void linkToScrollBar(MaterialScrollBar materialScrollBar, boolean addSpace){
+    void linkToScrollBar(MaterialScrollBar msb, boolean addSpace){
         this.addSpace = addSpace;
         if(Build.VERSION.SDK_INT >= 16){
             setBackground(ContextCompat.getDrawable(context, R.drawable.indicator));
@@ -58,38 +60,37 @@ void linkToScrollBar(MaterialScrollBar materialScrollBar, boolean addSpace){
         }
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(Utils.getDP(getIndicatorWidth(), this), Utils.getDP(getIndicatorHeight(), this));
         if(addSpace){
-            lp.setMargins(0, 0, Utils.getDP(15, this) + materialScrollBar.handle.getWidth(), 0);
+            lp.setMargins(0, 0, Utils.getDP(15, this) + msb.handle.getWidth(), 0);
         } else {
-            lp.setMargins(0, 0, Utils.getDP(2, this) + materialScrollBar.handle.getWidth(), 0);
+            lp.setMargins(0, 0, Utils.getDP(2, this) + msb.handle.getWidth(), 0);
         }
-        setVisibility(INVISIBLE);
 
         textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, getTextSize());
         RelativeLayout.LayoutParams tvlp = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         tvlp.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
 
         addView(textView, tvlp);
 
-        ((GradientDrawable)getBackground()).setColor(materialScrollBar.handleColour);
+        ((GradientDrawable)getBackground()).setColor(msb.handleColour);
 
-        lp.addRule(ALIGN_RIGHT, materialScrollBar.getId());
-        ((ViewGroup)materialScrollBar.getParent()).addView(this, lp);
+        lp.addRule(ALIGN_RIGHT, msb.getId());
+        ((ViewGroup)msb.getParent()).addView(this, lp);
+
+        materialScrollBar = msb;
     }
 
     /**
      * Used by the materialScrollBar to move the indicator with the handle
      * @param y Position to which the indicator should move.
      */
-    void setScroll(float y, boolean programmatic){
-        //Displace the indicator so that the carrot extends from the centre of the handle.
-        y -= Utils.getDP(getIndicatorHeight() / 2, this);
-        //If the indicator is hidden by the top of the screen, it is inverted and displaced downward.
-        if(y < 0){
-            y += Utils.getDP(getIndicatorHeight(), this);
-            ViewCompat.setScaleY(this, -1F);
-            ViewCompat.setScaleY(textView, -1F);
-            ViewCompat.setY(this, y);
-        } else {
+    void setScroll(float y){
+        if(getVisibility() == VISIBLE){
+            y -= 75 - materialScrollBar.getIndicatorOffset() + Utils.getDP(getIndicatorHeight() / 2, this);
+
+            if(y < 5){
+                y = 5;
+            }
+
             ViewCompat.setScaleY(this, 1F);
             ViewCompat.setScaleY(textView, 1F);
             ViewCompat.setY(this, y);
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/MaterialScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/MaterialScrollBar.java
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/TouchScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/TouchScrollBar.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`apply plugin: 'com.android.library'`
`2`	`2`
`3`		`-def version = '9.0.0'`
	`3`	`+def version = '9.1.0'`
`4`	`4`
`5`	`5`	`ext {`
`6`	`6`	`bintrayRepo = 'maven'`
`@@ -33,13 +33,12 @@ android {`
`33`	`33`	`defaultConfig {`
`34`	`34`	`minSdkVersion 11`
`35`	`35`	`targetSdkVersion 23`
`36`		`- versionCode 20`
	`36`	`+ versionCode 21`
`37`	`37`	`versionName version`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`dependencies {`
`42`		`- compile fileTree(include: ['*.jar'], dir: 'libs')`
`43`	`42`	`compile "com.android.support:recyclerview-v7:${supportLibVersion}"`
`44`	`43`	`}`
`45`	`44`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ int getIndicatorWidth() {`
`49`	`49`	`@Override`
`50`	`50`	`void testAdapter(RecyclerView.Adapter adapter) {`
`51`	`51`	`if(!(adapter instanceof INameableAdapter)){`
`52`		`- throw new CustomExceptions.AdapterNotSetupForIndicatorException("INameableAdapter");`
	`52`	`+ throw new CustomExceptions.AdapterNotSetupForIndicatorException(adapter.getClass(), "INameableAdapter");`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ class CustomExceptions {`
`22`	`22`
`23`	`23`	`static class AdapterNotSetupForIndicatorException extends RuntimeException {`
`24`	`24`
`25`		`- AdapterNotSetupForIndicatorException(String shouldExtend){`
`26`		`- super("In order to add this indicator, the adapter for your recyclerView MUST implement " + shouldExtend + ".");`
	`25`	`+ AdapterNotSetupForIndicatorException(Class aClass, String shouldExtend){`
	`26`	`+ super("In order to add this indicator, the adapter for your recyclerView, " + aClass.getName() + ", MUST implement " + shouldExtend + ".");`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ int getIndicatorWidth() {`
`64`	`64`	`@Override`
`65`	`65`	`void testAdapter(RecyclerView.Adapter adapter) {`
`66`	`66`	`if(!(adapter instanceof ICustomAdapter)){`
`67`		`- throw new CustomExceptions.AdapterNotSetupForIndicatorException("ICustomAdapter");`
	`67`	`+ throw new CustomExceptions.AdapterNotSetupForIndicatorException(adapter.getClass(), "ICustomAdapter");`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ int getIndicatorWidth() {`
`110`	`110`	`@Override`
`111`	`111`	`void testAdapter(RecyclerView.Adapter adapter) {`
`112`	`112`	`if(!(adapter instanceof IDateableAdapter)){`
`113`		`- throw new CustomExceptions.AdapterNotSetupForIndicatorException("IDateableAdapter");`
	`113`	`+ throw new CustomExceptions.AdapterNotSetupForIndicatorException(adapter.getClass(), "IDateableAdapter");`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`