From a8756d6977fda731d295878aa3ec5c3a6fd14b7a Mon Sep 17 00:00:00 2001
From: Damien Diehl <damien5314@gmail.com>
Date: Sun, 19 May 2019 13:18:11 -0700
Subject: [PATCH] Migrate support library to AndroidX (#1)

---
 cardstackview/build.gradle                    |  2 +-
 .../cardstackview/CardStackLayoutManager.java |  9 ++++----
 .../android/cardstackview/CardStackView.java  |  5 +++--
 .../internal/CardStackDataObserver.java       |  4 ++--
 .../internal/CardStackSmoothScroller.java     |  5 +++--
 .../internal/CardStackSnapHelper.java         |  9 ++++----
 .../internal/CardStackState.java              |  2 +-
 gradle.properties                             |  2 ++
 sample/build.gradle                           |  8 +++----
 .../cardstackview/sample/CardStackAdapter.kt  |  2 +-
 .../cardstackview/sample/MainActivity.kt      | 14 ++++++------
 .../cardstackview/sample/SpotDiffCallback.kt  |  2 +-
 sample/src/main/res/layout/activity_main.xml  | 22 +++++++++----------
 sample/src/main/res/layout/item_spot.xml      |  4 ++--
 14 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/cardstackview/build.gradle b/cardstackview/build.gradle
index f21b1ff5..ff0cbb6e 100644
--- a/cardstackview/build.gradle
+++ b/cardstackview/build.gradle
@@ -32,5 +32,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java
index 2732ee32..261ce797 100644
--- a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java
+++ b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java
@@ -3,14 +3,15 @@
 import android.content.Context;
 import android.graphics.PointF;
 import android.os.Handler;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;
 
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.yuyakaido.android.cardstackview.internal.CardStackSetting;
 import com.yuyakaido.android.cardstackview.internal.CardStackSmoothScroller;
 import com.yuyakaido.android.cardstackview.internal.CardStackState;
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java
index 7c55b70f..7193ddec 100644
--- a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java
+++ b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java
@@ -1,11 +1,12 @@
 package com.yuyakaido.android.cardstackview;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.yuyakaido.android.cardstackview.internal.CardStackDataObserver;
 import com.yuyakaido.android.cardstackview.internal.CardStackSnapHelper;
 
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackDataObserver.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackDataObserver.java
index a55f320e..76395a8c 100644
--- a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackDataObserver.java
+++ b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackDataObserver.java
@@ -1,7 +1,7 @@
 package com.yuyakaido.android.cardstackview.internal;
 
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.yuyakaido.android.cardstackview.CardStackLayoutManager;
 
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSmoothScroller.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSmoothScroller.java
index c4de4712..54eba6e8 100644
--- a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSmoothScroller.java
+++ b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSmoothScroller.java
@@ -1,9 +1,10 @@
 package com.yuyakaido.android.cardstackview.internal;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.yuyakaido.android.cardstackview.CardStackLayoutManager;
 import com.yuyakaido.android.cardstackview.CardStackListener;
 import com.yuyakaido.android.cardstackview.RewindAnimationSetting;
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSnapHelper.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSnapHelper.java
index 601288a0..d682adbd 100644
--- a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSnapHelper.java
+++ b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSnapHelper.java
@@ -1,11 +1,12 @@
 package com.yuyakaido.android.cardstackview.internal;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SnapHelper;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SnapHelper;
+
 import com.yuyakaido.android.cardstackview.CardStackLayoutManager;
 import com.yuyakaido.android.cardstackview.Duration;
 import com.yuyakaido.android.cardstackview.SwipeAnimationSetting;
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackState.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackState.java
index 049559e1..59254982 100644
--- a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackState.java
+++ b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackState.java
@@ -1,6 +1,6 @@
 package com.yuyakaido.android.cardstackview.internal;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.yuyakaido.android.cardstackview.Direction;
 
diff --git a/gradle.properties b/gradle.properties
index 743d692c..8de50581 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/sample/build.gradle b/sample/build.gradle
index d11770e2..9058594c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -25,10 +25,10 @@ dependencies {
     kapt 'com.github.bumptech.glide:compiler:4.9.0'
 
     // Support Library
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     // View
     implementation 'com.makeramen:roundedimageview:2.3.0'
diff --git a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/CardStackAdapter.kt b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/CardStackAdapter.kt
index bc57ba01..5ac51056 100644
--- a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/CardStackAdapter.kt
+++ b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/CardStackAdapter.kt
@@ -1,12 +1,12 @@
 package com.yuyakaido.android.cardstackview.sample
 
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 
 class CardStackAdapter(
diff --git a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.kt b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.kt
index f823b2fa..dcb00a04 100644
--- a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.kt
+++ b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.kt
@@ -1,13 +1,6 @@
 package com.yuyakaido.android.cardstackview.sample
 
 import android.os.Bundle
-import android.support.design.widget.NavigationView
-import android.support.v4.widget.DrawerLayout
-import android.support.v7.app.ActionBarDrawerToggle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.Toolbar
 import android.util.Log
 import android.view.Gravity
 import android.view.View
@@ -15,6 +8,13 @@ import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.LinearInterpolator
 import android.widget.TextView
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.DiffUtil
+import com.google.android.material.navigation.NavigationView
 import com.yuyakaido.android.cardstackview.*
 import java.util.*
 
diff --git a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/SpotDiffCallback.kt b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/SpotDiffCallback.kt
index a7459bab..a5ab9143 100644
--- a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/SpotDiffCallback.kt
+++ b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/SpotDiffCallback.kt
@@ -1,6 +1,6 @@
 package com.yuyakaido.android.cardstackview.sample
 
-import android.support.v7.util.DiffUtil
+import androidx.recyclerview.widget.DiffUtil
 
 class SpotDiffCallback(
         private val old: List<Spot>,
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 5a117f68..f00cfe57 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
@@ -12,17 +12,17 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -38,7 +38,7 @@
                 android:layout_alignParentBottom="true"
                 android:clipChildren="false">
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/skip_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
                     app:fabSize="auto"
                     app:rippleColor="#22ED7563"/>
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/rewind_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
                     app:fabSize="mini"
                     app:rippleColor="#225BC9FA"/>
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/like_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -91,13 +91,13 @@
 
     </LinearLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/navigation_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
         app:menu="@menu/navigation_main_activity">
-    </android.support.design.widget.NavigationView>
+    </com.google.android.material.navigation.NavigationView>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/sample/src/main/res/layout/item_spot.xml b/sample/src/main/res/layout/item_spot.xml
index d2770174..f7204b54 100644
--- a/sample/src/main/res/layout/item_spot.xml
+++ b/sample/src/main/res/layout/item_spot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!-- https://qiita.com/ntsk/items/dac92596742e18470a55 -->
-<android.support.v7.widget.CardView
+<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="match_parent"
@@ -86,4 +86,4 @@
         android:layout_height="match_parent">
     </FrameLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>