Merge pull request #559 from TypicalGitHubUser/scrolling-bug-fix

fix: LoadMore not working at one case. (#300)
openMF · Mar 14, 2017 · 5b61e1e · 5b61e1e
2 parents 3f11163 + f5042b2
commit 5b61e1e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/...sng-android/src/main/java/com/mifos/mifosxdroid/core/EndlessRecyclerOnScrollListener.java b/...sng-android/src/main/java/com/mifos/mifosxdroid/core/EndlessRecyclerOnScrollListener.java
@@ -6,9 +6,10 @@
 /**
  * Created by rajanmaurya on 16/4/2016.
  */
+
 public abstract class EndlessRecyclerOnScrollListener extends RecyclerView.OnScrollListener {
     public static final String TAG = EndlessRecyclerOnScrollListener.class.getSimpleName();
-    int firstVisibleItem, visibleItemCount, totalItemCount;
+    private int firstVisibleItem, visibleItemCount, totalItemCount;
     private int previousTotal = 0; // The total number of items in the dataset after the last load
     private boolean loading = true; // True if we are still waiting for the last set of data to
     // load.
@@ -28,6 +29,11 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
 
         visibleItemCount = recyclerView.getChildCount();
         totalItemCount = mLinearLayoutManager.getItemCount();
+
+        // If user refreshed a layout
+        if (previousTotal > totalItemCount) {
+            previousTotal = 0;
+        }
         firstVisibleItem = mLinearLayoutManager.findFirstVisibleItemPosition();
 
         if (loading && (totalItemCount > previousTotal + 1)) {
@@ -38,7 +44,6 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
         if (!loading && (totalItemCount - visibleItemCount) <= (firstVisibleItem +
                 visibleThreshold)) {
             // End has been reached
-            // Do something
             current_page++;
             onLoadMore(current_page);
             loading = true;

diff --git a/...g-android/src/main/java/com/mifos/mifosxdroid/core/EndlessRecyclerViewScrollListener.java b/...g-android/src/main/java/com/mifos/mifosxdroid/core/EndlessRecyclerViewScrollListener.java
@@ -77,6 +77,8 @@ public void onScrolled(RecyclerView view, int dx, int dy) {
             this.previousTotalItemCount = totalItemCount;
             if (totalItemCount == 0) {
                 this.loading = true;
+            } else {
+                this.loading = false;
             }
         }
         // If it’s still loading, we check to see if the dataset count has

diff --git a/...sng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.java b/...sng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.java
@@ -24,7 +24,7 @@
 
 import com.mifos.mifosxdroid.R;
 import com.mifos.mifosxdroid.adapters.ClientNameListAdapter;
-import com.mifos.mifosxdroid.core.EndlessRecyclerOnScrollListener;
+import com.mifos.mifosxdroid.core.EndlessRecyclerViewScrollListener;
 import com.mifos.mifosxdroid.core.MifosBaseActivity;
 import com.mifos.mifosxdroid.core.MifosBaseFragment;
 import com.mifos.mifosxdroid.core.RecyclerItemClickListener;
@@ -188,10 +188,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
          * This is the LoadMore of the RecyclerView. It called When Last Element of RecyclerView
          * is shown on the Screen.
          */
-        rv_clients.addOnScrollListener(new EndlessRecyclerOnScrollListener(mLayoutManager) {
+        rv_clients.addOnScrollListener(new EndlessRecyclerViewScrollListener(mLayoutManager) {
             @Override
-            public void onLoadMore(int current_page) {
-                mClientListPresenter.loadClients(true, clientList.size());
+            public void onLoadMore(int page, int totalItemCount) {
+                mClientListPresenter.loadClients(true, totalItemCount);
             }
         });