Migration to androidx

DreierF · DreierF · commit a0460f9f004d · 2018-11-23T20:10:10.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -20,10 +20,10 @@ android {
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation "com.android.support:appcompat-v7:28.0.0"
+    implementation "androidx.appcompat:appcompat:1.0.2"
     testImplementation 'junit:junit:4.12'
     implementation project(path: ':material-intro-screen')
 }
diff --git a/app/src/main/java/agency/tango/materialintro/CustomSlide.java b/app/src/main/java/agency/tango/materialintro/CustomSlide.java
@@ -1,7 +1,7 @@
 package agency.tango.materialintro;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/agency/tango/materialintro/IntroActivity.java b/app/src/main/java/agency/tango/materialintro/IntroActivity.java
@@ -2,8 +2,8 @@
 
 import android.Manifest;
 import android.os.Bundle;
-import android.support.annotation.FloatRange;
-import android.support.annotation.Nullable;
+import androidx.annotation.FloatRange;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/app/src/main/java/agency/tango/materialintro/MainActivity.java b/app/src/main/java/agency/tango/materialintro/MainActivity.java
@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.AppCompatButton;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatButton;
 import android.view.View;
 
 public class MainActivity extends AppCompatActivity {
diff --git a/app/src/main/java/agency/tango/materialintro/SplashActivity.java b/app/src/main/java/agency/tango/materialintro/SplashActivity.java
@@ -1,8 +1,8 @@
 package agency.tango.materialintro;
 
 import android.content.Intent;
-import android.support.v4.app.TaskStackBuilder;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.app.TaskStackBuilder;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class SplashActivity extends AppCompatActivity {
     @Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@color/colorPrimary">
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_launch_activity"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/gradle.properties b/gradle.properties
@@ -30,4 +30,6 @@ POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=tango
-POM_DEVELOPER_NAME=Tango Agency
+POM_DEVELOPER_NAME=Tango Agency
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/material-intro-screen/build.gradle b/material-intro-screen/build.gradle
@@ -10,7 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -45,12 +45,10 @@ android {
     }
 
     dependencies {
-        implementation "com.android.support:appcompat-v7:28.0.0"
-        implementation "com.android.support:design:28.0.0"
+        implementation 'androidx.appcompat:appcompat:1.0.2'
+        implementation 'com.google.android.material:material:1.0.0'
 
-        androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-            exclude group: 'com.android.support', module: 'support-annotations'
-        })
+        androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     }
 
 //    publish {
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/MaterialIntroActivity.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/MaterialIntroActivity.java
@@ -4,14 +4,14 @@
 import android.content.res.ColorStateList;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.SparseArray;
 import android.view.KeyEvent;
 import android.view.View;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/MoveUpBehaviour.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/MoveUpBehaviour.java
@@ -1,8 +1,8 @@
 package agency.tango.materialintroscreen;
 
 import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.snackbar.Snackbar;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java
