From 575d0be6a68475ad210588d839265b1b0c053062 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 10 Jul 2018 10:35:51 -0400 Subject: [PATCH] Apply 'read' message status icon. --- .../Contents.json | 2 +- ...le check@1x.png => delivered-18x12@1x.png} | Bin .../Contents.json | 23 ++++++++++++++++++ .../read-18x12@1x.png | Bin 0 -> 321 bytes .../read-18x12@2x.png | Bin 0 -> 633 bytes .../read-18x12@3x.png | Bin 0 -> 1017 bytes .../Contents.json | 6 ++--- .../{check@1x.png => sent-12@1x.png} | Bin .../{check@2x.png => sent-12@2x.png} | Bin .../{check@3x.png => sent-12@3x.png} | Bin .../Cells/OWSMessageFooterView.m | 4 ++- .../ViewControllers/HomeView/HomeViewCell.m | 3 +-- 12 files changed, 31 insertions(+), 7 deletions(-) rename Signal/Images.xcassets/message_status_delivered.imageset/{double check@1x.png => delivered-18x12@1x.png} (100%) create mode 100644 Signal/Images.xcassets/message_status_read.imageset/Contents.json create mode 100644 Signal/Images.xcassets/message_status_read.imageset/read-18x12@1x.png create mode 100644 Signal/Images.xcassets/message_status_read.imageset/read-18x12@2x.png create mode 100644 Signal/Images.xcassets/message_status_read.imageset/read-18x12@3x.png rename Signal/Images.xcassets/message_status_sent.imageset/{check@1x.png => sent-12@1x.png} (100%) rename Signal/Images.xcassets/message_status_sent.imageset/{check@2x.png => sent-12@2x.png} (100%) rename Signal/Images.xcassets/message_status_sent.imageset/{check@3x.png => sent-12@3x.png} (100%) diff --git a/Signal/Images.xcassets/message_status_delivered.imageset/Contents.json b/Signal/Images.xcassets/message_status_delivered.imageset/Contents.json index a030518be..51206a36f 100644 --- a/Signal/Images.xcassets/message_status_delivered.imageset/Contents.json +++ b/Signal/Images.xcassets/message_status_delivered.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "double check@1x.png", + "filename" : "delivered-18x12@1x.png", "scale" : "1x" }, { diff --git a/Signal/Images.xcassets/message_status_delivered.imageset/double check@1x.png b/Signal/Images.xcassets/message_status_delivered.imageset/delivered-18x12@1x.png similarity index 100% rename from Signal/Images.xcassets/message_status_delivered.imageset/double check@1x.png rename to Signal/Images.xcassets/message_status_delivered.imageset/delivered-18x12@1x.png diff --git a/Signal/Images.xcassets/message_status_read.imageset/Contents.json b/Signal/Images.xcassets/message_status_read.imageset/Contents.json new file mode 100644 index 000000000..debd3641e --- /dev/null +++ b/Signal/Images.xcassets/message_status_read.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "read-18x12@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "read-18x12@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "read-18x12@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/message_status_read.imageset/read-18x12@1x.png b/Signal/Images.xcassets/message_status_read.imageset/read-18x12@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..9fefab5c76ca5a9f049a0c1abaf184b255502a2c GIT binary patch literal 321 zcmV-H0lxl;P)Px#`$pNYk0cgViL!4&)C& zhw63BeGzF*pHFHvlLtIg5x)lMN?OASO6Zu{Qh*3hfh?z2=m9L=#<(?qs0y4zPS=_x zr(-Px%Gf6~2R7ee#m%T0pQ51#e`Y9w56dG=)lqfY`Kq4r#-atHqd5%j+M1n>rsIDha zBB9Ws(b4)_-#A;2ab{-EN>%Scp4-Xl(N%a=ToPx*DRDr25pTp@@kBJF z^u(UU2k~4y6CcG^pm0xo7r!carTIw_c=YCjC*I_^uq@T9Xa=dVulQ(i^XO9^)F8JO zn~HvjDFd5(QhXw~c=VQ+8mWax5_H?t45o`A+pAAC63%h z4uZg|Px&2ba$RKKbV>qxz&pDT<4&utR}c$cec8vp89Z{a9OoYI?7kw%n>bFILo9gp zajvHs^mu1)Vw}u%E)I#uqQ%B^4ZM2G^EQJX@5%ziSXb5^@rVej8X^|!$!XKfZ$ni} zkW)dhBGW&&l}na~xar$ALqo-q)os$a2!%jfeXbmed01@fjRrA>G1};JC3+e$4c?jO z#fb45V!^A=rL{tyv3N030Q5vp(rlsj>ph;Pp@(01e=PSxhF5RJn#O-WuGH}yCqAWH z2u*qPO^pyw9zQ~j;;__oCc2Y&JS1!eLr>w9hFW;kf=}LbHoBB%IJkK9sb;7_t_$oD z&L`~rlo@k<(Y`5<-hA-Ho1A|r9|6jOt|mAVEQvEBCh^~(9o?UbhLoO|`)|-UtS3#D TlfhPx&vq?ljR9FeknagSvK@^53Dn!9Wf(s!L(<{-12rk@YorPxMJb+stK-~KZ<`sMh zK@FOKxD*jDpbKp;xKR*vp%6v?Z|E9MYO1>HGJ*$ws{7Qb@0>H;Q`0lEFv_=OE!mVd zq?6K0rvn;4cY3aIS9&0QkU|#Y5c{dqdyU)DZRxA@Pi!peeQ8hnlb|n(xghzL%OMvz z$<5li*}6!Nq?Be{%sa)O_9`ghIG!D;1y->g)XJNZg{B<8(3%q_Ybj?a7q!98vL!{| zm4@K{{2Q$~W-^s>d~WQV8p)Al1oEoKU@`v>tvPQplyYMHn4ek)o8!`!Tq%-XH%--W zVh!~9sk!&I+)_XvAU4PLe#kUd%8Bt){JiIa#!iz02*q49#2QYBo#PAcmbqKHOZdz* z#bGJO@rK4d<%q?Qd!LPU77HHoUp1r}&QKoac`u!k*nMO1)G#$Z)nkEu{$E;WxA#&` zUk*1%Q-`~X*EGJB+?*Y$VPZV9^<7@O$Uolc7z{NWpX;C7rpVPut>njXPA|(mxbi@2 zcQl^Bxf{dU*UOi8gX06&!2NnEu$+LkXEsc6ta168i89Wr-@K3 zwPZgEk+_k3%YCG31!xR}<5mh4n&X>1Qi(IM+=tgztC~(r8lBZ}T0wFeh{aAHf+?!x z>js6OYm&1XPOQ*eKQ-(#zNF*M`A$G_In;cojrQMQ3z&_s-tvPBkm2&!WFvojp z@b)ux%p9`Q39^KvGgjupkH`koX@==-=W?Vl7nomeghE;-4~ n+9b0dtVs(L#53W4|5xo_fxGt*fGV9900000NkvXXu0mjfb{gf6 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/message_status_sent.imageset/Contents.json b/Signal/Images.xcassets/message_status_sent.imageset/Contents.json index d5934924e..5f32b4e3d 100644 --- a/Signal/Images.xcassets/message_status_sent.imageset/Contents.json +++ b/Signal/Images.xcassets/message_status_sent.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "check@1x.png", + "filename" : "sent-12@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "check@2x.png", + "filename" : "sent-12@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "check@3x.png", + "filename" : "sent-12@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/message_status_sent.imageset/check@1x.png b/Signal/Images.xcassets/message_status_sent.imageset/sent-12@1x.png similarity index 100% rename from Signal/Images.xcassets/message_status_sent.imageset/check@1x.png rename to Signal/Images.xcassets/message_status_sent.imageset/sent-12@1x.png diff --git a/Signal/Images.xcassets/message_status_sent.imageset/check@2x.png b/Signal/Images.xcassets/message_status_sent.imageset/sent-12@2x.png similarity index 100% rename from Signal/Images.xcassets/message_status_sent.imageset/check@2x.png rename to Signal/Images.xcassets/message_status_sent.imageset/sent-12@2x.png diff --git a/Signal/Images.xcassets/message_status_sent.imageset/check@3x.png b/Signal/Images.xcassets/message_status_sent.imageset/sent-12@3x.png similarity index 100% rename from Signal/Images.xcassets/message_status_sent.imageset/check@3x.png rename to Signal/Images.xcassets/message_status_sent.imageset/sent-12@3x.png diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m index 5d491663c..12593870c 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m @@ -107,9 +107,11 @@ NS_ASSUME_NONNULL_BEGIN statusIndicatorImage = [UIImage imageNamed:@"message_status_sent"]; break; case MessageReceiptStatusDelivered: - case MessageReceiptStatusRead: statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"]; break; + case MessageReceiptStatusRead: + statusIndicatorImage = [UIImage imageNamed:@"message_status_read"]; + break; case MessageReceiptStatusFailed: // No status indicator icon. break; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m index 6d4e9731c..d536afff2 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m @@ -294,8 +294,7 @@ NS_ASSUME_NONNULL_BEGIN statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"]; break; case MessageReceiptStatusRead: - statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"]; - messageStatusViewTintColor = [UIColor ows_signalBlueColor]; + statusIndicatorImage = [UIImage imageNamed:@"message_status_read"]; break; case MessageReceiptStatusFailed: statusIndicatorImage = [UIImage imageNamed:@"message_status_failed"];