migrate to Android X

Author: klinker24

gradle.properties

@@ -14,10 +14,12 @@
 # limitations under the License.
 #
 
+android.useAndroidX=true
+android.enableJetifier=true
+
 GRADLE_PLUGIN_VERSION=3.3.2
 KOTLIN_VERSION=1.3.21
-
-ANDROID_SUPPORT_VERSION=28.0.0
+ANDROID_X_VERSION=1.0.2
 
 MIN_SDK=15
 TARGET_SDK=28

library/build.gradle

@@ -51,11 +51,11 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
-    implementation "com.android.support:appcompat-v7:$ANDROID_SUPPORT_VERSION"
-    implementation "com.android.support:cardview-v7:$ANDROID_SUPPORT_VERSION"
+    implementation "androidx.appcompat:appcompat:$ANDROID_X_VERSION"
+    implementation 'com.google.android.material:material:1.0.0'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:3.8"
+    testImplementation 'org.robolectric:robolectric:3.8'
     testImplementation 'org.mockito:mockito-core:2.18.3'
 }
 

library/src/main/java/xyz/klinker/android/floating_tutorial/FloatingTutorialActivity.kt

@@ -20,7 +20,7 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import android.widget.FrameLayout
 

library/src/main/java/xyz/klinker/android/floating_tutorial/TutorialPage.kt

@@ -18,8 +18,8 @@ package xyz.klinker.android.floating_tutorial
 
 import android.content.Intent
 import android.graphics.Color
-import android.support.annotation.*
-import android.support.v7.widget.CardView
+import androidx.annotation.*
+import androidx.cardview.widget.CardView
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup

library/src/main/java/xyz/klinker/android/floating_tutorial/TutorialPresenter.kt

@@ -20,7 +20,7 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.annotation.SuppressLint
 import android.os.Build
-import android.support.annotation.VisibleForTesting
+import androidx.annotation.VisibleForTesting
 import android.view.View
 import android.view.ViewAnimationUtils
 

library/src/main/res/layout/tutorial_page_root.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2017 Luke Klinker
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -51,6 +50,8 @@
 
             <Button
                 android:id="@+id/tutorial_next_button"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                app:rippleColor="@color/tutorial_ripple_color"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -64,4 +65,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

library/src/main/res/values-v19/styles.xml

@@ -16,7 +16,7 @@
 
 <resources>
 
-    <style name="tutorial_FloatingTutorialTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+    <style name="tutorial_FloatingTutorialTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorAccent">@android:color/white</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>

library/src/main/res/values/colors.xml

@@ -18,6 +18,7 @@
 <resources>
 
     <color name="tutorial_background_dim">#55000000</color>
+    <color name="tutorial_ripple_color">#EEEEEE</color>
     <color name="tutorial_light_background_indicator">#AA000000</color>
     <color name="tutorial_dark_background_indicator">#EEFFFFFF</color>
 

library/src/main/res/values/styles.xml

@@ -16,7 +16,7 @@
 
 <resources>
 
-    <style name="tutorial_FloatingTutorialTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+    <style name="tutorial_FloatingTutorialTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorAccent">@android:color/white</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>

sample-java/build.gradle

@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$ANDROID_SUPPORT_VERSION"
+    implementation "androidx.appcompat:appcompat:$ANDROID_X_VERSION"
 
     implementation project(":library")
     implementation project(":sample-shared")