Fix load more when pull refresh disable

Author: anhtt

xrecyclerview/src/main/java/com/jcodecraeer/xrecyclerview/JellyView.java

@@ -97,7 +97,7 @@ public void refreshComplete(){
     @Override
     public void onMove(float delta) {
         jellyHeight = jellyHeight + (int)delta;
-        Log.i("jellyHeight", "delta = " + delta);
+//        Log.i("jellyHeight", "delta = " + delta);
         this.invalidate();
     }
 

xrecyclerview/src/main/java/com/jcodecraeer/xrecyclerview/StickyScrollLinearLayout.java

@@ -107,23 +107,23 @@ public void setTargetFirstVisiblePosition(int targetFirstVisiblePosition) {
 
     @Override
     public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
-        Log.e(TAG, "onStartNestedScroll "+child.toString()+"  "+target.toString());
+//        Log.e(TAG, "onStartNestedScroll "+child.toString()+"  "+target.toString());
         return true;
     }
 
     @Override
     public void onNestedScrollAccepted(@NonNull View child, @NonNull View target, int nestedScrollAxes) {
-        Log.e(TAG, "onNestedScrollAccepted");
+//        Log.e(TAG, "onNestedScrollAccepted");
     }
 
     @Override
     public void onStopNestedScroll(View target) {
-        Log.e(TAG, "onStopNestedScroll "+target.toString());
+//        Log.e(TAG, "onStopNestedScroll "+target.toString());
     }
 
     @Override
     public void onNestedScroll(@NonNull View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
-        Log.e(TAG, "onNestedScroll "+dyConsumed+"----"+dyUnconsumed);
+//        Log.e(TAG, "onNestedScroll "+dyConsumed+"----"+dyUnconsumed);
     }
 
     @Override
@@ -150,11 +150,11 @@ public void onNestedPreScroll(@NonNull View target, int dx, int dy, @NonNull int
 
         int scrollY = getScrollY();
         boolean temp = dy > 0 && (scrollY < mTopViewHeight);
-        Log.e(TAG,
-                "mTopViewHeight == "+mTopViewHeight
-                        +"\ndy == "+dy
-                        +"\nscrollY == "+scrollY
-                        +"\nhiddenTop && showTop "+temp);
+//        Log.e(TAG,
+//                "mTopViewHeight == "+mTopViewHeight
+//                        +"\ndy == "+dy
+//                        +"\nscrollY == "+scrollY
+//                        +"\nhiddenTop && showTop "+temp);
         if(!temp){
             // judge
             temp = dy < 0
@@ -165,11 +165,11 @@ public void onNestedPreScroll(@NonNull View target, int dx, int dy, @NonNull int
                                     ||
                             firstVisiblePosition==targetFirstVisiblePosition
                     );
-            Log.e(TAG,
-                    "mTopViewHeight == "+mTopViewHeight
-                            +"\ndy == "+dy
-                            +"\nscrollY == "+scrollY
-                            +"\nfirstVisiblePosition "+firstVisiblePosition);
+//            Log.e(TAG,
+//                    "mTopViewHeight == "+mTopViewHeight
+//                            +"\ndy == "+dy
+//                            +"\nscrollY == "+scrollY
+//                            +"\nfirstVisiblePosition "+firstVisiblePosition);
         }
         if (temp) {
             scrollBy(0, dy);
@@ -179,13 +179,13 @@ public void onNestedPreScroll(@NonNull View target, int dx, int dy, @NonNull int
 
     @Override
     public boolean onNestedFling(@NonNull View target, float velocityX, float velocityY, boolean consumed) {
-        Log.e(TAG, "onNestedFling");
+//        Log.e(TAG, "onNestedFling");
         return false;
     }
 
     @Override
     public boolean onNestedPreFling(@NonNull View target, float velocityX, float velocityY) {
-        Log.e(TAG, "onNestedPreFling");
+//        Log.e(TAG, "onNestedPreFling");
         //down - //up+
         if (getScrollY() >= mTopViewHeight) return false;
         fling((int) velocityY);
@@ -194,7 +194,7 @@ public boolean onNestedPreFling(@NonNull View target, float velocityX, float vel
 
     @Override
     public int getNestedScrollAxes() {
-        Log.e(TAG, "getNestedScrollAxes");
+//        Log.e(TAG, "getNestedScrollAxes");
         return 0;
     }
 

xrecyclerview/src/main/java/com/jcodecraeer/xrecyclerview/XRecyclerView.java

@@ -5,7 +5,6 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -25,6 +24,7 @@
 import java.util.List;
 
 import static com.jcodecraeer.xrecyclerview.BaseRefreshHeader.STATE_DONE;
+import static com.jcodecraeer.xrecyclerview.BaseRefreshHeader.STATE_REFRESHING;
 
 public class XRecyclerView extends RecyclerView {
     private boolean isLoadingData = false;
@@ -452,11 +452,9 @@ void activeLoadMore() {
 
     @Override
     public void onScrollStateChanged(int state) {
-//        Log.d(getClass().getSimpleName(), "onScrollStateChanged() called with: state = [" + state + "]");
         super.onScrollStateChanged(state);
         if (state == RecyclerView.SCROLL_STATE_IDLE && mLoadingListener != null && !isLoadingData && loadingMoreEnabled) {
             LayoutManager layoutManager = getLayoutManager();
-
             int lastVisibleItemPosition;
             if (layoutManager instanceof GridLayoutManager) {
                 lastVisibleItemPosition = ((GridLayoutManager) layoutManager).findLastVisibleItemPosition();
@@ -467,17 +465,29 @@ public void onScrollStateChanged(int state) {
             } else {
                 lastVisibleItemPosition = ((LinearLayoutManager) layoutManager).findLastVisibleItemPosition();
             }
-            int adjAdapterItemCount = layoutManager.getItemCount() + getHeaders_includingRefreshCount() + (pullRefreshEnabled ? 1 : 2);
+            int adjAdapterItemCount = layoutManager.getItemCount() + getHeaders_includingRefreshCount();
+            //Log.e("aaaaa","adjAdapterItemCount "+adjAdapterItemCount +" getItemCount "+layoutManager.getItemCount());
+
             int status = STATE_DONE;
+
             if (mRefreshHeader != null)
                 status = mRefreshHeader.getState();
-            if (!isWrappedByScrollView
-                    && layoutManager.getChildCount() > 0
-                    && lastVisibleItemPosition >= adjAdapterItemCount - limitNumberToCallLoadMore
-                    && adjAdapterItemCount >= layoutManager.getChildCount()
-                    && !isNoMore
-                    && status < ArrowRefreshHeader.STATE_REFRESHING) {
-                activeLoadMore();
+            if (
+                    layoutManager.getChildCount() > 0
+                            && lastVisibleItemPosition >= adjAdapterItemCount - limitNumberToCallLoadMore
+                            && adjAdapterItemCount >= layoutManager.getChildCount()
+                            && !isNoMore
+                            && status < ArrowRefreshHeader.STATE_REFRESHING
+            ) {
+                isLoadingData = true;
+                if (mFootView instanceof LoadingMoreFooter) {
+                    ((LoadingMoreFooter) mFootView).setState(LoadingMoreFooter.STATE_LOADING);
+                } else {
+                    if (footerViewCallBack != null) {
+                        footerViewCallBack.onLoadingMore(mFootView);
+                    }
+                }
+                mLoadingListener.onLoadMore();
             }
         }
     }
@@ -534,6 +544,11 @@ private boolean isOnTop() {
             return mRefreshHeader.getParent() != null;
     }
 
+    public boolean isRefreshing() {
+        if (mRefreshHeader != null) return mRefreshHeader.getState() == STATE_REFRESHING;
+        return false;
+    }
+
     private class DataObserver extends RecyclerView.AdapterDataObserver {
         @Override
         public void onChanged() {
@@ -632,11 +647,17 @@ public int getHeadersCount() {
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
             if (viewType == TYPE_REFRESH_HEADER) {
-                return new SimpleViewHolder(mRefreshHeader);
+                SimpleViewHolder refreshHolder = new SimpleViewHolder(mRefreshHeader);
+                refreshHolder.setIsRecyclable(false);
+                return refreshHolder;
             } else if (isHeaderType(viewType)) {
-                return new SimpleViewHolder(getHeaderViewByType(viewType));
+                SimpleViewHolder headerHolder = new SimpleViewHolder(getHeaderViewByType(viewType));
+                headerHolder.setIsRecyclable(false);
+                return headerHolder;
             } else if (viewType == TYPE_FOOTER) {
-                return new SimpleViewHolder(mFootView);
+                SimpleViewHolder footerHolder = new SimpleViewHolder(mFootView);
+                footerHolder.setIsRecyclable(false);
+                return footerHolder;
             }
             return adapter.onCreateViewHolder(parent, viewType);
         }