mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2024-06-11 01:49:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge 58a6608c19 into 96d2ff3a2b

Browse source
This commit is contained in:
Jordan Kay 2022-11-30 20:09:37 -05:00 committed by GitHub
parent 96d2ff3a2b 58a6608c19
commit 784cd86d0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ServiceLayer/Sources/ServiceLayer/Entities/PickerEmoji.swift
View file

@ -4,8 +4,8 @@ import Foundation
import Mastodon import Mastodon
public indirect enum PickerEmoji: Hashable { public indirect enum PickerEmoji: Hashable {
case custom(Emoji, inFrequentlyUsed: Bool) case custom(Emoji, infrequentlyUsed: Bool)
case system(SystemEmoji, inFrequentlyUsed: Bool) case system(SystemEmoji, infrequentlyUsed: Bool)
} }
public extension PickerEmoji { public extension PickerEmoji {
@ -43,12 +43,12 @@ public extension PickerEmoji {
} }
} }
var inFrequentlyUsed: Self { var infrequentlyUsed: Self {
switch self { switch self {
case let .custom(emoji, _): case let .custom(emoji, _):
return .custom(emoji, inFrequentlyUsed: true) return .custom(emoji, infrequentlyUsed: true)
case let .system(emoji, _): case let .system(emoji, _):
return .system(emoji, inFrequentlyUsed: true) return .system(emoji, infrequentlyUsed: true)
} }
} }
} }

6
ServiceLayer/Sources/ServiceLayer/Services/EmojiPickerService.swift
View file

@ -34,9 +34,9 @@ public extension EmojiPickerService {
} }
if typed[category] == nil { if typed[category] == nil {
typed[category] = [.custom(emoji, inFrequentlyUsed: false)] typed[category] = [.custom(emoji, infrequentlyUsed: false)]
} else { } else {
typed[category]?.append(.custom(emoji, inFrequentlyUsed: false)) typed[category]?.append(.custom(emoji, infrequentlyUsed: false))
} }
} }
@ -73,7 +73,7 @@ public extension EmojiPickerService {
.map { .map {
PickerEmoji.system( PickerEmoji.system(
$0.withMaxVersionForSkinToneVariations(Self.maxEmojiVersion), $0.withMaxVersionForSkinToneVariations(Self.maxEmojiVersion),
inFrequentlyUsed: false) infrequentlyUsed: false)
} }
} }

4
View Controllers/EmojiPickerViewController.swift
View file

@ -168,14 +168,14 @@ final class EmojiPickerViewController: UICollectionViewController {
contextMenuConfigurationForItemAt indexPath: IndexPath, contextMenuConfigurationForItemAt indexPath: IndexPath,
point: CGPoint) -> UIContextMenuConfiguration? { point: CGPoint) -> UIContextMenuConfiguration? {
guard let item = dataSource.itemIdentifier(for: indexPath), guard let item = dataSource.itemIdentifier(for: indexPath),
case let .system(emoji, inFrequentlyUsed) = item, case let .system(emoji, infrequentlyUsed) = item,
!emoji.skinToneVariations.isEmpty !emoji.skinToneVariations.isEmpty
else { return nil } else { return nil }
return UIContextMenuConfiguration(identifier: nil, previewProvider: nil) { _ in return UIContextMenuConfiguration(identifier: nil, previewProvider: nil) { _ in
UIMenu(children: ([emoji] + emoji.skinToneVariations).map { skinToneVariation in UIMenu(children: ([emoji] + emoji.skinToneVariations).map { skinToneVariation in
UIAction(title: skinToneVariation.emoji) { [weak self] _ in UIAction(title: skinToneVariation.emoji) { [weak self] _ in
self?.select(emoji: .system(skinToneVariation, inFrequentlyUsed: inFrequentlyUsed)) self?.select(emoji: .system(skinToneVariation, infrequentlyUsed: infrequentlyUsed))
self?.viewModel.updateUse(emoji: item) self?.viewModel.updateUse(emoji: item)
} }
}) })

4
ViewModels/Sources/ViewModels/Extensions/PickerEmoji+Extensions.swift
View file

@ -4,9 +4,9 @@ import Foundation
public extension PickerEmoji { public extension PickerEmoji {
func applyingDefaultSkinTone(identityContext: IdentityContext) -> PickerEmoji { func applyingDefaultSkinTone(identityContext: IdentityContext) -> PickerEmoji {
if case let .system(systemEmoji, inFrequentlyUsed) = self, if case let .system(systemEmoji, infrequentlyUsed) = self,
let defaultEmojiSkinTone = identityContext.appPreferences.defaultEmojiSkinTone { let defaultEmojiSkinTone = identityContext.appPreferences.defaultEmojiSkinTone {
return .system(systemEmoji.applying(skinTone: defaultEmojiSkinTone), inFrequentlyUsed: inFrequentlyUsed) return .system(systemEmoji.applying(skinTone: defaultEmojiSkinTone), infrequentlyUsed: infrequentlyUsed)
} else { } else {
return self return self
} }

2
ViewModels/Sources/ViewModels/View Models/EmojiPickerViewModel.swift
View file

@ -75,7 +75,7 @@ final public class EmojiPickerViewModel: ObservableObject {
emojis[.frequentlyUsed] = emojiUses.compactMap { use in emojis[.frequentlyUsed] = emojiUses.compactMap { use in
emojis.values.reduce([], +) emojis.values.reduce([], +)
.first { use.system == $0.system && use.emoji == $0.name } .first { use.system == $0.system && use.emoji == $0.name }
.map(\.inFrequentlyUsed) .map(\.infrequentlyUsed)
} }
} }