Skip to content

Commit

Permalink
Merge pull request #20057 from wordpress-mobile/issue/19898-followed-…
Browse files Browse the repository at this point in the history 
…p2s-in-dropdown-menu

[Reader IA] Add "Followed P2s" item to dropdown menu
  • Loading branch information
Thomas Horta authored Feb 1, 2024
2 parents d72692f + dfde3f8 commit eeec540
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 28 deletions.
2 changes: 1 addition & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class ReaderConstants {
static final String KEY_FIRST_LOAD = "first_load";
static final String KEY_ACTIVITY_TITLE = "activity_title";
static final String KEY_TRACKED_POSITIONS = "tracked_positions";
static final String KEY_IS_REFRESHING = "is_refreshing";
static final String KEY_CURRENT_UPDATE_ACTIONS = "current_update_actions";
static final String KEY_ACTIVE_SEARCH_TAB = "active_search_tab";
static final String KEY_SITE_ID = "site_id";

Expand Down
65 changes: 44 additions & 21 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,10 @@
import org.wordpress.android.widgets.RecyclerItemDecoration;
import org.wordpress.android.widgets.WPSnackbar;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Stack;

Expand Down Expand Up @@ -210,9 +212,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 HashSet<UpdateAction> mCurrentUpdateActions = new HashSet<>();
/*
* called by post adapter to load older posts when user scrolls to the last post
*/
Expand Down Expand Up @@ -957,8 +959,8 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
outState.putBoolean(ReaderConstants.KEY_ALREADY_REQUESTED, mHasRequestedPosts);
outState.putBoolean(ReaderConstants.KEY_ALREADY_UPDATED, mHasUpdatedPosts);
outState.putBoolean(ReaderConstants.KEY_FIRST_LOAD, mFirstLoad);
outState.putSerializable(ReaderConstants.KEY_CURRENT_UPDATE_ACTIONS, mCurrentUpdateActions);
if (mRecyclerView != null) {
outState.putBoolean(ReaderConstants.KEY_IS_REFRESHING, mRecyclerView.isRefreshing());
outState.putInt(ReaderConstants.KEY_RESTORE_POSITION, getCurrentPosition());
}
outState.putSerializable(ReaderConstants.ARG_POST_LIST_TYPE, getPostListType());
Expand Down Expand Up @@ -1180,9 +1182,12 @@ public void onShowCustomEmptyView(EmptyViewMessageType emptyViewMsgType) {
}
}

