[Reader IA] Add "Followed P2s" item to dropdown menu

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java

@@ -146,6 +146,7 @@
 
 import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Stack;
 
@@ -210,9 +211,9 @@ public class ReaderPostListFragment extends ViewPagerFragment
     private int mPostSearchAdapterPos;
     private int mSiteSearchAdapterPos;
     private int mSearchTabsPos = NO_POSITION;
-    private boolean mIsUpdating;
     private boolean mIsFilterableScreen;
     private boolean mIsFiltered = false;
+    @NonNull private final HashSet<UpdateAction> mCurrentUpdateActions = new HashSet<>();
     /*
      * called by post adapter to load older posts when user scrolls to the last post
      */
@@ -1181,8 +1182,7 @@ public void onShowCustomEmptyView(EmptyViewMessageType emptyViewMsgType) {
         }
 
         if (savedInstanceState != null && savedInstanceState.getBoolean(ReaderConstants.KEY_IS_REFRESHING)) {
-            mIsUpdating = true;
-            mRecyclerView.setRefreshing(true);
+            setIsUpdating(true, UpdateAction.REQUEST_NEWER);
         }
 
         return rootView;
@@ -1699,7 +1699,7 @@ private void setEmptyTitleDescriptionAndButton(boolean requestFailed) {
             setEmptyTitleAndDescriptionForBookmarksList();
             return;
         } else if (!NetworkUtils.isNetworkAvailable(getActivity())) {
-            mIsUpdating = false;
+            clearCurrentUpdateActions();
             title = getString(R.string.reader_empty_posts_no_connection);
         } else if (requestFailed) {
             if (isSearching()) {
@@ -2304,7 +2304,7 @@ public void run() {
     }
 
     private boolean isUpdating() {
-        return mIsUpdating;
+        return mCurrentUpdateActions.size() > 0;
     }
 
     /*
@@ -2321,30 +2321,45 @@ private void showLoadingProgress(boolean showProgress) {
         }
     }
 
-    private void setIsUpdating(boolean isUpdating, UpdateAction updateAction) {
-        if (!isAdded() || mIsUpdating == isUpdating) {
-            if (!isUpdating) {
-                mRecyclerView.setRefreshing(false);
-            }
-            return;
-        }
+    private void clearCurrentUpdateActions() {
+        if (!isAdded() || !isUpdating()) return;
 
-        if (updateAction == UpdateAction.REQUEST_OLDER) {
-            // show/hide progress bar at bottom if these are older posts
-            showLoadingProgress(isUpdating);
-        } else if (isUpdating) {
-            // show swipe-to-refresh if update started
-            mRecyclerView.setRefreshing(true);
+        mCurrentUpdateActions.clear();
+        updateProgressIndicators();
+    }
+
+    private void setIsUpdating(boolean isUpdating, @NonNull UpdateAction updateAction) {
+        if (!isAdded()) return;
+
+        boolean isUiUpdateNeeded;
+        if (isUpdating) {
+            isUiUpdateNeeded = mCurrentUpdateActions.add(updateAction);
         } else {
-            // hide swipe-to-refresh progress if update is complete
+            isUiUpdateNeeded = mCurrentUpdateActions.remove(updateAction);
+        }
+
+        if (isUiUpdateNeeded) updateProgressIndicators();
+    }
+
+    private void updateProgressIndicators() {
+        if (!isUpdating()) {
+            // when there's no update in progress, hide the bottom and swipe-to-refresh progress bars
+            showLoadingProgress(false);
             mRecyclerView.setRefreshing(false);
+        } else if (mCurrentUpdateActions.size() == 1 && mCurrentUpdateActions.contains(UpdateAction.REQUEST_OLDER)) {
+            // if only older posts are being updated, show only the bottom progress bar
+            showLoadingProgress(true);
+            mRecyclerView.setRefreshing(false);
+        } else {
+            // if anything else is being updated, show only the swipe-to-refresh progress bar
+            showLoadingProgress(false);
+            mRecyclerView.setRefreshing(true);
         }
-        mIsUpdating = isUpdating;
 
         // if swipe-to-refresh isn't active, keep it disabled during an update - this prevents
         // doing a refresh while another update is already in progress
-        if (mRecyclerView != null && !mRecyclerView.isRefreshing()) {
-            mRecyclerView.setSwipeToRefreshEnabled(!isUpdating && isSwipeToRefreshSupported());
+        if (!mRecyclerView.isRefreshing()) {
+            mRecyclerView.setSwipeToRefreshEnabled(!isUpdating() && isSwipeToRefreshSupported());
         }
     }