fix: Remove sticky headers from Attendees fragment (#1636)

fossasia · May 8, 2019 · 1bd8dc9 · 1bd8dc9
1 parent 6329349
commit 1bd8dc9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 100 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
@@ -35,9 +35,8 @@
 import com.eventyay.organizer.utils.SearchUtils;
 import com.mikepenz.fastadapter.FastAdapter;
 import com.mikepenz.fastadapter.adapters.ItemAdapter;
-import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersDecoration;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -67,7 +66,6 @@ public class AttendeesFragment extends BaseFragment<AttendeesPresenter> implemen
     private static final int SORTBYNAME = 0;
 
     private FastAdapter<Attendee> fastAdapter;
-    private StickyHeaderAdapter<Attendee> stickyHeaderAdapter;
 
     private final ScanningDecider scanningDecider = new ScanningDecider();
 
@@ -151,7 +149,6 @@ private void sortAttendees(int sortBy) {
             fastItemAdapter.withComparator((Attendee a1, Attendee a2) -> a1.getFirstname().compareTo(a2.getFirstname()), true);
         }
         fastItemAdapter.setNewList(getPresenter().getAttendees());
-        stickyHeaderAdapter.setSortByName(sortBy == SORTBYTICKET);
         binding.setVariable(BR.attendees, getPresenter().getAttendees());
         binding.executePendingBindings();
     }
@@ -188,7 +185,6 @@ protected int getTitle() {
     public void onStop() {
         super.onStop();
         refreshLayout.setOnRefreshListener(null);
-        //stickyHeaderAdapter.unregisterAdapterDataObserver(adapterDataObserver);
         if (searchView != null)
             searchView.setOnQueryTextListener(null);
     }
@@ -235,9 +231,7 @@ private void setupRecyclerView() {
             }
         );
 
-        stickyHeaderAdapter = new StickyHeaderAdapter<>();
-        stickyHeaderAdapter.setSortByName(false);
-        fastAdapter = FastAdapter.with(Arrays.asList(fastItemAdapter, stickyHeaderAdapter));
+        fastAdapter = FastAdapter.with(Collections.singletonList(fastItemAdapter));
         fastAdapter.setHasStableIds(true);
         fastAdapter.withEventHook(new AttendeeItemCheckInEvent(this));
 
@@ -268,13 +262,10 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
         ItemTouchHelper itemTouchHelper = new ItemTouchHelper(swipeController);
         itemTouchHelper.attachToRecyclerView(recyclerView);
 
-        final StickyRecyclerHeadersDecoration decoration = new StickyRecyclerHeadersDecoration(stickyHeaderAdapter);
-        recyclerView.addItemDecoration(decoration);
         observer = new RecyclerView.AdapterDataObserver() {
             @Override
             public void onChanged() {
                 super.onChanged();
-                decoration.invalidateHeaders();
             }
         };
         fastAdapter.registerAdapterDataObserver(observer);

diff --git a/app/src/main/java/com/eventyay/organizer/core/attendee/list/StickyHeaderAdapter.java b/app/src/main/java/com/eventyay/organizer/core/attendee/list/StickyHeaderAdapter.java
diff --git a/app/src/main/res/layout/attendee_layout.xml b/app/src/main/res/layout/attendee_layout.xml
@@ -17,6 +17,7 @@
         android:gravity="center"
         android:orientation="horizontal"
         android:foreground="?selectableItemBackground"
+        android:layout_margin="@dimen/spacing_extra_small"
         style="@style/ItemPadding">
 
         <LinearLayout