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 animation

Browse Source
This commit is contained in:
Ali 2022-01-13 21:05:24 +04:00
parent 1831f1e84b
commit fcea45e044
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift
View File

@ -504,6 +504,17 @@ final class ContextControllerExtractedPresentationNode: ASDisplayNode, ContextCo
) )
if let reactionContextNode = self.reactionContextNode { if let reactionContextNode = self.reactionContextNode {
let reactionsPositionDeltaYDistance = -animationInContentDistance
reactionContextNode.layer.animateSpring(
from: NSValue(cgPoint: CGPoint(x: 0.0, y: reactionsPositionDeltaYDistance)),
to: NSValue(cgPoint: CGPoint()),
keyPath: "position",
duration: duration,
delay: 0.0,
initialVelocity: 0.0,
damping: springDamping,
additive: true
)
reactionContextNode.animateIn(from: currentContentScreenFrame) reactionContextNode.animateIn(from: currentContentScreenFrame)
} }

6
submodules/ReactionSelectionNode/Sources/ReactionContextNode.swift
View File

@ -606,7 +606,7 @@ public final class ReactionContextNode: ASDisplayNode, UIScrollViewDelegate {
intermediateCompletion() intermediateCompletion()
} }
transition.animatePositionWithKeyframes(node: itemNode, keyframes: generateParabollicMotionKeyframes(from: selfSourceRect.center, to: expandedFrame.center, elevation: 30.0), completion: { [weak self, weak itemNode, weak targetView] _ in transition.animatePositionWithKeyframes(node: itemNode, keyframes: generateParabollicMotionKeyframes(from: selfSourceRect.center, to: expandedFrame.center, elevation: 30.0), completion: { [weak self, weak itemNode, weak targetView, weak animateTargetContainer] _ in
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1, execute: { DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1, execute: {
guard let strongSelf = self else { guard let strongSelf = self else {
return return
@ -620,7 +620,11 @@ public final class ReactionContextNode: ASDisplayNode, UIScrollViewDelegate {
guard let targetView = targetView as? ReactionIconView else { guard let targetView = targetView as? ReactionIconView else {
return return
} }
if let animateTargetContainer = animateTargetContainer {
animateTargetContainer.isHidden = false
}
targetView.isHidden = false targetView.isHidden = false
targetView.alpha = 1.0
targetView.imageView.alpha = 0.0 targetView.imageView.alpha = 0.0
targetView.addSubnode(itemNode) targetView.addSubnode(itemNode)
itemNode.frame = targetView.bounds itemNode.frame = targetView.bounds