1. Merge remote-tracking branch 'remotes/remote/master' into androidx

2. fix bug 3. add diffutil to androidx
CymChad · Jul 21, 2019 · 5d4379e · 5d4379e
1 parent 29d270c
commit 5d4379e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId "com.chad.baserecyclerviewadapterhelper"
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 28
         versionCode 5
         versionName "2.1"
@@ -28,7 +28,7 @@ dependencies {
     implementation project(path: ':library')
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'com.kyleduo.switchbutton:library:2.0.0'
     implementation 'com.orhanobut:logger:2.2.0'
 }
diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/DiffUtilActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/DiffUtilActivity.java
@@ -1,12 +1,14 @@
 package com.chad.baserecyclerviewadapterhelper;
 
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.chad.baserecyclerviewadapterhelper.adapter.diffUtil.DiffDemoCallback;
 import com.chad.baserecyclerviewadapterhelper.adapter.diffUtil.DiffUtilAdapter;
 import com.chad.baserecyclerviewadapterhelper.base.BaseActivity;

diff --git a/...c/main/java/com/chad/baserecyclerviewadapterhelper/adapter/diffUtil/DiffDemoCallback.java b/...c/main/java/com/chad/baserecyclerviewadapterhelper/adapter/diffUtil/DiffDemoCallback.java
@@ -1,7 +1,9 @@
 package com.chad.baserecyclerviewadapterhelper.adapter.diffUtil;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.chad.baserecyclerviewadapterhelper.entity.DiffUtilDemoEntity;
 import com.chad.library.adapter.base.diff.BaseQuickDiffCallback;

diff --git a/...rc/main/java/com/chad/baserecyclerviewadapterhelper/adapter/diffUtil/DiffUtilAdapter.java b/...rc/main/java/com/chad/baserecyclerviewadapterhelper/adapter/diffUtil/DiffUtilAdapter.java
@@ -1,6 +1,7 @@
 package com.chad.baserecyclerviewadapterhelper.adapter.diffUtil;
 
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import com.chad.baserecyclerviewadapterhelper.R;
 import com.chad.baserecyclerviewadapterhelper.entity.DiffUtilDemoEntity;

diff --git a/...m/chad/baserecyclerviewadapterhelper/decoration/GridSectionMultiAvgGapItemDecoration.java b/...m/chad/baserecyclerviewadapterhelper/decoration/GridSectionMultiAvgGapItemDecoration.java
@@ -2,17 +2,19 @@
 
 import android.graphics.Rect;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.LongSparseArray;
 import android.util.TypedValue;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.chad.library.adapter.base.BaseSectionMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.chad.library.adapter.base.entity.SectionMultiEntity;

diff --git a/app/src/main/res/layout/activity_diffutil.xml b/app/src/main/res/layout/activity_diffutil.xml
@@ -5,12 +5,12 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/diff_rv"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/library/build.gradle b/library/build.gradle
@@ -3,7 +3,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"

diff --git a/.../src/main/java/com/chad/library/adapter/base/diff/BaseQuickAdapterListUpdateCallback.java b/.../src/main/java/com/chad/library/adapter/base/diff/BaseQuickAdapterListUpdateCallback.java
@@ -1,8 +1,9 @@
 package com.chad.library.adapter.base.diff;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.util.ListUpdateCallback;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.ListUpdateCallback;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;