From 300f6f50cfd32548926fec27607407ea390455c1 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Tue, 7 Dec 2021 15:25:05 +1100
Subject: [PATCH] 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<bSD)ofJIbh}IDt*Y
z<ok4u@@IR^8#Z}_6z<Lmzq$YT=^wTwM(Luxrp-5wpLaC9dgzNw9Q$K?)l<TWPH&8)
zOs0EXJZN+Dtb~J(xn%!ABXND{zy1@$m=^__e$W+tWWMOKW?=o%3Yl;b)k7_8H_o>=
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%#qbBm<ja2^a;x%Hsm69?<u^ds>R>z{ST
zKK|VhYkX|y3fF)qQywxj?Oqshpt7@7b`8gsQtw>`G0XY=9HfI*d@ecm_{V+S^&bRY
zUH|sfj{VV=^HN_5@>eIhnqBke{{Dt}<D?n={Ty5BZ$0d4>RDYNeL?x`ks5=;#@FqH
z>x<=LEl*zmxcYkPABp+<_gt*l)4SC^zyBkrMap5(Mz8aiPgmVLQO*(a{z7BHF{{SE
zRTa+nk8l6@iCu+NW%Fi6<_>OFBNGK<!^wSo`!!4qEKSX#3=GtPNK--IH$TNCu_RSN
z!^O(Tz{t?h$iUnHtYmU2zlE5&v4Q~zDC8+{ff)wIW@Z+X5A&-9nPQPL#t<{GG&006
z!ra6XQ_Rw0vbBIsypfS%s-by`iK%6hL87HavWc0YSxQoxVPc{Mkd>5d$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`?<N2UF;8~E4*zfZd()DeAv9l&NFMAPnB>Rulo8VP{Sa<XHtz7c8snCxr
z@P0;=?xm^B6PABHuELitx&2`FC9m8wqK)@DX0`D+N*nKO@RhEQnAX3=UEsC~=Qc*Z
zbR~o3i>FLECFO8UtGn;vq#Fjz?6+ijx=vT=85_Agj}cYsRp|;>cFa={&rm-z*WEa4
z?G2Z-R!=il9&bT2mYBT~oF<Z-_c|)8dS{)EF_tdW&*w9>6|>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?<h9wIUGMaHeInhAlcf<8Yumy;MmE3Td!NKUcBAI
z^l3Bm6n6Wp@_3)dN|D3KGtv&`?3K@GR;)^kXPu{B)a+j1Rl7vItUk%$bCDtQdTl-l
zA2&v3A?-Dr<GEzsI~3&fto%JI>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@3<y^y(jwP2byTJC7+~&F2_?
zj!=J&hmvPl58q#Z=U>I5_qY2$eiOgrr){zMGgAjQtD&WWk;&u+zWo};hK2^lQ3eL;
zK%}Xl@0*|El30?epy6U=WME`yXk=h+09G<No!>&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];