diff --git a/app/build.gradle b/app/build.gradle index 8b564492b..73d501ed4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,9 +27,9 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(path: ':library') implementation project(':material-spinner-1.0.5') - implementation 'com.google.android.material:material:1.0.0' - implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.kyleduo.switchbutton:library:2.0.0' implementation 'com.orhanobut:logger:2.2.0' } diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/AnimationUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/AnimationUseActivity.java index a8e83267d..dad382d42 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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 984e1125c..3acf9acbb 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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 57163bdf5..59b01d54b 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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 3bacfdeb6..5afccd64e 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 androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.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 ce4bbcd05..fba78f959 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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 e675ff593..5e8f58d0a 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 androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.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 f00fe7f8a..a8f97b1ea 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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 3fc1e45f0..9d9abcb52 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 androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; +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 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 ddd5bd346..099522b98 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemRvAdapterUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemRvAdapterUseActivity.java @@ -1,8 +1,11 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +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 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 a6c89d339..9bbfd0606 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemUseActivity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/MultipleItemUseActivity.java @@ -1,9 +1,11 @@ package com.chad.baserecyclerviewadapterhelper; import android.os.Bundle; - -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +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 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 7f4d38157..e0dd04a1d 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 androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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 2155ea7b7..4207d4087 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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 0fb59b520..15b9f6372 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 androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.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 92fe89263..22f9438e2 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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 f7b939b56..ec0f87a2b 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 androidx.appcompat.app.AppCompatActivity; +import android.support.v7.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 f24c3060e..6e5459927 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 androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; +import android.databinding.DataBindingUtil; +import android.databinding.ViewDataBinding; import android.view.View; import android.view.ViewGroup; 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 fa4e109d9..40b0e1bdd 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 androidx.annotation.Nullable; +import android.support.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 f156db6e9..1769b1ca9 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.Toast; @@ -53,7 +53,7 @@ protected void convert(final BaseViewHolder helper, final ClickEntity item) { case ClickEntity.NEST_CLICK_ITEM_CHILD_VIEW: helper.setNestView(R.id.item_click); // u can set nestview id final RecyclerView recyclerView = helper.getView(R.id.nest_list); - recyclerView.setLayoutManager(new LinearLayoutManager(helper.itemView.getContext(), RecyclerView.VERTICAL, false)); + recyclerView.setLayoutManager(new LinearLayoutManager(helper.itemView.getContext(), LinearLayoutManager.VERTICAL, false)); recyclerView.setHasFixedSize(true); nestAdapter = new NestAdapter(); 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 1e54dc9e4..27dd52edc 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 androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.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 47e139c22..e9ed97d0a 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 androidx.databinding.ViewDataBinding; +import android.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 ab0932f2b..0fbf329e2 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 androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; -import androidx.annotation.LayoutRes; -import androidx.annotation.Nullable; +import android.databinding.DataBindingUtil; +import android.databinding.ViewDataBinding; +import android.support.annotation.LayoutRes; +import android.support.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 f14536f8b..c1b3e0de3 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 androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridSectionAverageGapItemDecoration.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridSectionAverageGapItemDecoration.java index 241572c9c..b265248cc 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridSectionAverageGapItemDecoration.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridSectionAverageGapItemDecoration.java @@ -2,6 +2,8 @@ import android.graphics.Rect; import android.os.Build; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.View; @@ -11,9 +13,6 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.entity.SectionEntity; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - /** * 应用于RecyclerView的GridLayoutManager,水平方向上固定间距大小,从而使条目宽度自适应。
* 配合Brvah的Section使用,不对Head生效,仅对每个Head的子Grid列表生效
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 88aa180fa..48103c66f 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 androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; +import android.support.annotation.NonNull; +import android.support.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 262299e81..ca7b920b2 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 androidx.annotation.StringRes; +import android.support.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 4dd6a9982..31c2f5bb0 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 ce25cac00..68c31c7c0 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 609fe08b5..a028223ca 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 7aa764211..549e55ebd 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 f2251d0f0..0a941e2a6 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 abf752a92..111125cf2 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 d8d109bf3..35f3f927e 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 7c11364cb..cb4608c04 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 d4c376845..8ba2cc8e0 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 21842a60b..6d0cb5151 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 953e276a5..c47aa912b 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 96989bae3..13a6f136e 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 ecb16ada3..07b69c94a 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 c4b604452..1fdc07f3c 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 6a5159ba4..d114dd1bd 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 5734cb29a..4d072f82d 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 0aa9a53c6..ff68f4738 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 0cdf26db1..d6dab42f9 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 9b760d57b..bd657b040 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 86adc6f82..2d4a79afe 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { jcenter() mavenLocal() mavenCentral() + } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' diff --git a/gradle.properties b/gradle.properties index 028ef0806..780b865cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,5 +19,3 @@ 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 22780482a..e6b1884fa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jan 12 19:58:40 AWST 2019 +#Thu Mar 29 22:14:15 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/library/build.gradle b/library/build.gradle index 5ec13a2b7..78add0500 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ android { compileSdkVersion 28 defaultConfig { - minSdkVersion 11 + minSdkVersion 14 targetSdkVersion 28 versionCode 1 versionName "1.0" @@ -48,5 +48,5 @@ artifacts { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - compileOnly 'androidx.recyclerview:recyclerview:1.0.0' + compileOnly 'com.android.support:recyclerview-v7:28.0.0' } 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 1813ff84c..b5cd5d742 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 androidx.annotation.NonNull; -import androidx.core.view.MotionEventCompat; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; +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 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 1a62968b9..d463452d0 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,7 @@ package com.chad.library.adapter.base; -import androidx.annotation.IntRange; -import androidx.annotation.LayoutRes; - +import android.support.annotation.IntRange; +import android.support.annotation.LayoutRes; import android.util.SparseIntArray; import android.view.ViewGroup; import com.chad.library.adapter.base.entity.IExpandable; 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 a2cb31575..3a8ee9c7c 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 @@ -20,17 +20,17 @@ import android.animation.Animator; import android.content.Context; -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.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 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 f96fc8a29..858baa08c 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 androidx.annotation.IntRange; -import androidx.annotation.LayoutRes; +import android.support.annotation.IntRange; +import android.support.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 01b89f57f..19694df52 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 androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.IdRes; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.RecyclerView; +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 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 0df4a1187..5fc69f54c 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 androidx.annotation.Nullable; +import android.support.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 c89b496f4..a4f8974a7 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 androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.helper.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 490868662..5c3cbe18a 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 androidx.recyclerview.widget.RecyclerView; +import android.support.v7.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 8eee3d376..9227a2c8c 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 androidx.recyclerview.widget.RecyclerView; +import android.support.v7.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 ced038c47..0ad31c3ed 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 androidx.core.view.GestureDetectorCompat; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.view.GestureDetectorCompat; +import android.support.v7.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 dd764d250..1cd65d847 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 androidx.annotation.IdRes; -import androidx.annotation.LayoutRes; +import android.support.annotation.IdRes; +import android.support.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 53e5114de..1babeacfe 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 androidx.annotation.LayoutRes; +import android.support.annotation.LayoutRes; import android.util.SparseIntArray; import java.util.List;