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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ali 2020-12-28 15:18:23 +04:00
commit c4b2bfaab4
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
submodules/CallListUI/Sources/CallListCallItem.swift
View File

@ -695,7 +695,9 @@ class CallListCallItemNode: ItemListRevealOptionsItemNode {
infoIconRightInset -= 36.0 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)) transition.updateFrameAdditive(node: self.titleNode, frame: CGRect(origin: CGPoint(x: revealOffset + leftInset, y: self.titleNode.frame.minY), size: self.titleNode.bounds.size))

5
submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
View File

@ -785,13 +785,14 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
self.addSubnode(self.recentListNode) self.addSubnode(self.recentListNode)
self.addSubnode(self.listNode) self.addSubnode(self.listNode)
self.addSubnode(self.mediaNode) self.addSubnode(self.mediaNode)
self.addSubnode(self.shimmerNode)
self.addSubnode(self.mediaAccessoryPanelContainer)
self.addSubnode(self.emptyResultsAnimationNode) self.addSubnode(self.emptyResultsAnimationNode)
self.addSubnode(self.emptyResultsTitleNode) self.addSubnode(self.emptyResultsTitleNode)
self.addSubnode(self.emptyResultsTextNode) self.addSubnode(self.emptyResultsTextNode)
self.addSubnode(self.shimmerNode)
self.addSubnode(self.mediaAccessoryPanelContainer)
let searchContext = Promise<ChatListSearchMessagesContext?>(nil) let searchContext = Promise<ChatListSearchMessagesContext?>(nil)
let searchContextValue = self.searchContextValue let searchContextValue = self.searchContextValue
let updateSearchContext: ((ChatListSearchMessagesContext?) -> (ChatListSearchMessagesContext?, Bool)) -> Void = { f in let updateSearchContext: ((ChatListSearchMessagesContext?) -> (ChatListSearchMessagesContext?, Bool)) -> Void = { f in

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

@ -242,13 +242,16 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
return return
} }
if image != nil { if image != nil {
strongSelf.removePlaceholder(animated: !firstTime)
if 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 self.imageNode.displaysAsynchronously = false
self.containerNode.addSubnode(self.contextSourceNode) self.containerNode.addSubnode(self.contextSourceNode)

9
submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
View File

@ -64,13 +64,16 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
return return
} }
if image != nil { if image != nil {
strongSelf.removePlaceholder(animated: !firstTime)
if 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 self.containerNode.shouldBegin = { [weak self] location in
guard let strongSelf = self else { guard let strongSelf = self else {