Merge branch 'doc-with-text' into voice-calls-2
This commit is contained in:
commit
d2f29e7db2
|
@ -4,8 +4,7 @@ final class DocumentView : UIView {
|
||||||
private let textColor: UIColor
|
private let textColor: UIColor
|
||||||
|
|
||||||
// MARK: Settings
|
// MARK: Settings
|
||||||
private static let iconSize: CGFloat = 24
|
private static let iconImageViewSize: CGSize = CGSize(width: 26, height: 40)
|
||||||
private static let iconImageViewSize: CGFloat = 40
|
|
||||||
|
|
||||||
// MARK: Lifecycle
|
// MARK: Lifecycle
|
||||||
init(viewItem: ConversationViewItem, textColor: UIColor) {
|
init(viewItem: ConversationViewItem, textColor: UIColor) {
|
||||||
|
@ -26,26 +25,23 @@ final class DocumentView : UIView {
|
||||||
private func setUpViewHierarchy() {
|
private func setUpViewHierarchy() {
|
||||||
guard let attachment = viewItem.attachmentStream ?? viewItem.attachmentPointer else { return }
|
guard let attachment = viewItem.attachmentStream ?? viewItem.attachmentPointer else { return }
|
||||||
// Image view
|
// Image view
|
||||||
let iconSize = DocumentView.iconSize
|
let icon = UIImage(named: "File")?.withTint(textColor)
|
||||||
let icon = UIImage(named: "actionsheet_document_black")?.withTint(textColor)?.resizedImage(to: CGSize(width: iconSize, height: iconSize))
|
|
||||||
let imageView = UIImageView(image: icon)
|
let imageView = UIImageView(image: icon)
|
||||||
imageView.contentMode = .center
|
imageView.contentMode = .center
|
||||||
let iconImageViewSize = DocumentView.iconImageViewSize
|
let iconImageViewSize = DocumentView.iconImageViewSize
|
||||||
imageView.set(.width, to: iconImageViewSize)
|
imageView.set(.width, to: iconImageViewSize.width)
|
||||||
imageView.set(.height, to: iconImageViewSize)
|
imageView.set(.height, to: iconImageViewSize.height)
|
||||||
// Body label
|
// Body label
|
||||||
let titleLabel = UILabel()
|
let titleLabel = UILabel()
|
||||||
titleLabel.lineBreakMode = .byTruncatingTail
|
titleLabel.lineBreakMode = .byTruncatingTail
|
||||||
titleLabel.text = attachment.sourceFilename ?? "File"
|
titleLabel.text = attachment.sourceFilename ?? "File"
|
||||||
titleLabel.textColor = textColor
|
titleLabel.textColor = textColor
|
||||||
titleLabel.font = .systemFont(ofSize: Values.mediumFontSize)
|
titleLabel.font = .systemFont(ofSize: Values.mediumFontSize, weight: .light)
|
||||||
// Stack view
|
// Stack view
|
||||||
let stackView = UIStackView(arrangedSubviews: [ imageView, titleLabel ])
|
let stackView = UIStackView(arrangedSubviews: [ imageView, titleLabel ])
|
||||||
stackView.axis = .horizontal
|
stackView.axis = .horizontal
|
||||||
stackView.alignment = .center
|
stackView.spacing = Values.verySmallSpacing
|
||||||
stackView.isLayoutMarginsRelativeArrangement = true
|
|
||||||
stackView.layoutMargins = UIEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 12)
|
|
||||||
addSubview(stackView)
|
addSubview(stackView)
|
||||||
stackView.pin(to: self, withInset: Values.smallSpacing)
|
stackView.pin(to: self)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -362,7 +362,6 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate {
|
||||||
let maxMessageWidth = VisibleMessageCell.getMaxWidth(for: viewItem)
|
let maxMessageWidth = VisibleMessageCell.getMaxWidth(for: viewItem)
|
||||||
let albumView = MediaAlbumView(mediaCache: cache, items: viewItem.mediaAlbumItems!, isOutgoing: isOutgoing, maxMessageWidth: maxMessageWidth)
|
let albumView = MediaAlbumView(mediaCache: cache, items: viewItem.mediaAlbumItems!, isOutgoing: isOutgoing, maxMessageWidth: maxMessageWidth)
|
||||||
self.albumView = albumView
|
self.albumView = albumView
|
||||||
snContentView.addSubview(albumView)
|
|
||||||
let size = getSize(for: viewItem)
|
let size = getSize(for: viewItem)
|
||||||
albumView.set(.width, to: size.width)
|
albumView.set(.width, to: size.width)
|
||||||
albumView.set(.height, to: size.height)
|
albumView.set(.height, to: size.height)
|
||||||
|
@ -398,9 +397,25 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate {
|
||||||
Storage.shared.getContact(with: thread.contactSessionID())?.isTrusted != true {
|
Storage.shared.getContact(with: thread.contactSessionID())?.isTrusted != true {
|
||||||
showMediaPlaceholder()
|
showMediaPlaceholder()
|
||||||
} else {
|
} else {
|
||||||
|
let inset: CGFloat = 12
|
||||||
|
let maxWidth = VisibleMessageCell.getMaxWidth(for: viewItem) - 2 * inset
|
||||||
|
// Stack view
|
||||||
|
let stackView = UIStackView(arrangedSubviews: [])
|
||||||
|
stackView.axis = .vertical
|
||||||
|
stackView.spacing = Values.smallSpacing
|
||||||
|
// Document view
|
||||||
let documentView = DocumentView(viewItem: viewItem, textColor: bodyLabelTextColor)
|
let documentView = DocumentView(viewItem: viewItem, textColor: bodyLabelTextColor)
|
||||||
snContentView.addSubview(documentView)
|
stackView.addArrangedSubview(documentView)
|
||||||
documentView.pin(to: snContentView)
|
// Body text view
|
||||||
|
if let message = viewItem.interaction as? TSMessage, let body = message.body, body.count > 0,
|
||||||
|
let delegate = delegate { // delegate should always be set at this point
|
||||||
|
let bodyTextView = VisibleMessageCell.getBodyTextView(for: viewItem, with: maxWidth, textColor: bodyLabelTextColor, searchText: delegate.lastSearchedText, delegate: self)
|
||||||
|
self.bodyTextView = bodyTextView
|
||||||
|
stackView.addArrangedSubview(bodyTextView)
|
||||||
|
}
|
||||||
|
// Constraints
|
||||||
|
snContentView.addSubview(stackView)
|
||||||
|
stackView.pin(to: snContentView, withInset: inset)
|
||||||
}
|
}
|
||||||
case .deletedMessage:
|
case .deletedMessage:
|
||||||
let deletedMessageView = DeletedMessageView(viewItem: viewItem, textColor: bodyLabelTextColor)
|
let deletedMessageView = DeletedMessageView(viewItem: viewItem, textColor: bodyLabelTextColor)
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "doc.pdf",
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
Binary file not shown.
Loading…
Reference in New Issue