diff --git a/submodules/CallListUI/Sources/CallListCallItem.swift b/submodules/CallListUI/Sources/CallListCallItem.swift index 7fd5e8bcf7..d4ffce52ac 100644 --- a/submodules/CallListUI/Sources/CallListCallItem.swift +++ b/submodules/CallListUI/Sources/CallListCallItem.swift @@ -695,7 +695,9 @@ class CallListCallItemNode: ItemListRevealOptionsItemNode { infoIconRightInset -= 36.0 } - transition.updateFrameAdditive(node: self.avatarNode, frame: CGRect(origin: CGPoint(x: revealOffset + leftInset - 52.0, y: 5.0), size: CGSize(width: 40.0, height: 40.0))) + var avatarFrame = self.avatarNode.frame + avatarFrame.origin.x = revealOffset + leftInset - 52.0 + transition.updateFrameAdditive(node: self.avatarNode, frame: avatarFrame) transition.updateFrameAdditive(node: self.titleNode, frame: CGRect(origin: CGPoint(x: revealOffset + leftInset, y: self.titleNode.frame.minY), size: self.titleNode.bounds.size)) diff --git a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift index 9a821d9103..b96f9c7210 100644 --- a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift +++ b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift @@ -785,13 +785,14 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode { self.addSubnode(self.recentListNode) self.addSubnode(self.listNode) self.addSubnode(self.mediaNode) - self.addSubnode(self.shimmerNode) - self.addSubnode(self.mediaAccessoryPanelContainer) self.addSubnode(self.emptyResultsAnimationNode) self.addSubnode(self.emptyResultsTitleNode) self.addSubnode(self.emptyResultsTextNode) + self.addSubnode(self.shimmerNode) + self.addSubnode(self.mediaAccessoryPanelContainer) + let searchContext = Promise(nil) let searchContextValue = self.searchContextValue let updateSearchContext: ((ChatListSearchMessagesContext?) -> (ChatListSearchMessagesContext?, Bool)) -> Void = { f in diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift index 2c3cb9270c..44ebb79321 100644 --- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift @@ -242,12 +242,15 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { return } if image != nil { - strongSelf.removePlaceholder(animated: !firstTime) if firstTime { - strongSelf.animationNode?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + strongSelf.animationNode?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, completion: { [weak self] _ in + self?.removePlaceholder(animated: false) + }) + } else { + strongSelf.removePlaceholder(animated: true) } + firstTime = false } - firstTime = false } self.imageNode.displaysAsynchronously = false diff --git a/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift index 868fb0c351..f81eb4b7f1 100644 --- a/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift @@ -64,12 +64,15 @@ class ChatMessageStickerItemNode: ChatMessageItemView { return } if image != nil { - strongSelf.removePlaceholder(animated: !firstTime) if firstTime { - strongSelf.imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + strongSelf.imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, completion: { [weak self] _ in + self?.removePlaceholder(animated: false) + }) + } else { + strongSelf.removePlaceholder(animated: true) } + firstTime = false } - firstTime = false } self.containerNode.shouldBegin = { [weak self] location in