oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

simplify emoji, remove iconview

Browse source 
// FREEBIE
This commit is contained in:
Michael Kirk 2018-04-04 00:11:38 -04:00
parent b3b3fa64e7
commit eb16043de6
1 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Signal/src/views/QuotedReplyPreview.swift
View file

@ -13,20 +13,6 @@ protocol QuotedReplyPreviewDelegate: class {
class QuotedReplyPreview: UIView {
public weak var delegate: QuotedReplyPreviewDelegate?
private class func iconView(message: TSQuotedMessage) -> UIView? {
guard let contentType = message.contentType else {
return nil
}
let iconText = TSAttachmentStream.emoji(forMimeType: contentType)
let label = UILabel()
label.setContentHuggingHigh()
label.text = iconText
return label
}
required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@ -55,9 +41,16 @@ class QuotedReplyPreview: UIView {
let bodyLabel: UILabel = UILabel()
bodyLabel.textColor = foregroundColor
bodyLabel.font = .ows_footnote
bodyLabel.text = quotedMessage.body
let iconView: UIView? = QuotedReplyPreview.iconView(message: quotedMessage)
bodyLabel.text = {
if let contentType = quotedMessage.contentType {
let emoji = TSAttachmentStream.emoji(forMimeType: contentType)
return "\(emoji) \(quotedMessage.body ?? "")"
} else {
return quotedMessage.body
}
}()
let thumbnailView: UIView? = {
if let image = quotedMessage.thumbnailImage() {
let imageView = UIImageView(image: image)
@ -81,20 +74,13 @@ class QuotedReplyPreview: UIView {
let quoteStripe: UIView = UIView()
quoteStripe.backgroundColor = authorColor
let bodyContentViews: [UIView] = iconView == nil ? [bodyLabel] : [iconView!, bodyLabel]
let bodyContentView: UIStackView = UIStackView(arrangedSubviews: bodyContentViews)
bodyContentView.axis = .horizontal
bodyContentView.spacing = 4.0
let textColumn = UIView.container()
textColumn.addSubview(authorLabel)
textColumn.addSubview(bodyContentView)
textColumn.addSubview(bodyLabel)
authorLabel.setCompressionResistanceHigh()
authorLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom)
authorLabel.autoPinEdge(.bottom, to: .top, of: bodyContentView)
bodyContentView.setCompressionResistanceHigh()
bodyContentView.autoPinEdges(toSuperviewMarginsExcludingEdge: .top)
authorLabel.autoPinEdge(.bottom, to: .top, of: bodyLabel)
bodyLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .top)
let contentViews: [UIView] = [textColumn, thumbnailView, cancelButton].flatMap { return $0 }
let contentRow = UIStackView(arrangedSubviews: contentViews)