Remove infintite scroll load indicator when reach end of feed.

wir478 · Jan 26, 2016 · 6b95ba1 · 6b95ba1
1 parent e84ec07
commit 6b95ba1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/app/src/main/java/io/plaidapp/ui/FeedAdapter.java b/app/src/main/java/io/plaidapp/ui/FeedAdapter.java
@@ -103,6 +103,7 @@ public class FeedAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     private final @ColorInt int initialGifBadgeColor;
 
     private List<PlaidItem> items;
+    private boolean showLoadingMore = false;
     private PlaidItemSorting.NaturalOrderWeigher naturalOrderWeigher;
     private ShotWeigher shotWeigher;
     private StoryWeigher storyWeigher;
@@ -581,7 +582,7 @@ public long getItemId(int position) {
 
     @Override
     public int getItemCount() {
-        return getDataItemCount() + 1; // include loading footer
+        return getDataItemCount() + (showLoadingMore ? 1 : 0);
     }
 
     /**
@@ -611,6 +612,10 @@ public int getDataItemCount() {
         return items.size();
     }
 
+    private int getLoadingMoreItemPosition() {
+        return showLoadingMore ? getItemCount() - 1 : RecyclerView.NO_POSITION;
+    }
+
     /**
      * Which ViewHolder types require a divider decoration
      */
@@ -620,12 +625,17 @@ public Class[] getDividedViewHolderClasses() {
 
     @Override
     public void dataStartedLoading() {
-        notifyItemChanged(getItemCount());
+        if (showLoadingMore) return;
+        notifyItemInserted(getLoadingMoreItemPosition());
+        showLoadingMore = true;
     }
 
     @Override
     public void dataFinishedLoading() {
-        notifyItemChanged(getItemCount());
+        if (!showLoadingMore) return;
+        showLoadingMore = false;
+        notifyItemRemoved(getLoadingMoreItemPosition());
+
     }
 
     /* package */ class DribbbleShotHolder extends RecyclerView.ViewHolder {

diff --git a/app/src/main/java/io/plaidapp/ui/HomeActivity.java b/app/src/main/java/io/plaidapp/ui/HomeActivity.java
@@ -196,7 +196,7 @@ public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
                         insets.getSystemWindowInsetTop() + ViewUtils.getActionBarSize
                                 (HomeActivity.this),
                         grid.getPaddingRight() + insets.getSystemWindowInsetRight(), // landscape
-                        grid.getPaddingBottom());
+                        grid.getPaddingBottom() + insets.getSystemWindowInsetBottom());
 
                 // inset the fab for the navbar
                 ViewGroup.MarginLayoutParams lpFab = (ViewGroup.MarginLayoutParams) fab