Add isDragging method

turing-tech · Dec 9, 2020 · b4c5b0f · b4c5b0f
1 parent 3ceda2c
commit b4c5b0f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "com.turingtechnologies.materialscrollbardemo"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 7
         versionName "7.0"
     }
@@ -27,6 +27,6 @@ dependencies {
     implementation project(':lib')
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.pnikosis:materialish-progress:1.7'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -2,15 +2,14 @@
 apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
-//    ext.kotlin_version = '1.2.10'
+
     repositories {
         jcenter()
 		google()
     }
     dependencies {
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
-        classpath 'com.android.tools.build:gradle:4.0.0-beta05'
-//        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:4.2.0-beta01'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'com.android.library'
-//apply plugin: 'kotlin-android'
 
-def libVersion = '13.3.4'
+def libVersion = '13.4.0'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionName libVersion
     }
     compileOptions {
@@ -44,9 +43,8 @@ artifacts {
 
 dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
-    //    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 }
 repositories {
     mavenCentral()

diff --git a/lib/gradle.properties b/lib/gradle.properties
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/MaterialScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/MaterialScrollBar.java
@@ -82,6 +82,7 @@ public abstract class MaterialScrollBar<T> extends RelativeLayout {
     boolean hiddenByUser = false;
     private boolean hiddenByNotEnoughElements = false;
     private float fastScrollSnapPercent = 0;
+    private Boolean isDragging = false;
 
     //Associated Objects
     RecyclerView recyclerView;
@@ -680,6 +681,10 @@ public void clearScrollListeners() {
         listeners.clear();
     }
 
+    public boolean isDragging() {
+        return isDragging;
+    }
+
     //CHAPTER IV - MISC METHODS
 
     //Fetch accent color.
@@ -765,6 +770,8 @@ public void onAnimationEnd(Animator animation) {
         if(lightOnTouch) {
             handleThumb.setBackgroundColor(handleColor);
         }
+
+        isDragging = true;
     }
 
     protected void onUp() {
@@ -782,6 +789,8 @@ public void onAnimationEnd(Animator animation) {
         if(lightOnTouch) {
             handleThumb.setBackgroundColor(handleOffColor);
         }
+
+        isDragging = false;
     }
 
     //Tests to ensure that the touch is on the handleThumb depending on the user preference