Migrate to Android X

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 def versionMajor = 1
 def versionMinor = 6
 def versionPatch = 2
-def versionBuild = 1 // bump for dogfood builds, public betas, etc.
+def versionBuild = 2 // bump for dogfood builds, public betas, etc.
 
 android {
     compileSdkVersion 28
@@ -33,13 +33,13 @@ android {
 }
 
 dependencies {
-    compile project(':library')
+    implementation project(':library')
     //Support
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     //Firebase
-    implementation 'com.google.firebase:firebase-core:16.0.6'
+    implementation 'com.google.firebase:firebase-core:16.0.7'
     implementation 'com.google.firebase:firebase-crash:16.2.1'
 }
 

app/src/main/java/com/heinrichreimersoftware/materialintro/demo/FinishActivity.java

@@ -25,10 +25,10 @@
 package com.heinrichreimersoftware.materialintro.demo;
 
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

app/src/main/java/com/heinrichreimersoftware/materialintro/demo/LoginFragment.java

@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.demo;
 
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.LayoutInflater;

app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainActivity.java

@@ -25,10 +25,10 @@
 package com.heinrichreimersoftware.materialintro.demo;
 
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainIntroActivity.java

@@ -27,7 +27,7 @@
 import android.Manifest;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Toast;

app/src/main/java/com/heinrichreimersoftware/materialintro/demo/SplashActivity.java

@@ -25,10 +25,10 @@
 package com.heinrichreimersoftware.materialintro.demo;
 
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.heinrichreimersoftware.materialintro.demo.databinding.ActivitySplashBinding;
 

app/src/main/res/layout-land/slide_canteen.xml

@@ -46,7 +46,7 @@
             tools:ignore="ContentDescription"
             tools:src="@android:drawable/sym_action_call" />
 
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:layout_width="@dimen/mi_baseline"
             android:layout_height="wrap_content" />
 

app/src/main/res/layout/activity_finish.xml

@@ -31,7 +31,7 @@
         android:orientation="vertical"
         tools:context="com.heinrichreimersoftware.materialintro.demo.FinishActivity">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"

app/src/main/res/layout/activity_main.xml

@@ -43,7 +43,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="?actionBarSize" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?actionBarSize"

gradle.properties

@@ -11,4 +11,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true

library/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 def versionMajor = 1
 def versionMinor = 6
 def versionPatch = 2
-def versionBuild = 1 // bump for dogfood builds, public betas, etc.
+def versionBuild = 2 // bump for dogfood builds, public betas, etc.
 
 android {
     compileSdkVersion 28
@@ -20,6 +20,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }

library/src/main/java/com/heinrichreimersoftware/materialintro/app/ButtonCtaFragment.java

@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.app;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 
 public interface ButtonCtaFragment {

library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java

@@ -43,24 +43,24 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.InterpolatorRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.constraint.ConstraintLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.util.Pair;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.InterpolatorRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.util.Pair;
+import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;

library/src/main/java/com/heinrichreimersoftware/materialintro/app/OnNavigationBlockedListener.java

@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.app;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

library/src/main/java/com/heinrichreimersoftware/materialintro/app/SlideFragment.java

@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.app;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 
 public class SlideFragment extends Fragment implements IntroNavigation {

library/src/main/java/com/heinrichreimersoftware/materialintro/slide/ButtonCtaSlide.java

@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.slide;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 
 public interface ButtonCtaSlide extends Slide {

library/src/main/java/com/heinrichreimersoftware/materialintro/slide/FragmentSlide.java

@@ -27,12 +27,12 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
-import android.support.v4.app.Fragment;
-import android.support.v7.view.ContextThemeWrapper;
+import androidx.annotation.ColorRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.view.ContextThemeWrapper;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;

library/src/main/java/com/heinrichreimersoftware/materialintro/slide/RestorableSlide.java

@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.slide;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 public interface RestorableSlide extends Slide {
     void setFragment(Fragment fragment);

library/src/main/java/com/heinrichreimersoftware/materialintro/slide/SimpleSlide.java

@@ -28,17 +28,17 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.ColorUtils;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;

library/src/main/java/com/heinrichreimersoftware/materialintro/slide/Slide.java

@@ -24,8 +24,8 @@
 
 package com.heinrichreimersoftware.materialintro.slide;
 
-import android.support.annotation.ColorRes;
-import android.support.v4.app.Fragment;
+import androidx.annotation.ColorRes;
+import androidx.fragment.app.Fragment;
 
 public interface Slide {
     Fragment getFragment();

library/src/main/java/com/heinrichreimersoftware/materialintro/slide/SlideAdapter.java

@@ -24,11 +24,11 @@
 
 package com.heinrichreimersoftware.materialintro.slide;
 
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 import android.view.ViewGroup;
 
 import com.heinrichreimersoftware.materialintro.app.SlideFragment;

library/src/main/java/com/heinrichreimersoftware/materialintro/util/AnimUtils.java

@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;

library/src/main/java/com/heinrichreimersoftware/materialintro/view/FadeableViewPager.java

@@ -27,8 +27,8 @@
 import android.content.Context;
 import android.database.DataSetObserver;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/heinrichreimersoftware/materialintro/view/InkPageIndicator.java

@@ -27,8 +27,8 @@
 import android.graphics.Path;
 import android.graphics.RectF;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.ColorInt;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.Interpolator;

library/src/main/java/com/heinrichreimersoftware/materialintro/view/SwipeBlockableViewPager.java

@@ -27,7 +27,7 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 

library/src/main/java/com/heinrichreimersoftware/materialintro/view/parallax/ParallaxFragment.java

@@ -1,9 +1,9 @@
 package com.heinrichreimersoftware.materialintro.view.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 com.heinrichreimersoftware.materialintro.view.parallax.util.ParallaxUtil;

library/src/main/java/com/heinrichreimersoftware/materialintro/view/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;

library/src/main/java/com/heinrichreimersoftware/materialintro/view/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;

library/src/main/java/com/heinrichreimersoftware/materialintro/view/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;

library/src/main/java/com/heinrichreimersoftware/materialintro/view/parallax/ParallaxSlideFragment.java

@@ -1,8 +1,8 @@
 package com.heinrichreimersoftware.materialintro.view.parallax;
 
 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 com.heinrichreimersoftware.materialintro.app.SlideFragment;