Version 8.0.0 - Enables use of the bars in XML in addition to previous options whose implementations remain unchanged.

turing-tech · turing-tech · commit a0da7e280f66 · 2016-02-20T03:45:07.000-05:00
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/DateActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/DateActivity.java
@@ -16,7 +16,7 @@ public class DateActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_others);
         RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         recyclerView.setAdapter(new DemoAdapter(this));
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/IconActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/IconActivity.java
@@ -31,7 +31,7 @@ public class IconActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_others);
 
         RecyclerView recyclerView = ((RecyclerView)findViewById(R.id.recyclerView));
         recyclerView.setAdapter(new IconAdapter(this));
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/MainActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/MainActivity.java
@@ -5,7 +5,6 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -22,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
         RecyclerView recyclerView = ((RecyclerView)findViewById(R.id.recyclerView));
         recyclerView.setAdapter(new DemoAdapter(this));
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        new DragScrollBar(this, recyclerView, false).setHandleColour(obtainStyledAttributes(new TypedValue().data, new int[] { R.attr.colorAccent }).getColor(0,0)).addIndicator(new AlphabetIndicator(this), true);
+        ((DragScrollBar)findViewById(R.id.dragScrollBar)).addIndicator(new AlphabetIndicator(this), true);
     }
 
     @Override
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/NameActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/NameActivity.java
@@ -16,7 +16,7 @@ public class NameActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_others);
         RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         recyclerView.setAdapter(new DemoAdapter(this));
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,10 +1,23 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" tools:context=".MainActivity">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".MainActivity">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <com.turingtechnologies.materialscrollbar.DragScrollBar
+        android:id="@+id/dragScrollBar"
+        android:layout_width="wrap_content"
+        app:recyclerView="@id/recyclerView"
+        app:lightOnTouch="false"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="false" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_others.xml b/app/src/main/res/layout/activity_others.xml
@@ -0,0 +1,29 @@
+<!--
+  ~  Copyright © 2016, Turing Technologies, an unincorporated organisation of Wynne Plaga
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".MainActivity">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</RelativeLayout>
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 
-def version = '7.2.0'
+def version = '8.0.0'
 
 ext {
     bintrayRepo = 'maven'
@@ -35,7 +35,7 @@ android {
     defaultConfig {
         minSdkVersion 7
         targetSdkVersion 23
-        versionCode 17
+        versionCode 18
         versionName version
     }
 }
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 adapterNotSetupForIndicatorException("INameableAdapter");
+            throw new CustomExceptions.AdapterNotSetupForIndicatorException("INameableAdapter");
         }
     }
 
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/CustomExceptions.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/CustomExceptions.java
@@ -16,10 +16,32 @@
 
 package com.turingtechnologies.materialscrollbar;
 
- class adapterNotSetupForIndicatorException extends RuntimeException{
+import java.util.ArrayList;
 
-        adapterNotSetupForIndicatorException(String shouldExtend) {
+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 + ".");
         }
 
+    }
+
+    static class MissingAttributesException extends RuntimeException {
+
+         MissingAttributesException(ArrayList<String> missing){
+             super("You are missing the following required attributes from a scroll bar in your XML: " + missing);
+         }
+
+    }
+
+    static class UnsupportedParentException extends RuntimeException {
+
+        UnsupportedParentException(){
+            super("The recyclerView which is associated with a programmatically added scroll bar must be the child of a relative layout.");
+        }
+
+    }
+
 }
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/CustomIndicator.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/CustomIndicator.java
@@ -63,7 +63,7 @@ int getIndicatorWidth() {
     @Override
     void testAdapter(RecyclerView.Adapter adapter) {
         if(!(adapter instanceof ICustomAdapter)){
-            throw new adapterNotSetupForIndicatorException("ICustomAdapter");
+            throw new CustomExceptions.AdapterNotSetupForIndicatorException("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 adapterNotSetupForIndicatorException("IDateableAdapter");
+            throw new CustomExceptions.AdapterNotSetupForIndicatorException("IDateableAdapter");
         }
     }
 
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/DragScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/DragScrollBar.java
@@ -20,6 +20,7 @@
 import android.os.Build;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -31,6 +32,14 @@ public DragScrollBar(Context context, RecyclerView recyclerView, boolean lightOn
         super(context, recyclerView, lightOnTouch);
     }
 
+    public DragScrollBar(Context context, AttributeSet attributeSet, int defStyle){
+        super(context, attributeSet, defStyle);
+    }
+
+    public DragScrollBar(Context context, AttributeSet attributeSet){
+        super(context, attributeSet);
+    }
+
     @Override
     void setTouchIntercept() {
         OnTouchListener otl = new OnTouchListener() {
@@ -110,7 +119,11 @@ int getMode() {
 
     @Override
     float getHideRatio() {
-        return .35F;
+        if(super.programmatic){
+            return .35F;
+        } else {
+            return .65F;
+        }
     }
 
     @Override
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/Handle.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/Handle.java
@@ -31,13 +31,15 @@ public class Handle extends View {
     Integer mode;
     boolean expanded = false;
     Context context;
+    Boolean programmatic;
 
-    public Handle(Context c, int m){
+    public Handle(Context c, int m, boolean pro){
         super(c);
 
         context = c;
         mode = m;
         p.setFlags(Paint.ANTI_ALIAS_FLAG);
+        programmatic = pro;
     }
 
     @Override
@@ -74,7 +76,11 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
     }
 
     private RectF makeRect(){
-        return new RectF(new Rect(getLeft() - Utils.getDP(11, context),getTop(),getLeft()-Utils.getDP(4, context),getBottom()));
+        if(programmatic){
+            return new RectF(new Rect(getLeft() - Utils.getDP(11, context),getTop(),getLeft()-Utils.getDP(4, context),getBottom()));
+        } else {
+            return new RectF(new Rect(getLeft() - Utils.getDP(4, context),getTop(),getLeft()+Utils.getDP(6, context),getBottom()));
+        }
     }
 
     @Override
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/TouchScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/TouchScrollBar.java
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml

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 = '7.2.0'`
	`3`	`+def version = '8.0.0'`
`4`	`4`
`5`	`5`	`ext {`
`6`	`6`	`bintrayRepo = 'maven'`
`@@ -35,7 +35,7 @@ android {`
`35`	`35`	`defaultConfig {`
`36`	`36`	`minSdkVersion 7`
`37`	`37`	`targetSdkVersion 23`
`38`		`- versionCode 17`
	`38`	`+ versionCode 18`
`39`	`39`	`versionName version`
`40`	`40`	`}`
`41`	`41`	`}`
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 adapterNotSetupForIndicatorException("INameableAdapter");`
	`52`	`+ throw new CustomExceptions.AdapterNotSetupForIndicatorException("INameableAdapter");`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ int getIndicatorWidth() {`
`63`	`63`	`@Override`
`64`	`64`	`void testAdapter(RecyclerView.Adapter adapter) {`
`65`	`65`	`if(!(adapter instanceof ICustomAdapter)){`
`66`		`- throw new adapterNotSetupForIndicatorException("ICustomAdapter");`
	`66`	`+ throw new CustomExceptions.AdapterNotSetupForIndicatorException("ICustomAdapter");`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`