From a568cbbc74fcbdf3bc822130afdb8d538fd2e652 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 19 May 2026 21:21:38 +0000 Subject: [PATCH 1/3] feat: reorder feed filter popup sections Reorder sections in the top nav feed filter popup to: Feeds, Relays, Hashtags, Locations, Communities, Lists, Interest Sets, DVMs. --- .../ui/navigation/topbars/FeedFilterSpinner.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt index 4761b28b39..a1f8407e34 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt @@ -334,13 +334,13 @@ private enum class FeedGroup( @param:androidx.annotation.StringRes val labelRes: Int, ) { FEEDS(R.string.feed_group_feeds), - HASHTAGS(R.string.feed_group_hashtags), - INTEREST_SETS(R.string.feed_group_interest_sets), - COMMUNITIES(R.string.feed_group_communities), - LOCATIONS(R.string.feed_group_locations), - LISTS(R.string.feed_group_lists), - DVMS(R.string.feed_group_dvms), RELAYS(R.string.feed_group_relays), + HASHTAGS(R.string.feed_group_hashtags), + LOCATIONS(R.string.feed_group_locations), + COMMUNITIES(R.string.feed_group_communities), + LISTS(R.string.feed_group_lists), + INTEREST_SETS(R.string.feed_group_interest_sets), + DVMS(R.string.feed_group_dvms), } private fun FeedDefinition.group(): FeedGroup = From b82ad10ca57d8a2a3aab1503dea1bb46d19a9d08 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 19 May 2026 21:25:12 +0000 Subject: [PATCH 2/3] feat: place interest sets next to hashtags in filter popup --- .../amethyst/ui/navigation/topbars/FeedFilterSpinner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt index a1f8407e34..822f23153c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt @@ -336,10 +336,10 @@ private enum class FeedGroup( FEEDS(R.string.feed_group_feeds), RELAYS(R.string.feed_group_relays), HASHTAGS(R.string.feed_group_hashtags), + INTEREST_SETS(R.string.feed_group_interest_sets), LOCATIONS(R.string.feed_group_locations), COMMUNITIES(R.string.feed_group_communities), LISTS(R.string.feed_group_lists), - INTEREST_SETS(R.string.feed_group_interest_sets), DVMS(R.string.feed_group_dvms), } From 77a9bc875486968ec24dd3a725d4f4f7638d98c4 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 19 May 2026 21:28:51 +0000 Subject: [PATCH 3/3] feat: move DVMs before Communities in filter popup --- .../amethyst/ui/navigation/topbars/FeedFilterSpinner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt index 822f23153c..19530a8b2b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt @@ -338,9 +338,9 @@ private enum class FeedGroup( HASHTAGS(R.string.feed_group_hashtags), INTEREST_SETS(R.string.feed_group_interest_sets), LOCATIONS(R.string.feed_group_locations), + DVMS(R.string.feed_group_dvms), COMMUNITIES(R.string.feed_group_communities), LISTS(R.string.feed_group_lists), - DVMS(R.string.feed_group_dvms), } private fun FeedDefinition.group(): FeedGroup =