oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

feat: show unsupported emoji

Browse source
This commit is contained in:
ryanzhao 2022-08-19 10:10:07 +10:00
parent 43b6f0b649
commit 3944fe52c1
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Session/Conversations/Context Menu/ContextMenuVC+Action.swift
View file

@ -161,7 +161,7 @@ extension ContextMenuVC {
if cellViewModel.threadVariant == .openGroup {
return OpenGroupManager.isOpenGroupSupport(.reactions, on: cellViewModel.threadOpenGroupServer)
}
return currentThreadIsMessageRequest
return !currentThreadIsMessageRequest
}()
let generatedActions: [Action] = [

4
Session/Conversations/Emoji Picker/EmojiPickerCollectionView.swift
View file

@ -152,7 +152,7 @@ class EmojiPickerCollectionView: UICollectionView {
func searchWithText(_ searchText: String?) {
if let searchText = searchText {
emojiSearchResults = allSendableEmoji.filter { emoji in
return emoji.baseEmoji.name.range(of: searchText, options: [.caseInsensitive]) != nil
return emoji.baseEmoji?.name.range(of: searchText, options: [.caseInsensitive]) != nil
}
} else {
emojiSearchResults = []
@ -187,7 +187,7 @@ class EmojiPickerCollectionView: UICollectionView {
currentSkinTonePicker = EmojiSkinTonePicker.present(referenceView: cell, emoji: emoji) { [weak self] emoji in
if let emoji: EmojiWithSkinTones = emoji {
Storage.shared.writeAsync { db in
emoji.baseEmoji.setPreferredSkinTones(
emoji.baseEmoji?.setPreferredSkinTones(
db,
preferredSkinTonePermutation: emoji.skinTones
)

8
Session/Conversations/Emoji Picker/EmojiSkinTonePicker.swift
View file

@ -14,7 +14,7 @@ class EmojiSkinTonePicker: UIView {
emoji: EmojiWithSkinTones,
completion: @escaping (EmojiWithSkinTones?) -> Void
) -> EmojiSkinTonePicker? {
guard emoji.baseEmoji.hasSkinTones else { return nil }
guard let baseEmoji = emoji.baseEmoji, baseEmoji.hasSkinTones else { return nil }
UIImpactFeedbackGenerator(style: .light).impactOccurred()
@ -104,9 +104,9 @@ class EmojiSkinTonePicker: UIView {
}
init(emoji: EmojiWithSkinTones, completion: @escaping (EmojiWithSkinTones?) -> Void) {
owsAssertDebug(emoji.baseEmoji.hasSkinTones)
owsAssertDebug(emoji.baseEmoji!.hasSkinTones)
self.emoji = emoji.baseEmoji
self.emoji = emoji.baseEmoji!
self.preferredSkinTonePermutation = emoji.skinTones
self.completion = completion
@ -127,7 +127,7 @@ class EmojiSkinTonePicker: UIView {
containerView.autoPinWidthToSuperview()
containerView.setCompressionResistanceHigh()
if emoji.baseEmoji.allowsMultipleSkinTones {
if emoji.baseEmoji!.allowsMultipleSkinTones {
prepareForMultipleSkinTones()
} else {
prepareForSingleSkinTone()