From 7f028afa1210c1672c5e20be7f52297624ef1a0b Mon Sep 17 00:00:00 2001 From: Allen Date: Tue, 18 Sep 2018 13:33:29 +0800 Subject: [PATCH] AndroidX refactoring --- app/build.gradle | 10 ++++----- .../AnimationUseActivity.java | 4 ++-- .../DataBindingUseActivity.java | 4 ++-- .../EmptyViewUseActivity.java | 4 ++-- .../ExpandableUseActivity.java | 4 ++-- .../HeaderAndFooterUseActivity.java | 4 ++-- .../HomeActivity.java | 6 ++--- .../ItemClickActivity.java | 4 ++-- .../ItemDragAndSwipeUseActivity.java | 8 +++---- .../MultipleItemRvAdapterUseActivity.java | 7 ++---- .../MultipleItemUseActivity.java | 8 +++---- .../PullToRefreshUseActivity.java | 6 ++--- .../SectionMultipleItemUseActivity.java | 4 ++-- .../SectionUseActivity.java | 4 ++-- .../UpFetchUseActivity.java | 4 ++-- .../WelcomeActivity.java | 2 +- .../adapter/DataBindingUseAdapter.java | 4 ++-- .../adapter/DefAdpater.java | 4 +--- .../adapter/DemoMultipleItemRvAdapter.java | 2 +- .../adapter/ItemClickAdapter.java | 4 ++-- .../base/BaseActivity.java | 4 ++-- .../base/BaseBindingViewHolder.java | 2 +- .../base/BaseDataBindingAdapter.java | 8 +++---- .../decoration/GridItemDecoration.java | 4 ++-- .../util/SpannableStringUtils.java | 8 +++---- .../util/ToastUtils.java | 2 +- .../main/res/layout/activity_adapter_use.xml | 2 +- ...activity_choose_multiple_item_use_type.xml | 8 +++---- .../res/layout/activity_data_binding_use.xml | 2 +- .../res/layout/activity_empty_view_use.xml | 4 ++-- .../layout/activity_expandable_item_use.xml | 2 +- .../layout/activity_header_and_footer_use.xml | 2 +- app/src/main/res/layout/activity_home.xml | 2 +- .../main/res/layout/activity_item_click.xml | 2 +- .../res/layout/activity_item_touch_use.xml | 2 +- app/src/main/res/layout/activity_main.xml | 6 ++--- .../res/layout/activity_multiple_item_use.xml | 2 +- .../main/res/layout/activity_section_uer.xml | 2 +- app/src/main/res/layout/def_section_head.xml | 4 ++-- app/src/main/res/layout/home_item_view.xml | 4 ++-- .../res/layout/item_header_and_footer.xml | 4 ++-- app/src/main/res/layout/item_image_view.xml | 4 ++-- .../main/res/layout/item_img_text_view.xml | 4 ++-- app/src/main/res/layout/item_movie.xml | 6 ++--- app/src/main/res/layout/item_nest_click.xml | 2 +- .../main/res/layout/item_section_content.xml | 4 ++-- app/src/main/res/layout/item_text_view.xml | 4 ++-- app/src/main/res/layout/layout_animation.xml | 4 ++-- app/src/main/res/layout/toolbar_layout.xml | 4 ++-- build.gradle | 3 +-- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 6 ++--- .../base/BaseItemDraggableAdapter.java | 8 +++---- .../base/BaseMultiItemQuickAdapter.java | 6 ++--- .../adapter/base/BaseQuickAdapter.java | 22 +++++++++---------- .../BaseSectionMultiItemQuickAdapter.java | 4 ++-- .../library/adapter/base/BaseViewHolder.java | 10 ++++----- .../adapter/base/MultipleItemRvAdapter.java | 2 +- .../callback/ItemDragAndSwipeCallback.java | 4 ++-- .../base/listener/OnItemDragListener.java | 2 +- .../base/listener/OnItemSwipeListener.java | 2 +- .../base/listener/SimpleClickListener.java | 4 ++-- .../adapter/base/loadmore/LoadMoreView.java | 4 ++-- .../adapter/base/util/MultiTypeDelegate.java | 2 +- 65 files changed, 141 insertions(+), 147 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1b12b7606..939651f84 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.chad.baserecyclerviewadapterhelper" minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 5 versionName "2.1" } @@ -28,9 +28,9 @@ dependencies { implementation project(path: ':library') implementation project(':material-spinner-1.0.5') implementation 'com.github.bumptech.glide:glide:3.7.0' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.google.android.material:material:1.0.0-rc02' + implementation 'androidx.cardview:cardview:1.0.0-rc02' + implementation 'androidx.appcompat:appcompat:1.0.0-rc02' implementation 'com.kyleduo.switchbutton:library:2.0.0' implementation 'com.orhanobut:logger:2.1.1' } diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/AnimationUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/AnimationUseActivity.java index dad382d42..a8e83267d 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/AnimationUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/AnimationUseActivity.java @@ -2,8 +2,8 @@ import android.app.Activity; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.CompoundButton; import android.widget.ImageView; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/DataBindingUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/DataBindingUseActivity.java index 3acf9acbb..984e1125c 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/DataBindingUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/DataBindingUseActivity.java @@ -1,8 +1,8 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.baserecyclerviewadapterhelper.adapter.DataBindingUseAdapter; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/EmptyViewUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/EmptyViewUseActivity.java index 59b01d54b..57163bdf5 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/EmptyViewUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/EmptyViewUseActivity.java @@ -2,8 +2,8 @@ import android.os.Bundle; import android.os.Handler; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ExpandableUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ExpandableUseActivity.java index 5afccd64e..3bacfdeb6 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ExpandableUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ExpandableUseActivity.java @@ -1,8 +1,8 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.chad.baserecyclerviewadapterhelper.adapter.ExpandableItemAdapter; import com.chad.baserecyclerviewadapterhelper.base.BaseActivity; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HeaderAndFooterUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HeaderAndFooterUseActivity.java index fba78f959..ce4bbcd05 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HeaderAndFooterUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HeaderAndFooterUseActivity.java @@ -1,8 +1,8 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HomeActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HomeActivity.java index 5e8f58d0a..e675ff593 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HomeActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HomeActivity.java @@ -2,9 +2,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ItemClickActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ItemClickActivity.java index a8f97b1ea..f00fe7f8a 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ItemClickActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ItemClickActivity.java @@ -1,8 +1,8 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ItemDragAndSwipeUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ItemDragAndSwipeUseActivity.java index 9d9abcb52..3fc1e45f0 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ItemDragAndSwipeUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/ItemDragAndSwipeUseActivity.java @@ -4,10 +4,10 @@ import android.graphics.Color; import android.graphics.Paint; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemRvAdapterUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemRvAdapterUseActivity.java index 099522b98..ddd5bd346 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemRvAdapterUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemRvAdapterUseActivity.java @@ -1,11 +1,8 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.util.Log; -import android.view.View; -import android.widget.Toast; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.chad.baserecyclerviewadapterhelper.adapter.DemoMultipleItemRvAdapter; import com.chad.baserecyclerviewadapterhelper.base.BaseActivity; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemUseActivity.java index 9bbfd0606..a6c89d339 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemUseActivity.java @@ -1,11 +1,9 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.view.ViewGroup; + +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.chad.baserecyclerviewadapterhelper.adapter.MultipleItemQuickAdapter; import com.chad.baserecyclerviewadapterhelper.base.BaseActivity; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java index e0dd04a1d..7f4d38157 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java @@ -4,9 +4,9 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/SectionMultipleItemUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/SectionMultipleItemUseActivity.java index 4207d4087..2155ea7b7 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/SectionMultipleItemUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/SectionMultipleItemUseActivity.java @@ -1,8 +1,8 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/SectionUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/SectionUseActivity.java index ae2987524..03f759395 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/SectionUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/SectionUseActivity.java @@ -1,8 +1,8 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/UpFetchUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/UpFetchUseActivity.java index 22f9438e2..92fe89263 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/UpFetchUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/UpFetchUseActivity.java @@ -1,8 +1,8 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.chad.baserecyclerviewadapterhelper.adapter.UpFetchAdapter; import com.chad.baserecyclerviewadapterhelper.base.BaseActivity; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/WelcomeActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/WelcomeActivity.java index ec0f87a2b..f7b939b56 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/WelcomeActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/WelcomeActivity.java @@ -3,7 +3,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; public class WelcomeActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DataBindingUseAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DataBindingUseAdapter.java index 6e5459927..f24c3060e 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DataBindingUseAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DataBindingUseAdapter.java @@ -1,7 +1,7 @@ package com.chad.baserecyclerviewadapterhelper.adapter; -import android.databinding.DataBindingUtil; -import android.databinding.ViewDataBinding; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ViewDataBinding; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DefAdpater.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DefAdpater.java index f840345c9..2a4978f81 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DefAdpater.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DefAdpater.java @@ -1,14 +1,12 @@ package com.chad.baserecyclerviewadapterhelper.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; -import com.bumptech.glide.Glide; import com.chad.baserecyclerviewadapterhelper.R; import com.chad.baserecyclerviewadapterhelper.data.DataServer; import com.chad.baserecyclerviewadapterhelper.entity.Status; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DemoMultipleItemRvAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DemoMultipleItemRvAdapter.java index 40b0e1bdd..fa4e109d9 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DemoMultipleItemRvAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DemoMultipleItemRvAdapter.java @@ -1,6 +1,6 @@ package com.chad.baserecyclerviewadapterhelper.adapter; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.chad.baserecyclerviewadapterhelper.adapter.provider.ImgItemProvider; import com.chad.baserecyclerviewadapterhelper.adapter.provider.TextImgItemProvider; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/ItemClickAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/ItemClickAdapter.java index 1769b1ca9..f791f683b 100755 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/ItemClickAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/ItemClickAdapter.java @@ -1,7 +1,7 @@ package com.chad.baserecyclerviewadapterhelper.adapter; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseActivity.java index 27dd52edc..1e54dc9e4 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseActivity.java @@ -2,8 +2,8 @@ import android.os.Build; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseBindingViewHolder.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseBindingViewHolder.java index e9ed97d0a..47e139c22 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseBindingViewHolder.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseBindingViewHolder.java @@ -1,6 +1,6 @@ package com.chad.baserecyclerviewadapterhelper.base; -import android.databinding.ViewDataBinding; +import androidx.databinding.ViewDataBinding; import android.view.View; import com.chad.library.adapter.base.BaseViewHolder; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseDataBindingAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseDataBindingAdapter.java index 0fbf329e2..ab0932f2b 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseDataBindingAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseDataBindingAdapter.java @@ -1,9 +1,9 @@ package com.chad.baserecyclerviewadapterhelper.base; -import android.databinding.DataBindingUtil; -import android.databinding.ViewDataBinding; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ViewDataBinding; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridItemDecoration.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridItemDecoration.java index c1b3e0de3..f14536f8b 100755 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridItemDecoration.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridItemDecoration.java @@ -4,8 +4,8 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/util/SpannableStringUtils.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/util/SpannableStringUtils.java index 48103c66f..88aa180fa 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/util/SpannableStringUtils.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/util/SpannableStringUtils.java @@ -5,10 +5,10 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Layout.Alignment; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/util/ToastUtils.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/util/ToastUtils.java index ca7b920b2..262299e81 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/util/ToastUtils.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/util/ToastUtils.java @@ -2,7 +2,7 @@ import android.os.Handler; import android.os.Looper; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.widget.Toast; public class ToastUtils { diff --git a/app/src/main/res/layout/activity_adapter_use.xml b/app/src/main/res/layout/activity_adapter_use.xml index 31c2f5bb0..4dd6a9982 100644 --- a/app/src/main/res/layout/activity_adapter_use.xml +++ b/app/src/main/res/layout/activity_adapter_use.xml @@ -63,7 +63,7 @@ - - - + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_data_binding_use.xml b/app/src/main/res/layout/activity_data_binding_use.xml index 68c31c7c0..ce25cac00 100644 --- a/app/src/main/res/layout/activity_data_binding_use.xml +++ b/app/src/main/res/layout/activity_data_binding_use.xml @@ -7,7 +7,7 @@ android:background="@color/bg" tools:context="com.chad.baserecyclerviewadapterhelper.DataBindingUseActivity"> - - - - diff --git a/app/src/main/res/layout/activity_header_and_footer_use.xml b/app/src/main/res/layout/activity_header_and_footer_use.xml index a028223ca..609fe08b5 100644 --- a/app/src/main/res/layout/activity_header_and_footer_use.xml +++ b/app/src/main/res/layout/activity_header_and_footer_use.xml @@ -5,7 +5,7 @@ android:background="@color/bg" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 549e55ebd..7aa764211 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -6,7 +6,7 @@ android:background="@color/bg" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/activity_item_click.xml b/app/src/main/res/layout/activity_item_click.xml index 0a941e2a6..f2251d0f0 100644 --- a/app/src/main/res/layout/activity_item_click.xml +++ b/app/src/main/res/layout/activity_item_click.xml @@ -9,7 +9,7 @@ android:focusableInTouchMode="true" tools:context="com.chad.baserecyclerviewadapterhelper.ItemClickActivity"> - diff --git a/app/src/main/res/layout/activity_item_touch_use.xml b/app/src/main/res/layout/activity_item_touch_use.xml index 111125cf2..abf752a92 100644 --- a/app/src/main/res/layout/activity_item_touch_use.xml +++ b/app/src/main/res/layout/activity_item_touch_use.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/bg" > - - - + diff --git a/app/src/main/res/layout/activity_multiple_item_use.xml b/app/src/main/res/layout/activity_multiple_item_use.xml index 35f3f927e..d8d109bf3 100644 --- a/app/src/main/res/layout/activity_multiple_item_use.xml +++ b/app/src/main/res/layout/activity_multiple_item_use.xml @@ -7,7 +7,7 @@ android:background="@color/bg" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/activity_section_uer.xml b/app/src/main/res/layout/activity_section_uer.xml index cb4608c04..7c11364cb 100644 --- a/app/src/main/res/layout/activity_section_uer.xml +++ b/app/src/main/res/layout/activity_section_uer.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:background="@color/bg" tools:context=".SectionUseActivity"> - diff --git a/app/src/main/res/layout/def_section_head.xml b/app/src/main/res/layout/def_section_head.xml index 8ba2cc8e0..d4c376845 100755 --- a/app/src/main/res/layout/def_section_head.xml +++ b/app/src/main/res/layout/def_section_head.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/main/res/layout/home_item_view.xml b/app/src/main/res/layout/home_item_view.xml index 6d0cb5151..21842a60b 100755 --- a/app/src/main/res/layout/home_item_view.xml +++ b/app/src/main/res/layout/home_item_view.xml @@ -6,7 +6,7 @@ android:gravity="center" android:orientation="horizontal"> - - + diff --git a/app/src/main/res/layout/item_header_and_footer.xml b/app/src/main/res/layout/item_header_and_footer.xml index c47aa912b..953e276a5 100644 --- a/app/src/main/res/layout/item_header_and_footer.xml +++ b/app/src/main/res/layout/item_header_and_footer.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/item_image_view.xml b/app/src/main/res/layout/item_image_view.xml index 13a6f136e..96989bae3 100644 --- a/app/src/main/res/layout/item_image_view.xml +++ b/app/src/main/res/layout/item_image_view.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_img_text_view.xml b/app/src/main/res/layout/item_img_text_view.xml index 07b69c94a..ecb16ada3 100644 --- a/app/src/main/res/layout/item_img_text_view.xml +++ b/app/src/main/res/layout/item_img_text_view.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_movie.xml b/app/src/main/res/layout/item_movie.xml index 1fdc07f3c..c4b604452 100644 --- a/app/src/main/res/layout/item_movie.xml +++ b/app/src/main/res/layout/item_movie.xml @@ -13,7 +13,7 @@ type="com.chad.baserecyclerviewadapterhelper.entity.MoviePresenter"/> - - - + diff --git a/app/src/main/res/layout/item_nest_click.xml b/app/src/main/res/layout/item_nest_click.xml index d114dd1bd..6a5159ba4 100644 --- a/app/src/main/res/layout/item_nest_click.xml +++ b/app/src/main/res/layout/item_nest_click.xml @@ -7,7 +7,7 @@ android:layout_height="wrap_content" android:background="@color/bg" > - diff --git a/app/src/main/res/layout/item_section_content.xml b/app/src/main/res/layout/item_section_content.xml index c6d9ba0c1..1e7a7af4b 100644 --- a/app/src/main/res/layout/item_section_content.xml +++ b/app/src/main/res/layout/item_section_content.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_text_view.xml b/app/src/main/res/layout/item_text_view.xml index ff68f4738..0aa9a53c6 100644 --- a/app/src/main/res/layout/item_text_view.xml +++ b/app/src/main/res/layout/item_text_view.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_animation.xml b/app/src/main/res/layout/layout_animation.xml index d6dab42f9..0cdf26db1 100755 --- a/app/src/main/res/layout/layout_animation.xml +++ b/app/src/main/res/layout/layout_animation.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml index bd657b040..9b760d57b 100644 --- a/app/src/main/res/layout/toolbar_layout.xml +++ b/app/src/main/res/layout/toolbar_layout.xml @@ -1,5 +1,5 @@ - - + diff --git a/build.gradle b/build.gradle index 7afb913f3..9462fcb3c 100644 --- a/build.gradle +++ b/build.gradle @@ -4,10 +4,9 @@ buildscript { google() mavenLocal() mavenCentral() - } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.3.0-alpha10' } } diff --git a/gradle.properties b/gradle.properties index 780b865cd..028ef0806 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,3 +19,5 @@ android.enableBuildCache=true android.enableD8=true android.buildCacheDir=./build/buildCache/ +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6b1884fa..7644afe1b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/library/build.gradle b/library/build.gradle index 159a7683e..3887ab6c7 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 11 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -48,5 +48,5 @@ artifacts { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - compileOnly 'com.android.support:recyclerview-v7:27.1.1' + compileOnly 'androidx.recyclerview:recyclerview:1.0.0-rc02' } diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseItemDraggableAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseItemDraggableAdapter.java index b5cd5d742..1813ff84c 100644 --- a/library/src/main/java/com/chad/library/adapter/base/BaseItemDraggableAdapter.java +++ b/library/src/main/java/com/chad/library/adapter/base/BaseItemDraggableAdapter.java @@ -1,10 +1,10 @@ package com.chad.library.adapter.base; import android.graphics.Canvas; -import android.support.annotation.NonNull; -import android.support.v4.view.MotionEventCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.core.view.MotionEventCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.MotionEvent; import android.view.View; diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseMultiItemQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseMultiItemQuickAdapter.java index 453f59dea..1fa86cfc4 100644 --- a/library/src/main/java/com/chad/library/adapter/base/BaseMultiItemQuickAdapter.java +++ b/library/src/main/java/com/chad/library/adapter/base/BaseMultiItemQuickAdapter.java @@ -1,8 +1,8 @@ package com.chad.library.adapter.base; -import android.support.annotation.IntRange; -import android.support.annotation.LayoutRes; -import android.util.Log; +import androidx.annotation.IntRange; +import androidx.annotation.LayoutRes; + import android.util.SparseIntArray; import android.view.ViewGroup; diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java index 9f4916cc2..bb54a0ad4 100755 --- a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java +++ b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java @@ -17,17 +17,17 @@ import android.animation.Animator; import android.content.Context; -import android.support.annotation.IdRes; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.LayoutParams; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.annotation.IdRes; +import androidx.annotation.IntDef; +import androidx.annotation.IntRange; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.LayoutParams; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseSectionMultiItemQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseSectionMultiItemQuickAdapter.java index 858baa08c..f96fc8a29 100644 --- a/library/src/main/java/com/chad/library/adapter/base/BaseSectionMultiItemQuickAdapter.java +++ b/library/src/main/java/com/chad/library/adapter/base/BaseSectionMultiItemQuickAdapter.java @@ -1,7 +1,7 @@ package com.chad.library.adapter.base; -import android.support.annotation.IntRange; -import android.support.annotation.LayoutRes; +import androidx.annotation.IntRange; +import androidx.annotation.LayoutRes; import android.util.SparseIntArray; import android.view.ViewGroup; diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseViewHolder.java b/library/src/main/java/com/chad/library/adapter/base/BaseViewHolder.java index be47b1335..eb9099cd5 100755 --- a/library/src/main/java/com/chad/library/adapter/base/BaseViewHolder.java +++ b/library/src/main/java/com/chad/library/adapter/base/BaseViewHolder.java @@ -20,11 +20,11 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.StringRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; import android.text.util.Linkify; import android.util.SparseArray; import android.view.View; diff --git a/library/src/main/java/com/chad/library/adapter/base/MultipleItemRvAdapter.java b/library/src/main/java/com/chad/library/adapter/base/MultipleItemRvAdapter.java index 5fc69f54c..0df4a1187 100644 --- a/library/src/main/java/com/chad/library/adapter/base/MultipleItemRvAdapter.java +++ b/library/src/main/java/com/chad/library/adapter/base/MultipleItemRvAdapter.java @@ -1,6 +1,6 @@ package com.chad.library.adapter.base; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.SparseArray; import android.view.View; diff --git a/library/src/main/java/com/chad/library/adapter/base/callback/ItemDragAndSwipeCallback.java b/library/src/main/java/com/chad/library/adapter/base/callback/ItemDragAndSwipeCallback.java index a4f8974a7..c89b496f4 100644 --- a/library/src/main/java/com/chad/library/adapter/base/callback/ItemDragAndSwipeCallback.java +++ b/library/src/main/java/com/chad/library/adapter/base/callback/ItemDragAndSwipeCallback.java @@ -1,8 +1,8 @@ package com.chad.library.adapter.base.callback; import android.graphics.Canvas; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.View; import com.chad.library.R; diff --git a/library/src/main/java/com/chad/library/adapter/base/listener/OnItemDragListener.java b/library/src/main/java/com/chad/library/adapter/base/listener/OnItemDragListener.java index 5c3cbe18a..490868662 100644 --- a/library/src/main/java/com/chad/library/adapter/base/listener/OnItemDragListener.java +++ b/library/src/main/java/com/chad/library/adapter/base/listener/OnItemDragListener.java @@ -1,6 +1,6 @@ package com.chad.library.adapter.base.listener; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; /** * Created by luoxw on 2016/6/20. diff --git a/library/src/main/java/com/chad/library/adapter/base/listener/OnItemSwipeListener.java b/library/src/main/java/com/chad/library/adapter/base/listener/OnItemSwipeListener.java index 9227a2c8c..8eee3d376 100644 --- a/library/src/main/java/com/chad/library/adapter/base/listener/OnItemSwipeListener.java +++ b/library/src/main/java/com/chad/library/adapter/base/listener/OnItemSwipeListener.java @@ -1,7 +1,7 @@ package com.chad.library.adapter.base.listener; import android.graphics.Canvas; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; /** * Created by luoxw on 2016/6/23. diff --git a/library/src/main/java/com/chad/library/adapter/base/listener/SimpleClickListener.java b/library/src/main/java/com/chad/library/adapter/base/listener/SimpleClickListener.java index 0ad31c3ed..ced038c47 100644 --- a/library/src/main/java/com/chad/library/adapter/base/listener/SimpleClickListener.java +++ b/library/src/main/java/com/chad/library/adapter/base/listener/SimpleClickListener.java @@ -1,8 +1,8 @@ package com.chad.library.adapter.base.listener; import android.os.Build; -import android.support.v4.view.GestureDetectorCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.view.GestureDetectorCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.GestureDetector; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; diff --git a/library/src/main/java/com/chad/library/adapter/base/loadmore/LoadMoreView.java b/library/src/main/java/com/chad/library/adapter/base/loadmore/LoadMoreView.java index 1cd65d847..dd764d250 100644 --- a/library/src/main/java/com/chad/library/adapter/base/loadmore/LoadMoreView.java +++ b/library/src/main/java/com/chad/library/adapter/base/loadmore/LoadMoreView.java @@ -1,7 +1,7 @@ package com.chad.library.adapter.base.loadmore; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; diff --git a/library/src/main/java/com/chad/library/adapter/base/util/MultiTypeDelegate.java b/library/src/main/java/com/chad/library/adapter/base/util/MultiTypeDelegate.java index 1babeacfe..53e5114de 100644 --- a/library/src/main/java/com/chad/library/adapter/base/util/MultiTypeDelegate.java +++ b/library/src/main/java/com/chad/library/adapter/base/util/MultiTypeDelegate.java @@ -1,6 +1,6 @@ package com.chad.library.adapter.base.util; -import android.support.annotation.LayoutRes; +import androidx.annotation.LayoutRes; import android.util.SparseIntArray; import java.util.List;