From 246218e333e175826cbaebc38714c39542602098 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 12 Jul 2018 15:07:51 -0400 Subject: [PATCH] Apply 'disappearing messages disabled' icon. --- .../Contents.json | 23 ++++++++++++++++++ .../timer-disabled-20@1x.png | Bin 0 -> 563 bytes .../timer-disabled-20@2x.png | Bin 0 -> 1225 bytes .../timer-disabled-20@3x.png | Bin 0 -> 1939 bytes .../Cells/OWSSystemMessageCell.m | 13 +++++++--- 5 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/Contents.json create mode 100644 Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@1x.png create mode 100644 Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@2x.png create mode 100644 Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@3x.png diff --git a/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/Contents.json b/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/Contents.json new file mode 100644 index 000000000..31bf40a72 --- /dev/null +++ b/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "timer-disabled-20@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "timer-disabled-20@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "timer-disabled-20@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@1x.png b/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..9f71d7c9617c221c35b9b9596a210e23a8c5ff97 GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIR5%fhl)FnDQ51*Qh{>V`Vi&Q9vb9@)ricmDM}Y{>n*&^!NDY zG$@pj{ctNgZZo!ldI|FoE~2fF%&9S~eqs(XU}C%A0DQR!4PdZJh?3tL!>ZkL;Ww zPYxf~eFMKcgg2mq;5MU8xelfJ4VOD=Wwr?hUV~->n3H383tqn!h%1ZL2+yGgOhZoL zpJoP2oSj-#ecjyc7 z;05?M`U(B83MFNstiCPfb@CdX!Y0f?2e?3Px(gGod|R9Fecm|Lh-RTPG|S(#ZB2zG@|oQUcn2qh$lcJNxm2+?V)1?M?7w_`l*GqW9xY#wX#TQDiwErw_m<`Z({G zTps%oA06mw4+YEc@(DD^-*5>mgDW!+8u)D3h7<55_!G=Y+TIVB!+|k}nQLLu@iugh z)xj|sUkyKi*`E*Gfpz`0<}&H&g0t-Sdd3EUiChP}F#CIvzMoNLtj97tc!mC>Nw=5w z0yrp6VB%(&W0+*+l{^{aXP~d(ap;QrZFziz)B9;R!4XVe1H+%PQ|8dDUxjx-6Ui9M z9ojd+aQG|jG1wG2Nf+cl8|Ma;5!AEl@;(uLnC;1aV;|e9L#||g-R^GR)-<-#iUdQx zjP9&yi{8dkx;|;xUeY@}P|t6&3&Uq8dpVlU!)Y*#ena;VJRTOY4n^4QpzSI&g}Xa^ zdYJcAoV(Lt7=`?Tv74c=DE%Ng;7BXt2$MT6It`>1CznNYYuyDS zxOFqbWL@fCVAv>qkb7aR(;xdPFo%eBrxQHELouPE1ZSYz0K+cir|7OJv2UU>hw$&) zn)-f1aoH@M^Tvod%D3PJv&^kJ+{Q3`Z*kIBNpX&fS>VRF6@CfBk@7G26zn-3=+}i; zweY*!$p@37?99`q3~r3I&?|m8RDKUv!=vCJu!@8~&%@RaNzqec9IODJ*xODx4e8S_ zt1!Q4;>HUfZpN05LSe8$aRn1Ug5fLVYv|6c;q+r z$$~u!%){wD(4!+_DZSP`2#Y7k7&>n_Q?TB~B(FTv1BZr(`u7yPt%v#2YwUgSMpzo# z(?36%m&Z}#LIP}qu`nUGqgz@QypxQ(w5=4QhO6ao?7c7&RJyv)LC?f#_zmobVYr#L zb$8V8$k_xVZkAUSgS*@Ex3Q*ZFyy`~_$dJ%o@#^I-#-U>o9(^Ubc2`aCGv--yEp?UAs)00000NkvXXu0mjfY4KWc literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@3x.png b/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc0f5fe9ed5219a64276ab008bda1e92f4516494 GIT binary patch literal 1939 zcmV;E2WP)Px+O-V#SRA>d&nrnzvRTRg4CT41dmR6FJmP83>p&#<0q50-HM-S34I0CdI!1j%n_(82RD^ezoZ-wj+NR` z#VP~`N>H+z&qKilU>q0*lF%BI9szrjDA%ep69c~i|LHtjt6}<|2krnXfd)NAM69ZU$wV@;h-kcqOuW$9OzYB5|C;C%##{0{sjod zq@-(l(xWl3E?`_dotFB69Rc|*@bV-*h_xV;bRi4JS`EJ{Ie3{;bJ|fO72ol0cv^Jw zq&^s53Vh#c$1Y@Nqtpfzd=&LZFg-%p4BvPBM1*eE>`>BLODb+zZ+4FLx9dS#y+d2pG~f9I7?qM%;2mJH-!ag>2cApRmF@6! zc&Gm?Y?P2bf)re`O){1R)Y+Z9!HzmC(QPhCo&M0BVe8sK-wlQj9F47?WYTvcO zH~$xP`KvkjH1Kt8zk|pZfKxzs(@Fxcu_^9T6;z`qkdo$J6zLQecU}A%o$I3v)QPVg zY{IHvE8lt|zTjL5V(1#=q0^1EwH}>IV(jE4*0I*cqWVHPTj2?Q7c(LCL+?SLKE83+ z)(ZIoI1|*He#N1SLuEk$d;%B&t^Zf0iU3Q(SWzmwoIJymmAAp~%ZLdPEeY943 z2Lslw2DJF`&N8dnmeK~MBiw5hj2kuNyH8r)+!`l2n7789yt9HHUd>p+6 zY*2oEH}adS2uSO}AD->v+pFW2?<9-YDNT%1P~H}Z!^WkjH6ex3iv#v_4K5z2tzp$G zT^`gY59))_d%<4d$K%?^k-ZAKT;^$qXbw!*&y`v@i&rM?PmZaw_~<3<1{#9TXTcF* zW3qMKb@jCRgDAQjflhUG!?GvJ|8R$cp9UU$~A0IFbUKlVT8_&FR#XKcv!NSOP9-(f90orZcM z`PV={cD40QJ(6Z1(J{{NxHPgy_X!>g#HqMn1V5H!`qe}yxQe8so1d`SO1h^!=|vGS zE`u)`1Qvta)ks1GltM}C_3q9&tvS0qBDM|iWA|Wmf}|C23kW5xg)DNp4_eEHISMmv zAQV$O{4;8GGaLg^No&i}KCOYtn>3B?1M(S4b}RhE$4Yc7k`gL_kR$OrfsUbhoxOEp z>HtyxKSmb2D4~;@w2*~XZx_fmuQ)RxOTXpl9Cl@gWT=YTF3xskT4&_3;wR(Sxd z1p0E4=5x_#^p)h>pwh`nK6G=M2~ttDub>Vm8d*KfB&44>b^@JyH5f`pzBT8D0u9Re zQk^1}G?)v(FR_{#D`;+oE*$o0XIa7QEW zffjHWRGYj$;H?L9!8sr^s&)=12|&LtOa>FdxDxck+Tap27+U-UEkK&%pM&k70~`dI Z(|?^j+2!L@zXSjP002ovPDHLkV1nD-nI`}M literal 0 HcmV?d00001 diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m index aaff8cf18..87f46700d 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m @@ -239,9 +239,16 @@ typedef void (^SystemMessageActionBlock)(void); case TSInfoMessageTypeGroupQuit: return nil; case TSInfoMessageTypeDisappearingMessagesUpdate: { - // OWSDisappearingConfigurationUpdateInfoMessage *configurationUpdate = - // (OWSDisappearingConfigurationUpdateInfoMessage *)interaction; configurationIsEnabled - result = [UIImage imageNamed:@"system_message_disappearing_messages"]; + BOOL areDisappearingMessagesEnabled = YES; + if ([interaction isKindOfClass:[OWSDisappearingConfigurationUpdateInfoMessage class]]) { + areDisappearingMessagesEnabled + = ((OWSDisappearingConfigurationUpdateInfoMessage *)interaction).configurationIsEnabled; + } else { + OWSFail(@"%@ unexpected interaction type: %@", self.logTag, interaction.class); + } + result = (areDisappearingMessagesEnabled + ? [UIImage imageNamed:@"system_message_disappearing_messages"] + : [UIImage imageNamed:@"system_message_disappearing_messages_disabled"]); break; } case TSInfoMessageVerificationStateChange: