opt pull to refresh

heaven7 · heaven7 · commit 0fbcdd0f57df · 2019-11-19T10:17:47.000+08:00
diff --git a/PullToRefesh/android-pullrefreshview2/build.gradle b/PullToRefesh/android-pullrefreshview2/build.gradle
@@ -1,13 +1,15 @@
 apply plugin: 'com.android.library'
 //apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.github.dcendents.android-maven'
+group='com.github.LightSun'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion 16
+        targetSdkVersion 28
         versionCode 10
         versionName "1.0"
 
@@ -26,14 +28,16 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    testCompile 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation "com.android.support:recyclerview-v7:28.0.0"
+    testImplementation 'junit:junit:4.12'
 
-    compile 'com.heaven7.core.adapter:adapter:1.8.8'
+    //implementation 'com.heaven7.core.adapter:adapter:1.8.8'
+    implementation 'com.github.LightSun:SuperAdapter:2.0.6'
     //compile 'com.heaven7.android.component:android-app-components:1.0.1'
 }
 
@@ -50,7 +54,7 @@ dependencies {
 
 //apply from: "publish_maven.gradle"
 
-ext {
+/*ext {
     bintrayRepo = 'maven'
     bintrayName = 'android-pullrefreshview2'   // Has to be same as your library module name
 
@@ -77,5 +81,5 @@ ext {
 }
 
 apply from: 'https://raw.githubusercontent.com/nisrulz/JCenter/master/installv1.gradle'
-apply from: 'https://raw.githubusercontent.com/nisrulz/JCenter/master/bintrayv1.gradle'
+apply from: 'https://raw.githubusercontent.com/nisrulz/JCenter/master/bintrayv1.gradle'*/
 //gradlew clean build install bintrayUpload
diff --git a/PullToRefesh/android-pullrefreshview2/src/main/java/com/heaven7/android/pullrefresh/DefaultFooterDelegate.java b/PullToRefesh/android-pullrefreshview2/src/main/java/com/heaven7/android/pullrefresh/DefaultFooterDelegate.java
@@ -0,0 +1,35 @@
+package com.heaven7.android.pullrefresh;
+
+import android.content.Context;
+import android.view.View;
+
+/**
+ * the default footer delegate
+ * @author heaven7
+ * @since 1.1.0
+ */
+/*public*/ class DefaultFooterDelegate implements FooterDelegate {
+
+    private LoadingFooterView mFooterView;
+
+    @Override
+    public void prepareFooterView(Context context){
+        if(mFooterView == null){
+            mFooterView = new LoadingFooterView(context);
+        }
+       // mFooterView.setOnClickListener(new PullToRefreshLayout.OnClickFooterListenerImpl());
+    }
+
+    @Override
+    public View getView() {
+        return mFooterView;
+    }
+    @Override
+    public void setState(int state) {
+        mFooterView.setState(state);
+    }
+    @Override
+    public int getState() {
+        return mFooterView.getState();
+    }
+}
diff --git a/PullToRefesh/android-pullrefreshview2/src/main/java/com/heaven7/android/pullrefresh/FooterDelegate.java b/PullToRefesh/android-pullrefreshview2/src/main/java/com/heaven7/android/pullrefresh/FooterDelegate.java
@@ -0,0 +1,41 @@
+package com.heaven7.android.pullrefresh;
+
+import android.content.Context;
+import android.view.View;
+
+/**
+ * the footer delegate .
+ * @author heaven7
+ * @since 1.1.0
+ */
+public interface FooterDelegate {
+
+    int STATE_NORMAL = 1;
+    int STATE_THE_END = 2;
+    int STATE_LOADING = 3;
+    int STATE_NET_ERROR = 4;
+
+    /**
+     * called on prepare footer view
+     * @param context the context to create footer view
+     */
+    void prepareFooterView(Context context);
+
+    /**
+     * the footer view.
+     * @return the footer view
+     */
+    View getView();
+
+    /**
+     * set the footer state
+     * @param state the target state
+     */
+    void setState(int state);
+
+    /**
+     * get the footer state
+     * @return the state.
+     */
+    int getState();
+}
diff --git a/PullToRefesh/android-pullrefreshview2/src/main/java/com/heaven7/android/pullrefresh/LoadingFooterView.java b/PullToRefesh/android-pullrefreshview2/src/main/java/com/heaven7/android/pullrefresh/LoadingFooterView.java
@@ -13,10 +13,10 @@
  */
 public class LoadingFooterView extends RelativeLayout {
 
-    public static final int STATE_NORMAL = 1;
-    public static final int STATE_THE_END = 2;
-    public static final int STATE_LOADING = 3;
-    public static final int STATE_NET_ERROR = 4;
+    public static final int STATE_NORMAL = FooterDelegate.STATE_NORMAL;
+    public static final int STATE_THE_END = FooterDelegate.STATE_THE_END;
+    public static final int STATE_LOADING = FooterDelegate.STATE_LOADING;
+    public static final int STATE_NET_ERROR = FooterDelegate.STATE_NET_ERROR;
 
     private int mState = STATE_NORMAL;
 
diff --git a/PullToRefesh/android-pullrefreshview2/src/main/java/com/heaven7/android/pullrefresh/PullToRefreshLayout.java b/PullToRefesh/android-pullrefreshview2/src/main/java/com/heaven7/android/pullrefresh/PullToRefreshLayout.java
@@ -16,8 +16,7 @@
 import android.widget.LinearLayout;
 
 import com.heaven7.adapter.AbstractLoadMoreScrollListener;
-import com.heaven7.adapter.ISelectable;
-import com.heaven7.adapter.QuickRecycleViewAdapter;
+import com.heaven7.adapter.AdapterManager;
 
 
 /**
@@ -33,11 +32,12 @@ public class PullToRefreshLayout extends FrameLayout {
     private LinearLayout mPlaceHolderView;
 
     private LoadMoreScrollListenerImpl mLoadMoreListenerImpl;
-    private LoadingFooterView mFooterView;
 
     private Callback mCallback;
     private PlaceHolderViewPerformer mHolderPerformer;
 
+    private FooterDelegate mFooterDelegate = new DefaultFooterDelegate();
+
     /**
      * the callback of {@linkplain PullToRefreshLayout}
      */
@@ -64,7 +64,19 @@ public void onLoadMore(PullToRefreshLayout layout) {
          * @param footer the footer view
          * @param state the state of footer
          */
+        @Deprecated
         public void onClickFooter(PullToRefreshLayout layout, LoadingFooterView footer, int state){
+            onClickFooter(layout, (View)footer, state);
+        }
+
+        /**
+         * called on click footer
+         * @param layout the layout
+         * @param footer the footer view
+         * @param state the state. see {@linkplain FooterDelegate#STATE_LOADING} and etc.
+         * @since 1.1.0
+         */
+        public void onClickFooter(PullToRefreshLayout layout, View footer, int state){
 
         }
     }
@@ -125,11 +137,24 @@ public void onRefresh() {
             }
         });
         mRv.addOnScrollListener(mLoadMoreListenerImpl);
-        //footer
-        mFooterView = new LoadingFooterView(getContext());
-        mFooterView.setOnClickListener(new OnClickFooterListenerImpl());
+    }
+    /**
+     * set the footer delegate
+     * @param delegate the footer delegate
+     * @since 1.1.0
+     */
+    public void setFooterDelegate(FooterDelegate delegate){
+        mFooterDelegate = delegate;
     }
 
+    /**
+     * get the footer delegate
+     * @return the footer delegate
+     * @since 1.1.0
+     */
+    public FooterDelegate getFooterDelegate(){
+        return mFooterDelegate;
+    }
     /**
      * set the place holder view performer
      * @param performer the performer.
@@ -143,7 +168,11 @@ public void setPlaceHolderViewPerformer(PlaceHolderViewPerformer performer) {
      * @param performer the target state performer.
      */
     public void setStatePerformer(LoadingFooterView.StatePerformer performer){
-        mFooterView.setStatePerformer(performer);
+        mFooterDelegate.prepareFooterView(getContext());
+        View view = mFooterDelegate.getView();
+        if(view instanceof LoadingFooterView){
+            ((LoadingFooterView)view).setStatePerformer(performer);
+        }
     }
 
     /**
@@ -155,15 +184,20 @@ public void setLayoutManager(RecyclerView.LayoutManager lm){
     }
 
     /** set adapter .it will auto add loading footer .
-     * @param <T> the data type
      * @param adapter the adapter to bind
      * */
-    public <T extends ISelectable> void setAdapter(QuickRecycleViewAdapter<T> adapter){
+    public void setAdapter(RecyclerView.Adapter adapter){
+        mFooterDelegate.prepareFooterView(getContext());
+        View view = mFooterDelegate.getView();
+        view.setOnClickListener(new OnClickFooterListenerImpl());
+
         final RecyclerView.Adapter preAdapter = getRecyclerView().getAdapter();
-        if(preAdapter != null && preAdapter instanceof QuickRecycleViewAdapter){
-            ((QuickRecycleViewAdapter) preAdapter).removeFooterView(mFooterView);
+        if(preAdapter instanceof AdapterManager.IHeaderFooterManager){
+            ((AdapterManager.IHeaderFooterManager) preAdapter).removeFooterView(view);
+        }
+        if(adapter instanceof AdapterManager.IHeaderFooterManager){
+            ((AdapterManager.IHeaderFooterManager) adapter).addFooterView(view);
         }
-        adapter.addFooterView(mFooterView);
         getRecyclerView().setAdapter(adapter);
     }
 
@@ -181,7 +215,9 @@ public void setLoadingComplete(){
      * @return the footer view.
      */
     public LoadingFooterView getFooterView(){
-        return mFooterView;
+        mFooterDelegate.prepareFooterView(getContext());
+        View view = mFooterDelegate.getView();
+        return view instanceof LoadingFooterView ? (LoadingFooterView) view : null;
     }
 
     /**
@@ -234,8 +270,12 @@ protected void onLoadMore(RecyclerView rv) {
     private class OnClickFooterListenerImpl implements OnClickListener{
         @Override
         public void onClick(View v) {
-            LoadingFooterView view = (LoadingFooterView) v;
-            mCallback.onClickFooter(PullToRefreshLayout.this, view, view.getState());
+            if(v instanceof LoadingFooterView){
+                LoadingFooterView view = (LoadingFooterView) v;
+                mCallback.onClickFooter(PullToRefreshLayout.this, view, view.getState());
+            }else {
+                mCallback.onClickFooter(PullToRefreshLayout.this, v, mFooterDelegate.getState());
+            }
         }
     }
 
diff --git a/PullToRefesh/app/build.gradle b/PullToRefesh/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
+//apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "pulltorefresh.android.heaven7.com.pulltorefesh"
-        minSdkVersion 15
-        targetSdkVersion 25
+        minSdkVersion 16
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,17 +24,24 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation "com.android.support:recyclerview-v7:28.0.0"
     //  compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
-    compile 'com.jakewharton:butterknife:8.4.0'
-    apt "com.jakewharton:butterknife-compiler:8.4.0"
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.jakewharton:butterknife:8.4.0'
+    annotationProcessor "com.jakewharton:butterknife-compiler:8.4.0"
     //compile 'com.heaven7.android.pullrefresh2:android-pullrefreshview2:1.0'
-    compile project(':android-pullrefreshview2')
+    implementation project(':android-pullrefreshview2')
     //compile 'com.heaven7.android.pullrefresh:android-pullrefreshview:1.0.1'
-    compile files('libs/TestProcessor.jar')
+    annotationProcessor files('libs/TestProcessor.jar')
+    implementation files('libs/TestProcessor.jar')
+
+    implementation('com.github.LightSun:util-v1:1.1.4') {
+        exclude group: 'com.android.support'
+    }
+    implementation 'com.github.LightSun:SuperAdapter:2.0.6'
 }
diff --git a/PullToRefesh/app/src/main/res/layout/item_test_pull_refresh.xml b/PullToRefesh/app/src/main/res/layout/item_test_pull_refresh.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/tv1"
diff --git a/PullToRefesh/build.gradle b/PullToRefesh/build.gradle
@@ -2,27 +2,32 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
     dependencies {
         //classpath 'com.android.tools.build:gradle:2.3.1'
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         //classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
        // classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+       // classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+      //  classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+       // classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         //classpath 'com.novoda:bintray-release:0.4.0'
 
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
     tasks.withType(Javadoc) {
         options.addStringOption('Xdoclint:none', '-quiet')
diff --git a/PullToRefesh/gradle/wrapper/gradle-wrapper.properties b/PullToRefesh/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-3.3-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.1.1-all.zip
