support androidx

LightSun · Feb 28, 2020 · 54ba9d2 · 54ba9d2
1 parent 128027a
commit 54ba9d2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/PullToRefesh/android-pullrefreshview/src/main/res/layout/lib_ptr_widget_refresh_view.xml b/PullToRefesh/android-pullrefreshview/src/main/res/layout/lib_ptr_widget_refresh_view.xml
@@ -13,7 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

diff --git a/PullToRefesh/app/build.gradle b/PullToRefesh/app/build.gradle
@@ -29,9 +29,9 @@ dependencies {
     //  compile 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.jakewharton:butterknife:8.4.0'
     annotationProcessor "com.jakewharton:butterknife-compiler:8.4.0"
-    //compile 'com.heaven7.android.pullrefresh2:android-pullrefreshview2:1.0'
+
     implementation project(':android-pullrefreshview')
-    //compile 'com.heaven7.android.pullrefresh:android-pullrefreshview:1.0.1'
+
     annotationProcessor files('libs/TestProcessor.jar')
     implementation files('libs/TestProcessor.jar')
 

diff --git a/...app/src/main/java/pulltorefresh/android/heaven7/com/pulltorefesh/sample/BaseActivity.java b/...app/src/main/java/pulltorefresh/android/heaven7/com/pulltorefesh/sample/BaseActivity.java
@@ -2,9 +2,10 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Gravity;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.heaven7.core.util.Toaster;
 
 import butterknife.ButterKnife;

diff --git a/...ava/pulltorefresh/android/heaven7/com/pulltorefesh/sample/PullToRefreshTest2Activity.java b/...ava/pulltorefresh/android/heaven7/com/pulltorefesh/sample/PullToRefreshTest2Activity.java
@@ -3,9 +3,10 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.heaven7.adapter.BaseSelector;
 import com.heaven7.adapter.QuickRecycleViewAdapter;
 import com.heaven7.adapter.util.ViewHelper2;

diff --git a/...java/pulltorefresh/android/heaven7/com/pulltorefesh/sample/PullToRefreshTestActivity.java b/...java/pulltorefresh/android/heaven7/com/pulltorefesh/sample/PullToRefreshTestActivity.java
@@ -3,9 +3,10 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.heaven7.adapter.BaseSelector;
 import com.heaven7.adapter.QuickRecycleViewAdapter;
 import com.heaven7.adapter.util.ViewHelper2;

diff --git a/PullToRefesh/app/src/main/res/layout/activity_main.xml b/PullToRefesh/app/src/main/res/layout/activity_main.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="pulltorefresh.android.heaven7.com.pulltorefesh.MainActivity">
+    >
 
     <TextView
         android:layout_width="wrap_content"