From 926856286011dd8832ed8ab5ba4e1e0a0a8c94dc Mon Sep 17 00:00:00 2001
From: autay27 <79455331+autay27@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:38:27 +0100
Subject: [PATCH] Sort by category in emoji picker (#4533)

Emojis are sorted by category within the emoji picker. The original
alphabetical sorting is preserved within categories.

This partially addresses #1868 and is only a small part of what is done
in #3300, but I think it is still enough to improve quality of life for
users.
---
 .../main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt  | 1 +
 app/src/main/java/com/keylesspalace/tusky/entity/Emoji.kt      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt
index f2162fad7..f615eb00c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt
@@ -33,6 +33,7 @@ class EmojiAdapter(
 
     private val emojiList: List<Emoji> = emojiList.filter { emoji -> emoji.visibleInPicker }
         .sortedBy { it.shortcode.lowercase(Locale.ROOT) }
+        .sortedBy { it.category?.lowercase(Locale.ROOT) ?: "" }
 
     override fun getItemCount() = emojiList.size
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Emoji.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Emoji.kt
index c4325a60d..14061c35f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Emoji.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Emoji.kt
@@ -26,5 +26,6 @@ data class Emoji(
     val shortcode: String,
     val url: String,
     @Json(name = "static_url") val staticUrl: String,
-    @Json(name = "visible_in_picker") val visibleInPicker: Boolean = true
+    @Json(name = "visible_in_picker") val visibleInPicker: Boolean = true,
+    val category: String?
 ) : Parcelable