From efa40dbdb72f7c9a7674a2bf6f8557f84773ab2c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 5 Jun 2017 16:13:01 -0400 Subject: [PATCH] Rework icons in conversation settings view. // FREEBIE --- .../table_ic_block@1x.png | Bin 1433 -> 1644 bytes .../table_ic_block@2x.png | Bin 1856 -> 2326 bytes .../table_ic_block@3x.png | Bin 2290 -> 3122 bytes .../Contents.json | 23 +++++ .../table_ic_group_edit@1x.png | Bin 0 -> 1532 bytes .../table_ic_group_edit@2x.png | Bin 0 -> 2033 bytes .../table_ic_group_edit@3x.png | Bin 0 -> 2563 bytes .../Contents.json | 23 +++++ .../table_ic_group_leave@1x.png | Bin 0 -> 1538 bytes .../table_ic_group_leave@2x.png | Bin 0 -> 2014 bytes .../table_ic_group_leave@3x.png | Bin 0 -> 2484 bytes .../Contents.json | 23 +++++ .../table_ic_group_members@1x.png | Bin 0 -> 1583 bytes .../table_ic_group_members@2x.png | Bin 0 -> 2158 bytes .../table_ic_group_members@3x.png | Bin 0 -> 2791 bytes .../Contents.json | 0 .../table_ic_timer@1x.png | Bin .../table_ic_timer@2x.png | Bin .../table_ic_timer@3x.png | Bin .../Contents.json | 2 +- .../table_ic_hourglass_empty.png | Bin 254 -> 0 bytes .../table_ic_hourglass_empty@1x.png | Bin 0 -> 1485 bytes .../table_ic_hourglass_empty@2x.png | Bin 344 -> 1782 bytes .../table_ic_hourglass_empty@3x.png | Bin 432 -> 2221 bytes .../Contents.json | 23 +++++ .../table_ic_lock_outline@1x.png | Bin 0 -> 1548 bytes .../table_ic_lock_outline@2x.png | Bin 0 -> 1852 bytes .../table_ic_lock_outline@3x.png | Bin 0 -> 2231 bytes .../Contents.json | 23 +++++ .../table_ic_mute_thread@1x.png | Bin 0 -> 1605 bytes .../table_ic_mute_thread@2x.png | Bin 0 -> 2166 bytes .../table_ic_mute_thread@3x.png | Bin 0 -> 2850 bytes ...SConversationSettingsTableViewController.m | 97 ++++++++++++------ 33 files changed, 180 insertions(+), 34 deletions(-) create mode 100644 Signal/Images.xcassets/table_ic_group_edit.imageset/Contents.json create mode 100644 Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@1x.png create mode 100644 Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@2x.png create mode 100644 Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@3x.png create mode 100644 Signal/Images.xcassets/table_ic_group_leave.imageset/Contents.json create mode 100644 Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@1x.png create mode 100644 Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@2x.png create mode 100644 Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@3x.png create mode 100644 Signal/Images.xcassets/table_ic_group_members.imageset/Contents.json create mode 100644 Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@1x.png create mode 100644 Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@2x.png create mode 100644 Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@3x.png rename Signal/Images.xcassets/{table_ic_timer.imageset => table_ic_hourglass.imageset}/Contents.json (100%) rename Signal/Images.xcassets/{table_ic_timer.imageset => table_ic_hourglass.imageset}/table_ic_timer@1x.png (100%) rename Signal/Images.xcassets/{table_ic_timer.imageset => table_ic_hourglass.imageset}/table_ic_timer@2x.png (100%) rename Signal/Images.xcassets/{table_ic_timer.imageset => table_ic_hourglass.imageset}/table_ic_timer@3x.png (100%) delete mode 100644 Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty.png create mode 100644 Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@1x.png create mode 100644 Signal/Images.xcassets/table_ic_lock_outline.imageset/Contents.json create mode 100644 Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@1x.png create mode 100644 Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@2x.png create mode 100644 Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@3x.png create mode 100644 Signal/Images.xcassets/table_ic_mute_thread.imageset/Contents.json create mode 100644 Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@1x.png create mode 100644 Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@2x.png create mode 100644 Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@3x.png diff --git a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@1x.png b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@1x.png index 2c874458ba837b3e8f3d451ce1e55e4137cffb0a..d9fd17d1b14b0a03972cdc6af63d0f990777fbbb 100644 GIT binary patch delta 604 zcmV-i0;Bzz3+xOriBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^1ZP1_ zK>z@;j|==^1+gy80s=BLll=l^0x~p{WCM8*IxsdmFf|}CH99ahIx;nr>;r*+B|KQ1 z0005tNklNS>0u^ne95D_>zC=Cswouy7}28qaU2)%S%+(I!}*^fFW`9;MPsMS zCrDg|eRv5!;CDzTn|#W-vJ=pMgjdjF#AfLDXbr68+ssr1#||7r;RO!h4qS!Hj#^8% z58t4mm`-XD92(9M5x>J;Y5+!j+VBnvD$+=d!BB!X(Bha)H8H>_@u@*yL^(>vJYAyH zWeKma2T!yCr!Y&A7JfQXp+8dqMG;=h0uE$ER-lp#S&Qht1m)7}Jq4S8I@Fm9+eTky zpSg%)l>jJL-RIH2?Me$qaOKOuf_>&9igh^}%?OjK0y-EUi#-ugAw8mzq+|sU{U>8_gB4qe5+8^T|RI9~IF! zu}B^ju819Ww?wr=$-N#Q{d3=>;bCV2?6}q_)<{ko*SqL78vOiOJg!ZVqz{fhGDAnb q&KB7}IHt(2d@}#n{3Hj)En1Ti)|FOyIM6_b7gVh=4aG%YYPR4_L>Ff=+cH4c0znW(XA zd)iH^GrhpbPkyTU*RO`DscD*jqOJ9JT{lLb!248xB_7+heM{$hpm6}#@EwZJL~}K3 zgK9U0A>2Z-gHt$8G=G6Y&#-q1;(y92IKz3*fPlW#0M|jesTKc(bM+DO5D&3A=jjp$>wq0}IYf}Xm{H5LQ00000NkvXXu0mjfbZ(-j diff --git a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@2x.png b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@2x.png index 66d61f3ba4ea8871c5b3a5e33f8afaa374199cad..8ba80069d420dbfd54451ea9381fb00a290efa2a 100644 GIT binary patch delta 1292 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 BdT#&# diff --git a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@3x.png b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@3x.png index 8a225841c58541d0b9100d69bfc9bf431c2a7dfc..680fad7c135ad4038154fa345893b2190d406349 100644 GIT binary patch delta 2094 zcmV+}2+{ZQ5waLDiBL{Q4GJ0x0000DNk~Le0000;0000;2nGNE09Ea?M*si-1ZP1_ zK>z@;j|==^1+gy80s=QOll=l^0yi>~WCM8*IxsdmFf|}CH99ahIyN(t>;r*+GxO0H z000N3Nklm#ThKrcBBt19ceatJAoDYTL1~vFWs32p)~FfbC=8X&^ZbE`zJ!*9gD&_4VCh zzg204APAA46<{M+4^{&a(hn?h4W&!q8*mDo1V2F77~7x{lpu&%LiDeJSHV-@A<%@} z!pIr$Avg+A=bJFvnhl6q2R;BJAhgJbe64FO!K#i3at$~P{snD|e9HHKnyT>!Ye!H6 zU>~>vx-E)9u?z%D*vBw|JP(FJuZd#XIKqu99};ci1V72BRViC4Oc z;dCZW-vh5#bbf($!x7H0{SAx&U7aMl+UXWR_esmZDxk4t5LA&N8oj~Q?(Zs%z1l#| zJa8QN%1<e!I+rqrMkNvYbi# zDzQW2E5S_%0hTI})Xna;6#rLB0#%MHy-A|ckrKoIQNI`bT%y-)l3pafva8z>FM=?* z)?oC2jH0(1hy<5^bep98uHdK>foshqp?t8!;4jqAj}5Y~_dphsx-xJR+g$KHaLK_q zALkYePlD?%OVsVk8lkM$N!n79lX4!+<~89Mr8i3qeMx=p;{)YZl3E|QiESGA47kL7 z^GHiQ+kD}&K;4cBtR@Pmx02L)cO$l~CAlg0sfl#byHu`!0Jj`Q&Qmu#-D=_yI#!Ze zJ(GxQ7SKah}7xb-XQfu9fnAS(Ru*sD}x$K}i9k`ymE>K_E zy|Tt>(^DjWDF>ijibT(6ni@|Fg^R(pqE?h2OSiBe(YDt}I_Ahz94wBrOO8P*oD)~% zY&EV_5|1(IBZ6yVOmgKS4sr?741((|+mDsli5hv3q=7s1nB>Yu9Egi?NuEIu$Atx3 zP0iF250Z2yg(OK!YFyHJj7k#pgrmhMbt8^?bCoB5Nuj!%a#2o2(%~XWP`r34uaS(! zlX`jeUS%F6h3am%3D`x@GjT#mg5t7PwjLyf7`Rt8VxbCpi+QuUf zlA1n~l*=?nm|w?rNrEoMg*jUhG>}tXyU2s2CI@cilFU7uM~91~(jQr^%<&_c zNorz$;4aJM&p5dxLAvyf#T7Z*WjSSy6?u@22wWU=ZUd48U7_NJqhS-joWneK zsrI)3b-UXdMR%-CX0!c$C;u_tIvVkRngzqD7b zD3(q8oI=NS7aD{zeAYUXXg>pJ%E~3~X`hH7%f#W9AS{#^C9}$B5^Z<6n4#`E7%T~Y z;a)Y0WmC_Z#%*j-rYWdM3BTSX(Plo-bh%3on&ZHVW%0s(v%!WHiO<^I#&2%XKj319 zI={sW%7;cr3`SpQICrx-VzZE>r8#?nmg=~~Z~03^kYxdt7ALu$Ys?8(QN*`}Bo{HN ztG0kDB1vD(l*t(s7F9{Gi8lDQj7hG49QIX?1FQYOvPfGCChtd*>Mi1o<a#Se5~w zMsIoLU!!J2e5v|iE}8l) zpx*I{t*m?oPP>|6qwEas|SsQ?U?ev813+$hETcSs?ieXny=E&_V*CD}T|2-$|Kdpaui~ Y1HUHg*iTp0(EtDd07*qoM6N<$g5|&BIRF3v delta 1261 zcmVn{6IFbWp1T;82FOyIM6_b7gVh=4aG%YYPR4_L>Ff=+cG?VWGfq(52 zlOq5C1Zhb`K~!i3?U}o46;Tkzy%s(S?Ti*02$D{XkH&yiNTXnzm`=OciADa2gjgt8 zMKMS~v=g*QtH#PlDH1HS@U28KQPBAN!tUi{?wq}6@9qVK41Da_IWynP?AgaTXE$xy zkc}%)=?XL|c^l`|)zuzU`#~Sr1AhjAWC6SdufSrX(Rk0X7O7kSNh{&g;1n1DDxye~ z{Bv**+@+YsBIB<0k@zui1AGOYihRX!tZRu{VuJO6%iss7OT;D4cB5z0DR)kQVekT^ z%5MyXR1x=ZnXHnZ0f^5-JPo!*0{lY%1Uv+~$6tdbAlU)-0X-upz!9(&cz?2j@*>a1 zRj;!n9m!7=T*6QEO@kv~bGrc8G{69u1n)siCfac&^}{|MiSP^kP0*i2B(6kUd^IG8fxUJ9pt}aXgHY-&;tb^W)vH_%``J2L zjAz3Pv-X@!X^#LU9f|_fITE^1R%V@4TUB`J&9G#=KTDrm(;fx3h}uR1?q2W_grc09 zIpn#t95K2OdS&fP))2jl(3KCRwvm8zDkRR@7i=Ca=NQf##}&>GwSO3*K<^b%%Sga| z5GZyi^IjfJ9hQ1^+OOkdbkQ#?eO)O+F@a)-qTJ%IR5}NN-Zr63HYST0dv`P$uGSq8ihn*RN23l-2ln1Gu`In~UZ_%RU_WZNLnk`|VP8k>Y$VR&ta*Jd zT0>m#q==j#cC-aNGKT8cVx*J=MO1wz6uU4-+o`P&D|@XX<-De6LaR6{??QzwK>IeU zp#kmmNtAJ{p$IKOLs4$Z(HHJf??bkL-WKW;M6|m1L86 zhSw`1`gX$p5GXg5$O`Z#b5qHg78qtlDCtn#A~3iV8fERI$(%Qx{s2L5L2k)i@OUG! zZUTsna?lh$l(gxzGQrDR(A2qzR}pq3RK(gEo8ug?GF#>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5 z!d3~a!V1U+3F|8Y3;nDA{o-C@9zzrKDK}xwt{K19`Se z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtH5OLR{C|l=&b@WD^hbJTrzEamT!Ta{o zS#6geqZt_%3<{_rjU5I^v7;bo&{!}xqe*a_eVDCb0&=~W?Pf{9lIla_P40l zEMWSsrc(Wp%eqfOr7%(by_0YTf5LI)<}G_? zY~<6tX}SD-OW2cu0~=;K*mno-c_6iUnb_5;SqGX#&MJL+(HI}REcPI0n?Z-QO!d5S ze`(pAb>{b60%9iKag>~Y!967UDBGOF6QWBpLF{IJ8yR^*Vp|gZ_aTM3U*{I za_w1Qxn$iJlVevoxpm_X+iiN`EI#FWw7-&;$#a98OW)o3w2Ho#eTur%%eTex|99S1 n73;Q6ulZ2?3lt>&`X5+z<5wP=YY;07Dv~{2{an^LB{Ts5JXZ&w literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@2x.png b/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a2cfa04550ab28969c328e03dcedcf4dc398a492 GIT binary patch literal 2033 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 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/table_ic_group_leave.imageset/Contents.json b/Signal/Images.xcassets/table_ic_group_leave.imageset/Contents.json new file mode 100644 index 000000000..eb9c6e487 --- /dev/null +++ b/Signal/Images.xcassets/table_ic_group_leave.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_group_leave@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_leave@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_leave@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@1x.png b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..16b2f3a5aaf6ed4445acc28d8ce1fc6ba94c88b0 GIT binary patch literal 1538 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&a=au%h`kcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5 z!d3~a!V1U+3F|8Y3;nDA{o-C@9zzrKDK}xwt{K19`Se z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtH5OLR{C|l=&b@WD^hbJTrza8s0x@7U@!2w3X4(#Y6pv#u1Yw)s3Etlj;?2X#7xLbL3Feh7B78ubgvo z5pa~|PEK@i>1^%t2sxLZ!aP}dx})Z;tPfU7G&1*9t(h#nDf1pv^s6;R zU-p=kZgdrocP;;4Y23xOkSFTgUA9Xhr{%c+CMkdSUg04bec_Xv^2x{xes3Z@T5G;d zO4C;Gb?q|H4SnHUs8M<7-FE9XBMq-ZGCBt%RD0&O8CSGMp9oEw_HV8dS4!11MgCd= z3$7QY7OjC2ZPgZuhvY77yI{jOJHR`y;GF~GzK5q@3RN+`$yCY|$~vihE|;TzrB(TK z*SndMIA?ZRJXif!xZ?ZP^iF@rB_1EG-Z)FKEnq*QUp|-7TjjZi*2-7m3nyFb`lGsZ whxo1q%xw?&ygoeoVygd#%X-=mwpk_2_Ig(%s&wxqS%L~?Pgg&ebxsLQ04z@e-2eap literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@2x.png b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..37461a4862a7d54bd9cdea465ca8eca5267583ca GIT binary patch literal 2014 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}oCO|{#S9GG z!XV7ZFl&wk0|SdvW=KRygs+cPa(=E}VoH8es$NBI0Z=sqgH44MkeQoWlBiITo0C^; zRbi_HR$&EXgM{^!6u?SKvTcwsYk*NEcCio^nlW#B-B_{|37a;u=! z;{2RaP!NRXWtP|(*?>KSE{q5fh%V>++=8Oi;$omSJ5#6@WHEI05eRGS%wcvQ3!-cA zFUkb^G!f)3J42`i$YSW~Be7Y4EQq856!caBnH8xy5iXg)00sNP#KJ}&s|316=lq=f zqTqtW-m&{c!2iNs|Mk_3{*lw_;o(xj}^&9Q?K>r=>mv!<=wnrF z15624zWFJcX_YRCC8>5s28QOk24=bjrXhxARt9EP#z60)sX=l9NXEG+HL)bWC?r2W z#}4d^To6~mSkDZi6ImXr)kYtbi;!{^B+G(DfqB-B3#b#8|LwSH74DWWFffODx;Tbp zu)dw)nIYmR;*g$nr_);{Pr$XuD~7Kr(9zXKL+^=_lU~!Ku8Pae3!W%ce171{&(&2C zaItxX0!t@noCv<*SnOOpLD&FaG!c>+A5V^WUv| z=czJh2NyE@vtQK1?PitM)F{V0Rx{Z87Z}d;DZ9v*pZHL;K(wxTT3FAmha0M1>mOh` zzTrUhhI^YX#Qll>p*pMSZ%=GnzO+t*Tt-{=k-Ft)1(KFOm@((!8M9jwx2M15`#7P3 zokz8wQ)1=i1o`H;!v~iCSXH{_#gARQ8y&CTe6T|?*XRyMn&FMwA7WJ}FO*9sZCTBl zJV{(%_ge$sh8NSnO01oprM$qO|At!dDtpm5!$Qfofx#0#={nx$TRt^k{Z~%v>?_u4 z=_~qK?`{ck-u>H9%v8(Tzw44(emvsq2Hu#& zE48mrxH!$@`ughSg+AG*o*(U0(i3;@;7L1_d-&;vw)KAJ+iaQMNhLL}>#d5}x9h9S zh0e%>S#LrO+mU{%NIuffKFmNISX3hZa)FMQ&DEF07C^q)uk;dtKJiMlB^zyGfIvvrMk z$H^y4-}0o)oi**{uaEN|ZL&BNVJZG3VRh3+h3Q@9?(Dz3AK6_HbB{Qn_Jgf($>ayl z8~C4;I{Ky0u37Y0=|p2#gyKt?9~^~C<~~?kV0%s>X?H@tW4Xhj&xYa`ooi%Gj>&lU(!@l6qRyJ7w9~lY2PZ{vFxa_WM!f2IW<6=N|c_(z*G^`6H*7 zR4?*N>72}TCD`G;+xC{5cki)fy;VFm&ux#X!L1w8=XW-K*!i*T$HjYWdJnA_`4wNc zd_DX>bN$5>=2n59qDALIwX`2d?QvH=k^PZpmevgR%?@@?o?e-nRV|(8c%QX((u#Dy zYc?yn_zpuU15_B-emG7W@z_je9IeGKG_^Qi4a;lW7jGfSX zvh4{!rg3L{B(-N}h4k$Gjh0@irQBzE~ClQ!6s;2yEPcN&T{F{)b3sP^IhX L>gTe~DWM4fA*%ZA literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@3x.png b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..f1f4a6cc81519201b9eb3e26c3fea993e84099c7 GIT binary patch literal 2484 zcmZ`*3p|s1AD>Hx|E_iB+fRfy*})-XaDE_{e8dx@9+0}p5Ny)5z*UCQ_V;X z0)c3HxD!Z{)m?fmSCRaZM}K#dEDAi58y-^FYWzRRW(CJRfCqu7>qsvJ$bT{nAP{93 z)0e`hcx?x0AR9rYgTV}hfX$JxArPzpkleBvd@5AHW`*$pfdfp&03`QP7zu;QDEtEs zFp3uu>I`xjP-}!00tLgVL7`AAm%a}m5nSixlAQxAl+Wh?NMvMWBqDMP0_27u(ROxr zNE8N%!N4U9I4>%UPZhw!cz2N+Ch^!+oJC!e|R zhf^4DzAQ@xpwtyVQ6R?zxTtH4prvbe1;Qb65U+!s1o|)|3$5TU) zaxfOTC>twz696xe&fFJ8pz;|w3<_-vN7=wp*1l*P044omkqbC-8Av0}Tn3d7a(zLN zg_BjmmTsY25c5j;_`DR0lunV{RLza743*3*PEF$ZZT@j;18BWw2xOUs2f@i#pfGxV zcLJHL+Ys`&bd|M*wa`76h5ExB)0h^kDBN~=)vpGdl|Aue9!V1=ZI?ov@(3^|EA96d z?#i8)@0k^gQkoyA?KH)>xp|u8_We?>-};>Q_Kr|2Y(4MP6Fch=QdHdy9GHFd;>$=i z=$R-&@6|9+dT?avB}=0;-pG7ZMMWhn2fGTZ_@tIP7FT%v`t`JmAh9BvR?FpRlyleI zkL;fuK5b%jcx|r&{#8tp>uz?WhW{<_QD61nA~Nr^-$G8Ntg*uq1KA4p9j5$G#i?ML$#zH z(QiI&F)K4U!=&cB7k9a5WN!+G*LSE6%#;Er3)2M8GpEKjYyYM>qZIJ!CvRJGv1^o7 zuaV&h>XXiygOY=UFdF%xeE~YU=ai^48A6M3!iIO|-LA{;iPqVY))a#f_}FghICn{X z=X0H4UHqwdir>!Z_7mf4z3oc#qKdEB`Wb(5R@xfjpTXUKaQoGpeo?3YgoJM0(^aW? zZsz6Z?c^OwA5%$SBW!f*bJa@YH{`S82!8UfQ>4S)jX&jOx_UtzpouIm+%d>#fAG0~ zuMtl+2^i08je}c01q*2p=-u{*jaK@b?B0$JrPM38+&_2A)^IRUcYQj#FiPQUL)-w` zN&9A?|HGCXCl_VYii-Y|gnM_M7Ul8p2E{S6X6xS!=G(hpuz#uF{&)oK!O`n|%{=zv zhF?QqRgPNtc+Cba3uLZ}CB^V7;}ZEpl(r>=R|D?{Im=nJ)~S>N|AZ2ixYVHRC(UqO zd(nlDXM)zUFQ-96HHbUZQ`iPwqbV-8tgot)wX4%FUx_Vsc^Wm5TO+O-P5ikUU*(UY zC;%jlUz~6GLA#4h?pd29xIQDCesm=5i1+Guig&uo5++SXl+r_=9WD&d(Vj(X@PYi} zbYxrb*skcZHscEXhewKR-QTx4o_JbYxBgb@ObbbQP*QlJz9Wn3a7b|D5Fk=DJ{z`Cov;MlO@+Ot?x9P;t^c(Hh zLvK|5YxX9|@Xw=>u{vJnnfyLar`coCDZYOR`dqFV=A_iuy=X;GcGhDg!Icglq4&a98XY{Zv-h zbFe7rRSz_>$>OD{sQru;GQq%vkznTJmOEwXnG0z8e0_(6S)a}MqCeR8vvnXL&l1C@ z!|;b{|JzKi#2pek`s>hY3{Wab3QI5X=a0@RtRNQ016@2T>0c=i7jHr#esAnQ;0Mq4 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/table_ic_group_members.imageset/Contents.json b/Signal/Images.xcassets/table_ic_group_members.imageset/Contents.json new file mode 100644 index 000000000..eea494df7 --- /dev/null +++ b/Signal/Images.xcassets/table_ic_group_members.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_group_members@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_members@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_members@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@1x.png b/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..1545cdd546c611761afe7c690a3613d80d395d3c GIT binary patch literal 1583 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 b_`)8@KX$F}-@pDYxDDay>gTe~DWM4f`;}B% literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7=t`r978H@y}5g^uqi>LHLy_Uz(4aTOP1bXeAL7GfMeh5 z|L3-!)Z+TiBK-Ks9KT5_o|AT&%GR=Su`L(>)Kvps`C@|RW?)g_-_Up4q zctg7a0~3P-0|N&{hT#fpLgciak8A&bQrT`2-n0Md0XK#nOBHiu|Chc|W{8Zt=c`U9Zv0vcek5-73ZPUlYf{Tv# z*LoJsT6X-`!+nQ+@7~|Ow0Yi1w|$SUrT+2X$LV~d`cJ-{yLB(WVnPiE<6~zI33;aj zKLncCngk4ZS{fV`Sa>eVDJC{-1ANyLnIX zy9bO6$lhUD;Q#c$eL~0mox7P}egp;0l)J$Vj11qqwui_lMq~hkg~8L+&t;ucLK6UU C9j7D! diff --git a/Signal/Images.xcassets/table_ic_lock_outline.imageset/Contents.json b/Signal/Images.xcassets/table_ic_lock_outline.imageset/Contents.json new file mode 100644 index 000000000..215c3d6b1 --- /dev/null +++ b/Signal/Images.xcassets/table_ic_lock_outline.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_lock_outline@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_lock_outline@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_lock_outline@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@1x.png b/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..cfb7999ef588df4c80fedce8020a6fd5f3d12a08 GIT binary patch literal 1548 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|I14-?iy0XB zj({-ZRBb+K1_llpi<;HsXMd|v6mX?tKo&&O01A4mfXs^2oCudpV1R;sVPs;Xk5vL)qjP>v zeo=5iVsa|TVPGvtLg=c&)0Mb`)s4tDzJT5g8Gwv4qocVuGsKHMb9h^>W_Sq* zavy9csw+M>4(uwBM;B}^VT&fWcl+4Y!EP_~M$Q!=lg!y}QjGakpR+)tUBt`0qCa%~~Izrkzs zQ**Al1b=`1O(wch?xICW#mw*55+a{ltrE;NNaF6;dE|9C*T1N%OSboO`1sb4IiHj@Ez^7kv)O+8h#mQ&=Paq-cYKbe;5T*Yy7# zx1wy+-;1}39*fQhOJMHveXnn@vQ>IpWyT_{nYrCN6XYsq|NmrU`dR$i%ZyEOpE>jd zNr@q;?Y>j| zvYL%^mPh{P7d8d4-i!y8GTFr*$gXOcbHwybQG2YYv>oHTR}Ryj8%Hkz715rqelF{r G5}E)NY7qzk literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@2x.png b/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ef9fa516c52732bab64c8f4272608230fb91cda2 GIT binary patch literal 1852 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 iV~I|_ za`<;3rGs>k3Lh#Ip%cj|^sm0jx6xsLSH0Ku9)8br-@p60pZ9&P>)l6nU#|vP3ITyY zY7{cbQ*tLuPZcG})qD8DddW?W=egbyRNkaJC|Rg-$bLK!2)a;u%7O9<;2@A9l1cOB z`?|T}8ElprJ%k+$mtEpMIxm_KaRON`OMIt zN|C&8wj>78(hM4FhC%;|1_+qHp-D5prG+qlxZ*@{BW68?Fwj5*zyc!qJP8l`OF2nz ze-Qt#NCBNQCpO!}Id24M<#< zQDkHD@xDK0h*sY25W`FSfVf%G^_<4V~NMv5YY25G8ITOPF#S_ zXLD(6b_8+O1xva_n44M7F=g}Ls06fhie#p0Ze(Ypl9?q!B+T#gPlR+A!r35@QZ9w$ zKoiIf=d(oG-tc?ZhN^Pw#KT!9h{z+*JKZMVKgVM9YuPrtIxuhL!RlFr?O#K3`3qkXmp5u-I=K1i z^1(Z(TGspT-nNtb@XIYQ2NDUsuk0xDOtd05kee+wsp- zO0uB=hN$dui^8GbS3MCY^8KGLQ3U^tzq=V;yndq&BWcgwD;Gn+A4sj$wHjYj((cRM z?V+9!Rn&zYsk71)cf#C)5E(j}L8@0-M!@qMW4deM2CJDvEz@fKmG4wv8CzwZ+a#RP zcda2+W44^Do(_JuvXRx2++F`7ES$2SS|5AGt=V%RUu{F5fRq2VwMt6`d+}C~d>13n^}}RL9i+>u z{?E1-$Nn%C)+TyTdlWYtwd&qb5narviXOF^o}NCg?~KT(DDS@{2vBu$U5SjkRey1G zPjuVnA;4IERT!&Ur3%@q{SK2v9xAQAdE`_@_JcpbIGZ8ZOCQmsXpp*(Z0GqL^1wbh z^pXE&uxI}jpR(8|%X*O|ipavm*B8SQ6wgw4hG~@AtQ7a&>Ks^>=!8=l_=&@#+zrCa zIPvbY*t03D&TGsDnd*~_CAH%0AIPDg+ivx1G%W9N z1ePIfx8P~W^u?L}zT1SI;L<85Cg)m0e1I;@ZW7B#~p8r^%l)7sSlpM+r{cDE>gx`OYyEuUWj1LJR0;wSnr9bM=J?bD^7 z4yaDL(dw(r2XAi)oeYHRG+~BoiH!#g1uZeoEZrNhUAxa(VL1S6J-h}1w~kjETQh*I zF53&ypJa7CS&0d?OHNISE%4YOH-LiGlPf%qF$*FGhMsY2p7`&-apznH-UR9r;U7>g z_srmeF7Vz{Te6r|MNgl?DJMosVGmyGrIIY~(-yBU~%s?RotK z<@lAYE7G=CLIZMoEb?>~6kM+>n(_ZK3WV=We5^a^on3#sYIFu!;t~74 zIXgpq|FWtx?5}P_k#X;~K@4h*f%s4Ycj$84fxq<jML?BL6b6n7&w|Gb5^>q2%(lHBd{-sf?ZuHacCjK&qZPSxS?LLU6&dXEe;$Xt8 zqwK)8R7y4O`hZFm>}Zn7Ogy}YwMjmAu%lQzG$-0EOOdFIN2EAwHMnRTc}lUI@H^Cp zXPWOhT~8cJ4Tk6V3o}iTgV?FmmQ&H8#*2F4ZSjKubwr2Ur2bzm!;=@53Ew!fb&A8P z?7wtrY=y+B)3a4y?K=@`m+!c!Q4yzX*WX@0Q50^%$hCJtcojdiZ5dpZsTz_veneFA x;=CT{T1~cJj=ZSk*dfcL`0ObFLh}&L$U%xncI>{_eL(u-N^y24l{;=p_!q8zeQ^K) literal 0 HcmV?d00001 diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m index dd3611e4b..cf06204bf 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m @@ -218,7 +218,7 @@ NS_ASSUME_NONNULL_BEGIN UITableViewCell *cell = [UITableViewCell new]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - UIImageView *iconView = [self viewForIconWithName:@"ic_lock_outline"]; + UIImageView *iconView = [self viewForIconWithName:@"table_ic_lock_outline"]; [cell.contentView addSubview:iconView]; [iconView autoVCenterInSuperview]; [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; @@ -230,7 +230,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [cell.contentView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; return cell; } @@ -268,7 +268,7 @@ NS_ASSUME_NONNULL_BEGIN [topView autoPinEdgeToSuperviewEdge:ALEdgeTop]; [topView autoSetDimension:ALDimensionHeight toSize:kOWSTable_DefaultCellHeight]; - UIImageView *iconView = [self viewForIconWithName:@"table_ic_timer"]; + UIImageView *iconView = [self viewForIconWithName:@"table_ic_hourglass"]; [topView addSubview:iconView]; [iconView autoVCenterInSuperview]; [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; @@ -280,7 +280,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [topView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; UISwitch *switchView = [UISwitch new]; switchView.on = self.disappearingMessagesConfiguration.isEnabled; @@ -334,7 +334,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [topView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; UISlider *slider = [UISlider new]; slider.maximumValue = (float)(self.disappearingMessagesDurations.count - 1); @@ -364,12 +364,22 @@ NS_ASSUME_NONNULL_BEGIN NSArray *groupItems = @[ [OWSTableItem itemWithCustomCellBlock:^{ UITableViewCell *cell = [UITableViewCell new]; - cell.textLabel.text - = NSLocalizedString(@"EDIT_GROUP_ACTION", @"table cell label in conversation settings"); - cell.textLabel.textColor = [UIColor blackColor]; - cell.textLabel.font = [UIFont ows_regularFontWithSize:17.f]; - cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + + UIImageView *iconView = [self viewForIconWithName:@"table_ic_group_edit"]; + [cell.contentView addSubview:iconView]; + [iconView autoVCenterInSuperview]; + [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; + + UILabel *rowLabel = [UILabel new]; + rowLabel.text = NSLocalizedString(@"EDIT_GROUP_ACTION", @"table cell label in conversation settings"); + rowLabel.textColor = [UIColor blackColor]; + rowLabel.font = [UIFont ows_regularFontWithSize:17.f]; + rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; + [cell.contentView addSubview:rowLabel]; + [rowLabel autoVCenterInSuperview]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; + return cell; } actionBlock:^{ @@ -377,25 +387,23 @@ NS_ASSUME_NONNULL_BEGIN }], [OWSTableItem itemWithCustomCellBlock:^{ UITableViewCell *cell = [UITableViewCell new]; - cell.textLabel.text - = NSLocalizedString(@"LEAVE_GROUP_ACTION", @"table cell label in conversation settings"); - cell.textLabel.textColor = [UIColor blackColor]; - cell.textLabel.font = [UIFont ows_regularFontWithSize:17.f]; - cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - return cell; - } - actionBlock:^{ - [weakSelf didTapLeaveGroup]; - }], - [OWSTableItem itemWithCustomCellBlock:^{ - UITableViewCell *cell = [UITableViewCell new]; - cell.textLabel.text + + UIImageView *iconView = [self viewForIconWithName:@"table_ic_group_members"]; + [cell.contentView addSubview:iconView]; + [iconView autoVCenterInSuperview]; + [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; + + UILabel *rowLabel = [UILabel new]; + rowLabel.text = NSLocalizedString(@"LIST_GROUP_MEMBERS_ACTION", @"table cell label in conversation settings"); - cell.textLabel.textColor = [UIColor blackColor]; - cell.textLabel.font = [UIFont ows_regularFontWithSize:17.f]; - cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail; - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + rowLabel.textColor = [UIColor blackColor]; + rowLabel.font = [UIFont ows_regularFontWithSize:17.f]; + rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; + [cell.contentView addSubview:rowLabel]; + [rowLabel autoVCenterInSuperview]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; + return cell; } actionBlock:^{ @@ -408,6 +416,29 @@ NS_ASSUME_NONNULL_BEGIN [showGroupMembersViewController configWithThread:(TSGroupThread *)strongSelf.thread]; [strongSelf.navigationController pushViewController:showGroupMembersViewController animated:YES]; }], + [OWSTableItem itemWithCustomCellBlock:^{ + UITableViewCell *cell = [UITableViewCell new]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + + UIImageView *iconView = [self viewForIconWithName:@"table_ic_group_leave"]; + [cell.contentView addSubview:iconView]; + [iconView autoVCenterInSuperview]; + [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; + + UILabel *rowLabel = [UILabel new]; + rowLabel.text = NSLocalizedString(@"LEAVE_GROUP_ACTION", @"table cell label in conversation settings"); + rowLabel.textColor = [UIColor blackColor]; + rowLabel.font = [UIFont ows_regularFontWithSize:17.f]; + rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; + [cell.contentView addSubview:rowLabel]; + [rowLabel autoVCenterInSuperview]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; + + return cell; + } + actionBlock:^{ + [weakSelf didTapLeaveGroup]; + }], ]; [contents addSection:[OWSTableSection sectionWithTitle:NSLocalizedString(@"GROUP_MANAGEMENT_SECTION", @@ -422,7 +453,7 @@ NS_ASSUME_NONNULL_BEGIN UITableViewCell *cell = [UITableViewCell new]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - UIImageView *iconView = [self viewForIconWithName:@"ic_mute_thread"]; + UIImageView *iconView = [self viewForIconWithName:@"table_ic_mute_thread"]; [cell.contentView addSubview:iconView]; [iconView autoVCenterInSuperview]; [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; @@ -435,7 +466,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [cell.contentView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; NSString *muteStatus = NSLocalizedString( @"CONVERSATION_SETTINGS_MUTE_NOT_MUTED", @"Indicates that the current thread is not muted."); @@ -490,7 +521,7 @@ NS_ASSUME_NONNULL_BEGIN UITableViewCell *cell = [UITableViewCell new]; cell.selectionStyle = UITableViewCellSelectionStyleNone; - UIImageView *iconView = [self viewForIconWithName:@"ic_block"]; + UIImageView *iconView = [self viewForIconWithName:@"table_ic_block"]; [cell.contentView addSubview:iconView]; [iconView autoVCenterInSuperview]; [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; @@ -503,7 +534,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [cell.contentView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; UISwitch *blockUserSwitch = [UISwitch new]; blockUserSwitch.on = isBlocked; @@ -616,8 +647,8 @@ NS_ASSUME_NONNULL_BEGIN iconView.image = [icon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; iconView.tintColor = [UIColor colorWithRGBHex:0x505050]; iconView.contentMode = UIViewContentModeScaleToFill; - [iconView autoSetDimension:ALDimensionWidth toSize:32.f]; - [iconView autoSetDimension:ALDimensionHeight toSize:32.f]; + [iconView autoSetDimension:ALDimensionWidth toSize:24.f]; + [iconView autoSetDimension:ALDimensionHeight toSize:24.f]; return iconView; }