Show post side toolbar items in the correct order

QuantumBadger · Feb 12, 2023 · 43011ba · 43011ba
1 parent 5159c7a
commit 43011ba
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/main/assets/changelog-alpha.txt b/src/main/assets/changelog-alpha.txt
@@ -1,5 +1,6 @@
-/Alpha 327 (2023-02-11)
+/Alpha 327 (2023-02-12)
 Rewrote JSON parsing code for posts and comments to use kotlinx serialization
+Show post side toolbar items in the correct order
 
 /Alpha 326 (2023-02-05)
 Subreddit emotes now supported in comments (thanks to bharatkvn)

diff --git a/src/main/java/org/quantumbadger/redreader/reddit/api/RedditPostActions.kt b/src/main/java/org/quantumbadger/redreader/reddit/api/RedditPostActions.kt
@@ -931,8 +931,25 @@ object RedditPostActions {
 			else -> throw RuntimeException("Unknown drawable for $action")
 		}
 
-		// TODO these are in the wrong order now
-		PrefsUtility.pref_menus_post_toolbar_items()
+		val itemsToShow = PrefsUtility.pref_menus_post_toolbar_items();
+
+		listOf(
+			Action.ACTION_MENU,
+			Action.COMMENTS_SWITCH,
+			Action.LINK_SWITCH,
+			Action.UPVOTE,
+			Action.DOWNVOTE,
+			Action.SAVE,
+			Action.HIDE,
+			Action.REPLY,
+			Action.EXTERNAL,
+			Action.SAVE_IMAGE,
+			Action.SHARE,
+			Action.COPY,
+			Action.USER_PROFILE,
+			Action.PROPERTIES
+		)
+			.filter { itemsToShow.contains(it) }
 			.filterNot {
 				isComments && it == Action.COMMENTS_SWITCH
 						|| !isComments && it == Action.LINK_SWITCH