fix: Improve system of pagination in Attendees list (#1822)

fossasia · Jul 19, 2019 · 4bb7e51 · 4bb7e51
1 parent 1b1e202
commit 4bb7e51
Showing 1 changed file with 22 additions and 26 deletions.
diff --git a/app/src/main/java/com/eventyay/organizer/core/attendee/list/AttendeesFragment.java b/app/src/main/java/com/eventyay/organizer/core/attendee/list/AttendeesFragment.java
@@ -1,33 +1,28 @@
 package com.eventyay.organizer.core.attendee.list;
 
 import android.content.Context;
-
-import androidx.databinding.DataBindingUtil;
-
 import android.graphics.PorterDuff;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 
-import com.eventyay.organizer.BR;
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-
+import androidx.appcompat.widget.SearchView;
+import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.SearchView;
-import androidx.recyclerview.widget.ItemTouchHelper;
-
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import com.eventyay.organizer.BR;
 import com.eventyay.organizer.R;
 import com.eventyay.organizer.common.mvp.view.BaseFragment;
 import com.eventyay.organizer.core.attendee.ScanningDecider;
@@ -39,6 +34,7 @@
 import com.eventyay.organizer.databinding.FragmentAttendeesBinding;
 import com.eventyay.organizer.ui.ViewUtils;
 import com.eventyay.organizer.utils.SearchUtils;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.mikepenz.fastadapter.FastAdapter;
 import com.mikepenz.fastadapter.adapters.ItemAdapter;
 import com.mikepenz.fastadapter.utils.ComparableItemListImpl;
@@ -58,6 +54,10 @@
 @SuppressWarnings("PMD.TooManyMethods")
 public class AttendeesFragment extends BaseFragment implements AttendeesView {
 
+    private static final int SORTBYTICKET = 1;
+    private static final int SORTBYNAME = 0;
+    private static final long ITEMS_PER_PAGE = 20;
+
     private Context context;
 
     private long eventId;
@@ -68,9 +68,6 @@ public class AttendeesFragment extends BaseFragment implements AttendeesView {
     @Inject
     ViewModelProvider.Factory viewModelFactory;
 
-    private static final int SORTBYTICKET = 1;
-    private static final int SORTBYNAME = 0;
-
     private FastAdapter<Attendee> fastAdapter;
 
     private final ScanningDecider scanningDecider = new ScanningDecider();
@@ -261,8 +258,13 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                     binding.fabScanQr.hide();
 
                 if (!recyclerView.canScrollVertically(1)) {
+
+                    if (recyclerView.getAdapter().getItemCount() > currentPage * ITEMS_PER_PAGE) {
+                        currentPage++;
+                    } else {
                         currentPage++;
                         attendeesViewModel.loadAttendeesPageWise(currentPage, true);
+                    }
                 }
             }
 
@@ -297,16 +299,10 @@ private void setupRefreshListener() {
             refreshLayout.setRefreshing(false);
             attendeeList.clear();
             attendeesViewModel.loadAttendeesPageWise(FIRST_PAGE, true);
+            currentPage = FIRST_PAGE;
         });
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        attendeeList.clear();
-        attendeesViewModel.loadAttendeesPageWise(FIRST_PAGE, false);
-    }
-
     // View Implementation
 
     @Override