no message

This commit is contained in:
Peter
2018-01-09 13:18:08 +04:00
parent 0f26dc36a7
commit 6a47e739a3
644 changed files with 34297 additions and 13580 deletions

View File

@@ -12,22 +12,26 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
let lineNode: ASImageNode
let titleNode: ASTextNode
let textNode: ASTextNode
var activityIndicator: UIActivityIndicatorView?
let imageNode: TransformImageNode
let activityIndicator: ActivityIndicator
private let messageDisposable = MetaDisposable()
private let editingMessageDisposable = MetaDisposable()
private var previousMedia: Media?
override var interfaceInteraction: ChatPanelInterfaceInteraction? {
didSet {
if let statuses = self.interfaceInteraction?.statuses {
self.editingMessageDisposable.set(statuses.editingMessage.start(next: { [weak self] value in
if let strongSelf = self, let activityIndicator = strongSelf.activityIndicator {
if let strongSelf = self {
if value {
activityIndicator.isHidden = false
activityIndicator.startAnimating()
} else {
activityIndicator.isHidden = true
activityIndicator.stopAnimating()
if strongSelf.activityIndicator.supernode == nil {
strongSelf.addSubnode(strongSelf.activityIndicator)
}
} else if strongSelf.activityIndicator.supernode != nil {
strongSelf.activityIndicator.removeFromSupernode()
}
}
}))
@@ -61,6 +65,12 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
self.textNode.maximumNumberOfLines = 1
self.textNode.displaysAsynchronously = false
self.imageNode = TransformImageNode()
self.imageNode.contentAnimations = [.subsequentUpdates]
self.imageNode.isHidden = true
self.activityIndicator = ActivityIndicator(type: .custom(theme.chat.inputPanel.panelControlAccentColor, 22.0))
super.init()
self.closeButton.addTarget(self, action: #selector(self.closePressed), forControlEvents: [.touchUpInside])
@@ -69,17 +79,94 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
self.addSubnode(self.lineNode)
self.addSubnode(self.titleNode)
self.addSubnode(self.textNode)
self.addSubnode(self.imageNode)
self.messageDisposable.set((account.postbox.messageAtId(messageId)
|> deliverOnMainQueue).start(next: { [weak self] message in
if let strongSelf = self {
var text = ""
if let messageText = message?.text {
text = messageText
if let message = message {
text = descriptionStringForMessage(message, strings: strings, accountPeerId: account.peerId)
}
strongSelf.titleNode.attributedText = NSAttributedString(string: "Edit Message", font: Font.medium(15.0), textColor: strongSelf.theme.chat.inputPanel.panelControlAccentColor)
strongSelf.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(15.0), textColor: strongSelf.theme.chat.inputPanel.primaryTextColor)
var updatedMedia: Media?
var imageDimensions: CGSize?
if let message = message, !message.containsSecretMedia {
for media in message.media {
if let image = media as? TelegramMediaImage {
updatedMedia = image
if let representation = largestRepresentationForPhoto(image) {
imageDimensions = representation.dimensions
}
break
} else if let file = media as? TelegramMediaFile {
updatedMedia = file
if !file.isInstantVideo, let representation = largestImageRepresentation(file.previewRepresentations), !file.isSticker {
imageDimensions = representation.dimensions
}
break
}
}
}
let imageNodeLayout = strongSelf.imageNode.asyncLayout()
var applyImage: (() -> Void)?
if let imageDimensions = imageDimensions {
let boundingSize = CGSize(width: 35.0, height: 35.0)
applyImage = imageNodeLayout(TransformImageArguments(corners: ImageCorners(radius: 2.0), imageSize: imageDimensions.aspectFilled(boundingSize), boundingSize: boundingSize, intrinsicInsets: UIEdgeInsets()))
}
var mediaUpdated = false
if let updatedMedia = updatedMedia, let previousMedia = strongSelf.previousMedia {
mediaUpdated = !updatedMedia.isEqual(previousMedia)
} else if (updatedMedia != nil) != (strongSelf.previousMedia != nil) {
mediaUpdated = true
}
strongSelf.previousMedia = updatedMedia
var updateImageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?
if mediaUpdated {
if let updatedMedia = updatedMedia, imageDimensions != nil {
if let image = updatedMedia as? TelegramMediaImage {
updateImageSignal = chatMessagePhotoThumbnail(account: account, photo: image)
} else if let file = updatedMedia as? TelegramMediaFile {
if file.isVideo {
updateImageSignal = chatMessageVideoThumbnail(account: account, file: file)
} else if let iconImageRepresentation = smallestImageRepresentation(file.previewRepresentations) {
let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: [iconImageRepresentation], reference: nil)
updateImageSignal = chatWebpageSnippetPhoto(account: account, photo: tmpImage)
}
}
} else {
updateImageSignal = .single({ _ in return nil })
}
}
let isMedia: Bool
if let message = message {
switch messageContentKind(message, strings: strings, accountPeerId: account.peerId) {
case .text:
isMedia = false
default:
isMedia = true
}
} else {
isMedia = false
}
strongSelf.titleNode.attributedText = NSAttributedString(string: strings.Conversation_EditingMessagePanelTitle, font: Font.medium(15.0), textColor: strongSelf.theme.chat.inputPanel.panelControlAccentColor)
strongSelf.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(15.0), textColor: isMedia ? strongSelf.theme.chat.inputPanel.secondaryTextColor : strongSelf.theme.chat.inputPanel.primaryTextColor)
if let applyImage = applyImage {
applyImage()
strongSelf.imageNode.isHidden = false
} else {
strongSelf.imageNode.isHidden = true
}
if let updateImageSignal = updateImageSignal {
strongSelf.imageNode.setSignal(updateImageSignal)
}
strongSelf.setNeedsLayout()
}
@@ -111,15 +198,6 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
}
}
override func didLoad() {
super.didLoad()
let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: .gray)
self.activityIndicator = activityIndicator
self.view.addSubview(activityIndicator)
activityIndicator.isHidden = true
}
override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
return CGSize(width: constrainedSize.width, height: 45.0)
}
@@ -133,21 +211,25 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
let rightInset: CGFloat = 55.0
let textRightInset: CGFloat = 20.0
if let activityIndicator = self.activityIndicator {
let indicatorSize = activityIndicator.bounds.size
activityIndicator.frame = CGRect(origin: CGPoint(x: 18.0, y: 15.0), size: indicatorSize)
}
let indicatorSize = CGSize(width: 22.0, height: 22.0)
activityIndicator.frame = CGRect(origin: CGPoint(x: 18.0, y: 15.0), size: indicatorSize)
let closeButtonSize = self.closeButton.measure(CGSize(width: 100.0, height: 100.0))
self.closeButton.frame = CGRect(origin: CGPoint(x: bounds.size.width - rightInset - closeButtonSize.width, y: 19.0), size: closeButtonSize)
self.lineNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 8.0), size: CGSize(width: 2.0, height: bounds.size.height - 10.0))
let titleSize = self.titleNode.measure(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset, height: bounds.size.height))
self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset, y: 7.0), size: titleSize)
var imageTextInset: CGFloat = 0.0
if !self.imageNode.isHidden {
imageTextInset = 9.0 + 35.0
}
self.imageNode.frame = CGRect(origin: CGPoint(x: leftInset + 9.0, y: 8.0), size: CGSize(width: 35.0, height: 35.0))
let textSize = self.textNode.measure(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset, height: bounds.size.height))
self.textNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset, y: 25.0), size: textSize)
let titleSize = self.titleNode.measure(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset - imageTextInset, height: bounds.size.height))
self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset + imageTextInset, y: 7.0), size: titleSize)
let textSize = self.textNode.measure(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset - imageTextInset, height: bounds.size.height))
self.textNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset + imageTextInset, y: 25.0), size: textSize)
}
@objc func closePressed() {