From d0618e37381398816add35a1ab5b51a172e0056f Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 9 Jul 2018 12:42:03 -0400
Subject: [PATCH] Apply 'failed' message status icon in home view.

---
 .../Contents.json                             |  23 ++++++++++++++++++
 .../error-12@1x.png                           | Bin 0 -> 220 bytes
 .../error-12@2x.png                           | Bin 0 -> 423 bytes
 .../error-12@3x.png                           | Bin 0 -> 701 bytes
 .../Contents.json                             |   0
 .../error-20@1x.png                           | Bin
 .../error-20@2x.png                           | Bin
 .../error-20@3x.png                           | Bin
 .../ConversationView/Cells/OWSMessageCell.m   |   2 +-
 .../ViewControllers/HomeView/HomeViewCell.m   |   9 ++++---
 10 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 Signal/Images.xcassets/message_status_failed.imageset/Contents.json
 create mode 100644 Signal/Images.xcassets/message_status_failed.imageset/error-12@1x.png
 create mode 100644 Signal/Images.xcassets/message_status_failed.imageset/error-12@2x.png
 create mode 100644 Signal/Images.xcassets/message_status_failed.imageset/error-12@3x.png
 rename Signal/Images.xcassets/{message_send_failed.imageset => message_status_failed_large.imageset}/Contents.json (100%)
 rename Signal/Images.xcassets/{message_send_failed.imageset => message_status_failed_large.imageset}/error-20@1x.png (100%)
 rename Signal/Images.xcassets/{message_send_failed.imageset => message_status_failed_large.imageset}/error-20@2x.png (100%)
 rename Signal/Images.xcassets/{message_send_failed.imageset => message_status_failed_large.imageset}/error-20@3x.png (100%)

diff --git a/Signal/Images.xcassets/message_status_failed.imageset/Contents.json b/Signal/Images.xcassets/message_status_failed.imageset/Contents.json
new file mode 100644
index 000000000..386ea46b7
--- /dev/null
+++ b/Signal/Images.xcassets/message_status_failed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "error-12@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "error-12@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "error-12@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/message_status_failed.imageset/error-12@1x.png b/Signal/Images.xcassets/message_status_failed.imageset/error-12@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6f7131a41496762551194d400416da730777c4e
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}(>z@qLo`IE
zUb5zE3J_>bED>MVxOE5DA-jw<cP34p+PZt8`Mi83L9XWSD)uvv&#XS|aJ{zF!=lZ7
zhJDA?FJ@M%yIZR**e#D_RehS2+3IZ(mijy3^5d1WV_r_#TItp2T4l31f#doIuKi1n
z8%w-6Z2YEkx%ma1)th^5KYqA2Z|{X)+cYi3UVe-SSi357ZQCrnIgGzvU$0>PS+1hI
TC1g?)(1i@1u6{1-oD!M<%K2LL

literal 0
HcmV?d00001

diff --git a/Signal/Images.xcassets/message_status_failed.imageset/error-12@2x.png b/Signal/Images.xcassets/message_status_failed.imageset/error-12@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8c0b4b7c6407a4b30195c73005dd9dae7e1c6f2
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$VM#<mR7efAmOXC5KoEsZ>YM<ji^K_Xizp&>u7D`HjB|q&C@DA$g*)T}gbsn=
zeP+iZva_>*_esxQyl>vHvp@Ezh~r7!Q}I=N7RMr}#Y$X>KjKEb3K*5*UOYNPgVvI(
z8ONKte?^RU;+Oa#PQ=GR+B~BV4O(J|jbg6egGj(qq%0oLpe2S_JbFQP1aQ%-h(9F8
z;yWW5tJBJIi@BvH*2;xvi%+$zEbYUd1{xTHl?%@XEJaoVljYSsB>^6I;fZ%K6A5HR
zct}Zr2VQ7r54y04!1wt!$kn_W@3kz+#@hCfIs&}V;$3XR4>pm9)C72;-BO~gAVD26
z{8_hmW;L&x1XVD5NiZEr13j2mMS@jOzk5+v^qW`XoqeP6$8sDM<>iQ(l&psx$+8~T
zHX2?Qoat<m!CyF*gppXec4`m$%CscR2@}teYsbTXcQj~;>A>4GEaAI8TTUlXh<M4^
RMEL*!002ovPDHLkV1jgzxLp7M

literal 0
HcmV?d00001

