Skip to content

Commit c03d12a

Browse files
mcxiaokemcxiaoke
authored
Merge pull request #18 from emanonwzy/upgrade
enhance: migrate to androidx
2 parents 5341e3e + 25bc666 commit c03d12a

File tree

18 files changed

+70
-70
lines changed

18 files changed

+70
-70
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.support_version = '28.0.0'
3+
ext.androidx_version = '1.0.0'
44

55
repositories {
66
jcenter()

‎gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ ANDROID_BUILD_TOOLS_VERSION=29.0.2
1919
ANDROID_BUILD_SDK_VERSION=29
2020

2121
ANDROID_BUILD_MIN_SDK_VERSION=21
22+
android.useAndroidX=true
23+
android.enableJetifier=true

‎http/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
testImplementation 'com.google.code.gson:gson:2.8.6'
1010
testImplementation 'junit:junit:4.12'
1111
testImplementation 'org.mockito:mockito-core:2.18.3'
12-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
12+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
1313
androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
1414
}
1515

‎recycler/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
apply plugin: 'com.android.library'
22

33
dependencies {
4-
implementation "com.android.support:support-v4:$support_version"
5-
implementation "com.android.support:recyclerview-v7:$support_version"
4+
implementation "androidx.recyclerview:recyclerview:1.0.0"
65

76
implementation project(":core")
87
implementation project(":ui")

‎recycler/src/main/java/com/mcxiaoke/next/recycler/AdvancedRecyclerAdapter.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.mcxiaoke.next.recycler;
22

33
import android.os.Handler;
4-
import android.support.annotation.LayoutRes;
5-
import android.support.annotation.NonNull;
6-
import android.support.v7.widget.RecyclerView;
7-
import android.support.v7.widget.RecyclerView.Adapter;
8-
import android.support.v7.widget.RecyclerView.AdapterDataObserver;
9-
import android.support.v7.widget.RecyclerView.ViewHolder;
104
import android.util.Log;
115
import android.view.ViewGroup;
6+
7+
import androidx.annotation.LayoutRes;
8+
import androidx.annotation.NonNull;
9+
import androidx.recyclerview.widget.RecyclerView;
10+
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
11+
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
12+
1213
import com.mcxiaoke.next.recycler.AdvancedRecyclerView.ItemViewHolder;
1314
import com.mcxiaoke.next.recycler.AdvancedRecyclerView.ViewHolderCreator;
1415
import com.mcxiaoke.next.recycler.AdvancedRecyclerView.SimpleViewHolderCreator;
@@ -158,7 +159,7 @@ public int removeFooter(ViewHolderCreator footer) {
158159
return index;
159160
}
160161

161-
public Adapter getWrapped() {
162+
public RecyclerView.Adapter getWrapped() {
162163
return mWrapped;
163164
}
164165

‎recycler/src/main/java/com/mcxiaoke/next/recycler/AdvancedRecyclerArrayAdapter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
package com.mcxiaoke.next.recycler;
1717

18-
import android.support.annotation.NonNull;
19-
import android.support.annotation.Nullable;
20-
import android.support.v7.util.DiffUtil;
21-
import android.support.v7.widget.RecyclerView;
18+
import androidx.annotation.NonNull;
19+
import androidx.annotation.Nullable;
20+
import androidx.recyclerview.widget.DiffUtil;
21+
import androidx.recyclerview.widget.RecyclerView;
2222

2323
import java.util.ArrayList;
2424
import java.util.Arrays;
@@ -29,7 +29,7 @@
2929

3030
/**
3131
* Simple {@link RecyclerView.Adapter} implementation analog to {@link android.widget.ArrayAdapter}
32-
* for {@link android.support.v7.widget.RecyclerView}. Holds to a list of objects of type {@link T}
32+
* for {@link androidx.recyclerview.widget.RecyclerView}. Holds to a list of objects of type {@link T}
3333
*
3434
* @param <T> item type (a immutable pojo works best)
3535
* @param <VH> {@link RecyclerView.ViewHolder} for item {@link T}
@@ -217,7 +217,7 @@ public void insert(@NonNull T object, int index) {
217217
* DiffUtil uses this method to check equality instead of {@link Object#equals(Object)}
218218
* so that you can change its behavior depending on your UI.
219219
* For example, if you are using DiffUtil with a
220-
* {@link android.support.v7.widget.RecyclerView.Adapter RecyclerView.Adapter}, you should
220+
* {@link androidx.recyclerview.widget.RecyclerView.Adapter RecyclerView.Adapter}, you should
221221
* return whether the items' visual representations are the same.
222222
* <p>
223223
* This method is called only if {@link #isItemTheSame(Object, Object)} returns

‎recycler/src/main/java/com/mcxiaoke/next/recycler/AdvancedRecyclerView.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.mcxiaoke.next.recycler;
22

33
import android.content.Context;
4-
import android.support.annotation.LayoutRes;
5-
import android.support.annotation.Nullable;
6-
import android.support.v7.widget.LinearLayoutManager;
7-
import android.support.v7.widget.RecyclerView;
84
import android.util.AttributeSet;
95
import android.view.LayoutInflater;
10-
import android.view.MotionEvent;
116
import android.view.View;
127
import android.view.ViewGroup;
8+
9+
import androidx.annotation.LayoutRes;
10+
import androidx.annotation.Nullable;
11+
import androidx.recyclerview.widget.LinearLayoutManager;
12+
import androidx.recyclerview.widget.RecyclerView;
13+
1314
import com.mcxiaoke.next.utils.LogUtils;
1415

1516
/**

‎recycler/src/main/java/com/mcxiaoke/next/recycler/HeaderFooterRecyclerAdapter.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.mcxiaoke.next.recycler;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.v7.widget.RecyclerView;
5-
import android.support.v7.widget.RecyclerView.ViewHolder;
63
import android.util.Log;
74
import android.view.ViewGroup;
85

6+
import androidx.annotation.NonNull;
7+
import androidx.recyclerview.widget.RecyclerView;
8+
99
@SuppressWarnings("WeakerAccess")
1010
abstract class HeaderFooterRecyclerAdapter
1111
extends RecyclerView.Adapter {
@@ -25,7 +25,7 @@ abstract class HeaderFooterRecyclerAdapter
2525
*/
2626
@NonNull
2727
@Override
28-
public final ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
28+
public final RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
2929
Log.v(TAG, "onCreateViewHolder() viewType=" + viewType
3030
+ " headerItemCount=" + headerItemCount
3131
+ " contentItemCount=" + contentItemCount
@@ -47,7 +47,7 @@ public final ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewTy
4747
* {@inheritDoc}
4848
*/
4949
@Override
50-
public final void onBindViewHolder(@NonNull ViewHolder holder, int position) {
50+
public final void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
5151
Log.v(TAG, "onBindViewHolder() position=" + position
5252
+ " headerItemCount=" + headerItemCount
5353
+ " contentItemCount=" + contentItemCount
@@ -468,7 +468,7 @@ protected int getContentItemViewType(int position) {
468468
* @param viewType the view type for the header.
469469
* @return the view holder.
470470
*/
471-
protected abstract ViewHolder onCreateHeaderItemViewHolder(ViewGroup parent, int viewType);
471+
protected abstract RecyclerView.ViewHolder onCreateHeaderItemViewHolder(ViewGroup parent, int viewType);
472472

473473
/**
474474
* This method works exactly the same as {@link #onCreateViewHolder(ViewGroup, int)}, but for footer items.
@@ -477,7 +477,7 @@ protected int getContentItemViewType(int position) {
477477
* @param viewType the view type for the footer.
478478
* @return the view holder.
479479
*/
480-
protected abstract ViewHolder onCreateFooterItemViewHolder(ViewGroup parent, int viewType);
480+
protected abstract RecyclerView.ViewHolder onCreateFooterItemViewHolder(ViewGroup parent, int viewType);
481481

482482
/**
483483
* This method works exactly the same as {@link #onCreateViewHolder(ViewGroup, int)}, but for content items.
@@ -486,30 +486,30 @@ protected int getContentItemViewType(int position) {
486486
* @param viewType the view type for the content.
487487
* @return the view holder.
488488
*/
489-
protected abstract ViewHolder onCreateContentItemViewHolder(ViewGroup parent, int viewType);
489+
protected abstract RecyclerView.ViewHolder onCreateContentItemViewHolder(ViewGroup parent, int viewType);
490490

491491
/**
492-
* This method works exactly the same as {@link #onBindViewHolder(ViewHolder, int)}, but for header items.
492+
* This method works exactly the same as {@link #onBindViewHolder(RecyclerView.ViewHolder, int)}, but for header items.
493493
*
494494
* @param holder the view holder for the header item.
495495
* @param position the position.
496496
*/
497-
protected abstract void onBindHeaderItemViewHolder(ViewHolder holder, int position);
497+
protected abstract void onBindHeaderItemViewHolder(RecyclerView.ViewHolder holder, int position);
498498

499499
/**
500-
* This method works exactly the same as {@link #onBindViewHolder(ViewHolder, int)}, but for footer items.
500+
* This method works exactly the same as {@link #onBindViewHolder(RecyclerView.ViewHolder, int)}, but for footer items.
501501
*
502502
* @param holder the view holder for the footer item.
503503
* @param position the position.
504504
*/
505-
protected abstract void onBindFooterItemViewHolder(ViewHolder holder, int position);
505+
protected abstract void onBindFooterItemViewHolder(RecyclerView.ViewHolder holder, int position);
506506

507507
/**
508-
* This method works exactly the same as {@link #onBindViewHolder(ViewHolder, int)}, but for content items.
508+
* This method works exactly the same as {@link #onBindViewHolder(RecyclerView.ViewHolder, int)}, but for content items.
509509
*
510510
* @param holder the view holder for the content item.
511511
* @param position the position.
512512
*/
513-
protected abstract void onBindContentItemViewHolder(ViewHolder holder, int position);
513+
protected abstract void onBindContentItemViewHolder(RecyclerView.ViewHolder holder, int position);
514514

515515
}

‎samples/build.gradle‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ dependencies {
88
implementation project(":ui")
99
implementation project(":recycler")
1010
implementation 'com.mcxiaoke.volley:library:1.0.18'
11-
implementation "com.jakewharton:butterknife:8.8.1"
12-
implementation "com.android.support:support-v4:$support_version"
13-
implementation "com.android.support:recyclerview-v7:$support_version"
14-
implementation "com.android.support:appcompat-v7:$support_version"
15-
implementation "com.android.support:design:$support_version"
11+
implementation "com.jakewharton:butterknife:10.0.0"
12+
implementation "androidx.recyclerview:recyclerview:$androidx_version"
13+
implementation "androidx.appcompat:appcompat:$androidx_version"
14+
implementation "com.google.android.material:material:$androidx_version"
1615
implementation 'com.google.code.gson:gson:2.8.6'
1716
implementation 'io.reactivex:rxjava:1.0.12'
1817
implementation 'io.reactivex:rxandroid:0.25.0'
1918

20-
annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"
19+
annotationProcessor "com.jakewharton:butterknife-compiler:10.0.0"
2120
}
2221

2322
android {

‎samples/src/main/java/com/mcxiaoke/next/samples/MotionTrackListView.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.annotation.SuppressLint;
44
import android.content.Context;
5-
import android.support.v4.view.MotionEventCompat;
5+
import androidx.core.view.MotionEventCompat;
66
import android.util.AttributeSet;
77
import android.util.Log;
88
import android.view.GestureDetector;

0 commit comments

Comments
 (0)