Switch from Smile to EmojiKit
This commit is contained in:
@@ -1,12 +1,21 @@
|
|||||||
{
|
{
|
||||||
"pins" : [
|
"pins" : [
|
||||||
{
|
{
|
||||||
"identity" : "smile",
|
"identity" : "emojikit",
|
||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/tyiu/Smile",
|
"location" : "https://github.com/tyiu/EmojiKit",
|
||||||
"state" : {
|
"state" : {
|
||||||
"branch" : "master",
|
"branch" : "emoji-keywords",
|
||||||
"revision" : "70b703eeaeab93365e01944daba1a56e446852c7"
|
"revision" : "3250b3cada8829ec3ff09013e861cba2b48bdb04"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "swift-collections",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/apple/swift-collections.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
|
||||||
|
"version" : "1.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -15,14 +15,14 @@ let package = Package(
|
|||||||
dependencies: [
|
dependencies: [
|
||||||
// Dependencies declare other packages that this package depends on.
|
// Dependencies declare other packages that this package depends on.
|
||||||
// .package(url: /* package url */, from: "1.0.0"),
|
// .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: [
|
||||||
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
|
// 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.
|
// Targets can depend on other targets in this package, and on products in packages this package depends on.
|
||||||
.target(
|
.target(
|
||||||
name: "EmojiPicker",
|
name: "EmojiPicker",
|
||||||
dependencies: ["Smile"]),
|
dependencies: ["EmojiKit"]),
|
||||||
.testTarget(
|
.testTarget(
|
||||||
name: "EmojiPickerTests",
|
name: "EmojiPickerTests",
|
||||||
dependencies: ["EmojiPicker"]),
|
dependencies: ["EmojiPicker"]),
|
||||||
|
|||||||
@@ -6,14 +6,14 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import Smile
|
import EmojiKit
|
||||||
|
|
||||||
public final class DefaultEmojiProvider: EmojiProvider {
|
public final class DefaultEmojiProvider: EmojiProvider {
|
||||||
|
|
||||||
public init() { }
|
public init() { }
|
||||||
|
|
||||||
public func getAll() -> [Emoji] {
|
public func getAll() -> [Emoji] {
|
||||||
return emojiList.values.map { Emoji(value: $0, name: name(emoji: $0).first ?? "") }
|
return EmojiManager.getAvailableEmojis().flatMap { $0.emojis.values }
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -6,6 +6,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
import EmojiKit
|
||||||
|
|
||||||
public struct EmojiPickerView: View {
|
public struct EmojiPickerView: View {
|
||||||
|
|
||||||
@@ -39,7 +40,7 @@ public struct EmojiPickerView: View {
|
|||||||
return emojis
|
return emojis
|
||||||
} else {
|
} else {
|
||||||
return emojis
|
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 {
|
struct EmojiPickerView_Previews: PreviewProvider {
|
||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
EmojiPickerView(selectedEmoji: .constant(Emoji(value: "", name: "")))
|
EmojiPickerView(selectedEmoji: .constant(Emoji(value: "", keywords: [])))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
|
import EmojiKit
|
||||||
|
|
||||||
public protocol EmojiProvider {
|
public protocol EmojiProvider {
|
||||||
func getAll() -> [Emoji]
|
func getAll() -> [Emoji]
|
||||||
|
|||||||
Reference in New Issue
Block a user