diff --git a/Signal/Images.xcassets/message_status_failed.imageset/error-12@3x.png b/Signal/Images.xcassets/message_status_failed.imageset/error-12@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bad89d6c0275869098eefc0471e63c0548046cf7
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%cS%G+R9Fekm@!WqK@^0Kgn}XkG)N#pnO~5OhK4j0ahX3smyYJ@G(pPWNTj4l
z5g}J7RJ8d6Mj{doC57dX`Hp+m+~I`X_<VSzVc**Cy&2Yf-aD@p`Pfj&p?DzfirY0c
z6jwDz8c)S<;*Gcv4AgZfj>Wq~l1mM>oncR%eu$|i{+34%di^(^tMWu_3rzIdnfOlJ
z7hj4mY7*~@yhjeX?fMUTjow*USN3<&o84;uUfdK@K`u4adM|pTkpvQdir(Op<~vE%
zvy-U(EP78g9yP^M`pW#){8;P?^rB}NL+hU(--#tt_*U#1^mJ3~shQvk2<MDlu1s5y
z-mZoA1Nf!Q=begDiP4-m6~3p?ZeXBUH06rO*}$dM5~l(Uzxwb{JgcjZ>XG52cxm%R
zg=nA^n0nxB8jGyZM9le~QF>8|vAV=LKnqRk@vy-PaZs*`;9R_}qJI9Mg(kqmA%<Qv
ztMN609!J+az>sg?iyn=Hlxyx{i2IqqRRlebuDQLGhI(9#nNlnE>K!Z8STcLFuW-wR
zel3Hc#vaDd$Q-`1I5jMl$g)G?T)5^4L#Ni^jm3S1u334R_vo0%_=BS(nhh1idBi<%
z4oW3QEpZOeidsBOPy6<%>)+lv0y(*8Oiy^ll?V0^_#&QHQBkaE<W_dkKm#p+HXa(-
z(=3*c@woABw-b817TPm`>qva^n|vHD-D41@*2VUNA~)poY;<br5v$Lb^q{D`3YhW-
zMjAZXqx8L{`;X7}RQz`nC7g-9{@4(v7`X!cnJtXvj&uJU<EDrQ;!qrmsb<KfhT0_f
j%~4W;k~sSo_LJTpx55nVztZ|Z00000NkvXXu0mjfs{UB-

literal 0
HcmV?d00001

diff --git a/Signal/Images.xcassets/message_send_failed.imageset/Contents.json b/Signal/Images.xcassets/message_status_failed_large.imageset/Contents.json
similarity index 100%
rename from Signal/Images.xcassets/message_send_failed.imageset/Contents.json
rename to Signal/Images.xcassets/message_status_failed_large.imageset/Contents.json
diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@1x.png b/Signal/Images.xcassets/message_status_failed_large.imageset/error-20@1x.png
similarity index 100%
rename from Signal/Images.xcassets/message_send_failed.imageset/error-20@1x.png
rename to Signal/Images.xcassets/message_status_failed_large.imageset/error-20@1x.png
diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@2x.png b/Signal/Images.xcassets/message_status_failed_large.imageset/error-20@2x.png
similarity index 100%
rename from Signal/Images.xcassets/message_send_failed.imageset/error-20@2x.png
rename to Signal/Images.xcassets/message_status_failed_large.imageset/error-20@2x.png
diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@3x.png b/Signal/Images.xcassets/message_status_failed_large.imageset/error-20@3x.png
similarity index 100%
rename from Signal/Images.xcassets/message_send_failed.imageset/error-20@3x.png
rename to Signal/Images.xcassets/message_status_failed_large.imageset/error-20@3x.png
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index f15b44d5c..6aa0fe4f7 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -220,7 +220,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (UIImage *)sendFailureBadge
 {
-    UIImage *image = [UIImage imageNamed:@"message_send_failed"];
+    UIImage *image = [UIImage imageNamed:@"message_status_failed_large"];
     OWSAssert(image);
     OWSAssert(image.size.width == self.sendFailureBadgeSize && image.size.height == self.sendFailureBadgeSize);
     return image;
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
index ffa39e5b1..cef88eb90 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
@@ -286,17 +286,18 @@ NS_ASSUME_NONNULL_BEGIN
                     statusIndicatorImage = [UIImage imageNamed:@"message_status_sent"];
                     break;
                 case MessageReceiptStatusDelivered:
+                    statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"];
+                    break;
                 case MessageReceiptStatusRead:
                     statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"];
+                    messageStatusViewTintColor = [UIColor ows_signalBlueColor];
                     break;
                 case MessageReceiptStatusFailed:
                     // TODO:
-                    statusIndicatorImage = [UIImage imageNamed:@"message_status_sending"];
+                    statusIndicatorImage = [UIImage imageNamed:@"message_status_failed"];
+                    messageStatusViewTintColor = [UIColor ows_destructiveRedColor];
                     break;
             }
-            if (messageStatus == MessageReceiptStatusRead) {
-                messageStatusViewTintColor = [UIColor ows_signalBlueColor];
-            }
         }
         self.messageStatusView.image = [statusIndicatorImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
         self.messageStatusView.tintColor = messageStatusViewTintColor;