Skip to content

Commit 4e0d29b

Browse files
author
Denis Chuvasov
committed
migration to AndroidX
1 parent d14fbbb commit 4e0d29b

9 files changed

Lines changed: 31 additions & 32 deletions

File tree

app/src/main/java/com/loopeer/test/itemtouchhelperextension/DividerItemDecoration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import android.graphics.Canvas;
2121
import android.graphics.Paint;
2222
import android.graphics.Rect;
23-
import android.support.v4.content.ContextCompat;
24-
import android.support.v4.view.ViewCompat;
25-
import android.support.v7.widget.LinearLayoutManager;
26-
import android.support.v7.widget.RecyclerView;
23+
import androidx.core.content.ContextCompat;
24+
import androidx.core.view.ViewCompat;
25+
import androidx.recyclerview.widget.LinearLayoutManager;
26+
import androidx.recyclerview.widget.RecyclerView;
2727
import android.view.View;
2828

2929
public class DividerItemDecoration extends RecyclerView.ItemDecoration {

app/src/main/java/com/loopeer/test/itemtouchhelperextension/ItemTouchHelperCallback.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
package com.loopeer.test.itemtouchhelperextension;
33

44
import android.graphics.Canvas;
5-
import android.support.v7.widget.RecyclerView;
6-
import android.support.v7.widget.helper.ItemTouchHelper;
5+
import androidx.recyclerview.widget.RecyclerView;
6+
import androidx.recyclerview.widget.ItemTouchHelper;
77

88
import com.loopeer.itemtouchhelperextension.ItemTouchHelperExtension;
99

app/src/main/java/com/loopeer/test/itemtouchhelperextension/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.loopeer.test.itemtouchhelperextension;
22

3-
import android.support.v7.app.AppCompatActivity;
3+
import androidx.appcompat.app.AppCompatActivity;
44
import android.os.Bundle;
5-
import android.support.v7.widget.LinearLayoutManager;
6-
import android.support.v7.widget.RecyclerView;
5+
import androidx.recyclerview.widget.LinearLayoutManager;
6+
import androidx.recyclerview.widget.RecyclerView;
77
import android.view.Menu;
88
import android.view.MenuItem;
99

app/src/main/java/com/loopeer/test/itemtouchhelperextension/MainRecyclerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.loopeer.test.itemtouchhelperextension;
22

33
import android.content.Context;
4-
import android.support.v4.view.MotionEventCompat;
5-
import android.support.v7.widget.RecyclerView;
4+
import androidx.core.view.MotionEventCompat;
5+
import androidx.recyclerview.widget.RecyclerView;
66
import android.view.LayoutInflater;
77
import android.view.MotionEvent;
88
import android.view.View;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.RecyclerView
2+
<androidx.recyclerview.widget.RecyclerView
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:id="@+id/recycler_main"
55
android:layout_width="match_parent"

build.gradle

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,12 @@ ext {
3939
versionName : '1.0.0',
4040
]
4141

42-
supportLibraryVersion = '26.1.0'
43-
constraintVersion = '1.1.0-beta1'
4442
flexboxVersion = '0.3.0'
4543

46-
libs = [appcompatV7 : "com.android.support:appcompat-v7:$supportLibraryVersion",
47-
supportV4 : "com.android.support:support-v4:$supportLibraryVersion",
48-
recyclerView : "com.android.support:recyclerview-v7:$supportLibraryVersion",
49-
cardview : "com.android.support:cardview-v7:$supportLibraryVersion",
50-
design : "com.android.support:design:$supportLibraryVersion",
51-
constraintLayout: "com.android.support.constraint:constraint-layout:$constraintVersion",
44+
libs = [appcompatV7 : 'androidx.appcompat:appcompat:1.0.0',
45+
recyclerView : "androidx.recyclerview:recyclerview:1.0.0",
46+
cardview : "androidx.cardview:cardview:1.0.0",
47+
design : 'com.google.android.material:material:1.0.0',
48+
constraintLayout: "androidx.constraintlayout:constraintlayout:1.1.3",
5249
]
5350
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true

itemtouchhelperextension/src/main/java/com/loopeer/itemtouchhelperextension/ItemTouchHelperExtension.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
import android.graphics.Canvas;
99
import android.graphics.Rect;
1010
import android.os.Build;
11-
import android.support.annotation.Nullable;
12-
import android.support.v4.view.GestureDetectorCompat;
13-
import android.support.v4.view.MotionEventCompat;
14-
import android.support.v4.view.VelocityTrackerCompat;
15-
import android.support.v4.view.ViewCompat;
16-
import android.support.v7.widget.RecyclerView;
17-
import android.support.v7.widget.RecyclerView.ViewHolder;
18-
import android.support.v7.widget.helper.ItemTouchUIUtil;
11+
import androidx.annotation.Nullable;
12+
import androidx.core.view.GestureDetectorCompat;
13+
import androidx.core.view.MotionEventCompat;
14+
import androidx.core.view.VelocityTrackerCompat;
15+
import androidx.core.view.ViewCompat;
16+
import androidx.recyclerview.widget.RecyclerView;
17+
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
18+
import androidx.recyclerview.widget.ItemTouchUIUtil;
1919
import android.util.Log;
2020
import android.view.*;
2121
import android.view.animation.AccelerateDecelerateInterpolator;

itemtouchhelperextension/src/main/java/com/loopeer/itemtouchhelperextension/ItemTouchUIUtilImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package com.loopeer.itemtouchhelperextension;
1818

1919
import android.graphics.Canvas;
20-
import android.support.v4.view.ViewCompat;
21-
import android.support.v7.widget.RecyclerView;
22-
import android.support.v7.widget.helper.ItemTouchHelper;
23-
import android.support.v7.widget.helper.ItemTouchUIUtil;
20+
import androidx.core.view.ViewCompat;
21+
import androidx.recyclerview.widget.RecyclerView;
22+
import androidx.recyclerview.widget.ItemTouchHelper;
23+
import androidx.recyclerview.widget.ItemTouchUIUtil;
2424
import android.view.View;
2525

2626

0 commit comments

Comments
 (0)