Fixes #121. Migrates to androidx

turing-tech · turing-tech · commit 83a0ab0437fb · 2018-10-29T21:26:39.000-04:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.turingtechnologies.materialscrollbardemo"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 6
         versionName "6.0"
     }
@@ -25,8 +25,8 @@ android {
 
 dependencies {
     compile project(':lib')
-    compile "com.android.support:recyclerview-v7:${supportLibVersion}"
+    compile "androidx.recyclerview:recyclerview:1.0.0"
     compile 'com.pnikosis:materialish-progress:1.7'
-    compile "com.android.support:design:${supportLibVersion}"
-    compile "com.android.support:appcompat-v7:${supportLibVersion}"
+    compile "com.google.android.material:material:1.0.0"
+    compile "androidx.appcompat:appcompat:1.0.0"
 }
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/DateActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/DateActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/IconActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/IconActivity.java
@@ -18,9 +18,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/MainActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/MainActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/MultiFragmentActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/MultiFragmentActivity.java
@@ -2,11 +2,11 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/NameActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/NameActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/SplashActivity.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Activities/SplashActivity.java
@@ -7,7 +7,7 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.turingtechnologies.materialscrollbardemo.AppData;
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/AppData.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/AppData.java
@@ -5,7 +5,7 @@
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.turingtechnologies.materialscrollbardemo.Activities.MainActivity;
 
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/DemoAdapter.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/DemoAdapter.java
@@ -3,7 +3,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Fragments/FirstLetterFragment.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/Fragments/FirstLetterFragment.java
@@ -1,9 +1,9 @@
 package com.turingtechnologies.materialscrollbardemo.Fragments;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/turingtechnologies/materialscrollbardemo/IconAdapter.java b/app/src/main/java/com/turingtechnologies/materialscrollbardemo/IconAdapter.java
@@ -3,7 +3,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".Activities.MainActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/activity_multi_frag.xml b/app/src/main/res/layout/activity_multi_frag.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     tools:context=".Activities.MainActivity">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/fragmentViewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/activity_others.xml b/app/src/main/res/layout/activity_others.xml
@@ -21,7 +21,7 @@
                 android:layout_height="match_parent"
                 tools:context=".Activities.MainActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/build.gradle b/build.gradle
@@ -9,8 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
-        classpath 'com.android.tools.build:gradle:3.2.0-beta01'
-        classpath 'me.tatarka:gradle-retrolambda:3.7.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 //        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -24,6 +23,4 @@ allprojects {
         maven { url 'https://jitpack.io' }
        google()
     }
-
-    project.ext.supportLibVersion = '27.1.1'
 }
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'com.android.library'
 def libVersion = '13.3.0'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionName libVersion
     }
     compileOptions {
@@ -43,12 +43,10 @@ artifacts {
 }
 
 dependencies {
-    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
-    implementation "com.android.support:design:${supportLibVersion}"
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "com.google.android.material:material:1.0.0"
     //    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 repositories {
     mavenCentral()
 }
-
-apply plugin: 'me.tatarka.retrolambda'
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/DragScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/DragScrollBar.java
@@ -17,7 +17,7 @@
 package com.turingtechnologies.materialscrollbar;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/FastScrollerUtil.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/FastScrollerUtil.java
@@ -1,7 +1,7 @@
 package com.turingtechnologies.materialscrollbar;
 
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 
 import java.util.ArrayList;
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/Indicator.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/Indicator.java
@@ -19,10 +19,10 @@
 import android.content.Context;
 import android.graphics.Typeface;
 import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.ColorInt;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorInt;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ViewGroup;
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/MaterialScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/MaterialScrollBar.java
@@ -24,13 +24,13 @@
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.MotionEvent;
@@ -233,6 +233,12 @@ protected void onAttachedToWindow() {
             } catch (ClassCastException e) {
                 throw new RuntimeException("The id given for the recyclerView did not refer to a RecyclerView", e);
             }
+            implementPreferences();
+
+            implementFlavourPreferences();
+
+            a.recycle();
+
             generalSetup();
         }
     }
@@ -242,12 +248,6 @@ private void generalSetup() {
         recyclerView.setVerticalScrollBarEnabled(false); // disable any existing scrollbars
         recyclerView.addOnScrollListener(new ScrollListener()); // lets us read when the recyclerView scrolls
 
-        implementPreferences();
-
-        implementFlavourPreferences();
-
-        a.recycle();
-
         setTouchIntercept(); // catches touches on the bar
 
         identifySwipeRefreshParents();
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java
@@ -16,8 +16,8 @@
 
 package com.turingtechnologies.materialscrollbar;
 
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.View;
 
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/TouchScrollBar.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/TouchScrollBar.java
@@ -20,7 +20,7 @@
 import android.content.res.TypedArray;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.animation.Animation;
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/Utils.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/Utils.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.util.LayoutDirection;
 import android.util.TypedValue;
 import android.view.View;
