Implement frequency tracking for frequently used emojis

ElementX/Sources/Application/AppSettings.swift

@@ -232,7 +232,7 @@ final class AppSettings {
     @UserPreference(key: UserDefaultsKeys.hasRunIdentityConfirmationOnboarding, defaultValue: false, storageType: .userDefaults(store))
     var hasRunIdentityConfirmationOnboarding
 
-    @UserPreference(key: UserDefaultsKeys.frequentlyUsedSystemEmojis, defaultValue: [String](), storageType: .userDefaults(store))
+    @UserPreference(key: UserDefaultsKeys.frequentlyUsedSystemEmojis, defaultValue: [FrequentlyUsedEmoji](), storageType: .userDefaults(store))
     var frequentlyUsedSystemEmojis
 
     // MARK: - Home Screen

ElementX/Sources/Services/Emojis/EmojiProvider.swift

@@ -7,7 +7,6 @@
 
 import Emojibase
 import Foundation
-import OrderedCollections
 
 class EmojiProvider: EmojiProviderProtocol {
     private let maxFrequentEmojis = 20
@@ -61,18 +60,27 @@ class EmojiProvider: EmojiProviderProtocol {
             return []
         }
 
-        return appSettings.frequentlyUsedSystemEmojis
+        return appSettings.frequentlyUsedSystemEmojis.map(\.key)
     }
 
     func markEmojiAsFrequentlyUsed(_ emoji: String) {
         guard !ProcessInfo.processInfo.isiOSAppOnMac else {
             return
         }
 
-        var uniqueOrderedRecents = OrderedSet(appSettings.frequentlyUsedSystemEmojis)
-        uniqueOrderedRecents.insert(emoji, at: 0)
+        let frequentlyUsed = if !frequentlyUsedSystemEmojis().contains(emoji) {
+            appSettings.frequentlyUsedSystemEmojis + [.init(count: 0, key: emoji)]
+        } else {
+            appSettings.frequentlyUsedSystemEmojis.map { frequentlyUsedEmoji in
+                if frequentlyUsedEmoji.key == emoji {
+                    return FrequentlyUsedEmoji(count: frequentlyUsedEmoji.count + 1, key: emoji)
+                }
+
+                return frequentlyUsedEmoji
+            }
+        }
 
-        appSettings.frequentlyUsedSystemEmojis = Array(uniqueOrderedRecents)
+        appSettings.frequentlyUsedSystemEmojis = frequentlyUsed.sorted { $0.count > $1.count }
     }
 
     // MARK: - Private

ElementX/Sources/Services/Emojis/EmojiProviderProtocol.swift

@@ -31,6 +31,15 @@ enum EmojiProviderState {
     case loaded([EmojiCategory])
 }
 
+struct FrequentlyUsedEmoji: Codable, Hashable {
+    let count: UInt
+    let key: String
+
+    static func == (lhs: FrequentlyUsedEmoji, rhs: FrequentlyUsedEmoji) -> Bool {
+        lhs.key == rhs.key
+    }
+}
+
 @MainActor
 protocol EmojiProviderProtocol {
     var state: EmojiProviderState { get }