@@ -2,9 +2,9 @@
 
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragmentBuilder.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragmentBuilder.java
@@ -1,7 +1,7 @@
 package agency.tango.materialintroscreen;
 
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
 
 @SuppressWarnings({"unused", "WeakerAccess"})
 public class SlideFragmentBuilder {
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/adapter/SlidesAdapter.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/adapter/SlidesAdapter.java
@@ -1,7 +1,7 @@
 package agency.tango.materialintroscreen.adapter;
 
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 import android.view.ViewGroup;
 
 import java.util.ArrayList;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/IViewTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/IViewTranslation.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.animations;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.view.View;
 
 public interface IViewTranslation {
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/ViewTranslationWrapper.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/ViewTranslationWrapper.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.animations;
 
-import android.support.annotation.AnimRes;
+import androidx.annotation.AnimRes;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/AlphaTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/AlphaTranslation.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.animations.translations;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.view.View;
 
 import agency.tango.materialintroscreen.animations.IViewTranslation;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultAlphaTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultAlphaTranslation.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.animations.translations;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.view.View;
 
 import agency.tango.materialintroscreen.animations.IViewTranslation;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultPositionTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/DefaultPositionTranslation.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.animations.translations;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.view.View;
 
 import agency.tango.materialintroscreen.animations.IViewTranslation;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.animations.translations;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.view.View;
 
 import agency.tango.materialintroscreen.R;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.animations.translations;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.view.View;
 
 import agency.tango.materialintroscreen.R;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/NoTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/NoTranslation.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.animations.translations;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.view.View;
 
 import agency.tango.materialintroscreen.animations.IViewTranslation;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/scrollListeners/ParallaxScrollListener.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/scrollListeners/ParallaxScrollListener.java
@@ -1,7 +1,7 @@
 package agency.tango.materialintroscreen.listeners.scrollListeners;
 
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import agency.tango.materialintroscreen.SlideFragment;
 import agency.tango.materialintroscreen.adapter.SlidesAdapter;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFragment.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFragment.java
@@ -1,9 +1,9 @@
 package agency.tango.materialintroscreen.parallax;
 
 import android.os.Bundle;
-import android.support.annotation.FloatRange;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.FloatRange;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/Parallaxable.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/Parallaxable.java
@@ -1,6 +1,6 @@
 package agency.tango.materialintroscreen.parallax;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 
 public interface Parallaxable {
     void setOffset(@FloatRange(from = -1.0, to = 1.0) float offset);
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/CustomViewPager.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/CustomViewPager.java
@@ -28,23 +28,25 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.annotation.CallSuper;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
-import android.support.v4.view.AbsSavedState;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.VelocityTrackerCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.WindowInsetsCompat;
-import android.support.v4.view.accessibility.AccessibilityEventCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.view.accessibility.AccessibilityRecordCompat;
-import android.support.v4.widget.EdgeEffectCompat;
+import androidx.annotation.CallSuper;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.os.ParcelableCompat;
+import androidx.core.os.ParcelableCompatCreatorCallbacks;
+import androidx.customview.view.AbsSavedState;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.core.view.VelocityTrackerCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.accessibility.AccessibilityEventCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityRecordCompat;
+import androidx.core.widget.EdgeEffectCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.FocusFinder;
@@ -81,8 +83,8 @@
  * which is a convenient way to supply and manage the lifecycle of each page.
  * There are standard adapters implemented for using fragments with the ViewPager,
  * which cover the most common use cases.  These are
- * {@link android.support.v4.app.FragmentPagerAdapter} and
- * {@link android.support.v4.app.FragmentStatePagerAdapter}; each of these
+ * {@link FragmentPagerAdapter} and
+ * {@link FragmentStatePagerAdapter}; each of these
  * classes have simple code showing how to build a full user interface
  * with them.
  *
@@ -434,7 +436,7 @@ void initViewPager() {
         }
 
         ViewCompat.setOnApplyWindowInsetsListener(this,
-                new android.support.v4.view.OnApplyWindowInsetsListener() {
+                new androidx.core.view.OnApplyWindowInsetsListener() {
                     private final Rect mTempRect = new Rect();
 
                     @Override
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java
@@ -13,9 +13,8 @@
 import android.graphics.RectF;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.ViewCompat;
-import agency.tango.materialintroscreen.widgets.CustomViewPager;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.core.view.ViewCompat;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.Interpolator;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java
@@ -1,8 +1,8 @@
 package agency.tango.materialintroscreen.widgets;
 
 import android.content.Context;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java
@@ -1,8 +1,8 @@
 package agency.tango.materialintroscreen.widgets;
 
 import android.content.Context;
-import agency.tango.materialintroscreen.widgets.CustomViewPager;
-import android.support.v4.view.MotionEventCompat;
+
+import androidx.core.view.MotionEventCompat;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
diff --git a/material-intro-screen/src/main/res/layout/activity_material_intro.xml b/material-intro-screen/src/main/res/layout/activity_material_intro.xml

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ android {`
`10`	`10`	`versionCode 1`
`11`	`11`	`versionName "1.0"`
`12`	`12`
`13`		`- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
	`13`	`+ testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`buildTypes {`
`@@ -45,12 +45,10 @@ android {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`dependencies {`
`48`		`- implementation "com.android.support:appcompat-v7:28.0.0"`
`49`		`- implementation "com.android.support:design:28.0.0"`
	`48`	`+ implementation 'androidx.appcompat:appcompat:1.0.2'`
	`49`	`+ implementation 'com.google.android.material:material:1.0.0'`
`50`	`50`
`51`		`- androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {`
`52`		`- exclude group: 'com.android.support', module: 'support-annotations'`
`53`		`- })`
	`51`	`+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`// publish {`