From 5e521a81925386079513bfd322cf0212a2f08844 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Tue, 7 Dec 2021 14:12:48 +1100 Subject: [PATCH 1/3] fix the issue where no text will show along with a doc type attachment --- .../Content Views/DocumentView.swift | 18 ++++++--------- .../Message Cells/VisibleMessageCell.swift | 21 +++++++++++++++--- .../Session/File.imageset/Contents.json | 12 ++++++++++ .../Session/File.imageset/doc.pdf | Bin 0 -> 4310 bytes 4 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 Session/Meta/Images.xcassets/Session/File.imageset/Contents.json create mode 100644 Session/Meta/Images.xcassets/Session/File.imageset/doc.pdf diff --git a/Session/Conversations/Message Cells/Content Views/DocumentView.swift b/Session/Conversations/Message Cells/Content Views/DocumentView.swift index ff2b2e73d..372befc8c 100644 --- a/Session/Conversations/Message Cells/Content Views/DocumentView.swift +++ b/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: 26, height: 40) // MARK: Lifecycle init(viewItem: ConversationViewItem, textColor: UIColor) { @@ -26,26 +25,23 @@ 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.mediumFontSize, weight: .light) // Stack view let stackView = UIStackView(arrangedSubviews: [ imageView, titleLabel ]) stackView.axis = .horizontal - stackView.alignment = .center - stackView.isLayoutMarginsRelativeArrangement = true - stackView.layoutMargins = UIEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 12) + stackView.spacing = Values.verySmallSpacing addSubview(stackView) - stackView.pin(to: self, withInset: Values.smallSpacing) + stackView.pin(to: self) } } diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index fe529aa51..db69e60e7 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/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) diff --git a/Session/Meta/Images.xcassets/Session/File.imageset/Contents.json b/Session/Meta/Images.xcassets/Session/File.imageset/Contents.json new file mode 100644 index 000000000..df41b260e --- /dev/null +++ b/Session/Meta/Images.xcassets/Session/File.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "doc.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Session/Meta/Images.xcassets/Session/File.imageset/doc.pdf b/Session/Meta/Images.xcassets/Session/File.imageset/doc.pdf new file mode 100644 index 0000000000000000000000000000000000000000..4338f23a167302e52ad9bce56015c86851f4cd0b GIT binary patch literal 4310 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 sCT7}j4{>LHjQ{`u literal 0 HcmV?d00001 From 300f6f50cfd32548926fec27607407ea390455c1 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Tue, 7 Dec 2021 15:25:05 +1100 Subject: [PATCH 2/3] add size label for file type attachment --- .../Content Views/DocumentView.swift | 16 +++++++++++++--- .../Session/File.imageset/doc.pdf | Bin 4310 -> 4296 bytes SignalUtilitiesKit/Utilities/OWSFormat.m | 8 ++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Session/Conversations/Message Cells/Content Views/DocumentView.swift b/Session/Conversations/Message Cells/Content Views/DocumentView.swift index 372befc8c..5f0717ae6 100644 --- a/Session/Conversations/Message Cells/Content Views/DocumentView.swift +++ b/Session/Conversations/Message Cells/Content Views/DocumentView.swift @@ -4,7 +4,7 @@ final class DocumentView : UIView { private let textColor: UIColor // MARK: Settings - private static let iconImageViewSize: CGSize = CGSize(width: 26, height: 40) + private static let iconImageViewSize: CGSize = CGSize(width: 31, height: 40) // MARK: Lifecycle init(viewItem: ConversationViewItem, textColor: UIColor) { @@ -36,11 +36,21 @@ final class DocumentView : UIView { titleLabel.lineBreakMode = .byTruncatingTail titleLabel.text = attachment.sourceFilename ?? "File" titleLabel.textColor = textColor - titleLabel.font = .systemFont(ofSize: Values.mediumFontSize, weight: .light) + 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 addSubview(stackView) stackView.pin(to: self) } diff --git a/Session/Meta/Images.xcassets/Session/File.imageset/doc.pdf b/Session/Meta/Images.xcassets/Session/File.imageset/doc.pdf index 4338f23a167302e52ad9bce56015c86851f4cd0b..50b0bb95e305d5ec08a8abfe36b2e38bed9550be 100644 GIT binary patch delta 974 zcmcbnctUZ4eZ9G*f}I^#aY<2XVlGz&V`_+ZU$7(3o&CXISTk= zoa!jo@+-W*v`af8Wm0CU^2E%KK3i|N?ykAiS};ZOp-=CPO*szJAN89Wi-u12>GqK9 zv3Yjp0sFBGV?IZ@iL65NR%#b9Oe|UNW^%Dg*==K)-n)Vi%*96;*e{lBzjAI%J8#0$ zTXowSkFPy0+01yR$gRn*{!5M7Y6JbMPr}a~C8lXF48P+0vMug_RF>QBnW=q?0@ihX ze!#N6@jFw^Gp=J-{GMET@|7#=p~3kZGb6huO1{c!WMVCtdZer&WE+FY$F&P?n?;`G zW>gjYckjghXVpFLZ5yK0X1vtd$oH?ZVdu0PypA49nNQU!U8<8db-tC?V|iI0byhO< ztx1L8k*l0%_Oi}+__UHSp)|NP;&0Y*p0XXS2Br}YT9T}`pFVd)LM8l1;bwKYm1XmG zA9Kpx8-15;%@w80X~*A*9$N5A_~4ZcBdtzp=KrmZA^e-xy*!do$#ZHUqi-r_MnevF z_obamlD8RB4$AMHu|eyhc$E9fHxV8ReD%#qbBmR>z{ST zKK|VhYkX|y3fF)qQywxj?Oqshpt7@7b`8gsQtw>`G0XY=9HfI*d@ecm_{V+S^&bRY zUH|sfj{VV=^HN_5@>eIhnqBke{{Dt}RDYNeL?x`ks5=;#@FqH z>x<=LEl*zmxcYkPABp+<_gt*l)4SC^zyBkrMap5(Mz8aiPgmVLQO*(a{z7BHF{{SE zRTa+nk8l6@iCu+NW%Fi6<_>OFBNGK5d$7MrMi9#$S ZuO=3iR1~GAaT!~h8F8tqy863u0RR?;l%N0r delta 988 zcmX@1cujGFeZ8fzf}I^#aY<2XVlGz&V`_+J-)#q;J+DRoHkRzzTzQWB*%WpO4z&hh zg&F^uHBU`?Rulo8VP{SaFLECFO8UtGn;vq#Fjz?6+ijx=vT=85_Agj}cYsRp|;>cFa={&rm-z*WEa4 z?G2Z-R!=il9&bT2mYBT~oF6|>4Ypj6Q>G|9DkX-enD zw5TvAvANa-)p^fb-d(8o@iw|9x%DH@8iAi3j?t|w3NC3jv$o%Q^-rSph~omsW+R># zH<+|4nr^Ww+)$R!?4OZs_&r^!?C8w59SS)Tr{D1wt27H6i!?m?(6}>WwWV{G>-Viq z@-iU_cI$;4mjC?s{c)M}dx1k+uHV`$n&Q7BWW%nKHIELl)VHZHH~!f*tNvn8#+_&0 z%BilV^CnatEaOn0`b~a~@69Gh?tX$&ve|a;t}jdayzOdB$TjvP;X2b5zL#A$eCKXl za&ujeIM1ayH#8GZmnQiyEPiw&Y_E>80juN3;#A#QpBp<~%Xh#1tha*Y!3SslS8Me1 zUVQ#}-L$-7<@s5K948VkMoG)r917m{`|AM(Ke3gI=Omk~{nH{cr6+cs@~Z1ACjOf- zG0{DL$E!74_e;%>dZbt>fB*RVeRDq+*Zlp~`2AV(g@3I5_qY2$eiOgrr){zMGgAjQtD&WWk;&u+zWo};hK2^lQ3eL; zK%}Xl@0*|El30?epy6U=WME`yXk=h+09G&t!d$@s1QhZVxWEhpV>1h*$y@o= zg3Pc;nP7++SQ?vR7-4Q^j3H)WXf#<@z$QM)EIB1H)!ZW4EG^C0$kNm>*}&4$+%m<& o($L5vF)7)O%Z8v5g;+?=O)M&@C`wJ^GPX1~<5E?1^>^a}09Lk;@&Et; diff --git a/SignalUtilitiesKit/Utilities/OWSFormat.m b/SignalUtilitiesKit/Utilities/OWSFormat.m index effb40f4e..db48cb8c7 100644 --- a/SignalUtilitiesKit/Utilities/OWSFormat.m +++ b/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]; From 6225c12ced490b89685b952e3e7175f6e98f6c03 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Tue, 7 Dec 2021 15:53:58 +1100 Subject: [PATCH 3/3] minor improvement on pre-sending file page icon --- .../Session/FileLarge.imageset/Contents.json | 12 ++++++++++++ .../Session/FileLarge.imageset/doc_large.pdf | Bin 0 -> 4310 bytes .../MediaMessageView.swift | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Session/Meta/Images.xcassets/Session/FileLarge.imageset/Contents.json create mode 100644 Session/Meta/Images.xcassets/Session/FileLarge.imageset/doc_large.pdf diff --git a/Session/Meta/Images.xcassets/Session/FileLarge.imageset/Contents.json b/Session/Meta/Images.xcassets/Session/FileLarge.imageset/Contents.json new file mode 100644 index 000000000..667dcde62 --- /dev/null +++ b/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 + } +} diff --git a/Session/Meta/Images.xcassets/Session/FileLarge.imageset/doc_large.pdf b/Session/Meta/Images.xcassets/Session/FileLarge.imageset/doc_large.pdf new file mode 100644 index 0000000000000000000000000000000000000000..d9dd80473784a71539430605998372fd618df65c GIT binary patch literal 4310 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 uApwPoi&@))GT{H;<