From 9063d4f72bc8c6a4269435e3a3b6f105ed63ce96 Mon Sep 17 00:00:00 2001
From: Terry Yiu <963907+tyiu@users.noreply.github.com>
Date: Wed, 5 Jun 2024 23:25:54 -0400
Subject: [PATCH] Switch from Smile to EmojiKit

---
 Package.resolved                              | 17 ++++++++++++----
 Package.swift                                 |  4 ++--
 .../EmojiPicker/DefaultEmojiProvider.swift    |  4 ++--
 Sources/EmojiPicker/Emoji.swift               | 20 -------------------
 Sources/EmojiPicker/EmojiPickerView.swift     |  5 +++--
 Sources/EmojiPicker/EmojiProvider.swift       |  1 +
 6 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100644 Sources/EmojiPicker/Emoji.swift

diff --git a/Package.resolved b/Package.resolved
index 73c0a19..80cc0ee 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,12 +1,21 @@
 {
   "pins" : [
     {
-      "identity" : "smile",
+      "identity" : "emojikit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/tyiu/Smile",
+      "location" : "https://github.com/tyiu/EmojiKit",
       "state" : {
-        "branch" : "master",
-        "revision" : "70b703eeaeab93365e01944daba1a56e446852c7"
+        "branch" : "emoji-keywords",
+        "revision" : "3250b3cada8829ec3ff09013e861cba2b48bdb04"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections.git",
+      "state" : {
+        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
+        "version" : "1.1.0"
       }
     }
   ],
diff --git a/Package.swift b/Package.swift
index 2aad563..c64acd8 100644
--- a/Package.swift
+++ b/Package.swift
@@ -15,14 +15,14 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(url: "https://github.com/tyiu/Smile", branch: "master")
+        .package(url: "https://github.com/tyiu/EmojiKit", branch: "emoji-keywords")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "EmojiPicker",
-            dependencies: ["Smile"]),
+            dependencies: ["EmojiKit"]),
         .testTarget(
             name: "EmojiPickerTests",
             dependencies: ["EmojiPicker"]),
diff --git a/Sources/EmojiPicker/DefaultEmojiProvider.swift b/Sources/EmojiPicker/DefaultEmojiProvider.swift
index 69d135b..f75478d 100644
--- a/Sources/EmojiPicker/DefaultEmojiProvider.swift
+++ b/Sources/EmojiPicker/DefaultEmojiProvider.swift
@@ -6,14 +6,14 @@
 //
 
 import Foundation
-import Smile
+import EmojiKit
 
 public final class DefaultEmojiProvider: EmojiProvider {
 
     public init() { }
 
     public func getAll() -> [Emoji] {
-        return emojiList.values.map { Emoji(value: $0, name: name(emoji: $0).first ?? "") }
+        return EmojiManager.getAvailableEmojis().flatMap { $0.emojis.values }
     }
 
 }
diff --git a/Sources/EmojiPicker/Emoji.swift b/Sources/EmojiPicker/Emoji.swift
deleted file mode 100644
index 37fdbd2..0000000
--- a/Sources/EmojiPicker/Emoji.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  Emoji.swift
-//  
-//
-//  Created by Kévin Sibué on 11/01/2023.
-//
-
-import Foundation
-
-public struct Emoji: Hashable {
-
-    public let value: String
-    public let name: String
-
-    public init(value: String, name: String) {
-        self.value = value
-        self.name = name
-    }
-
-}
diff --git a/Sources/EmojiPicker/EmojiPickerView.swift b/Sources/EmojiPicker/EmojiPickerView.swift
index 2279782..a5ab259 100644
--- a/Sources/EmojiPicker/EmojiPickerView.swift
+++ b/Sources/EmojiPicker/EmojiPickerView.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import EmojiKit
 
 public struct EmojiPickerView: View {
 
@@ -39,7 +40,7 @@ public struct EmojiPickerView: View {
             return emojis
         } else {
             return emojis
-                .filter { $0.name.lowercased().contains(search.lowercased()) }
+//                .filter { $0.name.lowercased().contains(search.lowercased()) }
         }
     }
 
@@ -72,6 +73,6 @@ public struct EmojiPickerView: View {
 
 struct EmojiPickerView_Previews: PreviewProvider {
     static var previews: some View {
-        EmojiPickerView(selectedEmoji: .constant(Emoji(value: "", name: "")))
+        EmojiPickerView(selectedEmoji: .constant(Emoji(value: "", keywords: [])))
     }
 }
diff --git a/Sources/EmojiPicker/EmojiProvider.swift b/Sources/EmojiPicker/EmojiProvider.swift
index 012a5dd..bbd2caf 100644
--- a/Sources/EmojiPicker/EmojiProvider.swift
+++ b/Sources/EmojiPicker/EmojiProvider.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import EmojiKit
 
 public protocol EmojiProvider {
     func getAll() -> [Emoji]