File tree Expand file tree Collapse file tree 6 files changed +23
-21
lines changed
src/main/java/com/turingtechnologies/materialscrollbar Expand file tree Collapse file tree 6 files changed +23
-21
lines changed Original file line number Diff line number Diff line change 1
1
apply plugin : ' com.android.application'
2
2
3
3
android {
4
- compileSdkVersion 29
5
- buildToolsVersion ' 29 .0.3'
4
+ compileSdkVersion 30
5
+ buildToolsVersion ' 30 .0.3'
6
6
7
7
defaultConfig {
8
8
applicationId " com.turingtechnologies.materialscrollbardemo"
9
9
minSdkVersion 14
10
- targetSdkVersion 29
10
+ targetSdkVersion 30
11
11
versionCode 7
12
12
versionName " 7.0"
13
13
}
@@ -27,6 +27,6 @@ dependencies {
27
27
implementation project(' :lib' )
28
28
implementation ' androidx.recyclerview:recyclerview:1.1.0'
29
29
implementation ' com.pnikosis:materialish-progress:1.7'
30
- implementation ' com.google.android.material:material:1.1.0 '
31
- implementation ' androidx.appcompat:appcompat:1.1 .0'
30
+ implementation ' com.google.android.material:material:1.2.1 '
31
+ implementation ' androidx.appcompat:appcompat:1.2 .0'
32
32
}
Original file line number Diff line number Diff line change 2
2
apply plugin : ' com.github.ben-manes.versions'
3
3
4
4
buildscript {
5
- // ext.kotlin_version = '1.2.10'
5
+
6
6
repositories {
7
7
jcenter()
8
8
google()
9
9
}
10
10
dependencies {
11
11
classpath ' com.github.ben-manes:gradle-versions-plugin:0.15.0'
12
- classpath ' com.android.tools.build:gradle:4.0.0-beta05'
13
- // classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12
+ classpath ' com.android.tools.build:gradle:4.2.0-beta01'
14
13
15
14
// NOTE: Do not place your application dependencies here; they belong
16
15
// in the individual module build.gradle files
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
6
- distributionUrl =https\://services.gradle.org/distributions/gradle-6.3 -all.zip
6
+ distributionUrl =https\://services.gradle.org/distributions/gradle-6.7 -all.zip
Original file line number Diff line number Diff line change 1
1
apply plugin : ' com.android.library'
2
- // apply plugin: 'kotlin-android'
3
2
4
- def libVersion = ' 13.3.4 '
3
+ def libVersion = ' 13.4.0 '
5
4
6
5
android {
7
- compileSdkVersion 29
8
- buildToolsVersion ' 29 .0.3'
6
+ compileSdkVersion 30
7
+ buildToolsVersion ' 30 .0.3'
9
8
10
9
defaultConfig {
11
10
minSdkVersion 14
12
- targetSdkVersion 29
11
+ targetSdkVersion 30
13
12
versionName libVersion
14
13
}
15
14
compileOptions {
@@ -44,9 +43,8 @@ artifacts {
44
43
45
44
dependencies {
46
45
implementation ' androidx.recyclerview:recyclerview:1.1.0'
47
- implementation ' com.google.android.material:material:1.1.0'
48
- implementation ' androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
49
- // compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
46
+ implementation ' com.google.android.material:material:1.2.1'
47
+ implementation ' androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
50
48
}
51
49
repositories {
52
50
mavenCentral()
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -82,6 +82,7 @@ public abstract class MaterialScrollBar<T> extends RelativeLayout {
82
82
boolean hiddenByUser = false ;
83
83
private boolean hiddenByNotEnoughElements = false ;
84
84
private float fastScrollSnapPercent = 0 ;
85
+ private Boolean isDragging = false ;
85
86
86
87
//Associated Objects
87
88
RecyclerView recyclerView ;
@@ -680,6 +681,10 @@ public void clearScrollListeners() {
680
681
listeners .clear ();
681
682
}
682
683
684
+ public boolean isDragging () {
685
+ return isDragging ;
686
+ }
687
+
683
688
//CHAPTER IV - MISC METHODS
684
689
685
690
//Fetch accent color.
@@ -765,6 +770,8 @@ public void onAnimationEnd(Animator animation) {
765
770
if (lightOnTouch ) {
766
771
handleThumb .setBackgroundColor (handleColor );
767
772
}
773
+
774
+ isDragging = true ;
768
775
}
769
776
770
777
protected void onUp () {
@@ -782,6 +789,8 @@ public void onAnimationEnd(Animator animation) {
782
789
if (lightOnTouch ) {
783
790
handleThumb .setBackgroundColor (handleOffColor );
784
791
}
792
+
793
+ isDragging = false ;
785
794
}
786
795
787
796
//Tests to ensure that the touch is on the handleThumb depending on the user preference
You can’t perform that action at this time.
0 commit comments