From 58a6608c19a56c827e0832731e4b2adc63115063 Mon Sep 17 00:00:00 2001 From: Jordan Kay Date: Mon, 28 Nov 2022 16:35:29 -0500 Subject: [PATCH] Fix spelling --- .../Sources/ServiceLayer/Entities/PickerEmoji.swift | 10 +++++----- .../ServiceLayer/Services/EmojiPickerService.swift | 6 +++--- View Controllers/EmojiPickerViewController.swift | 4 ++-- .../ViewModels/Extensions/PickerEmoji+Extensions.swift | 4 ++-- .../ViewModels/View Models/EmojiPickerViewModel.swift | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ServiceLayer/Sources/ServiceLayer/Entities/PickerEmoji.swift b/ServiceLayer/Sources/ServiceLayer/Entities/PickerEmoji.swift index 5ccd53d..7238930 100644 --- a/ServiceLayer/Sources/ServiceLayer/Entities/PickerEmoji.swift +++ b/ServiceLayer/Sources/ServiceLayer/Entities/PickerEmoji.swift @@ -4,8 +4,8 @@ import Foundation import Mastodon public indirect enum PickerEmoji: Hashable { - case custom(Emoji, inFrequentlyUsed: Bool) - case system(SystemEmoji, inFrequentlyUsed: Bool) + case custom(Emoji, infrequentlyUsed: Bool) + case system(SystemEmoji, infrequentlyUsed: Bool) } public extension PickerEmoji { @@ -43,12 +43,12 @@ public extension PickerEmoji { } } - var inFrequentlyUsed: Self { + var infrequentlyUsed: Self { switch self { case let .custom(emoji, _): - return .custom(emoji, inFrequentlyUsed: true) + return .custom(emoji, infrequentlyUsed: true) case let .system(emoji, _): - return .system(emoji, inFrequentlyUsed: true) + return .system(emoji, infrequentlyUsed: true) } } } diff --git a/ServiceLayer/Sources/ServiceLayer/Services/EmojiPickerService.swift b/ServiceLayer/Sources/ServiceLayer/Services/EmojiPickerService.swift index 6cfa20b..de0a2a2 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/EmojiPickerService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/EmojiPickerService.swift @@ -34,9 +34,9 @@ public extension EmojiPickerService { } if typed[category] == nil { - typed[category] = [.custom(emoji, inFrequentlyUsed: false)] + typed[category] = [.custom(emoji, infrequentlyUsed: false)] } else { - typed[category]?.append(.custom(emoji, inFrequentlyUsed: false)) + typed[category]?.append(.custom(emoji, infrequentlyUsed: false)) } } @@ -73,7 +73,7 @@ public extension EmojiPickerService { .map { PickerEmoji.system( $0.withMaxVersionForSkinToneVariations(Self.maxEmojiVersion), - inFrequentlyUsed: false) + infrequentlyUsed: false) } } diff --git a/View Controllers/EmojiPickerViewController.swift b/View Controllers/EmojiPickerViewController.swift index 06a16d8..cabdd67 100644 --- a/View Controllers/EmojiPickerViewController.swift +++ b/View Controllers/EmojiPickerViewController.swift @@ -168,14 +168,14 @@ final class EmojiPickerViewController: UICollectionViewController { contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? { guard let item = dataSource.itemIdentifier(for: indexPath), - case let .system(emoji, inFrequentlyUsed) = item, + case let .system(emoji, infrequentlyUsed) = item, !emoji.skinToneVariations.isEmpty else { return nil } return UIContextMenuConfiguration(identifier: nil, previewProvider: nil) { _ in UIMenu(children: ([emoji] + emoji.skinToneVariations).map { skinToneVariation 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) } }) diff --git a/ViewModels/Sources/ViewModels/Extensions/PickerEmoji+Extensions.swift b/ViewModels/Sources/ViewModels/Extensions/PickerEmoji+Extensions.swift index d367d4c..8c2e02f 100644 --- a/ViewModels/Sources/ViewModels/Extensions/PickerEmoji+Extensions.swift +++ b/ViewModels/Sources/ViewModels/Extensions/PickerEmoji+Extensions.swift @@ -4,9 +4,9 @@ import Foundation public extension 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 { - return .system(systemEmoji.applying(skinTone: defaultEmojiSkinTone), inFrequentlyUsed: inFrequentlyUsed) + return .system(systemEmoji.applying(skinTone: defaultEmojiSkinTone), infrequentlyUsed: infrequentlyUsed) } else { return self } diff --git a/ViewModels/Sources/ViewModels/View Models/EmojiPickerViewModel.swift b/ViewModels/Sources/ViewModels/View Models/EmojiPickerViewModel.swift index a95cdbe..7946fb0 100644 --- a/ViewModels/Sources/ViewModels/View Models/EmojiPickerViewModel.swift +++ b/ViewModels/Sources/ViewModels/View Models/EmojiPickerViewModel.swift @@ -75,7 +75,7 @@ final public class EmojiPickerViewModel: ObservableObject { emojis[.frequentlyUsed] = emojiUses.compactMap { use in emojis.values.reduce([], +) .first { use.system == $0.system && use.emoji == $0.name } - .map(\.inFrequentlyUsed) + .map(\.infrequentlyUsed) } }