From 8bf94c8ee80f04f52d1ca79afed1c398bb042aa1 Mon Sep 17 00:00:00 2001 From: limuyang Date: Tue, 21 Nov 2023 14:40:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8C=85=E5=90=8D=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=20BRVAH=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/animation/AnimationUseActivity.kt | 2 +- .../animation/adapter/AnimationAdapter.kt | 4 ++-- .../adapter/DataBindingAdapter.java | 4 ++-- .../differ/adapter/DiffUtilAdapter.java | 4 ++-- .../dragswipe/DefaultDragAndSwipeActivity.kt | 8 ++++---- .../dragswipe/DragAndSwipeDifferActivity.kt | 10 +++++----- .../activity/dragswipe/HeaderDragAndSwipe.kt | 2 +- .../dragswipe/HeaderDragAndSwipeActivity.kt | 12 ++++++------ .../ManualDragAndSwipeUseActivity.java | 10 +++++----- .../adapter/DiffDragAndSwipeAdapter.kt | 4 ++-- .../dragswipe/adapter/DragAndSwipeAdapter.java | 6 +++--- .../adapter/HeaderDragAndSwipeAdapter.kt | 6 +++--- .../emptyview/adapter/EmptyViewAdapter.kt | 2 +- .../headerfooter/HeaderAndFooterUseActivity.kt | 2 +- .../headerfooter/adapter/FooterAdapter.kt | 4 ++-- .../headerfooter/adapter/HeaderAdapter.kt | 2 +- .../adapter/HeaderAndFooterAdapter.kt | 2 +- .../activity/home/HomeActivity.kt | 3 +-- .../activity/home/adapter/HomeAdapter.kt | 2 +- .../home/adapter/HomeTopHeaderAdapter.kt | 7 ++++--- .../activity/itemclick/ItemClickActivity.kt | 4 ++-- .../itemclick/adapter/ItemClickAdapter.java | 2 +- .../loadmore/AutoLoadMoreRefreshUseActivity.kt | 6 +++--- .../NoAutoAutoLoadMoreRefreshUseActivity.kt | 6 +++--- .../loadmore/adapter/CustomLoadMoreAdapter.kt | 4 ++-- .../loadmore/adapter/RecyclerViewAdapter.kt | 2 +- .../activity/scene/adapter/GroupAdapter.kt | 2 +- .../activity/upfetch/UpFetchUseActivity.kt | 8 ++++---- .../activity/upfetch/adapter/UpFetchAdapter.kt | 2 +- .../animator/CustomAnimation1.java | 2 +- .../animator/CustomAnimation2.java | 2 +- .../animator/CustomAnimation3.java | 2 +- app/src/main/res/layout/activity_home.xml | 2 +- library/build.gradle.kts | 4 ++-- .../base/fullspan/FullSpanAdapterType.kt | 13 ------------- .../base => adapter4}/BaseDifferAdapter.kt | 3 +-- .../base => adapter4}/BaseMultiItemAdapter.kt | 5 +++-- .../base => adapter4}/BaseQuickAdapter.kt | 18 +++++++++--------- .../base => adapter4}/BaseSingleItemAdapter.kt | 2 +- .../base => adapter4}/QuickAdapterHelper.kt | 13 ++++++------- .../animation/AlphaInAnimation.kt | 2 +- .../animation/ItemAnimator.kt | 2 +- .../animation/ScaleInAnimation.kt | 5 +++-- .../animation/SlideInBottomAnimation.kt | 2 +- .../animation/SlideInLeftAnimation.kt | 2 +- .../animation/SlideInRightAnimation.kt | 2 +- .../dragswipe/DragSwipeExt.kt | 6 +++--- .../dragswipe/QuickDragAndSwipe.kt | 10 +++++----- .../listener/DragAndSwipeDataCallback.kt | 2 +- .../dragswipe/listener/OnItemDragListener.java | 2 +- .../listener/OnItemSwipeListener.java | 2 +- .../adapter4/fullspan/FullSpanAdapterType.kt | 13 +++++++++++++ .../layoutmanager/QuickGridLayoutManager.kt | 6 +++--- .../base => adapter4}/loadState/LoadState.kt | 2 +- .../loadState/LoadStateAdapter.kt | 4 ++-- .../leading/DefaultLeadingLoadStateAdapter.kt | 4 ++-- .../leading/LeadingLoadStateAdapter.kt | 6 +++--- .../DefaultTrailingLoadStateAdapter.kt | 4 ++-- .../trailing/TrailingLoadStateAdapter.kt | 6 +++--- .../base => adapter4}/util/AdapterUtils.kt | 2 +- .../base => adapter4}/util/ItemClickUtils.kt | 5 ++--- .../viewholder/DataBindingHolder.java | 2 +- .../viewholder/QuickViewHolder.kt | 2 +- .../viewholder/StateLayoutVH.kt | 4 ++-- 64 files changed, 147 insertions(+), 148 deletions(-) delete mode 100644 library/src/main/java/com/chad/library/adapter/base/fullspan/FullSpanAdapterType.kt rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/BaseDifferAdapter.kt (98%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/BaseMultiItemAdapter.kt (98%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/BaseQuickAdapter.kt (97%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/BaseSingleItemAdapter.kt (98%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/QuickAdapterHelper.kt (96%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/animation/AlphaInAnimation.kt (94%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/animation/ItemAnimator.kt (80%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/animation/ScaleInAnimation.kt (89%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/animation/SlideInBottomAnimation.kt (94%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/animation/SlideInLeftAnimation.kt (94%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/animation/SlideInRightAnimation.kt (94%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/dragswipe/DragSwipeExt.kt (93%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/dragswipe/QuickDragAndSwipe.kt (96%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/dragswipe/listener/DragAndSwipeDataCallback.kt (83%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/dragswipe/listener/OnItemDragListener.java (89%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/dragswipe/listener/OnItemSwipeListener.java (96%) create mode 100644 library/src/main/java/com/chad/library/adapter4/fullspan/FullSpanAdapterType.kt rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/layoutmanager/QuickGridLayoutManager.kt (95%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/loadState/LoadState.kt (98%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/loadState/LoadStateAdapter.kt (97%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/loadState/leading/DefaultLeadingLoadStateAdapter.kt (92%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/loadState/leading/LeadingLoadStateAdapter.kt (94%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/loadState/trailing/DefaultTrailingLoadStateAdapter.kt (96%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/loadState/trailing/TrailingLoadStateAdapter.kt (97%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/util/AdapterUtils.kt (95%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/util/ItemClickUtils.kt (95%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/viewholder/DataBindingHolder.java (96%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/viewholder/QuickViewHolder.kt (98%) rename library/src/main/java/com/chad/library/{adapter/base => adapter4}/viewholder/StateLayoutVH.kt (93%) diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/animation/AnimationUseActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/animation/AnimationUseActivity.kt index 1efbcceb1..1152e4722 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/animation/AnimationUseActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/animation/AnimationUseActivity.kt @@ -7,7 +7,7 @@ import com.chad.baserecyclerviewadapterhelper.animator.CustomAnimation2 import com.chad.baserecyclerviewadapterhelper.animator.CustomAnimation3 import com.chad.baserecyclerviewadapterhelper.base.BaseViewBindingActivity import com.chad.baserecyclerviewadapterhelper.databinding.ActivityAnimationUseBinding -import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter4.BaseQuickAdapter /** * https://github.com/CymChad/BaseRecyclerViewAdapterHelper diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/animation/adapter/AnimationAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/animation/adapter/AnimationAdapter.kt index 9f7b32df2..cd780526a 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/animation/adapter/AnimationAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/animation/adapter/AnimationAdapter.kt @@ -14,8 +14,8 @@ import com.chad.baserecyclerviewadapterhelper.data.DataServer import com.chad.baserecyclerviewadapterhelper.entity.Status import com.chad.baserecyclerviewadapterhelper.utils.ClickableMovementMethod import com.chad.baserecyclerviewadapterhelper.utils.Tips -import com.chad.library.adapter.base.BaseQuickAdapter -import com.chad.library.adapter.base.viewholder.QuickViewHolder +import com.chad.library.adapter4.BaseQuickAdapter +import com.chad.library.adapter4.viewholder.QuickViewHolder /** * 文 件 名: AnimationAdapter diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/databinding/adapter/DataBindingAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/databinding/adapter/DataBindingAdapter.java index 2fa33b856..693cafcc6 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/databinding/adapter/DataBindingAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/databinding/adapter/DataBindingAdapter.java @@ -10,8 +10,8 @@ import com.chad.baserecyclerviewadapterhelper.databinding.ItemMovieBinding; import com.chad.baserecyclerviewadapterhelper.entity.Movie; import com.chad.baserecyclerviewadapterhelper.entity.MoviePresenter; -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.viewholder.DataBindingHolder; +import com.chad.library.adapter4.BaseQuickAdapter; +import com.chad.library.adapter4.viewholder.DataBindingHolder; /** * @author: limuyang diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/differ/adapter/DiffUtilAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/differ/adapter/DiffUtilAdapter.java index 67122614b..24504fb75 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/differ/adapter/DiffUtilAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/differ/adapter/DiffUtilAdapter.java @@ -7,8 +7,8 @@ import com.chad.baserecyclerviewadapterhelper.R; import com.chad.baserecyclerviewadapterhelper.entity.DiffEntity; -import com.chad.library.adapter.base.BaseDifferAdapter; -import com.chad.library.adapter.base.viewholder.QuickViewHolder; +import com.chad.library.adapter4.BaseDifferAdapter; +import com.chad.library.adapter4.viewholder.QuickViewHolder; /** * Create adapter diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/DefaultDragAndSwipeActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/DefaultDragAndSwipeActivity.kt index e4118fa64..272643dc2 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/DefaultDragAndSwipeActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/DefaultDragAndSwipeActivity.kt @@ -14,10 +14,10 @@ import com.chad.baserecyclerviewadapterhelper.base.BaseViewBindingActivity import com.chad.baserecyclerviewadapterhelper.databinding.ActivityUniversalRecyclerBinding import com.chad.baserecyclerviewadapterhelper.utils.Tips import com.chad.baserecyclerviewadapterhelper.utils.vibrate -import com.chad.library.adapter.base.dragswipe.QuickDragAndSwipe -import com.chad.library.adapter.base.dragswipe.listener.OnItemDragListener -import com.chad.library.adapter.base.dragswipe.listener.OnItemSwipeListener -import com.chad.library.adapter.base.viewholder.QuickViewHolder +import com.chad.library.adapter4.dragswipe.QuickDragAndSwipe +import com.chad.library.adapter4.dragswipe.listener.OnItemDragListener +import com.chad.library.adapter4.dragswipe.listener.OnItemSwipeListener +import com.chad.library.adapter4.viewholder.QuickViewHolder /** * 默认实现拖动与侧滑效果 diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/DragAndSwipeDifferActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/DragAndSwipeDifferActivity.kt index b1e055bb3..7dde40f7e 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/DragAndSwipeDifferActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/DragAndSwipeDifferActivity.kt @@ -14,11 +14,11 @@ import com.chad.baserecyclerviewadapterhelper.base.BaseViewBindingActivity import com.chad.baserecyclerviewadapterhelper.data.DataServer import com.chad.baserecyclerviewadapterhelper.databinding.ActivityUniversalRecyclerBinding import com.chad.baserecyclerviewadapterhelper.utils.vibrate -import com.chad.library.adapter.base.dragswipe.QuickDragAndSwipe -import com.chad.library.adapter.base.dragswipe.listener.DragAndSwipeDataCallback -import com.chad.library.adapter.base.dragswipe.listener.OnItemDragListener -import com.chad.library.adapter.base.dragswipe.listener.OnItemSwipeListener -import com.chad.library.adapter.base.viewholder.QuickViewHolder +import com.chad.library.adapter4.dragswipe.QuickDragAndSwipe +import com.chad.library.adapter4.dragswipe.listener.DragAndSwipeDataCallback +import com.chad.library.adapter4.dragswipe.listener.OnItemDragListener +import com.chad.library.adapter4.dragswipe.listener.OnItemSwipeListener +import com.chad.library.adapter4.viewholder.QuickViewHolder /** * Created by limuyang diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/HeaderDragAndSwipe.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/HeaderDragAndSwipe.kt index 0ac01a8ec..fd0732e88 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/HeaderDragAndSwipe.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/HeaderDragAndSwipe.kt @@ -3,7 +3,7 @@ package com.chad.baserecyclerviewadapterhelper.activity.dragswipe import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.RecyclerView import com.chad.baserecyclerviewadapterhelper.activity.dragswipe.adapter.HeaderDragAndSwipeAdapter -import com.chad.library.adapter.base.dragswipe.QuickDragAndSwipe +import com.chad.library.adapter4.dragswipe.QuickDragAndSwipe /** * 重写拖拽类，根据itemType 设置某个类型的是否允许拖拽 diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/HeaderDragAndSwipeActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/HeaderDragAndSwipeActivity.kt index d4984e7b7..992d261a4 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/HeaderDragAndSwipeActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/HeaderDragAndSwipeActivity.kt @@ -12,12 +12,12 @@ import com.chad.baserecyclerviewadapterhelper.activity.home.adapter.HomeTopHeade import com.chad.baserecyclerviewadapterhelper.base.BaseViewBindingActivity import com.chad.baserecyclerviewadapterhelper.databinding.ActivityUniversalRecyclerBinding import com.chad.baserecyclerviewadapterhelper.utils.vibrate -import com.chad.library.adapter.base.QuickAdapterHelper -import com.chad.library.adapter.base.dragswipe.setItemDragListener -import com.chad.library.adapter.base.dragswipe.setItemSwipeListener -import com.chad.library.adapter.base.loadState.LoadState.NotLoading -import com.chad.library.adapter.base.loadState.trailing.TrailingLoadStateAdapter -import com.chad.library.adapter.base.viewholder.QuickViewHolder +import com.chad.library.adapter4.QuickAdapterHelper +import com.chad.library.adapter4.dragswipe.setItemDragListener +import com.chad.library.adapter4.dragswipe.setItemSwipeListener +import com.chad.library.adapter4.loadState.LoadState.NotLoading +import com.chad.library.adapter4.loadState.trailing.TrailingLoadStateAdapter +import com.chad.library.adapter4.viewholder.QuickViewHolder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/ManualDragAndSwipeUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/ManualDragAndSwipeUseActivity.java index 59904d6be..81054ca5c 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/ManualDragAndSwipeUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/ManualDragAndSwipeUseActivity.java @@ -17,11 +17,11 @@ import com.chad.baserecyclerviewadapterhelper.databinding.ActivityUniversalRecyclerBinding; import com.chad.baserecyclerviewadapterhelper.utils.Tips; import com.chad.baserecyclerviewadapterhelper.utils.VibratorUtilsKt; -import com.chad.library.adapter.base.QuickAdapterHelper; -import com.chad.library.adapter.base.dragswipe.QuickDragAndSwipe; -import com.chad.library.adapter.base.dragswipe.listener.OnItemDragListener; -import com.chad.library.adapter.base.dragswipe.listener.OnItemSwipeListener; -import com.chad.library.adapter.base.viewholder.QuickViewHolder; +import com.chad.library.adapter4.QuickAdapterHelper; +import com.chad.library.adapter4.dragswipe.QuickDragAndSwipe; +import com.chad.library.adapter4.dragswipe.listener.OnItemDragListener; +import com.chad.library.adapter4.dragswipe.listener.OnItemSwipeListener; +import com.chad.library.adapter4.viewholder.QuickViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/DiffDragAndSwipeAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/DiffDragAndSwipeAdapter.kt index 07f474caf..7cda101cb 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/DiffDragAndSwipeAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/DiffDragAndSwipeAdapter.kt @@ -5,8 +5,8 @@ import android.view.ViewGroup import com.chad.baserecyclerviewadapterhelper.R import com.chad.baserecyclerviewadapterhelper.activity.differ.adapter.DiffEntityCallback import com.chad.baserecyclerviewadapterhelper.entity.DiffEntity -import com.chad.library.adapter.base.BaseDifferAdapter -import com.chad.library.adapter.base.viewholder.QuickViewHolder +import com.chad.library.adapter4.BaseDifferAdapter +import com.chad.library.adapter4.viewholder.QuickViewHolder /** * Create adapter diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/DragAndSwipeAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/DragAndSwipeAdapter.java index 77b5363da..95b77bf4c 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/DragAndSwipeAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/DragAndSwipeAdapter.java @@ -7,9 +7,9 @@ import androidx.annotation.NonNull; import com.chad.baserecyclerviewadapterhelper.R; -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.dragswipe.listener.DragAndSwipeDataCallback; -import com.chad.library.adapter.base.viewholder.QuickViewHolder; +import com.chad.library.adapter4.BaseQuickAdapter; +import com.chad.library.adapter4.dragswipe.listener.DragAndSwipeDataCallback; +import com.chad.library.adapter4.viewholder.QuickViewHolder; public class DragAndSwipeAdapter extends BaseQuickAdapter implements DragAndSwipeDataCallback { diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/HeaderDragAndSwipeAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/HeaderDragAndSwipeAdapter.kt index 3f7e99675..f5d5f561b 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/HeaderDragAndSwipeAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/dragswipe/adapter/HeaderDragAndSwipeAdapter.kt @@ -3,9 +3,9 @@ package com.chad.baserecyclerviewadapterhelper.activity.dragswipe.adapter import android.content.Context import android.view.ViewGroup import com.chad.baserecyclerviewadapterhelper.R -import com.chad.library.adapter.base.BaseQuickAdapter -import com.chad.library.adapter.base.viewholder.QuickViewHolder -import com.chad.library.adapter.base.dragswipe.listener.DragAndSwipeDataCallback +import com.chad.library.adapter4.BaseQuickAdapter +import com.chad.library.adapter4.viewholder.QuickViewHolder +import com.chad.library.adapter4.dragswipe.listener.DragAndSwipeDataCallback /** * kotlin方式集成案例 diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/emptyview/adapter/EmptyViewAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/emptyview/adapter/EmptyViewAdapter.kt index 4c39c2166..b61e79a4b 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/emptyview/adapter/EmptyViewAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/emptyview/adapter/EmptyViewAdapter.kt @@ -6,7 +6,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.chad.baserecyclerviewadapterhelper.databinding.LayoutAnimationBinding import com.chad.baserecyclerviewadapterhelper.entity.Status -import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter4.BaseQuickAdapter class EmptyViewAdapter : BaseQuickAdapter() { diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/HeaderAndFooterUseActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/HeaderAndFooterUseActivity.kt index 95f1bb3bf..4caf896e7 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/HeaderAndFooterUseActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/HeaderAndFooterUseActivity.kt @@ -9,7 +9,7 @@ import com.chad.baserecyclerviewadapterhelper.base.BaseViewBindingActivity import com.chad.baserecyclerviewadapterhelper.data.DataServer import com.chad.baserecyclerviewadapterhelper.databinding.ActivityUniversalRecyclerBinding import com.chad.baserecyclerviewadapterhelper.utils.Tips -import com.chad.library.adapter.base.QuickAdapterHelper +import com.chad.library.adapter4.QuickAdapterHelper /** * https://github.com/CymChad/BaseRecyclerViewAdapterHelper diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/FooterAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/FooterAdapter.kt index 42eb3b7bf..5d4e0830a 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/FooterAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/FooterAdapter.kt @@ -3,8 +3,8 @@ package com.chad.baserecyclerviewadapterhelper.activity.headerfooter.adapter import android.content.Context import android.view.ViewGroup import com.chad.baserecyclerviewadapterhelper.R -import com.chad.library.adapter.base.BaseSingleItemAdapter -import com.chad.library.adapter.base.viewholder.QuickViewHolder +import com.chad.library.adapter4.BaseSingleItemAdapter +import com.chad.library.adapter4.viewholder.QuickViewHolder class FooterAdapter( private val isDelete: Boolean diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/HeaderAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/HeaderAdapter.kt index 0bd4db1bb..a09207776 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/HeaderAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/HeaderAdapter.kt @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.chad.baserecyclerviewadapterhelper.R -import com.chad.library.adapter.base.BaseSingleItemAdapter +import com.chad.library.adapter4.BaseSingleItemAdapter class HeaderAdapter: BaseSingleItemAdapter() { diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/HeaderAndFooterAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/HeaderAndFooterAdapter.kt index 2a809b09d..aabb6f447 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/HeaderAndFooterAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/headerfooter/adapter/HeaderAndFooterAdapter.kt @@ -7,7 +7,7 @@ import androidx.recyclerview.widget.RecyclerView import com.chad.baserecyclerviewadapterhelper.R import com.chad.baserecyclerviewadapterhelper.databinding.ItemHeaderAndFooterBinding import com.chad.baserecyclerviewadapterhelper.entity.Status -import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter4.BaseQuickAdapter /** * https://github.com/CymChad/BaseRecyclerViewAdapterHelper diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/HomeActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/HomeActivity.kt index d83f6531d..799379789 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/HomeActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/HomeActivity.kt @@ -3,7 +3,6 @@ package com.chad.baserecyclerviewadapterhelper.activity.home import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import androidx.recyclerview.widget.ConcatAdapter import com.chad.baserecyclerviewadapterhelper.R import com.chad.baserecyclerviewadapterhelper.activity.animation.AnimationUseActivity import com.chad.baserecyclerviewadapterhelper.activity.databinding.DataBindingUseActivity @@ -20,7 +19,7 @@ import com.chad.baserecyclerviewadapterhelper.activity.scene.GroupDemoActivity import com.chad.baserecyclerviewadapterhelper.activity.upfetch.UpFetchUseActivity import com.chad.baserecyclerviewadapterhelper.databinding.ActivityHomeBinding import com.chad.baserecyclerviewadapterhelper.entity.HomeEntity -import com.chad.library.adapter.base.QuickAdapterHelper +import com.chad.library.adapter4.QuickAdapterHelper class HomeActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/adapter/HomeAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/adapter/HomeAdapter.kt index 6dddfacab..ff07fe740 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/adapter/HomeAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/adapter/HomeAdapter.kt @@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.chad.baserecyclerviewadapterhelper.databinding.DefSectionHeadBinding import com.chad.baserecyclerviewadapterhelper.databinding.HomeItemViewBinding import com.chad.baserecyclerviewadapterhelper.entity.HomeEntity -import com.chad.library.adapter.base.BaseMultiItemAdapter +import com.chad.library.adapter4.BaseMultiItemAdapter /** * https://github.com/CymChad/BaseRecyclerViewAdapterHelper diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/adapter/HomeTopHeaderAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/adapter/HomeTopHeaderAdapter.kt index 59e0c807a..e9f14dc01 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/adapter/HomeTopHeaderAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/home/adapter/HomeTopHeaderAdapter.kt @@ -6,10 +6,11 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.chad.baserecyclerviewadapterhelper.R -import com.chad.library.adapter.base.BaseSingleItemAdapter -import com.chad.library.adapter.base.fullspan.FullSpanAdapterType +import com.chad.library.adapter4.BaseSingleItemAdapter +import com.chad.library.adapter4.fullspan.FullSpanAdapterType -class HomeTopHeaderAdapter : BaseSingleItemAdapter(), FullSpanAdapterType { +class HomeTopHeaderAdapter : BaseSingleItemAdapter(), + FullSpanAdapterType { companion object { val HEAD_VIEWTYPE = 0x10000556 diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/itemclick/ItemClickActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/itemclick/ItemClickActivity.kt index 96e51e512..7cd1aded8 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/itemclick/ItemClickActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/itemclick/ItemClickActivity.kt @@ -8,8 +8,8 @@ import com.chad.baserecyclerviewadapterhelper.base.BaseViewBindingActivity import com.chad.baserecyclerviewadapterhelper.databinding.ActivityUniversalRecyclerBinding import com.chad.baserecyclerviewadapterhelper.entity.ClickEntity import com.chad.baserecyclerviewadapterhelper.utils.Tips -import com.chad.library.adapter.base.util.addOnDebouncedChildClick -import com.chad.library.adapter.base.util.setOnDebouncedItemClick +import com.chad.library.adapter4.util.addOnDebouncedChildClick +import com.chad.library.adapter4.util.setOnDebouncedItemClick /** * @author Allen diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/itemclick/adapter/ItemClickAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/itemclick/adapter/ItemClickAdapter.java index 5af7af993..f49a4853c 100755 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/itemclick/adapter/ItemClickAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/itemclick/adapter/ItemClickAdapter.java @@ -12,7 +12,7 @@ import com.chad.baserecyclerviewadapterhelper.databinding.ItemLongClickChildviewBinding; import com.chad.baserecyclerviewadapterhelper.databinding.ItemLongClickViewBinding; import com.chad.baserecyclerviewadapterhelper.entity.ClickEntity; -import com.chad.library.adapter.base.BaseMultiItemAdapter; +import com.chad.library.adapter4.BaseMultiItemAdapter; import java.util.List; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/AutoLoadMoreRefreshUseActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/AutoLoadMoreRefreshUseActivity.kt index 71dfeebb9..ca288c235 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/AutoLoadMoreRefreshUseActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/AutoLoadMoreRefreshUseActivity.kt @@ -13,9 +13,9 @@ import com.chad.baserecyclerviewadapterhelper.data.DataServer import com.chad.baserecyclerviewadapterhelper.databinding.ActivityLoadMoreBinding import com.chad.baserecyclerviewadapterhelper.entity.Status import com.chad.baserecyclerviewadapterhelper.utils.Tips -import com.chad.library.adapter.base.QuickAdapterHelper -import com.chad.library.adapter.base.loadState.LoadState -import com.chad.library.adapter.base.loadState.trailing.TrailingLoadStateAdapter.OnTrailingListener +import com.chad.library.adapter4.QuickAdapterHelper +import com.chad.library.adapter4.loadState.LoadState +import com.chad.library.adapter4.loadState.trailing.TrailingLoadStateAdapter.OnTrailingListener /** * 自动加载更多 diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/NoAutoAutoLoadMoreRefreshUseActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/NoAutoAutoLoadMoreRefreshUseActivity.kt index f956ef8d3..525dd25a0 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/NoAutoAutoLoadMoreRefreshUseActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/NoAutoAutoLoadMoreRefreshUseActivity.kt @@ -14,9 +14,9 @@ import com.chad.baserecyclerviewadapterhelper.data.DataServer import com.chad.baserecyclerviewadapterhelper.databinding.ActivityLoadMoreBinding import com.chad.baserecyclerviewadapterhelper.entity.Status import com.chad.baserecyclerviewadapterhelper.utils.Tips -import com.chad.library.adapter.base.QuickAdapterHelper -import com.chad.library.adapter.base.loadState.LoadState -import com.chad.library.adapter.base.loadState.trailing.TrailingLoadStateAdapter.OnTrailingListener +import com.chad.library.adapter4.QuickAdapterHelper +import com.chad.library.adapter4.loadState.LoadState +import com.chad.library.adapter4.loadState.trailing.TrailingLoadStateAdapter.OnTrailingListener /** * 不进行自动加载更多 diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/adapter/CustomLoadMoreAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/adapter/CustomLoadMoreAdapter.kt index 42bc34059..50cf3917b 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/adapter/CustomLoadMoreAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/adapter/CustomLoadMoreAdapter.kt @@ -5,8 +5,8 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.chad.baserecyclerviewadapterhelper.databinding.ViewLoadMoreBinding -import com.chad.library.adapter.base.loadState.LoadState -import com.chad.library.adapter.base.loadState.trailing.TrailingLoadStateAdapter +import com.chad.library.adapter4.loadState.LoadState +import com.chad.library.adapter4.loadState.trailing.TrailingLoadStateAdapter /** * 自定义的"加载更多"。 diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/adapter/RecyclerViewAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/adapter/RecyclerViewAdapter.kt index d401b2452..89e612ef9 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/adapter/RecyclerViewAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/loadmore/adapter/RecyclerViewAdapter.kt @@ -15,7 +15,7 @@ import com.chad.baserecyclerviewadapterhelper.R import com.chad.baserecyclerviewadapterhelper.databinding.LayoutAnimationBinding import com.chad.baserecyclerviewadapterhelper.entity.Status import com.chad.baserecyclerviewadapterhelper.utils.Tips -import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter4.BaseQuickAdapter /** * @author: limuyang diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/scene/adapter/GroupAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/scene/adapter/GroupAdapter.kt index 9036f0f48..291ea9e4c 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/scene/adapter/GroupAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/scene/adapter/GroupAdapter.kt @@ -11,7 +11,7 @@ import com.chad.baserecyclerviewadapterhelper.R import com.chad.baserecyclerviewadapterhelper.databinding.ItemGroupTypeBinding import com.chad.baserecyclerviewadapterhelper.entity.GroupDemoEntity import com.chad.baserecyclerviewadapterhelper.utils.dp -import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter4.BaseQuickAdapter /** * 每一组的Adapter diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/upfetch/UpFetchUseActivity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/upfetch/UpFetchUseActivity.kt index a06f77c1e..dd831aa93 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/upfetch/UpFetchUseActivity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/upfetch/UpFetchUseActivity.kt @@ -6,10 +6,10 @@ import com.chad.baserecyclerviewadapterhelper.activity.upfetch.adapter.UpFetchAd import com.chad.baserecyclerviewadapterhelper.base.BaseViewBindingActivity import com.chad.baserecyclerviewadapterhelper.databinding.ActivityUniversalRecyclerBinding import com.chad.baserecyclerviewadapterhelper.entity.Movie -import com.chad.library.adapter.base.QuickAdapterHelper -import com.chad.library.adapter.base.loadState.LoadState -import com.chad.library.adapter.base.loadState.LoadState.NotLoading -import com.chad.library.adapter.base.loadState.leading.LeadingLoadStateAdapter.OnLeadingListener +import com.chad.library.adapter4.QuickAdapterHelper +import com.chad.library.adapter4.loadState.LoadState +import com.chad.library.adapter4.loadState.LoadState.NotLoading +import com.chad.library.adapter4.loadState.leading.LeadingLoadStateAdapter.OnLeadingListener import java.util.* /** diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/upfetch/adapter/UpFetchAdapter.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/upfetch/adapter/UpFetchAdapter.kt index 35b2ffd66..75a42b135 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/upfetch/adapter/UpFetchAdapter.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/activity/upfetch/adapter/UpFetchAdapter.kt @@ -7,7 +7,7 @@ import androidx.recyclerview.widget.RecyclerView import com.chad.baserecyclerviewadapterhelper.R import com.chad.baserecyclerviewadapterhelper.databinding.ItemHeaderAndFooterBinding import com.chad.baserecyclerviewadapterhelper.entity.Movie -import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter4.BaseQuickAdapter /** * @author: limuyang diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation1.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation1.java index 1651d5c88..514923cc0 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation1.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation1.java @@ -5,7 +5,7 @@ import android.animation.ObjectAnimator; import android.view.View; import android.view.animation.DecelerateInterpolator; -import com.chad.library.adapter.base.animation.ItemAnimator; +import com.chad.library.adapter4.animation.ItemAnimator; import org.jetbrains.annotations.NotNull; /** diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation2.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation2.java index 406ce83bc..d9d38d2d0 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation2.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation2.java @@ -5,7 +5,7 @@ import android.view.View; import android.view.animation.Interpolator; -import com.chad.library.adapter.base.animation.ItemAnimator; +import com.chad.library.adapter4.animation.ItemAnimator; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation3.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation3.java index c3d6420cb..60785bcff 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation3.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animator/CustomAnimation3.java @@ -6,7 +6,7 @@ import android.view.View; import android.view.animation.DecelerateInterpolator; -import com.chad.library.adapter.base.animation.ItemAnimator; +import com.chad.library.adapter4.animation.ItemAnimator; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index b2fcfae9a..d03c05206 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -11,7 +11,7 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - app:layoutManager="com.chad.library.adapter.base.layoutmanager.QuickGridLayoutManager" + app:layoutManager="com.chad.library.adapter4.layoutmanager.QuickGridLayoutManager" app:spanCount="2" tools:listitem="@layout/home_item_view" /> diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 609ac8905..9843c483c 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -9,7 +9,7 @@ plugins { signing } -val versionName = "4.0.3" +val versionName = "4.1.0" android { @@ -95,7 +95,7 @@ afterEvaluate { create("release") { from(components.findByName("release")) groupId = "io.github.cymchad" - artifactId = "BaseRecyclerViewAdapterHelper" + artifactId = "BaseRecyclerViewAdapterHelper4" version = versionName pom { diff --git a/library/src/main/java/com/chad/library/adapter/base/fullspan/FullSpanAdapterType.kt b/library/src/main/java/com/chad/library/adapter/base/fullspan/FullSpanAdapterType.kt deleted file mode 100644 index 1a5a049ac..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/fullspan/FullSpanAdapterType.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.chad.library.adapter.base.fullspan - -import androidx.recyclerview.widget.GridLayoutManager - -/** - * If Adapter needs full span, implement this interface. - * Need to be used with [com.chad.library.adapter.base.layoutmanager.QuickGridLayoutManager] - * - * 如果此类型的 Adapter 需要满跨度，实现此接口。 - * 需要配合 [com.chad.library.adapter.base.layoutmanager.QuickGridLayoutManager] 使用，或者自行实现[GridLayoutManager.SpanSizeLookup] - * - */ -interface FullSpanAdapterType \ No newline at end of file diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseDifferAdapter.kt b/library/src/main/java/com/chad/library/adapter4/BaseDifferAdapter.kt similarity index 98% rename from library/src/main/java/com/chad/library/adapter/base/BaseDifferAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/BaseDifferAdapter.kt index 6c1c38624..a26f5410e 100644 --- a/library/src/main/java/com/chad/library/adapter/base/BaseDifferAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/BaseDifferAdapter.kt @@ -1,6 +1,5 @@ -package com.chad.library.adapter.base +package com.chad.library.adapter4 -import androidx.annotation.IntRange import androidx.recyclerview.widget.* import androidx.recyclerview.widget.AsyncListDiffer.ListListener import java.util.* diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseMultiItemAdapter.kt b/library/src/main/java/com/chad/library/adapter4/BaseMultiItemAdapter.kt similarity index 98% rename from library/src/main/java/com/chad/library/adapter/base/BaseMultiItemAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/BaseMultiItemAdapter.kt index f7d9a5574..4e58700c2 100644 --- a/library/src/main/java/com/chad/library/adapter/base/BaseMultiItemAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/BaseMultiItemAdapter.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base +package com.chad.library.adapter4 import android.content.Context import android.util.SparseArray @@ -142,7 +142,8 @@ abstract class BaseMultiItemAdapter(items: List = emptyList()) : * @param V * @constructor Create empty On multi item */ - abstract class OnMultiItem : OnMultiItemAdapterListener { + abstract class OnMultiItem : + OnMultiItemAdapterListener { internal var weakA: WeakReference>? = null val adapter: BaseMultiItemAdapter? diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.kt b/library/src/main/java/com/chad/library/adapter4/BaseQuickAdapter.kt similarity index 97% rename from library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/BaseQuickAdapter.kt index 1ce41b060..fd41501cc 100644 --- a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/BaseQuickAdapter.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base +package com.chad.library.adapter4 import android.animation.Animator import android.content.Context @@ -12,14 +12,14 @@ import androidx.annotation.IdRes import androidx.annotation.IntRange import androidx.annotation.LayoutRes import androidx.recyclerview.widget.RecyclerView -import com.chad.library.adapter.base.animation.AlphaInAnimation -import com.chad.library.adapter.base.animation.ItemAnimator -import com.chad.library.adapter.base.animation.ScaleInAnimation -import com.chad.library.adapter.base.animation.SlideInBottomAnimation -import com.chad.library.adapter.base.animation.SlideInLeftAnimation -import com.chad.library.adapter.base.animation.SlideInRightAnimation -import com.chad.library.adapter.base.util.asStaggeredGridFullSpan -import com.chad.library.adapter.base.viewholder.StateLayoutVH +import com.chad.library.adapter4.animation.AlphaInAnimation +import com.chad.library.adapter4.animation.ItemAnimator +import com.chad.library.adapter4.animation.ScaleInAnimation +import com.chad.library.adapter4.animation.SlideInBottomAnimation +import com.chad.library.adapter4.animation.SlideInLeftAnimation +import com.chad.library.adapter4.animation.SlideInRightAnimation +import com.chad.library.adapter4.util.asStaggeredGridFullSpan +import com.chad.library.adapter4.viewholder.StateLayoutVH import java.util.Collections /** diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseSingleItemAdapter.kt b/library/src/main/java/com/chad/library/adapter4/BaseSingleItemAdapter.kt similarity index 98% rename from library/src/main/java/com/chad/library/adapter/base/BaseSingleItemAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/BaseSingleItemAdapter.kt index af044471d..ed56e1672 100644 --- a/library/src/main/java/com/chad/library/adapter/base/BaseSingleItemAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/BaseSingleItemAdapter.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base +package com.chad.library.adapter4 import androidx.recyclerview.widget.RecyclerView diff --git a/library/src/main/java/com/chad/library/adapter/base/QuickAdapterHelper.kt b/library/src/main/java/com/chad/library/adapter4/QuickAdapterHelper.kt similarity index 96% rename from library/src/main/java/com/chad/library/adapter/base/QuickAdapterHelper.kt rename to library/src/main/java/com/chad/library/adapter4/QuickAdapterHelper.kt index 586d73ce0..8ae1df7ae 100644 --- a/library/src/main/java/com/chad/library/adapter/base/QuickAdapterHelper.kt +++ b/library/src/main/java/com/chad/library/adapter4/QuickAdapterHelper.kt @@ -1,12 +1,11 @@ -package com.chad.library.adapter.base +package com.chad.library.adapter4 import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.RecyclerView -import com.chad.library.adapter.base.loadState.LoadState -import com.chad.library.adapter.base.loadState.leading.DefaultLeadingLoadStateAdapter -import com.chad.library.adapter.base.loadState.leading.LeadingLoadStateAdapter -import com.chad.library.adapter.base.loadState.trailing.DefaultTrailingLoadStateAdapter -import com.chad.library.adapter.base.loadState.trailing.TrailingLoadStateAdapter +import com.chad.library.adapter4.loadState.LoadState +import com.chad.library.adapter4.loadState.leading.DefaultLeadingLoadStateAdapter +import com.chad.library.adapter4.loadState.leading.LeadingLoadStateAdapter +import com.chad.library.adapter4.loadState.trailing.TrailingLoadStateAdapter import java.util.Collections /** @@ -335,7 +334,7 @@ class QuickAdapterHelper private constructor( fun setTrailingLoadStateAdapter( loadMoreListener: TrailingLoadStateAdapter.OnTrailingListener? ) = setTrailingLoadStateAdapter( - DefaultTrailingLoadStateAdapter().apply { + com.chad.library.adapter4.loadState.trailing.DefaultTrailingLoadStateAdapter().apply { setOnLoadMoreListener(loadMoreListener) } ) diff --git a/library/src/main/java/com/chad/library/adapter/base/animation/AlphaInAnimation.kt b/library/src/main/java/com/chad/library/adapter4/animation/AlphaInAnimation.kt similarity index 94% rename from library/src/main/java/com/chad/library/adapter/base/animation/AlphaInAnimation.kt rename to library/src/main/java/com/chad/library/adapter4/animation/AlphaInAnimation.kt index d71761235..311083101 100755 --- a/library/src/main/java/com/chad/library/adapter/base/animation/AlphaInAnimation.kt +++ b/library/src/main/java/com/chad/library/adapter4/animation/AlphaInAnimation.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.animation +package com.chad.library.adapter4.animation import android.animation.Animator import android.animation.ObjectAnimator diff --git a/library/src/main/java/com/chad/library/adapter/base/animation/ItemAnimator.kt b/library/src/main/java/com/chad/library/adapter4/animation/ItemAnimator.kt similarity index 80% rename from library/src/main/java/com/chad/library/adapter/base/animation/ItemAnimator.kt rename to library/src/main/java/com/chad/library/adapter4/animation/ItemAnimator.kt index 4a5ab65e3..8d0251a4f 100644 --- a/library/src/main/java/com/chad/library/adapter/base/animation/ItemAnimator.kt +++ b/library/src/main/java/com/chad/library/adapter4/animation/ItemAnimator.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.animation +package com.chad.library.adapter4.animation import android.animation.Animator import android.view.View diff --git a/library/src/main/java/com/chad/library/adapter/base/animation/ScaleInAnimation.kt b/library/src/main/java/com/chad/library/adapter4/animation/ScaleInAnimation.kt similarity index 89% rename from library/src/main/java/com/chad/library/adapter/base/animation/ScaleInAnimation.kt rename to library/src/main/java/com/chad/library/adapter4/animation/ScaleInAnimation.kt index 8f18cfb9b..03e28252f 100755 --- a/library/src/main/java/com/chad/library/adapter/base/animation/ScaleInAnimation.kt +++ b/library/src/main/java/com/chad/library/adapter4/animation/ScaleInAnimation.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.animation +package com.chad.library.adapter4.animation import android.animation.Animator import android.animation.AnimatorSet @@ -12,7 +12,8 @@ import android.view.animation.DecelerateInterpolator */ class ScaleInAnimation @JvmOverloads constructor( private val duration: Long = 300, - private val mFrom: Float = DEFAULT_SCALE_FROM) : ItemAnimator { + private val mFrom: Float = DEFAULT_SCALE_FROM +) : ItemAnimator { private val interpolator = DecelerateInterpolator() diff --git a/library/src/main/java/com/chad/library/adapter/base/animation/SlideInBottomAnimation.kt b/library/src/main/java/com/chad/library/adapter4/animation/SlideInBottomAnimation.kt similarity index 94% rename from library/src/main/java/com/chad/library/adapter/base/animation/SlideInBottomAnimation.kt rename to library/src/main/java/com/chad/library/adapter4/animation/SlideInBottomAnimation.kt index e928b034b..107baf9c1 100755 --- a/library/src/main/java/com/chad/library/adapter/base/animation/SlideInBottomAnimation.kt +++ b/library/src/main/java/com/chad/library/adapter4/animation/SlideInBottomAnimation.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.animation +package com.chad.library.adapter4.animation import android.animation.Animator import android.animation.ObjectAnimator diff --git a/library/src/main/java/com/chad/library/adapter/base/animation/SlideInLeftAnimation.kt b/library/src/main/java/com/chad/library/adapter4/animation/SlideInLeftAnimation.kt similarity index 94% rename from library/src/main/java/com/chad/library/adapter/base/animation/SlideInLeftAnimation.kt rename to library/src/main/java/com/chad/library/adapter4/animation/SlideInLeftAnimation.kt index 000834cf3..4c834c179 100755 --- a/library/src/main/java/com/chad/library/adapter/base/animation/SlideInLeftAnimation.kt +++ b/library/src/main/java/com/chad/library/adapter4/animation/SlideInLeftAnimation.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.animation +package com.chad.library.adapter4.animation import android.animation.Animator import android.animation.ObjectAnimator diff --git a/library/src/main/java/com/chad/library/adapter/base/animation/SlideInRightAnimation.kt b/library/src/main/java/com/chad/library/adapter4/animation/SlideInRightAnimation.kt similarity index 94% rename from library/src/main/java/com/chad/library/adapter/base/animation/SlideInRightAnimation.kt rename to library/src/main/java/com/chad/library/adapter4/animation/SlideInRightAnimation.kt index 34e4a895a..53cafd874 100755 --- a/library/src/main/java/com/chad/library/adapter/base/animation/SlideInRightAnimation.kt +++ b/library/src/main/java/com/chad/library/adapter4/animation/SlideInRightAnimation.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.animation +package com.chad.library.adapter4.animation import android.animation.Animator import android.animation.ObjectAnimator diff --git a/library/src/main/java/com/chad/library/adapter/base/dragswipe/DragSwipeExt.kt b/library/src/main/java/com/chad/library/adapter4/dragswipe/DragSwipeExt.kt similarity index 93% rename from library/src/main/java/com/chad/library/adapter/base/dragswipe/DragSwipeExt.kt rename to library/src/main/java/com/chad/library/adapter4/dragswipe/DragSwipeExt.kt index f875d4026..f5227c1b5 100644 --- a/library/src/main/java/com/chad/library/adapter/base/dragswipe/DragSwipeExt.kt +++ b/library/src/main/java/com/chad/library/adapter4/dragswipe/DragSwipeExt.kt @@ -1,9 +1,9 @@ -package com.chad.library.adapter.base.dragswipe +package com.chad.library.adapter4.dragswipe import android.graphics.Canvas import androidx.recyclerview.widget.RecyclerView -import com.chad.library.adapter.base.dragswipe.listener.OnItemDragListener -import com.chad.library.adapter.base.dragswipe.listener.OnItemSwipeListener +import com.chad.library.adapter4.dragswipe.listener.OnItemDragListener +import com.chad.library.adapter4.dragswipe.listener.OnItemSwipeListener /** * 使用拖拽方式的拓展函数 diff --git a/library/src/main/java/com/chad/library/adapter/base/dragswipe/QuickDragAndSwipe.kt b/library/src/main/java/com/chad/library/adapter4/dragswipe/QuickDragAndSwipe.kt similarity index 96% rename from library/src/main/java/com/chad/library/adapter/base/dragswipe/QuickDragAndSwipe.kt rename to library/src/main/java/com/chad/library/adapter4/dragswipe/QuickDragAndSwipe.kt index cacdccffc..0c8107952 100644 --- a/library/src/main/java/com/chad/library/adapter/base/dragswipe/QuickDragAndSwipe.kt +++ b/library/src/main/java/com/chad/library/adapter4/dragswipe/QuickDragAndSwipe.kt @@ -1,12 +1,12 @@ -package com.chad.library.adapter.base.dragswipe +package com.chad.library.adapter4.dragswipe import android.graphics.Canvas import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView -import com.chad.library.adapter.base.dragswipe.listener.DragAndSwipeDataCallback -import com.chad.library.adapter.base.dragswipe.listener.OnItemDragListener -import com.chad.library.adapter.base.dragswipe.listener.OnItemSwipeListener -import com.chad.library.adapter.base.viewholder.StateLayoutVH +import com.chad.library.adapter4.dragswipe.listener.DragAndSwipeDataCallback +import com.chad.library.adapter4.dragswipe.listener.OnItemDragListener +import com.chad.library.adapter4.dragswipe.listener.OnItemSwipeListener +import com.chad.library.adapter4.viewholder.StateLayoutVH /** * @author yangfeng diff --git a/library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/DragAndSwipeDataCallback.kt b/library/src/main/java/com/chad/library/adapter4/dragswipe/listener/DragAndSwipeDataCallback.kt similarity index 83% rename from library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/DragAndSwipeDataCallback.kt rename to library/src/main/java/com/chad/library/adapter4/dragswipe/listener/DragAndSwipeDataCallback.kt index 46573c13a..07d5fe911 100644 --- a/library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/DragAndSwipeDataCallback.kt +++ b/library/src/main/java/com/chad/library/adapter4/dragswipe/listener/DragAndSwipeDataCallback.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.dragswipe.listener +package com.chad.library.adapter4.dragswipe.listener /** * 由外部实现的数据操作 diff --git a/library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/OnItemDragListener.java b/library/src/main/java/com/chad/library/adapter4/dragswipe/listener/OnItemDragListener.java similarity index 89% rename from library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/OnItemDragListener.java rename to library/src/main/java/com/chad/library/adapter4/dragswipe/listener/OnItemDragListener.java index e81aa7950..835a53432 100644 --- a/library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/OnItemDragListener.java +++ b/library/src/main/java/com/chad/library/adapter4/dragswipe/listener/OnItemDragListener.java @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.dragswipe.listener; +package com.chad.library.adapter4.dragswipe.listener; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/OnItemSwipeListener.java b/library/src/main/java/com/chad/library/adapter4/dragswipe/listener/OnItemSwipeListener.java similarity index 96% rename from library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/OnItemSwipeListener.java rename to library/src/main/java/com/chad/library/adapter4/dragswipe/listener/OnItemSwipeListener.java index 30bbc9ee7..dfdf08705 100644 --- a/library/src/main/java/com/chad/library/adapter/base/dragswipe/listener/OnItemSwipeListener.java +++ b/library/src/main/java/com/chad/library/adapter4/dragswipe/listener/OnItemSwipeListener.java @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.dragswipe.listener; +package com.chad.library.adapter4.dragswipe.listener; import android.graphics.Canvas; diff --git a/library/src/main/java/com/chad/library/adapter4/fullspan/FullSpanAdapterType.kt b/library/src/main/java/com/chad/library/adapter4/fullspan/FullSpanAdapterType.kt new file mode 100644 index 000000000..a3bd2be36 --- /dev/null +++ b/library/src/main/java/com/chad/library/adapter4/fullspan/FullSpanAdapterType.kt @@ -0,0 +1,13 @@ +package com.chad.library.adapter4.fullspan + +import androidx.recyclerview.widget.GridLayoutManager + +/** + * If Adapter needs full span, implement this interface. + * Need to be used with [com.chad.library.adapter4.base.layoutmanager.QuickGridLayoutManager] + * + * 如果此类型的 Adapter 需要满跨度，实现此接口。 + * 需要配合 [com.chad.library.adapter4.base.layoutmanager.QuickGridLayoutManager] 使用，或者自行实现[GridLayoutManager.SpanSizeLookup] + * + */ +interface FullSpanAdapterType \ No newline at end of file diff --git a/library/src/main/java/com/chad/library/adapter/base/layoutmanager/QuickGridLayoutManager.kt b/library/src/main/java/com/chad/library/adapter4/layoutmanager/QuickGridLayoutManager.kt similarity index 95% rename from library/src/main/java/com/chad/library/adapter/base/layoutmanager/QuickGridLayoutManager.kt rename to library/src/main/java/com/chad/library/adapter4/layoutmanager/QuickGridLayoutManager.kt index 95ad6723d..9ea211834 100644 --- a/library/src/main/java/com/chad/library/adapter/base/layoutmanager/QuickGridLayoutManager.kt +++ b/library/src/main/java/com/chad/library/adapter4/layoutmanager/QuickGridLayoutManager.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.layoutmanager +package com.chad.library.adapter4.layoutmanager import android.content.Context import android.util.AttributeSet @@ -6,8 +6,8 @@ import androidx.annotation.CallSuper import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.chad.library.adapter.base.BaseQuickAdapter -import com.chad.library.adapter.base.fullspan.FullSpanAdapterType +import com.chad.library.adapter4.BaseQuickAdapter +import com.chad.library.adapter4.fullspan.FullSpanAdapterType /** * grid layout manager. diff --git a/library/src/main/java/com/chad/library/adapter/base/loadState/LoadState.kt b/library/src/main/java/com/chad/library/adapter4/loadState/LoadState.kt similarity index 98% rename from library/src/main/java/com/chad/library/adapter/base/loadState/LoadState.kt rename to library/src/main/java/com/chad/library/adapter4/loadState/LoadState.kt index a0ea46df2..2ab37fac7 100644 --- a/library/src/main/java/com/chad/library/adapter/base/loadState/LoadState.kt +++ b/library/src/main/java/com/chad/library/adapter4/loadState/LoadState.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.loadState +package com.chad.library.adapter4.loadState /** * Load state diff --git a/library/src/main/java/com/chad/library/adapter/base/loadState/LoadStateAdapter.kt b/library/src/main/java/com/chad/library/adapter4/loadState/LoadStateAdapter.kt similarity index 97% rename from library/src/main/java/com/chad/library/adapter/base/loadState/LoadStateAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/loadState/LoadStateAdapter.kt index bd274e3b3..05913b54a 100644 --- a/library/src/main/java/com/chad/library/adapter/base/loadState/LoadStateAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/loadState/LoadStateAdapter.kt @@ -1,9 +1,9 @@ -package com.chad.library.adapter.base.loadState +package com.chad.library.adapter4.loadState import android.view.ViewGroup import androidx.annotation.CallSuper import androidx.recyclerview.widget.RecyclerView -import com.chad.library.adapter.base.fullspan.FullSpanAdapterType +import com.chad.library.adapter4.fullspan.FullSpanAdapterType /** * Load state Adapter diff --git a/library/src/main/java/com/chad/library/adapter/base/loadState/leading/DefaultLeadingLoadStateAdapter.kt b/library/src/main/java/com/chad/library/adapter4/loadState/leading/DefaultLeadingLoadStateAdapter.kt similarity index 92% rename from library/src/main/java/com/chad/library/adapter/base/loadState/leading/DefaultLeadingLoadStateAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/loadState/leading/DefaultLeadingLoadStateAdapter.kt index 2a5405075..f6b7b7743 100644 --- a/library/src/main/java/com/chad/library/adapter/base/loadState/leading/DefaultLeadingLoadStateAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/loadState/leading/DefaultLeadingLoadStateAdapter.kt @@ -1,11 +1,11 @@ -package com.chad.library.adapter.base.loadState.leading +package com.chad.library.adapter4.loadState.leading import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.chad.library.R -import com.chad.library.adapter.base.loadState.LoadState +import com.chad.library.adapter4.loadState.LoadState /** * Default leading load state adapter diff --git a/library/src/main/java/com/chad/library/adapter/base/loadState/leading/LeadingLoadStateAdapter.kt b/library/src/main/java/com/chad/library/adapter4/loadState/leading/LeadingLoadStateAdapter.kt similarity index 94% rename from library/src/main/java/com/chad/library/adapter/base/loadState/leading/LeadingLoadStateAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/loadState/leading/LeadingLoadStateAdapter.kt index df174d634..e4183c838 100644 --- a/library/src/main/java/com/chad/library/adapter/base/loadState/leading/LeadingLoadStateAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/loadState/leading/LeadingLoadStateAdapter.kt @@ -1,9 +1,9 @@ -package com.chad.library.adapter.base.loadState.leading +package com.chad.library.adapter4.loadState.leading import androidx.annotation.CallSuper import androidx.recyclerview.widget.RecyclerView -import com.chad.library.adapter.base.loadState.LoadState -import com.chad.library.adapter.base.loadState.LoadStateAdapter +import com.chad.library.adapter4.loadState.LoadState +import com.chad.library.adapter4.loadState.LoadStateAdapter /** * Leading load state adapter diff --git a/library/src/main/java/com/chad/library/adapter/base/loadState/trailing/DefaultTrailingLoadStateAdapter.kt b/library/src/main/java/com/chad/library/adapter4/loadState/trailing/DefaultTrailingLoadStateAdapter.kt similarity index 96% rename from library/src/main/java/com/chad/library/adapter/base/loadState/trailing/DefaultTrailingLoadStateAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/loadState/trailing/DefaultTrailingLoadStateAdapter.kt index 4b086bbe1..f55ba9754 100644 --- a/library/src/main/java/com/chad/library/adapter/base/loadState/trailing/DefaultTrailingLoadStateAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/loadState/trailing/DefaultTrailingLoadStateAdapter.kt @@ -1,11 +1,11 @@ -package com.chad.library.adapter.base.loadState.trailing +package com.chad.library.adapter4.loadState.trailing import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.chad.library.R -import com.chad.library.adapter.base.loadState.LoadState +import com.chad.library.adapter4.loadState.LoadState /** * Default trailing load state adapter diff --git a/library/src/main/java/com/chad/library/adapter/base/loadState/trailing/TrailingLoadStateAdapter.kt b/library/src/main/java/com/chad/library/adapter4/loadState/trailing/TrailingLoadStateAdapter.kt similarity index 97% rename from library/src/main/java/com/chad/library/adapter/base/loadState/trailing/TrailingLoadStateAdapter.kt rename to library/src/main/java/com/chad/library/adapter4/loadState/trailing/TrailingLoadStateAdapter.kt index 846c2bfee..6216d2f15 100644 --- a/library/src/main/java/com/chad/library/adapter/base/loadState/trailing/TrailingLoadStateAdapter.kt +++ b/library/src/main/java/com/chad/library/adapter4/loadState/trailing/TrailingLoadStateAdapter.kt @@ -1,11 +1,11 @@ -package com.chad.library.adapter.base.loadState.trailing +package com.chad.library.adapter4.loadState.trailing import androidx.annotation.CallSuper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager -import com.chad.library.adapter.base.loadState.LoadState -import com.chad.library.adapter.base.loadState.LoadStateAdapter +import com.chad.library.adapter4.loadState.LoadState +import com.chad.library.adapter4.loadState.LoadStateAdapter /** * Tail load more parent class Adapter. diff --git a/library/src/main/java/com/chad/library/adapter/base/util/AdapterUtils.kt b/library/src/main/java/com/chad/library/adapter4/util/AdapterUtils.kt similarity index 95% rename from library/src/main/java/com/chad/library/adapter/base/util/AdapterUtils.kt rename to library/src/main/java/com/chad/library/adapter4/util/AdapterUtils.kt index 30e28b9f0..8d0732654 100644 --- a/library/src/main/java/com/chad/library/adapter/base/util/AdapterUtils.kt +++ b/library/src/main/java/com/chad/library/adapter4/util/AdapterUtils.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.util +package com.chad.library.adapter4.util import android.view.LayoutInflater import android.view.View diff --git a/library/src/main/java/com/chad/library/adapter/base/util/ItemClickUtils.kt b/library/src/main/java/com/chad/library/adapter4/util/ItemClickUtils.kt similarity index 95% rename from library/src/main/java/com/chad/library/adapter/base/util/ItemClickUtils.kt rename to library/src/main/java/com/chad/library/adapter4/util/ItemClickUtils.kt index ff0d433f2..131c75d2d 100644 --- a/library/src/main/java/com/chad/library/adapter/base/util/ItemClickUtils.kt +++ b/library/src/main/java/com/chad/library/adapter4/util/ItemClickUtils.kt @@ -1,10 +1,9 @@ -package com.chad.library.adapter.base.util +package com.chad.library.adapter4.util import android.view.View import androidx.annotation.IdRes import androidx.recyclerview.widget.RecyclerView -import com.chad.library.R -import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter4.BaseQuickAdapter /** * @author 李沐阳 diff --git a/library/src/main/java/com/chad/library/adapter/base/viewholder/DataBindingHolder.java b/library/src/main/java/com/chad/library/adapter4/viewholder/DataBindingHolder.java similarity index 96% rename from library/src/main/java/com/chad/library/adapter/base/viewholder/DataBindingHolder.java rename to library/src/main/java/com/chad/library/adapter4/viewholder/DataBindingHolder.java index f157a8ae6..b2ebd54f0 100644 --- a/library/src/main/java/com/chad/library/adapter/base/viewholder/DataBindingHolder.java +++ b/library/src/main/java/com/chad/library/adapter4/viewholder/DataBindingHolder.java @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.viewholder; +package com.chad.library.adapter4.viewholder; import android.view.LayoutInflater; import android.view.View; diff --git a/library/src/main/java/com/chad/library/adapter/base/viewholder/QuickViewHolder.kt b/library/src/main/java/com/chad/library/adapter4/viewholder/QuickViewHolder.kt similarity index 98% rename from library/src/main/java/com/chad/library/adapter/base/viewholder/QuickViewHolder.kt rename to library/src/main/java/com/chad/library/adapter4/viewholder/QuickViewHolder.kt index ed35086d4..881938ce7 100644 --- a/library/src/main/java/com/chad/library/adapter/base/viewholder/QuickViewHolder.kt +++ b/library/src/main/java/com/chad/library/adapter4/viewholder/QuickViewHolder.kt @@ -1,4 +1,4 @@ -package com.chad.library.adapter.base.viewholder +package com.chad.library.adapter4.viewholder import android.graphics.Bitmap import android.graphics.drawable.Drawable diff --git a/library/src/main/java/com/chad/library/adapter/base/viewholder/StateLayoutVH.kt b/library/src/main/java/com/chad/library/adapter4/viewholder/StateLayoutVH.kt similarity index 93% rename from library/src/main/java/com/chad/library/adapter/base/viewholder/StateLayoutVH.kt rename to library/src/main/java/com/chad/library/adapter4/viewholder/StateLayoutVH.kt index 08ebf1201..4c39cf920 100644 --- a/library/src/main/java/com/chad/library/adapter/base/viewholder/StateLayoutVH.kt +++ b/library/src/main/java/com/chad/library/adapter4/viewholder/StateLayoutVH.kt @@ -1,11 +1,11 @@ -package com.chad.library.adapter.base.viewholder +package com.chad.library.adapter4.viewholder import android.view.Gravity import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import androidx.recyclerview.widget.RecyclerView -import com.chad.library.adapter.base.fullspan.FullSpanAdapterType +import com.chad.library.adapter4.fullspan.FullSpanAdapterType /** * An emptyState viewHolder. (For internal use only)