From 1cdc58378ad4bea3b9fca07ce7b7456ca019f43d Mon Sep 17 00:00:00 2001 From: Mark Hansen Date: Sat, 5 Aug 2023 14:43:23 -0400 Subject: [PATCH] Sort Hashtags you follow menu (#695) * Sort Hashtags you follow menu * change sorting method --------- Co-authored-by: Mark Hansen Co-authored-by: sk --- .../android/fragments/HomeTabFragment.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java index 93ef046e3..4d407429f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java @@ -62,6 +62,7 @@ import org.joinmastodon.android.utils.ElevationOnScrollListener; import org.joinmastodon.android.utils.ProvidesAssistContent; import java.util.Collection; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -336,11 +337,13 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab hashtagsMenu.clear(); hashtagsMenu.getItem().setVisible(hashtagsItems.size() > 0); UiUtils.insetPopupMenuIcon(ctx, UiUtils.makeBackItem(hashtagsMenu)); - hashtagsItems.forEach((id, hashtag) -> { - MenuItem item = hashtagsMenu.add(Menu.NONE, id, Menu.NONE, hashtag.name); - item.setIcon(R.drawable.ic_fluent_number_symbol_24_regular); - UiUtils.insetPopupMenuIcon(ctx, item); - }); + hashtagsItems.entrySet().stream() + .sorted(Comparator.comparing(x -> x.getValue().name, String.CASE_INSENSITIVE_ORDER)) + .forEach(entry -> { + MenuItem item = hashtagsMenu.add(Menu.NONE, entry.getKey(), Menu.NONE, entry.getValue().name); + item.setIcon(R.drawable.ic_fluent_number_symbol_24_regular); + UiUtils.insetPopupMenuIcon(ctx, item); + }); } public void updateToolbarLogo(){