From 35ef08fc06dcf4204486c3cdbcdaf83e7b0ca539 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 1 Aug 2019 04:10:51 +0300 Subject: [PATCH] UI fixes --- .../TelegramUI/TelegramUI/ChatHistoryListNode.swift | 2 +- .../ChatMessageAnimatedStickerItemNode.swift | 12 ++++++------ .../TelegramUI/ThemeSettingsController.swift | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index 55c06eeedf..61c0929385 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -545,7 +545,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { var animatedEmojiStickers: [String: StickerPackItem] = [:] for case let item as StickerPackItem in items { if let emoji = item.getStringRepresentationsOfIndexKeys().first { - animatedEmojiStickers[emoji] = item + animatedEmojiStickers[emoji.trimmedEmoji] = item } } return animatedEmojiStickers diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift index 8f402cdf45..43a818c58e 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift @@ -676,17 +676,17 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { self.hapticFeedback = hapticFeedback } hapticFeedback.prepareImpact() - hapticFeedback.impact(.heavy) + hapticFeedback.impact(.medium) Queue.mainQueue().after(0.2) { - hapticFeedback.impact(.medium) + hapticFeedback.impact(.light) Queue.mainQueue().after(0.78) { - hapticFeedback.impact(.heavy) + hapticFeedback.impact(.medium) Queue.mainQueue().after(0.2) { - hapticFeedback.impact(.medium) + hapticFeedback.impact(.light) Queue.mainQueue().after(0.78) { - hapticFeedback.impact(.heavy) + hapticFeedback.impact(.medium) Queue.mainQueue().after(0.2) { - hapticFeedback.impact(.medium) + hapticFeedback.impact(.light) } } } diff --git a/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift b/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift index 75e291f4ca..a962138eea 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift @@ -437,8 +437,8 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The let fontSize = settings.fontSize let dateTimeFormat = presentationData.dateTimeFormat - let largeEmoji = settings.largeEmoji - let disableAnimations = settings.disableAnimations + let largeEmoji = presentationData.largeEmoji + let disableAnimations = presentationData.disableAnimations let accentColor = settings.themeSpecificAccentColors[settings.theme.index]?.color let theme = makePresentationTheme(themeReference: settings.theme, accentColor: accentColor, serviceBackgroundColor: defaultServiceBackgroundColor, preview: true)