ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Emoji improvements

Browse Source
This commit is contained in:
Ali 2022-08-02 14:26:49 +04:00
parent fdbb8aab0a
commit eb13b10a5e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
submodules/TelegramUI/Components/EmojiSuggestionsComponent/Sources/EmojiSuggestionsComponent.swift
View File

@ -39,6 +39,8 @@ public final class EmojiSuggestionsComponent: Component {
|> map { view, featuredEmojiPacks, hasPremium -> [TelegramMediaFile] in |> map { view, featuredEmojiPacks, hasPremium -> [TelegramMediaFile] in
var result: [TelegramMediaFile] = [] var result: [TelegramMediaFile] = []
let normalizedQuery = query.basicEmoji.0
var existingIds = Set<MediaId>() var existingIds = Set<MediaId>()
for entry in view.entries { for entry in view.entries {
guard let item = entry.item as? StickerPackItem else { guard let item = entry.item as? StickerPackItem else {
@ -47,7 +49,7 @@ public final class EmojiSuggestionsComponent: Component {
for attribute in item.file.attributes { for attribute in item.file.attributes {
switch attribute { switch attribute {
case let .CustomEmoji(_, alt, _): case let .CustomEmoji(_, alt, _):
if alt == query { if alt == query || (!normalizedQuery.isEmpty && alt == normalizedQuery) {
if !item.file.isPremiumEmoji || hasPremium { if !item.file.isPremiumEmoji || hasPremium {
if !existingIds.contains(item.file.fileId) { if !existingIds.contains(item.file.fileId) {
existingIds.insert(item.file.fileId) existingIds.insert(item.file.fileId)
@ -66,7 +68,7 @@ public final class EmojiSuggestionsComponent: Component {
for attribute in item.file.attributes { for attribute in item.file.attributes {
switch attribute { switch attribute {
case let .CustomEmoji(_, alt, _): case let .CustomEmoji(_, alt, _):
if alt == query { if alt == query || (!normalizedQuery.isEmpty && alt == normalizedQuery) {
if !item.file.isPremiumEmoji || hasPremium { if !item.file.isPremiumEmoji || hasPremium {
if !existingIds.contains(item.file.fileId) { if !existingIds.contains(item.file.fileId) {
existingIds.insert(item.file.fileId) existingIds.insert(item.file.fileId)

3
submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
View File

@ -2506,6 +2506,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
self.currentEmojiSuggestion = suggestionContext self.currentEmojiSuggestion = suggestionContext
} }
suggestionContext.localPosition = trackingPosition suggestionContext.localPosition = trackingPosition
suggestionContext.position = emojiSuggestionPosition
self.dismissedEmojiSuggestionPosition = nil self.dismissedEmojiSuggestionPosition = nil
if beginRequest { if beginRequest {
@ -2627,7 +2628,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
containerSize: CGSize(width: self.bounds.width - sideInset * 2.0, height: 100.0) containerSize: CGSize(width: self.bounds.width - sideInset * 2.0, height: 100.0)
) )
let viewFrame = CGRect(origin: CGPoint(x: max(sideInset, floor(globalPosition.x - viewSize.width / 2.0)), y: globalPosition.y - 2.0 - viewSize.height), size: viewSize) let viewFrame = CGRect(origin: CGPoint(x: min(self.bounds.width - sideInset - viewSize.width, max(sideInset, floor(globalPosition.x - viewSize.width / 2.0))), y: globalPosition.y - 2.0 - viewSize.height), size: viewSize)
currentEmojiSuggestionView.frame = viewFrame currentEmojiSuggestionView.frame = viewFrame
if let componentView = currentEmojiSuggestionView.componentView as? EmojiSuggestionsComponent.View { if let componentView = currentEmojiSuggestionView.componentView as? EmojiSuggestionsComponent.View {
componentView.adjustBackground(relativePositionX: floor(globalPosition.x - viewFrame.minX)) componentView.adjustBackground(relativePositionX: floor(globalPosition.x - viewFrame.minX))