ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 14:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Peter
2016-10-07 19:14:56 +03:00
parent cb5a81670d
commit a68d6f31c1
79 changed files with 5487 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TelegramUI/ChatMessageTextBubbleContentNode.swift
View File

@@ -27,7 +27,7 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
fatalError("init(coder:) has not been implemented")
}
override func asyncLayoutContent() -> (_ item: ChatMessageItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ position: ChatMessageBubbleContentPosition, _ constrainedSize: CGSize) -> (CGFloat, (CGSize) -> (CGFloat, (CGFloat) -> (CGSize, () -> Void))) {
override func asyncLayoutContent() -> (_ item: ChatMessageItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ position: ChatMessageBubbleContentPosition, _ constrainedSize: CGSize) -> (CGFloat, (CGSize) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation) -> Void))) {
let textLayout = TextNode.asyncLayout(self.textNode)
let statusLayout = self.statusNode.asyncLayout()
@@ -57,7 +57,7 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
} else if message.flags.contains(.Unsent) {
statusType = .BubbleOutgoing(.Sending)
} else {
statusType = .BubbleOutgoing(.Sent(read: true))
statusType = .BubbleOutgoing(.Sent(read: item.read))
}
}
} else {
@@ -65,7 +65,7 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
}
var statusSize: CGSize?
var statusApply: (() -> Void)?
var statusApply: ((Bool) -> Void)?
if let statusType = statusType {
let (size, apply) = statusLayout(dateText, statusType, textConstrainedSize)
@@ -136,13 +136,17 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
adjustedStatusFrame = CGRect(origin: CGPoint(x: boundingWidth - statusFrame.size.width - layoutConstants.text.bubbleInsets.right, y: statusFrame.origin.y), size: statusFrame.size)
}
return (boundingSize, { [weak self] in
return (boundingSize, { [weak self] animation in
if let strongSelf = self {
let _ = textApply()
if let statusApply = statusApply, let adjustedStatusFrame = adjustedStatusFrame {
strongSelf.statusNode.frame = adjustedStatusFrame
statusApply()
var hasAnimation = true
if case .None = animation {
hasAnimation = false
}
statusApply(hasAnimation)
if strongSelf.statusNode.supernode == nil {
strongSelf.addSubnode(strongSelf.statusNode)
}