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

Fix greeting sticker animation

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-01-25 18:38:39 +03:00
parent e458be1a7b
commit 1e24ba62c7
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
View File

@ -970,7 +970,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
let initialFrame = animationNode.view.convert(animationNode.bounds, to: parentNode.view) let initialFrame = animationNode.view.convert(animationNode.bounds, to: parentNode.view)
parentNode.addSubnode(animationNode) parentNode.addSubnode(animationNode)
animationNode.frame = initialFrame animationNode.frame = initialFrame
var targetPositionY = initialFrame.center.y var targetPositionY = initialFrame.center.y
if let listNode = strongSelf.greetingStickerListNode as? ListView { if let listNode = strongSelf.greetingStickerListNode as? ListView {
targetPositionY = listNode.frame.height - listNode.insets.top - animationNodeFrame.height / 2.0 - 12.0 targetPositionY = listNode.frame.height - listNode.insets.top - animationNodeFrame.height / 2.0 - 12.0
@ -982,11 +982,25 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
animationNode.layer.animatePosition(from: initialFrame.center, to: targetPosition, duration: 0.4, mediaTimingFunction: CAMediaTimingFunction(controlPoints: 0.3, 0.0, 0.0, 1.0), removeOnCompletion: false, completion: { [weak self] finished in animationNode.layer.animatePosition(from: initialFrame.center, to: targetPosition, duration: 0.4, mediaTimingFunction: CAMediaTimingFunction(controlPoints: 0.3, 0.0, 0.0, 1.0), removeOnCompletion: false, completion: { [weak self] finished in
if let strongSelf = self { if let strongSelf = self {
let initialDateNodeFrame = strongSelf.dateAndStatusNode.frame
if strongSelf.animatingGreeting {
if strongSelf.dateAndStatusNode.supernode !== parentNode {
let dateNodeFrame = strongSelf.dateAndStatusNode.view.convert(strongSelf.dateAndStatusNode.bounds, to: parentNode.view)
parentNode.addSubnode(strongSelf.dateAndStatusNode)
strongSelf.dateAndStatusNode.frame = dateNodeFrame
strongSelf.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
}
}
strongSelf.greetingCompletion?({ strongSelf.greetingCompletion?({
animationNode.layer.removeAllAnimations() animationNode.layer.removeAllAnimations()
strongSelf.animationNode?.frame = animationNodeFrame strongSelf.animationNode?.frame = animationNodeFrame
strongSelf.contextSourceNode.contentNode.insertSubnode(animationNode, aboveSubnode: strongSelf.imageNode) strongSelf.contextSourceNode.contentNode.insertSubnode(animationNode, aboveSubnode: strongSelf.imageNode)
strongSelf.contextSourceNode.contentNode.addSubnode(strongSelf.dateAndStatusNode)
strongSelf.dateAndStatusNode.frame = initialDateNodeFrame
if let animationNode = strongSelf.animationNode as? AnimatedStickerNode { if let animationNode = strongSelf.animationNode as? AnimatedStickerNode {
animationNode.updateLayout(size: updatedContentFrame.insetBy(dx: imageInset, dy: imageInset).size) animationNode.updateLayout(size: updatedContentFrame.insetBy(dx: imageInset, dy: imageInset).size)
} }
@ -1023,7 +1037,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
} }
dateAndStatusApply(false) dateAndStatusApply(false)
strongSelf.dateAndStatusNode.frame = CGRect(origin: CGPoint(x: max(displayLeftInset, updatedImageFrame.maxX - dateAndStatusSize.width - 4.0), y: updatedImageFrame.maxY - dateAndStatusSize.height - 4.0), size: dateAndStatusSize) let dateAndStatusFrame = CGRect(origin: CGPoint(x: max(displayLeftInset, updatedImageFrame.maxX - dateAndStatusSize.width - 4.0), y: updatedImageFrame.maxY - dateAndStatusSize.height - 4.0), size: dateAndStatusSize)
if strongSelf.dateAndStatusNode.supernode != strongSelf.greetingStickerParentNode {
strongSelf.dateAndStatusNode.frame = dateAndStatusFrame
}
if let updatedReplyBackgroundNode = updatedReplyBackgroundNode { if let updatedReplyBackgroundNode = updatedReplyBackgroundNode {
if strongSelf.replyBackgroundNode == nil { if strongSelf.replyBackgroundNode == nil {