Merge pull request #532 from RyanRory/doc-with-text

Fix no text shown along with doc type attachments

Session/Conversations/Message Cells/Content Views/DocumentView.swift

@@ -4,8 +4,7 @@ final class DocumentView : UIView {
     private let textColor: UIColor
     
     // MARK: Settings
-    private static let iconSize: CGFloat = 24
-    private static let iconImageViewSize: CGFloat = 40
+    private static let iconImageViewSize: CGSize = CGSize(width: 31, height: 40)
     
     // MARK: Lifecycle
     init(viewItem: ConversationViewItem, textColor: UIColor) {
@@ -26,26 +25,33 @@ final class DocumentView : UIView {
     private func setUpViewHierarchy() {
         guard let attachment = viewItem.attachmentStream ?? viewItem.attachmentPointer else { return }
         // Image view
-        let iconSize = DocumentView.iconSize
-        let icon = UIImage(named: "actionsheet_document_black")?.withTint(textColor)?.resizedImage(to: CGSize(width: iconSize, height: iconSize))
+        let icon = UIImage(named: "File")?.withTint(textColor)
         let imageView = UIImageView(image: icon)
         imageView.contentMode = .center
         let iconImageViewSize = DocumentView.iconImageViewSize
-        imageView.set(.width, to: iconImageViewSize)
-        imageView.set(.height, to: iconImageViewSize)
+        imageView.set(.width, to: iconImageViewSize.width)
+        imageView.set(.height, to: iconImageViewSize.height)
         // Body label
         let titleLabel = UILabel()
         titleLabel.lineBreakMode = .byTruncatingTail
         titleLabel.text = attachment.sourceFilename ?? "File"
         titleLabel.textColor = textColor
-        titleLabel.font = .systemFont(ofSize: Values.mediumFontSize)
+        titleLabel.font = .systemFont(ofSize: Values.smallFontSize, weight: .light)
+        // Size label
+        let sizeLabel = UILabel()
+        sizeLabel.lineBreakMode = .byTruncatingTail
+        sizeLabel.text = OWSFormat.formatFileSize(UInt(attachment.byteCount))
+        sizeLabel.textColor = textColor
+        sizeLabel.font = .systemFont(ofSize: Values.verySmallFontSize)
+        // Label stack view
+        let labelStackView = UIStackView(arrangedSubviews: [ titleLabel, sizeLabel ])
+        labelStackView.axis = .vertical
         // Stack view
-        let stackView = UIStackView(arrangedSubviews: [ imageView, titleLabel ])
+        let stackView = UIStackView(arrangedSubviews: [ imageView, labelStackView ])
         stackView.axis = .horizontal
+        stackView.spacing = Values.verySmallSpacing
         stackView.alignment = .center
-        stackView.isLayoutMarginsRelativeArrangement = true
-        stackView.layoutMargins = UIEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 12)
         addSubview(stackView)
-        stackView.pin(to: self, withInset: Values.smallSpacing)
+        stackView.pin(to: self)
     }
 }

Session/Conversations/Message Cells/VisibleMessageCell.swift

@@ -362,7 +362,6 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate {
                 let maxMessageWidth = VisibleMessageCell.getMaxWidth(for: viewItem)
                 let albumView = MediaAlbumView(mediaCache: cache, items: viewItem.mediaAlbumItems!, isOutgoing: isOutgoing, maxMessageWidth: maxMessageWidth)
                 self.albumView = albumView
-                snContentView.addSubview(albumView)
                 let size = getSize(for: viewItem)
                 albumView.set(.width, to: size.width)
                 albumView.set(.height, to: size.height)
@@ -398,9 +397,25 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate {
                 Storage.shared.getContact(with: thread.contactSessionID())?.isTrusted != true {
                 showMediaPlaceholder()
             } 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)
-                snContentView.addSubview(documentView)
-                documentView.pin(to: snContentView)
+                stackView.addArrangedSubview(documentView)
+                // 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:
             let deletedMessageView = DeletedMessageView(viewItem: viewItem, textColor: bodyLabelTextColor)

Session/Meta/Images.xcassets/Session/File.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "doc.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Session/Meta/Images.xcassets/Session/FileLarge.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "doc_large.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SignalUtilitiesKit/Media Viewing & Editing/MediaMessageView.swift

@@ -269,7 +269,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
     private func createGenericPreview() {
         var subviews = [UIView]()
 
-        let imageView = createHeroImageView(imageName: "actionsheet_document_black")
+        let imageView = createHeroImageView(imageName: "FileLarge")
+        imageView.contentMode = .center
         subviews.append(imageView)
 
         let fileNameLabel = createFileNameLabel()

SignalUtilitiesKit/Utilities/OWSFormat.m

@@ -31,11 +31,11 @@ NS_ASSUME_NONNULL_BEGIN
     const unsigned long kOneKilobyte = 1024;
     const unsigned long kOneMegabyte = kOneKilobyte * kOneKilobyte;
 
-    if (fileSize > kOneMegabyte * 10) {
-        return [[formatter stringFromNumber:@((int)round(fileSize / (CGFloat)kOneMegabyte))]
+    if (fileSize > kOneMegabyte) {
+        return [[formatter stringFromNumber:@((double)lround(fileSize * 100 / (CGFloat)kOneMegabyte) / 100)]
             stringByAppendingString:@" MB"];
-    } else if (fileSize > kOneKilobyte * 10) {
-        return [[formatter stringFromNumber:@((int)round(fileSize / (CGFloat)kOneKilobyte))]
+    } else if (fileSize > kOneKilobyte) {
+        return [[formatter stringFromNumber:@((double)lround(fileSize * 100 / (CGFloat)kOneKilobyte) / 100)]
             stringByAppendingString:@" KB"];
     } else {
         return [NSString stringWithFormat:@"%lu Bytes", fileSize];