From 70061667835c768b3302640a45ad034612592c9f Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 2 Nov 2021 13:20:27 +0400 Subject: [PATCH 1/3] Fix additional emoji animations --- submodules/TelegramUI/Sources/ChatHistoryListNode.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift index 687449a15c..d232173361 100644 --- a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift @@ -786,7 +786,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { let additionalAnimatedEmojiStickers = context.engine.stickers.loadedStickerPack(reference: .animatedEmojiAnimations, forceActualized: false) |> map { animatedEmoji -> [String: [Int: StickerPackItem]] in - let sequence = "0️⃣1️⃣2️⃣3️⃣4️⃣5️⃣6️⃣7️⃣8️⃣9️⃣" + let sequence = "0️⃣1️⃣2️⃣3️⃣4️⃣5️⃣6️⃣7️⃣8️⃣9️⃣".strippedEmoji var animatedEmojiStickers: [String: [Int: StickerPackItem]] = [:] switch animatedEmoji { case let .result(_, items, _): @@ -806,7 +806,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { indexEmoji = nil } - if let emoji = emoji?.strippedEmoji, let indexEmoji = indexEmoji?.first, let strIndex = sequence.firstIndex(of: indexEmoji) { + if let emoji = emoji?.strippedEmoji, let indexEmoji = indexEmoji?.strippedEmoji.first, let strIndex = sequence.firstIndex(of: indexEmoji) { let index = sequence.distance(from: sequence.startIndex, to: strIndex) if animatedEmojiStickers[emoji] != nil { animatedEmojiStickers[emoji]![index] = item From 59431e746b1605cc4eb8d8ad24282f83fcf126a4 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 2 Nov 2021 14:14:01 +0400 Subject: [PATCH 2/3] Fix join icon animation size --- submodules/UndoUI/Sources/UndoOverlayControllerNode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift index c0b1ea47bb..de84de3069 100644 --- a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift +++ b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift @@ -737,7 +737,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode { self.avatarNode = nil self.iconNode = nil self.iconCheckNode = nil - self.animationNode = AnimationNode(animation: "anim_inviterequest", colors: [:], scale: 1.0) + self.animationNode = AnimationNode(animation: "anim_inviterequest", colors: [:], scale: 0.066) self.animatedStickerNode = nil self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(14.0), textColor: .white) self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(14.0), textColor: .white) From 5060701adbeb6faf86c61ff4a23222e7da8efd9c Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 2 Nov 2021 14:17:13 +0400 Subject: [PATCH 3/3] Fix invite link view title size --- .../Sources/InviteLinkViewController.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift index 84441f06c6..e8bc9bd75b 100644 --- a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift +++ b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift @@ -981,15 +981,7 @@ public final class InviteLinkViewController: ViewController { self.titleNode.attributedText = NSAttributedString(string: titleText, font: Font.bold(17.0), textColor: self.presentationData.theme.actionSheet.primaryTextColor) self.subtitleNode.attributedText = NSAttributedString(string: subtitleText, font: subtitleFont, textColor: subtitleColor) - - let subtitleSize = self.subtitleNode.updateLayout(CGSize(width: layout.size.width, height: headerHeight)) - let subtitleFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - subtitleSize.width) / 2.0), y: 30.0 - UIScreenPixel), size: subtitleSize) - transition.updateFrame(node: self.subtitleNode, frame: subtitleFrame) - - let titleSize = self.titleNode.updateLayout(CGSize(width: layout.size.width, height: headerHeight)) - let titleFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - titleSize.width) / 2.0), y: subtitleSize.height.isZero ? 18.0 : 10.0 + UIScreenPixel), size: titleSize) - transition.updateFrame(node: self.titleNode, frame: titleFrame) - + let editSize = self.editButton.measure(CGSize(width: layout.size.width, height: headerHeight)) let editFrame = CGRect(origin: CGPoint(x: 16.0 + layout.safeInsets.left, y: 18.0), size: editSize) transition.updateFrame(node: self.editButton, frame: editFrame) @@ -997,6 +989,14 @@ public final class InviteLinkViewController: ViewController { let doneSize = self.doneButton.measure(CGSize(width: layout.size.width, height: headerHeight)) let doneFrame = CGRect(origin: CGPoint(x: layout.size.width - doneSize.width - 16.0 - layout.safeInsets.right, y: 18.0), size: doneSize) transition.updateFrame(node: self.doneButton, frame: doneFrame) + + let subtitleSize = self.subtitleNode.updateLayout(CGSize(width: layout.size.width - editSize.width - doneSize.width - 20.0, height: headerHeight)) + let subtitleFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - subtitleSize.width) / 2.0), y: 30.0 - UIScreenPixel), size: subtitleSize) + transition.updateFrame(node: self.subtitleNode, frame: subtitleFrame) + + let titleSize = self.titleNode.updateLayout(CGSize(width: layout.size.width - editSize.width - doneSize.width - 20.0, height: headerHeight)) + let titleFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - titleSize.width) / 2.0), y: subtitleSize.height.isZero ? 18.0 : 10.0 + UIScreenPixel), size: titleSize) + transition.updateFrame(node: self.titleNode, frame: titleFrame) } override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {