Skip to content

Commit a8756d6

Browse files
author
Damien Diehl
authored
Migrate support library to AndroidX (yuyakaido#1)
1 parent b1b6053 commit a8756d6

File tree

14 files changed

+48
-42
lines changed

14 files changed

+48
-42
lines changed

‎cardstackview/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ android {
3232
}
3333

3434
dependencies {
35-
implementation 'com.android.support:recyclerview-v7:28.0.0'
35+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
3636
}

‎cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
import android.content.Context;
44
import android.graphics.PointF;
55
import android.os.Handler;
6-
import android.support.annotation.FloatRange;
7-
import android.support.annotation.IntRange;
8-
import android.support.annotation.NonNull;
9-
import android.support.v7.widget.RecyclerView;
106
import android.view.View;
117
import android.view.ViewGroup;
128
import android.view.animation.Interpolator;
139

10+
import androidx.annotation.FloatRange;
11+
import androidx.annotation.IntRange;
12+
import androidx.annotation.NonNull;
13+
import androidx.recyclerview.widget.RecyclerView;
14+
1415
import com.yuyakaido.android.cardstackview.internal.CardStackSetting;
1516
import com.yuyakaido.android.cardstackview.internal.CardStackSmoothScroller;
1617
import com.yuyakaido.android.cardstackview.internal.CardStackState;

‎cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.yuyakaido.android.cardstackview;
22

33
import android.content.Context;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.widget.RecyclerView;
64
import android.util.AttributeSet;
75
import android.view.MotionEvent;
86

7+
import androidx.annotation.Nullable;
8+
import androidx.recyclerview.widget.RecyclerView;
9+
910
import com.yuyakaido.android.cardstackview.internal.CardStackDataObserver;
1011
import com.yuyakaido.android.cardstackview.internal.CardStackSnapHelper;
1112

‎cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackDataObserver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.yuyakaido.android.cardstackview.internal;
22

3-
import android.support.annotation.Nullable;
4-
import android.support.v7.widget.RecyclerView;
3+
import androidx.annotation.Nullable;
4+
import androidx.recyclerview.widget.RecyclerView;
55

66
import com.yuyakaido.android.cardstackview.CardStackLayoutManager;
77

‎cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSmoothScroller.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.yuyakaido.android.cardstackview.internal;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.v7.widget.RecyclerView;
53
import android.view.View;
64

5+
import androidx.annotation.NonNull;
6+
import androidx.recyclerview.widget.RecyclerView;
7+
78
import com.yuyakaido.android.cardstackview.CardStackLayoutManager;
89
import com.yuyakaido.android.cardstackview.CardStackListener;
910
import com.yuyakaido.android.cardstackview.RewindAnimationSetting;

‎cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSnapHelper.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.yuyakaido.android.cardstackview.internal;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.widget.RecyclerView;
6-
import android.support.v7.widget.SnapHelper;
73
import android.view.View;
84

5+
import androidx.annotation.NonNull;
6+
import androidx.annotation.Nullable;
7+
import androidx.recyclerview.widget.RecyclerView;
8+
import androidx.recyclerview.widget.SnapHelper;
9+
910
import com.yuyakaido.android.cardstackview.CardStackLayoutManager;
1011
import com.yuyakaido.android.cardstackview.Duration;
1112
import com.yuyakaido.android.cardstackview.SwipeAnimationSetting;

‎cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.yuyakaido.android.cardstackview.internal;
22

3-
import android.support.v7.widget.RecyclerView;
3+
import androidx.recyclerview.widget.RecyclerView;
44

55
import com.yuyakaido.android.cardstackview.Direction;
66

‎gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9+
android.enableJetifier=true
10+
android.useAndroidX=true
911
org.gradle.jvmargs=-Xmx1536m
1012
# When configured, Gradle will run in incubating parallel mode.
1113
# This option should only be used with decoupled projects. More details, visit

‎sample/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ dependencies {
2525
kapt 'com.github.bumptech.glide:compiler:4.9.0'
2626

2727
// Support Library
28-
implementation 'com.android.support:appcompat-v7:28.0.0'
29-
implementation 'com.android.support:recyclerview-v7:28.0.0'
30-
implementation 'com.android.support:cardview-v7:28.0.0'
31-
implementation 'com.android.support:design:28.0.0'
28+
implementation 'androidx.appcompat:appcompat:1.0.2'
29+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
30+
implementation 'androidx.cardview:cardview:1.0.0'
31+
implementation 'com.google.android.material:material:1.0.0'
3232

3333
// View
3434
implementation 'com.makeramen:roundedimageview:2.3.0'

‎sample/src/main/java/com/yuyakaido/android/cardstackview/sample/CardStackAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.yuyakaido.android.cardstackview.sample
22

3-
import android.support.v7.widget.RecyclerView
43
import android.view.LayoutInflater
54
import android.view.View
65
import android.view.ViewGroup
76
import android.widget.ImageView
87
import android.widget.TextView
98
import android.widget.Toast
9+
import androidx.recyclerview.widget.RecyclerView
1010
import com.bumptech.glide.Glide
1111

1212
class CardStackAdapter(

‎sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package com.yuyakaido.android.cardstackview.sample
22

33
import android.os.Bundle
4-
import android.support.design.widget.NavigationView
5-
import android.support.v4.widget.DrawerLayout
6-
import android.support.v7.app.ActionBarDrawerToggle
7-
import android.support.v7.app.AppCompatActivity
8-
import android.support.v7.util.DiffUtil
9-
import android.support.v7.widget.DefaultItemAnimator
10-
import android.support.v7.widget.Toolbar
114
import android.util.Log
125
import android.view.Gravity
136
import android.view.View
147
import android.view.animation.AccelerateInterpolator
158
import android.view.animation.DecelerateInterpolator
169
import android.view.animation.LinearInterpolator
1710
import android.widget.TextView
11+
import androidx.appcompat.app.ActionBarDrawerToggle
12+
import androidx.appcompat.app.AppCompatActivity
13+
import androidx.appcompat.widget.Toolbar
14+
import androidx.drawerlayout.widget.DrawerLayout
15+
import androidx.recyclerview.widget.DefaultItemAnimator
16+
import androidx.recyclerview.widget.DiffUtil
17+
import com.google.android.material.navigation.NavigationView
1818
import com.yuyakaido.android.cardstackview.*
1919
import java.util.*
2020

‎sample/src/main/java/com/yuyakaido/android/cardstackview/sample/SpotDiffCallback.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.yuyakaido.android.cardstackview.sample
22

3-
import android.support.v7.util.DiffUtil
3+
import androidx.recyclerview.widget.DiffUtil
44

55
class SpotDiffCallback(
66
private val old: List<Spot>,

‎sample/src/main/res/layout/activity_main.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<android.support.v4.widget.DrawerLayout
3+
<androidx.drawerlayout.widget.DrawerLayout
44
xmlns:android="http://schemas.android.com/apk/res/android"
55
xmlns:app="http://schemas.android.com/apk/res-auto"
66
android:id="@+id/drawer_layout"
@@ -12,17 +12,17 @@
1212
android:layout_width="match_parent"
1313
android:layout_height="match_parent">
1414

15-
<android.support.design.widget.AppBarLayout
15+
<com.google.android.material.appbar.AppBarLayout
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content">
1818

19-
<android.support.v7.widget.Toolbar
19+
<androidx.appcompat.widget.Toolbar
2020
android:id="@+id/toolbar"
2121
android:layout_width="match_parent"
2222
android:layout_height="wrap_content">
23-
</android.support.v7.widget.Toolbar>
23+
</androidx.appcompat.widget.Toolbar>
2424

25-
</android.support.design.widget.AppBarLayout>
25+
</com.google.android.material.appbar.AppBarLayout>
2626

2727
<RelativeLayout
2828
android:layout_width="match_parent"
@@ -38,7 +38,7 @@
3838
android:layout_alignParentBottom="true"
3939
android:clipChildren="false">
4040

41-
<android.support.design.widget.FloatingActionButton
41+
<com.google.android.material.floatingactionbutton.FloatingActionButton
4242
android:id="@+id/skip_button"
4343
android:layout_width="wrap_content"
4444
android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
5050
app:fabSize="auto"
5151
app:rippleColor="#22ED7563"/>
5252

53-
<android.support.design.widget.FloatingActionButton
53+
<com.google.android.material.floatingactionbutton.FloatingActionButton
5454
android:id="@+id/rewind_button"
5555
android:layout_width="wrap_content"
5656
android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
6464
app:fabSize="mini"
6565
app:rippleColor="#225BC9FA"/>
6666

67-
<android.support.design.widget.FloatingActionButton
67+
<com.google.android.material.floatingactionbutton.FloatingActionButton
6868
android:id="@+id/like_button"
6969
android:layout_width="wrap_content"
7070
android:layout_height="wrap_content"
@@ -91,13 +91,13 @@
9191

9292
</LinearLayout>
9393

94-
<android.support.design.widget.NavigationView
94+
<com.google.android.material.navigation.NavigationView
9595
android:id="@+id/navigation_view"
9696
android:layout_width="wrap_content"
9797
android:layout_height="match_parent"
9898
android:layout_gravity="start"
9999
android:fitsSystemWindows="true"
100100
app:menu="@menu/navigation_main_activity">
101-
</android.support.design.widget.NavigationView>
101+
</com.google.android.material.navigation.NavigationView>
102102

103-
</android.support.v4.widget.DrawerLayout>
103+
</androidx.drawerlayout.widget.DrawerLayout>

‎sample/src/main/res/layout/item_spot.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<!-- https://qiita.com/ntsk/items/dac92596742e18470a55 -->
4-
<android.support.v7.widget.CardView
4+
<androidx.cardview.widget.CardView
55
xmlns:android="http://schemas.android.com/apk/res/android"
66
xmlns:app="http://schemas.android.com/apk/res-auto"
77
android:layout_width="match_parent"
@@ -86,4 +86,4 @@
8686
android:layout_height="match_parent">
8787
</FrameLayout>
8888

89-
</android.support.v7.widget.CardView>
89+
</androidx.cardview.widget.CardView>

0 commit comments

Comments
 (0)