From 108803265bbeadfa6bbfdbe5f8497a7e5c47bff5 Mon Sep 17 00:00:00 2001 From: D Date: Sun, 27 Dec 2020 22:01:01 +0800 Subject: [PATCH] Migrate to AndroidX --- app/build.gradle | 12 +++++----- .../d/pulllayout/ExampleInstrumentedTest.java | 4 ++-- .../d/pulllayout/edge/EdgeListActivity.java | 4 ++-- .../list/activity/CoordinatorTabActivity.java | 15 +++++++------ .../list/activity/ListActivity.java | 13 ++++++----- .../list/adapter/rv/ItemTouchGridAdapter.java | 3 ++- .../list/adapter/rv/SpaceItemDecoration.java | 3 ++- .../list/fragment/ItemTouchFragment.java | 15 +++++++------ .../list/fragment/MultipleFragment.java | 9 ++++---- .../list/fragment/SimpleFragment.java | 7 +++--- .../com/d/pulllayout/list/model/EdgeType.java | 2 +- .../com/d/pulllayout/list/model/ListType.java | 4 ++-- .../list/presenter/LoadPresenter.java | 4 ++-- .../activity/PullRecyclerViewActivity.java | 4 ++-- .../view/NestedScrollingListView.java | 5 +++-- .../d/pulllayout/view/NoScrollViewPager.java | 7 +++--- .../res/layout/activity_coordinatorlayout.xml | 22 +++++++++---------- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_pull.xml | 2 +- .../res/layout/activity_pull_listview.xml | 2 +- .../res/layout/activity_pull_recyclerview.xml | 4 ++-- .../res/layout/activity_pull_scrollview.xml | 2 +- .../main/res/layout/activity_pull_view.xml | 2 +- .../fragment_list_coordinatorlayout.xml | 18 +++++++-------- .../res/layout/fragment_list_item_touch.xml | 2 +- ...gment_list_pullrecyclerlayout_listview.xml | 2 +- ...t_list_pullrecyclerlayout_recyclerview.xml | 2 +- .../layout/fragment_list_pullrecyclerview.xml | 2 +- build.gradle | 2 +- gradle.properties | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- integration/edge_elastic/build.gradle | 12 +++++----- .../edge/elastic/ExampleInstrumentedTest.java | 4 ++-- .../edge/elastic/BezierWaveView.java | 3 ++- .../pulllayout/edge/elastic/HeaderView.java | 5 +++-- integration/edge_ripple/build.gradle | 12 +++++----- .../edge/ripple/ExampleInstrumentedTest.java | 4 ++-- .../pulllayout/edge/ripple/FooterView.java | 5 +++-- .../pulllayout/edge/ripple/HeaderView.java | 5 +++-- .../pulllayout/edge/ripple/state/State.java | 3 ++- lib/build.gradle | 16 +++++++------- .../pulllayout/ExampleInstrumentedTest.java | 4 ++-- .../java/com/d/lib/pulllayout/PullLayout.java | 3 ++- .../d/lib/pulllayout/PullRecyclerLayout.java | 7 +++--- .../com/d/lib/pulllayout/edge/EdgeView.java | 5 +++-- .../lib/pulllayout/edge/arrow/FooterView.java | 5 +++-- .../lib/pulllayout/edge/arrow/HeaderView.java | 5 +++-- .../pulllayout/edge/arrow/LoadingView.java | 3 ++- .../pulllayout/lv/adapter/CommonAdapter.java | 3 ++- .../pulllayout/lv/adapter/CommonHolder.java | 11 +++++----- .../com/d/lib/pulllayout/rv/ItemViewList.java | 3 ++- .../d/lib/pulllayout/rv/PullRecyclerView.java | 9 ++++---- .../pulllayout/rv/adapter/CommonAdapter.java | 5 +++-- .../rv/adapter/CommonCheckAdapter.java | 3 ++- .../rv/adapter/CommonCursorAdapter.java | 5 +++-- .../pulllayout/rv/adapter/CommonHolder.java | 9 ++++---- .../pulllayout/rv/adapter/WrapAdapter.java | 9 ++++---- .../rv/adapter/WrapAdapterDataObserver.java | 2 +- .../itemdecoration/DividerItemDecoration.java | 5 +++-- .../itemtouchhelper/OnStartDragListener.java | 2 +- .../SimpleItemTouchHelperCallback.java | 7 +++--- .../d/lib/pulllayout/util/AppBarHelper.java | 6 +++-- .../pulllayout/util/NestedScrollHelper.java | 13 ++++++----- .../pulllayout/util/RecyclerScrollHelper.java | 9 ++++---- .../pulllayout/util/RefreshableCompat.java | 9 ++++---- .../java/com/d/lib/pulllayout/util/Utils.java | 3 ++- 66 files changed, 217 insertions(+), 178 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3a4bb70..5e54b60 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.d.pulllayout" minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 26 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -27,14 +27,14 @@ android { dependencies { testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':lib') implementation project(':integration:edge_ripple') implementation project(':integration:edge_elastic') - implementation('com.dsiner.lib:common:1.1.1') { + implementation('com.dsiner.lib:common:1.2.0') { exclude group: 'com.dsiner.lib', module: 'pulllayout' } } diff --git a/app/src/androidTest/java/com/d/pulllayout/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/d/pulllayout/ExampleInstrumentedTest.java index 79cd7c4..a006553 100644 --- a/app/src/androidTest/java/com/d/pulllayout/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/d/pulllayout/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.d.pulllayout; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/d/pulllayout/edge/EdgeListActivity.java b/app/src/main/java/com/d/pulllayout/edge/EdgeListActivity.java index 390d666..53953ba 100644 --- a/app/src/main/java/com/d/pulllayout/edge/EdgeListActivity.java +++ b/app/src/main/java/com/d/pulllayout/edge/EdgeListActivity.java @@ -4,8 +4,8 @@ import android.widget.PopupWindow; import com.d.lib.common.util.ViewHelper; -import com.d.lib.common.view.popup.MenuPopup; -import com.d.lib.common.view.popup.PopupWindowFactory; +import com.d.lib.common.widget.popup.MenuPopup; +import com.d.lib.common.widget.popup.PopupWindowFactory; import com.d.pulllayout.R; import com.d.pulllayout.list.activity.ListActivity; import com.d.pulllayout.list.model.EdgeType; diff --git a/app/src/main/java/com/d/pulllayout/list/activity/CoordinatorTabActivity.java b/app/src/main/java/com/d/pulllayout/list/activity/CoordinatorTabActivity.java index 7f94f50..18520aa 100644 --- a/app/src/main/java/com/d/pulllayout/list/activity/CoordinatorTabActivity.java +++ b/app/src/main/java/com/d/pulllayout/list/activity/CoordinatorTabActivity.java @@ -1,17 +1,18 @@ package com.d.pulllayout.list.activity; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; import android.view.View; import android.widget.PopupWindow; -import com.d.lib.common.component.loader.v4.AbsPageFragmentActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + +import com.d.lib.common.component.loader.v4.BasePagerFragmentActivity; import com.d.lib.common.component.mvp.MvpBasePresenter; import com.d.lib.common.util.ViewHelper; -import com.d.lib.common.view.popup.MenuPopup; -import com.d.lib.common.view.popup.PopupWindowFactory; +import com.d.lib.common.widget.popup.MenuPopup; +import com.d.lib.common.widget.popup.PopupWindowFactory; import com.d.pulllayout.R; import com.d.pulllayout.list.fragment.CoordinatorLayoutFragment; import com.d.pulllayout.list.model.ListType; @@ -24,7 +25,7 @@ * CoordinatorTabActivity * Created by D on 2018/5/31. */ -public class CoordinatorTabActivity extends AbsPageFragmentActivity { +public class CoordinatorTabActivity extends BasePagerFragmentActivity { private int mListType = ListType.PULLRECYCLERLAYOUT_PULLRECYCLERVIEW; diff --git a/app/src/main/java/com/d/pulllayout/list/activity/ListActivity.java b/app/src/main/java/com/d/pulllayout/list/activity/ListActivity.java index d78f784..2b4bbb8 100644 --- a/app/src/main/java/com/d/pulllayout/list/activity/ListActivity.java +++ b/app/src/main/java/com/d/pulllayout/list/activity/ListActivity.java @@ -4,18 +4,19 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.View; import android.widget.ImageView; import android.widget.PopupWindow; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.d.lib.common.component.mvp.MvpBasePresenter; import com.d.lib.common.component.mvp.app.v4.BaseFragmentActivity; import com.d.lib.common.util.ViewHelper; -import com.d.lib.common.view.TitleLayout; -import com.d.lib.common.view.popup.MenuPopup; -import com.d.lib.common.view.popup.PopupWindowFactory; +import com.d.lib.common.widget.TitleLayout; +import com.d.lib.common.widget.popup.MenuPopup; +import com.d.lib.common.widget.popup.PopupWindowFactory; import com.d.pulllayout.R; import com.d.pulllayout.list.fragment.CoordinatorLayoutFragment; import com.d.pulllayout.list.fragment.ItemTouchFragment; @@ -102,7 +103,7 @@ public void onClick(PopupWindow popup, int position, String item) { protected int getLayoutRes() { return mType == TYPE_COORDINATOR_LIST ? R.layout.fragment_list_coordinatorlayout - : R.layout.lib_pub_activity_abs_content; + : R.layout.lib_pub_activity_loader_content; } @Override diff --git a/app/src/main/java/com/d/pulllayout/list/adapter/rv/ItemTouchGridAdapter.java b/app/src/main/java/com/d/pulllayout/list/adapter/rv/ItemTouchGridAdapter.java index c7856a0..5f4ef0b 100644 --- a/app/src/main/java/com/d/pulllayout/list/adapter/rv/ItemTouchGridAdapter.java +++ b/app/src/main/java/com/d/pulllayout/list/adapter/rv/ItemTouchGridAdapter.java @@ -2,11 +2,12 @@ import android.annotation.SuppressLint; import android.content.Context; -import android.support.v4.content.ContextCompat; import android.view.MotionEvent; import android.view.View; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import com.d.lib.pulllayout.rv.adapter.CommonAdapter; import com.d.lib.pulllayout.rv.adapter.CommonHolder; import com.d.lib.pulllayout.rv.itemtouchhelper.ItemTouchHelperViewHolder; diff --git a/app/src/main/java/com/d/pulllayout/list/adapter/rv/SpaceItemDecoration.java b/app/src/main/java/com/d/pulllayout/list/adapter/rv/SpaceItemDecoration.java index cfafa45..2ae4f9c 100644 --- a/app/src/main/java/com/d/pulllayout/list/adapter/rv/SpaceItemDecoration.java +++ b/app/src/main/java/com/d/pulllayout/list/adapter/rv/SpaceItemDecoration.java @@ -1,9 +1,10 @@ package com.d.pulllayout.list.adapter.rv; import android.graphics.Rect; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + /** * SpaceItemDecoration * Created by D on 2016/8/6. diff --git a/app/src/main/java/com/d/pulllayout/list/fragment/ItemTouchFragment.java b/app/src/main/java/com/d/pulllayout/list/fragment/ItemTouchFragment.java index 9dc1a31..f0f94dd 100644 --- a/app/src/main/java/com/d/pulllayout/list/fragment/ItemTouchFragment.java +++ b/app/src/main/java/com/d/pulllayout/list/fragment/ItemTouchFragment.java @@ -1,20 +1,21 @@ package com.d.pulllayout.list.fragment; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; import android.view.View; import android.widget.ImageView; import android.widget.PopupWindow; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.d.lib.common.component.mvp.MvpBasePresenter; import com.d.lib.common.component.mvp.MvpView; import com.d.lib.common.component.mvp.app.v4.BaseFragment; import com.d.lib.common.util.ViewHelper; -import com.d.lib.common.view.TitleLayout; -import com.d.lib.common.view.popup.MenuPopup; -import com.d.lib.common.view.popup.PopupWindowFactory; +import com.d.lib.common.widget.TitleLayout; +import com.d.lib.common.widget.popup.MenuPopup; +import com.d.lib.common.widget.popup.PopupWindowFactory; import com.d.lib.pulllayout.rv.PullRecyclerView; import com.d.lib.pulllayout.rv.adapter.CommonAdapter; import com.d.lib.pulllayout.rv.itemtouchhelper.OnStartDragListener; diff --git a/app/src/main/java/com/d/pulllayout/list/fragment/MultipleFragment.java b/app/src/main/java/com/d/pulllayout/list/fragment/MultipleFragment.java index f7dab5f..96a64ac 100644 --- a/app/src/main/java/com/d/pulllayout/list/fragment/MultipleFragment.java +++ b/app/src/main/java/com/d/pulllayout/list/fragment/MultipleFragment.java @@ -1,12 +1,13 @@ package com.d.pulllayout.list.fragment; import android.os.Bundle; -import android.support.annotation.Nullable; import android.view.View; -import com.d.lib.common.component.loader.v4.AbsFragment; +import androidx.annotation.Nullable; + +import com.d.lib.common.component.loader.v4.BaseLoaderFragment; import com.d.lib.common.component.mvp.MvpView; -import com.d.lib.common.view.DSLayout; +import com.d.lib.common.widget.DSLayout; import com.d.lib.pulllayout.loader.CommonLoader; import com.d.lib.pulllayout.loader.RecyclerAdapter; import com.d.lib.pulllayout.rv.adapter.MultiItemTypeSupport; @@ -24,7 +25,7 @@ * Multiple Type * Created by D on 2017/4/26. */ -public class MultipleFragment extends AbsFragment { +public class MultipleFragment extends BaseLoaderFragment { private int mListType; @Override diff --git a/app/src/main/java/com/d/pulllayout/list/fragment/SimpleFragment.java b/app/src/main/java/com/d/pulllayout/list/fragment/SimpleFragment.java index c7d0deb..c4c0ad2 100644 --- a/app/src/main/java/com/d/pulllayout/list/fragment/SimpleFragment.java +++ b/app/src/main/java/com/d/pulllayout/list/fragment/SimpleFragment.java @@ -1,10 +1,11 @@ package com.d.pulllayout.list.fragment; import android.os.Bundle; -import android.support.annotation.Nullable; import android.util.Log; -import com.d.lib.common.component.loader.v4.AbsFragment; +import androidx.annotation.Nullable; + +import com.d.lib.common.component.loader.v4.BaseLoaderFragment; import com.d.lib.common.component.mvp.MvpView; import com.d.lib.pulllayout.Pullable; import com.d.lib.pulllayout.loader.RecyclerAdapter; @@ -22,7 +23,7 @@ * Simple Type * Created by D on 2017/4/26. */ -public class SimpleFragment extends AbsFragment { +public class SimpleFragment extends BaseLoaderFragment { private int mListType; private int mEdgeType; diff --git a/app/src/main/java/com/d/pulllayout/list/model/EdgeType.java b/app/src/main/java/com/d/pulllayout/list/model/EdgeType.java index 4dfe6b8..5a09994 100644 --- a/app/src/main/java/com/d/pulllayout/list/model/EdgeType.java +++ b/app/src/main/java/com/d/pulllayout/list/model/EdgeType.java @@ -2,7 +2,7 @@ import android.content.Context; -import com.d.lib.common.view.popup.MenuPopup; +import com.d.lib.common.widget.popup.MenuPopup; import com.d.lib.pulllayout.edge.IEdgeView; import com.d.pulllayout.R; diff --git a/app/src/main/java/com/d/pulllayout/list/model/ListType.java b/app/src/main/java/com/d/pulllayout/list/model/ListType.java index 7b78dc1..73471f6 100644 --- a/app/src/main/java/com/d/pulllayout/list/model/ListType.java +++ b/app/src/main/java/com/d/pulllayout/list/model/ListType.java @@ -1,6 +1,6 @@ package com.d.pulllayout.list.model; -import com.d.lib.common.view.popup.MenuPopup; +import com.d.lib.common.widget.popup.MenuPopup; import com.d.pulllayout.R; import java.util.Arrays; @@ -12,7 +12,7 @@ public class ListType { public static final int PULLRECYCLERLAYOUT_LISTVIEW = 2; public static final int PULLRECYCLERVIEW = 3; - public static int[] S_RES_IDS = new int[]{R.layout.lib_pub_fragment_abs, + public static int[] S_RES_IDS = new int[]{R.layout.lib_pub_fragment_loader, R.layout.fragment_list_pullrecyclerlayout_recyclerview, R.layout.fragment_list_pullrecyclerlayout_listview, R.layout.fragment_list_pullrecyclerview}; diff --git a/app/src/main/java/com/d/pulllayout/list/presenter/LoadPresenter.java b/app/src/main/java/com/d/pulllayout/list/presenter/LoadPresenter.java index 9971fbd..2a13214 100644 --- a/app/src/main/java/com/d/pulllayout/list/presenter/LoadPresenter.java +++ b/app/src/main/java/com/d/pulllayout/list/presenter/LoadPresenter.java @@ -4,7 +4,7 @@ import android.os.Handler; import android.os.Looper; -import com.d.lib.common.component.loader.AbsPresenter; +import com.d.lib.common.component.loader.MvpBaseLoaderPresenter; import com.d.lib.common.event.bus.callback.SimpleCallback; import com.d.pulllayout.list.model.Bean; @@ -15,7 +15,7 @@ * LoadPresenter * Created by D on 2017/4/26. */ -public class LoadPresenter extends AbsPresenter { +public class LoadPresenter extends MvpBaseLoaderPresenter { public LoadPresenter(Context context) { super(context); diff --git a/app/src/main/java/com/d/pulllayout/pull/activity/PullRecyclerViewActivity.java b/app/src/main/java/com/d/pulllayout/pull/activity/PullRecyclerViewActivity.java index 2e93f99..4c1f7d3 100644 --- a/app/src/main/java/com/d/pulllayout/pull/activity/PullRecyclerViewActivity.java +++ b/app/src/main/java/com/d/pulllayout/pull/activity/PullRecyclerViewActivity.java @@ -1,7 +1,7 @@ package com.d.pulllayout.pull.activity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.d.lib.common.component.mvp.MvpBasePresenter; import com.d.lib.common.component.mvp.MvpView; diff --git a/app/src/main/java/com/d/pulllayout/view/NestedScrollingListView.java b/app/src/main/java/com/d/pulllayout/view/NestedScrollingListView.java index d0ff123..467d86d 100644 --- a/app/src/main/java/com/d/pulllayout/view/NestedScrollingListView.java +++ b/app/src/main/java/com/d/pulllayout/view/NestedScrollingListView.java @@ -1,11 +1,12 @@ package com.d.pulllayout.view; import android.content.Context; -import android.support.v4.view.NestedScrollingChild; -import android.support.v4.view.NestedScrollingChildHelper; import android.util.AttributeSet; import android.widget.ListView; +import androidx.core.view.NestedScrollingChild; +import androidx.core.view.NestedScrollingChildHelper; + public class NestedScrollingListView extends ListView implements NestedScrollingChild { private NestedScrollingChildHelper mScrollingChildHelper; diff --git a/app/src/main/java/com/d/pulllayout/view/NoScrollViewPager.java b/app/src/main/java/com/d/pulllayout/view/NoScrollViewPager.java index 96a5d4f..92fa491 100644 --- a/app/src/main/java/com/d/pulllayout/view/NoScrollViewPager.java +++ b/app/src/main/java/com/d/pulllayout/view/NoScrollViewPager.java @@ -1,12 +1,13 @@ package com.d.pulllayout.view; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; + /** * NoScrollViewPager * Created by D on 2020/3/11. diff --git a/app/src/main/res/layout/activity_coordinatorlayout.xml b/app/src/main/res/layout/activity_coordinatorlayout.xml index 46c9c4e..20ae4e0 100644 --- a/app/src/main/res/layout/activity_coordinatorlayout.xml +++ b/app/src/main/res/layout/activity_coordinatorlayout.xml @@ -5,14 +5,14 @@ android:layout_height="match_parent" android:background="@color/lib_pub_color_bg_main"> - - - - - - - + + - - + - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ff2740b..2a6eaad 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:background="@color/lib_pub_color_bg_main" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/activity_pull.xml b/app/src/main/res/layout/activity_pull.xml index dd34a2b..4decf4c 100644 --- a/app/src/main/res/layout/activity_pull.xml +++ b/app/src/main/res/layout/activity_pull.xml @@ -6,7 +6,7 @@ android:background="@color/lib_pub_color_bg_main" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/activity_pull_listview.xml b/app/src/main/res/layout/activity_pull_listview.xml index a17841c..6c63586 100644 --- a/app/src/main/res/layout/activity_pull_listview.xml +++ b/app/src/main/res/layout/activity_pull_listview.xml @@ -11,7 +11,7 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/lib_pub_dimen_title_height" /> - diff --git a/app/src/main/res/layout/activity_pull_recyclerview.xml b/app/src/main/res/layout/activity_pull_recyclerview.xml index d9642f0..69b6b40 100644 --- a/app/src/main/res/layout/activity_pull_recyclerview.xml +++ b/app/src/main/res/layout/activity_pull_recyclerview.xml @@ -11,7 +11,7 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/lib_pub_dimen_title_height" /> - @@ -23,7 +23,7 @@ app:lib_pull_enable="true" app:lib_pull_gravity="top|left|right|bottom"> - - diff --git a/app/src/main/res/layout/activity_pull_view.xml b/app/src/main/res/layout/activity_pull_view.xml index cd84a25..0dc9d3f 100644 --- a/app/src/main/res/layout/activity_pull_view.xml +++ b/app/src/main/res/layout/activity_pull_view.xml @@ -11,7 +11,7 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/lib_pub_dimen_title_height" /> - diff --git a/app/src/main/res/layout/fragment_list_coordinatorlayout.xml b/app/src/main/res/layout/fragment_list_coordinatorlayout.xml index 9c5306d..582f726 100644 --- a/app/src/main/res/layout/fragment_list_coordinatorlayout.xml +++ b/app/src/main/res/layout/fragment_list_coordinatorlayout.xml @@ -5,14 +5,14 @@ android:layout_height="match_parent" android:background="@color/lib_pub_color_bg_main"> - - - - - - - - + + + - + diff --git a/app/src/main/res/layout/fragment_list_item_touch.xml b/app/src/main/res/layout/fragment_list_item_touch.xml index 85d8b94..f9a1485 100644 --- a/app/src/main/res/layout/fragment_list_item_touch.xml +++ b/app/src/main/res/layout/fragment_list_item_touch.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/fragment_list_pullrecyclerlayout_listview.xml b/app/src/main/res/layout/fragment_list_pullrecyclerlayout_listview.xml index 4d7f991..7ebc327 100644 --- a/app/src/main/res/layout/fragment_list_pullrecyclerlayout_listview.xml +++ b/app/src/main/res/layout/fragment_list_pullrecyclerlayout_listview.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/fragment_list_pullrecyclerlayout_recyclerview.xml b/app/src/main/res/layout/fragment_list_pullrecyclerlayout_recyclerview.xml index 88ac7b6..e2ad75a 100644 --- a/app/src/main/res/layout/fragment_list_pullrecyclerlayout_recyclerview.xml +++ b/app/src/main/res/layout/fragment_list_pullrecyclerlayout_recyclerview.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/fragment_list_pullrecyclerview.xml b/app/src/main/res/layout/fragment_list_pullrecyclerview.xml index c966c94..0509e8c 100644 --- a/app/src/main/res/layout/fragment_list_pullrecyclerview.xml +++ b/app/src/main/res/layout/fragment_list_pullrecyclerview.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/build.gradle b/build.gradle index 1b30e28..92b0e70 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.6.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index 1ef3a7c..b590f75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,4 +12,6 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8 -android.injected.testOnly=false \ No newline at end of file +android.injected.testOnly=false +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4949e87..16e4885 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/integration/edge_elastic/build.gradle b/integration/edge_elastic/build.gradle index 3768be7..0f25325 100644 --- a/integration/edge_elastic/build.gradle +++ b/integration/edge_elastic/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 resourcePrefix 'lib_pull_edge_elastic_' defaultConfig { minSdkVersion 11 - targetSdkVersion 27 + targetSdkVersion 26 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -27,10 +27,10 @@ android { dependencies { testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' implementation fileTree(dir: 'libs', include: ['*.jar']) compileOnly project(':lib') - compileOnly 'com.android.support:appcompat-v7:27.1.1' + compileOnly 'androidx.appcompat:appcompat:1.0.0' } \ No newline at end of file diff --git a/integration/edge_elastic/src/androidTest/java/com/d/lib/pulllayout/edge/elastic/ExampleInstrumentedTest.java b/integration/edge_elastic/src/androidTest/java/com/d/lib/pulllayout/edge/elastic/ExampleInstrumentedTest.java index ff09de6..1c1d826 100644 --- a/integration/edge_elastic/src/androidTest/java/com/d/lib/pulllayout/edge/elastic/ExampleInstrumentedTest.java +++ b/integration/edge_elastic/src/androidTest/java/com/d/lib/pulllayout/edge/elastic/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.d.lib.pulllayout.edge.elastic; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/integration/edge_elastic/src/main/java/com/d/lib/pulllayout/edge/elastic/BezierWaveView.java b/integration/edge_elastic/src/main/java/com/d/lib/pulllayout/edge/elastic/BezierWaveView.java index ad2ee5a..c0974de 100644 --- a/integration/edge_elastic/src/main/java/com/d/lib/pulllayout/edge/elastic/BezierWaveView.java +++ b/integration/edge_elastic/src/main/java/com/d/lib/pulllayout/edge/elastic/BezierWaveView.java @@ -5,10 +5,11 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Path; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; +import androidx.annotation.Nullable; + import com.d.lib.pulllayout.util.Utils; public class BezierWaveView extends View { diff --git a/integration/edge_elastic/src/main/java/com/d/lib/pulllayout/edge/elastic/HeaderView.java b/integration/edge_elastic/src/main/java/com/d/lib/pulllayout/edge/elastic/HeaderView.java index 7c366f9..1ddf6b8 100644 --- a/integration/edge_elastic/src/main/java/com/d/lib/pulllayout/edge/elastic/HeaderView.java +++ b/integration/edge_elastic/src/main/java/com/d/lib/pulllayout/edge/elastic/HeaderView.java @@ -1,11 +1,12 @@ package com.d.lib.pulllayout.edge.elastic; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.Gravity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.d.lib.pulllayout.edge.EdgeView; public class HeaderView extends EdgeView { diff --git a/integration/edge_ripple/build.gradle b/integration/edge_ripple/build.gradle index 7df0521..cb11755 100644 --- a/integration/edge_ripple/build.gradle +++ b/integration/edge_ripple/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 resourcePrefix 'lib_pull_edge_ripple_' defaultConfig { minSdkVersion 11 - targetSdkVersion 27 + targetSdkVersion 26 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -27,10 +27,10 @@ android { dependencies { testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' implementation fileTree(dir: 'libs', include: ['*.jar']) compileOnly project(':lib') - compileOnly 'com.android.support:appcompat-v7:27.1.1' + compileOnly 'androidx.appcompat:appcompat:1.0.0' } \ No newline at end of file diff --git a/integration/edge_ripple/src/androidTest/java/com/d/lib/pulllayout/edge/ripple/ExampleInstrumentedTest.java b/integration/edge_ripple/src/androidTest/java/com/d/lib/pulllayout/edge/ripple/ExampleInstrumentedTest.java index a479971..fe07c24 100644 --- a/integration/edge_ripple/src/androidTest/java/com/d/lib/pulllayout/edge/ripple/ExampleInstrumentedTest.java +++ b/integration/edge_ripple/src/androidTest/java/com/d/lib/pulllayout/edge/ripple/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.d.lib.pulllayout.edge.ripple; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/FooterView.java b/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/FooterView.java index b4fe86f..d5d2085 100644 --- a/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/FooterView.java +++ b/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/FooterView.java @@ -3,10 +3,11 @@ import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.d.lib.pulllayout.edge.EdgeView; public class FooterView extends EdgeView { diff --git a/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/HeaderView.java b/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/HeaderView.java index e5efb2f..3d0fde8 100644 --- a/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/HeaderView.java +++ b/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/HeaderView.java @@ -1,11 +1,12 @@ package com.d.lib.pulllayout.edge.ripple; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.Gravity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.d.lib.pulllayout.edge.EdgeView; public class HeaderView extends EdgeView { diff --git a/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/state/State.java b/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/state/State.java index 6575c32..2140a68 100644 --- a/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/state/State.java +++ b/integration/edge_ripple/src/main/java/com/d/lib/pulllayout/edge/ripple/state/State.java @@ -2,9 +2,10 @@ import android.content.Context; import android.graphics.Canvas; -import android.support.v4.content.ContextCompat; import android.view.View; +import androidx.core.content.ContextCompat; + import com.d.lib.pulllayout.edge.ripple.R; /** diff --git a/lib/build.gradle b/lib/build.gradle index 8028cb2..dcf3f0d 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,17 +1,17 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 resourcePrefix 'lib_pull_' defaultConfig { minSdkVersion 11 - targetSdkVersion 27 + targetSdkVersion 26 versionCode 1 versionName "1.0" consumerProguardFiles 'consumer-proguard-rules.pro' - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -28,11 +28,11 @@ android { dependencies { testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' implementation fileTree(dir: 'libs', include: ['*.jar']) - api 'com.android.support:appcompat-v7:27.1.1' - api 'com.android.support:recyclerview-v7:27.1.1' - api 'com.android.support:design:27.1.1' + api 'androidx.appcompat:appcompat:1.0.0' + api 'androidx.recyclerview:recyclerview:1.0.0' + api 'com.google.android.material:material:1.0.0' } diff --git a/lib/src/androidTest/java/com/d/lib/pulllayout/ExampleInstrumentedTest.java b/lib/src/androidTest/java/com/d/lib/pulllayout/ExampleInstrumentedTest.java index e15dc7f..57f1773 100644 --- a/lib/src/androidTest/java/com/d/lib/pulllayout/ExampleInstrumentedTest.java +++ b/lib/src/androidTest/java/com/d/lib/pulllayout/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.d.lib.pulllayout; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/lib/src/main/java/com/d/lib/pulllayout/PullLayout.java b/lib/src/main/java/com/d/lib/pulllayout/PullLayout.java index 7b9df4e..82c71ed 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/PullLayout.java +++ b/lib/src/main/java/com/d/lib/pulllayout/PullLayout.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.SystemClock; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; @@ -12,6 +11,8 @@ import android.view.ViewConfiguration; import android.view.ViewGroup; +import androidx.annotation.Nullable; + import com.d.lib.pulllayout.edge.IEdgeView; import com.d.lib.pulllayout.util.AppBarHelper; import com.d.lib.pulllayout.util.NestedAnimHelper; diff --git a/lib/src/main/java/com/d/lib/pulllayout/PullRecyclerLayout.java b/lib/src/main/java/com/d/lib/pulllayout/PullRecyclerLayout.java index 2e67308..4fbef47 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/PullRecyclerLayout.java +++ b/lib/src/main/java/com/d/lib/pulllayout/PullRecyclerLayout.java @@ -5,9 +5,6 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; @@ -16,6 +13,10 @@ import android.widget.ListAdapter; import android.widget.ListView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.d.lib.pulllayout.edge.IEdgeView; import com.d.lib.pulllayout.edge.IState; import com.d.lib.pulllayout.edge.arrow.FooterView; diff --git a/lib/src/main/java/com/d/lib/pulllayout/edge/EdgeView.java b/lib/src/main/java/com/d/lib/pulllayout/edge/EdgeView.java index e5770b3..cdc05a6 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/edge/EdgeView.java +++ b/lib/src/main/java/com/d/lib/pulllayout/edge/EdgeView.java @@ -2,14 +2,15 @@ import android.animation.TimeInterpolator; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.d.lib.pulllayout.Pullable; import com.d.lib.pulllayout.util.NestedAnimHelper; import com.d.lib.pulllayout.util.Utils; diff --git a/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/FooterView.java b/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/FooterView.java index e1bbcea..3881a4c 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/FooterView.java +++ b/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/FooterView.java @@ -1,12 +1,13 @@ package com.d.lib.pulllayout.edge.arrow; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.d.lib.pulllayout.R; import com.d.lib.pulllayout.edge.EdgeView; diff --git a/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/HeaderView.java b/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/HeaderView.java index 75a165e..88f034d 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/HeaderView.java +++ b/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/HeaderView.java @@ -1,8 +1,6 @@ package com.d.lib.pulllayout.edge.arrow; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.animation.Animation; @@ -10,6 +8,9 @@ import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.d.lib.pulllayout.R; import com.d.lib.pulllayout.edge.EdgeView; diff --git a/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/LoadingView.java b/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/LoadingView.java index e73e576..d99081b 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/LoadingView.java +++ b/lib/src/main/java/com/d/lib/pulllayout/edge/arrow/LoadingView.java @@ -6,10 +6,11 @@ import android.graphics.Paint; import android.graphics.RectF; import android.os.Handler; -import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.View; +import androidx.core.content.ContextCompat; + import com.d.lib.pulllayout.R; import java.lang.ref.WeakReference; diff --git a/lib/src/main/java/com/d/lib/pulllayout/lv/adapter/CommonAdapter.java b/lib/src/main/java/com/d/lib/pulllayout/lv/adapter/CommonAdapter.java index 75ccbfe..967d48a 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/lv/adapter/CommonAdapter.java +++ b/lib/src/main/java/com/d/lib/pulllayout/lv/adapter/CommonAdapter.java @@ -1,11 +1,12 @@ package com.d.lib.pulllayout.lv.adapter; import android.content.Context; -import android.support.annotation.NonNull; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; +import androidx.annotation.NonNull; + import com.d.lib.pulllayout.loader.RecyclerAdapter; import java.util.ArrayList; diff --git a/lib/src/main/java/com/d/lib/pulllayout/lv/adapter/CommonHolder.java b/lib/src/main/java/com/d/lib/pulllayout/lv/adapter/CommonHolder.java index 13ef92f..a6d299a 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/lv/adapter/CommonHolder.java +++ b/lib/src/main/java/com/d/lib/pulllayout/lv/adapter/CommonHolder.java @@ -2,11 +2,6 @@ import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; @@ -16,6 +11,12 @@ import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * CommonHolder for ListView * Created by D on 2017/4/25. diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/ItemViewList.java b/lib/src/main/java/com/d/lib/pulllayout/rv/ItemViewList.java index 00e147a..97575b6 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/ItemViewList.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/ItemViewList.java @@ -1,8 +1,9 @@ package com.d.lib.pulllayout.rv; -import android.support.annotation.Nullable; import android.view.View; +import androidx.annotation.Nullable; + import java.util.ArrayList; import java.util.List; diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/PullRecyclerView.java b/lib/src/main/java/com/d/lib/pulllayout/rv/PullRecyclerView.java index 208c05d..06175fa 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/PullRecyclerView.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/PullRecyclerView.java @@ -2,15 +2,16 @@ import android.animation.TimeInterpolator; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; import android.view.View; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.d.lib.pulllayout.Pullable; import com.d.lib.pulllayout.Refreshable; import com.d.lib.pulllayout.edge.IEdgeView; diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonAdapter.java b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonAdapter.java index cfbdcaf..bedcae6 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonAdapter.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonAdapter.java @@ -1,11 +1,12 @@ package com.d.lib.pulllayout.rv.adapter; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import com.d.lib.pulllayout.loader.RecyclerAdapter; import com.d.lib.pulllayout.rv.itemtouchhelper.ItemTouchHelperAdapter; import com.d.lib.pulllayout.rv.itemtouchhelper.OnStartDragListener; diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonCheckAdapter.java b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonCheckAdapter.java index e03b74f..de17efc 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonCheckAdapter.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonCheckAdapter.java @@ -1,7 +1,8 @@ package com.d.lib.pulllayout.rv.adapter; import android.content.Context; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Collections; diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonCursorAdapter.java b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonCursorAdapter.java index 9062e42..d7ecb06 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonCursorAdapter.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonCursorAdapter.java @@ -2,11 +2,12 @@ import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import com.d.lib.pulllayout.util.Utils; /** diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonHolder.java b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonHolder.java index 8d5df12..28896d7 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonHolder.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/CommonHolder.java @@ -2,10 +2,6 @@ import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; @@ -14,6 +10,11 @@ import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.d.lib.pulllayout.rv.itemtouchhelper.ItemTouchHelperViewHolder; public class CommonHolder extends RecyclerView.ViewHolder implements ItemTouchHelperViewHolder { diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/WrapAdapter.java b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/WrapAdapter.java index e11d8af..8e86a2e 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/WrapAdapter.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/WrapAdapter.java @@ -1,12 +1,13 @@ package com.d.lib.pulllayout.rv.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; + import com.d.lib.pulllayout.edge.IEdgeView; import com.d.lib.pulllayout.rv.ItemViewList; diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/WrapAdapterDataObserver.java b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/WrapAdapterDataObserver.java index 253123d..7d9f1f1 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/WrapAdapterDataObserver.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/adapter/WrapAdapterDataObserver.java @@ -1,6 +1,6 @@ package com.d.lib.pulllayout.rv.adapter; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; /** * WrapAdapterDataObserver for RecyclerView diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/itemdecoration/DividerItemDecoration.java b/lib/src/main/java/com/d/lib/pulllayout/rv/itemdecoration/DividerItemDecoration.java index 5debaa4..b64b012 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/itemdecoration/DividerItemDecoration.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/itemdecoration/DividerItemDecoration.java @@ -3,10 +3,11 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.d.lib.pulllayout.rv.adapter.WrapAdapter; /** diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/itemtouchhelper/OnStartDragListener.java b/lib/src/main/java/com/d/lib/pulllayout/rv/itemtouchhelper/OnStartDragListener.java index 15454a3..03f8036 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/itemtouchhelper/OnStartDragListener.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/itemtouchhelper/OnStartDragListener.java @@ -1,6 +1,6 @@ package com.d.lib.pulllayout.rv.itemtouchhelper; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; /** * Listener for manual initiation of a drag. diff --git a/lib/src/main/java/com/d/lib/pulllayout/rv/itemtouchhelper/SimpleItemTouchHelperCallback.java b/lib/src/main/java/com/d/lib/pulllayout/rv/itemtouchhelper/SimpleItemTouchHelperCallback.java index 9faed11..a8587d4 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/rv/itemtouchhelper/SimpleItemTouchHelperCallback.java +++ b/lib/src/main/java/com/d/lib/pulllayout/rv/itemtouchhelper/SimpleItemTouchHelperCallback.java @@ -2,9 +2,10 @@ import android.graphics.Canvas; import android.os.Build; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; + +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; /** * An implementation of ItemTouchHelper.Callback that enables basic drag drop and swipe-to-dismiss diff --git a/lib/src/main/java/com/d/lib/pulllayout/util/AppBarHelper.java b/lib/src/main/java/com/d/lib/pulllayout/util/AppBarHelper.java index 3bd8c7f..0e601a4 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/util/AppBarHelper.java +++ b/lib/src/main/java/com/d/lib/pulllayout/util/AppBarHelper.java @@ -1,10 +1,12 @@ package com.d.lib.pulllayout.util; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CoordinatorLayout; import android.view.View; import android.view.ViewParent; +import androidx.coordinatorlayout.widget.CoordinatorLayout; + +import com.google.android.material.appbar.AppBarLayout; + public class AppBarHelper { private final View mView; private final AppBarLayout.OnOffsetChangedListener mOnOffsetChangedListener; diff --git a/lib/src/main/java/com/d/lib/pulllayout/util/NestedScrollHelper.java b/lib/src/main/java/com/d/lib/pulllayout/util/NestedScrollHelper.java index d240c4f..7a75752 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/util/NestedScrollHelper.java +++ b/lib/src/main/java/com/d/lib/pulllayout/util/NestedScrollHelper.java @@ -1,16 +1,17 @@ package com.d.lib.pulllayout.util; -import android.support.design.widget.CoordinatorLayout; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.View; import android.view.ViewParent; import android.widget.AbsListView; import android.widget.ScrollView; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; + import com.d.lib.pulllayout.Pullable; public class NestedScrollHelper { diff --git a/lib/src/main/java/com/d/lib/pulllayout/util/RecyclerScrollHelper.java b/lib/src/main/java/com/d/lib/pulllayout/util/RecyclerScrollHelper.java index 2bb657c..f7a9db0 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/util/RecyclerScrollHelper.java +++ b/lib/src/main/java/com/d/lib/pulllayout/util/RecyclerScrollHelper.java @@ -1,13 +1,14 @@ package com.d.lib.pulllayout.util; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.View; import android.widget.AbsListView; import android.widget.ListView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; + import java.util.ArrayList; import java.util.List; diff --git a/lib/src/main/java/com/d/lib/pulllayout/util/RefreshableCompat.java b/lib/src/main/java/com/d/lib/pulllayout/util/RefreshableCompat.java index 7603678..046f150 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/util/RefreshableCompat.java +++ b/lib/src/main/java/com/d/lib/pulllayout/util/RefreshableCompat.java @@ -1,16 +1,17 @@ package com.d.lib.pulllayout.util; import android.os.Build; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.ListView; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.d.lib.pulllayout.PullRecyclerLayout; import com.d.lib.pulllayout.Refreshable; import com.d.lib.pulllayout.loader.RecyclerAdapter; diff --git a/lib/src/main/java/com/d/lib/pulllayout/util/Utils.java b/lib/src/main/java/com/d/lib/pulllayout/util/Utils.java index 12db5f5..32501a0 100644 --- a/lib/src/main/java/com/d/lib/pulllayout/util/Utils.java +++ b/lib/src/main/java/com/d/lib/pulllayout/util/Utils.java @@ -3,10 +3,11 @@ import android.content.Context; import android.database.Cursor; import android.graphics.Paint; -import android.support.annotation.NonNull; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; + /** * Utils * Created by D on 2017/4/19.