if (savedInstanceState != null && savedInstanceState.getBoolean(ReaderConstants.KEY_IS_REFRESHING)) {
mIsUpdating = true;
mRecyclerView.setRefreshing(true);
if (savedInstanceState != null) {
Serializable actions = savedInstanceState.getSerializable(ReaderConstants.KEY_CURRENT_UPDATE_ACTIONS);
if (actions instanceof HashSet<?>) {
mCurrentUpdateActions = (HashSet<UpdateAction>) actions;
updateProgressIndicators();
}
}

return rootView;
Expand Down Expand Up @@ -1702,7 +1707,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()) {
Expand Down Expand Up @@ -2311,7 +2316,7 @@ public void run() {
}

private boolean isUpdating() {
return mIsUpdating;
return mCurrentUpdateActions.size() > 0;
}

/*
Expand All @@ -2328,27 +2333,45 @@ private void showLoadingProgress(boolean showProgress) {
}
}

private void setIsUpdating(boolean isUpdating, UpdateAction updateAction) {
if (!isAdded() || mIsUpdating == isUpdating) {
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());
}
}

Expand Down
1 change: 1 addition & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/tracker/ReaderTracker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ class ReaderTracker @Inject constructor(
readerTag.isPostsILike -> "liked"
readerTag.isA8C -> "a8c"
readerTag.isListTopic -> "list"
readerTag.isP2 -> "p2"
else -> null
}?.let { trackingId ->
analyticsTrackerWrapper.track(
Expand Down
13 changes: 13 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderTopBarMenuHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ class ReaderTopBarMenuHelper @Inject constructor() {
readerTagsList.indexOrNull { it.isA8C }?.let { a8cIndex ->
add(createAutomatticItem(getMenuItemIdFromReaderTagIndex(a8cIndex)))
}
readerTagsList.indexOrNull { it.isP2 }?.let { followedP2sIndex ->
add(createFollowedP2sItem(
id = getMenuItemIdFromReaderTagIndex(followedP2sIndex),
text = readerTagsList[followedP2sIndex].tagTitle,
))
}
readerTagsList
.foldIndexed(SparseArrayCompat<ReaderTag>()) { index, sparseArray, readerTag ->
if (readerTag.tagType == ReaderTagType.CUSTOM_LIST) {
Expand Down Expand Up @@ -85,6 +91,13 @@ class ReaderTopBarMenuHelper @Inject constructor() {
)
}

private fun createFollowedP2sItem(id: String, text: String): MenuElementData.Item.Single {
return MenuElementData.Item.Single(
id = id,
text = UiString.UiStringText(text),
)
}

private fun createCustomListsItem(customLists: SparseArrayCompat<ReaderTag>): MenuElementData.Item.SubMenu {
val customListsMenuItems = mutableListOf<MenuElementData.Item.Single>()
customLists.forEach { index, readerTag ->
Expand Down
23 changes: 17 additions & 6 deletions WordPress/src/test/java/org/wordpress/android/ui/reader/utils/ReaderTopBarMenuHelperTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ class ReaderTopBarMenuHelperTest {
add(mockSavedTag()) // item 2
add(mockLikedTag()) // item 3
add(mockA8CTag()) // item 4
add(createCustomListTag("custom-list-1")) // item 5
add(createCustomListTag("custom-list-2")) // item 6
add(createCustomListTag("custom-list-3")) // item 7
add(mockFollowedP2sTag()) // item 5
add(createCustomListTag("custom-list-1")) // item 6
add(createCustomListTag("custom-list-2")) // item 7
add(createCustomListTag("custom-list-3")) // item 8
}

val menu = helper.createMenu(tags)
Expand All @@ -46,18 +47,21 @@ class ReaderTopBarMenuHelperTest {
val a8cItem = menu.findSingleItem { it.id == "4" }!!
assertThat(a8cItem.text).isEqualTo(UiStringRes(R.string.reader_dropdown_menu_automattic))

val followedP2sItem = menu.findSingleItem { it.id == "5" }!!
assertThat(followedP2sItem.text).isEqualTo(UiStringText("Followed P2s"))

assertThat(menu).contains(MenuElementData.Divider)

val customListsItem = menu.findSubMenu()!!
assertThat(customListsItem.text).isEqualTo(UiStringRes(R.string.reader_dropdown_menu_lists))

val customList1Item = customListsItem.children.findSingleItem { it.id == "5" }!!
val customList1Item = customListsItem.children.findSingleItem { it.id == "6" }!!
assertThat(customList1Item.text).isEqualTo(UiStringText("custom-list-1"))

val customList2Item = customListsItem.children.findSingleItem { it.id == "6" }!!
val customList2Item = customListsItem.children.findSingleItem { it.id == "7" }!!
assertThat(customList2Item.text).isEqualTo(UiStringText("custom-list-2"))

val customList3Item = customListsItem.children.findSingleItem { it.id == "7" }!!
val customList3Item = customListsItem.children.findSingleItem { it.id == "8" }!!
assertThat(customList3Item.text).isEqualTo(UiStringText("custom-list-3"))
}

Expand Down Expand Up @@ -264,6 +268,13 @@ class ReaderTopBarMenuHelperTest {
}
}

private fun mockFollowedP2sTag(): ReaderTag {
return mock {
on { isP2 } doReturn true
on { tagTitle } doReturn "Followed P2s"
}
}

private fun createCustomListTag(title: String): ReaderTag {
return ReaderTag(
title,
Expand Down

0 comments on commit eeec540

Please sign in to comment.