From 04b200586fab1692e004103da90e9f2f34079405 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 26 Oct 2018 01:12:51 +0300 Subject: [PATCH] no message --- .../Tabs/IconCallsHW.imageset/Calls@2x.png | Bin 0 -> 917 bytes .../Tabs/IconCallsHW.imageset/Calls@3x.png | Bin 0 -> 1315 bytes .../Tabs/IconCallsHW.imageset/Contents.json | 22 +++++++ .../Tabs/IconChatsHW.imageset/Chats@2x.png | Bin 0 -> 822 bytes .../Tabs/IconChatsHW.imageset/Chats@3x.png | Bin 0 -> 1270 bytes .../Tabs/IconChatsHW.imageset/Contents.json | 22 +++++++ .../IconContactsHW.imageset/Contacts@2x.png | Bin 0 -> 918 bytes .../IconContactsHW.imageset/Contacts@3x.png | Bin 0 -> 1300 bytes .../IconContactsHW.imageset/Contents.json | 22 +++++++ .../IconSettingsHW.imageset/Contents.json | 22 +++++++ .../IconSettingsHW.imageset/Settings@2x.png | Bin 0 -> 1057 bytes .../IconSettingsHW.imageset/Settings@3x.png | Bin 0 -> 1576 bytes TelegramUI/CallListController.swift | 13 +++- TelegramUI/ChatListController.swift | 61 +++++++++++------- TelegramUI/ContactsController.swift | 12 +++- TelegramUI/EditSettingsController.swift | 4 +- .../PresentationResourcesRootController.swift | 38 +---------- TelegramUI/SettingsController.swift | 9 ++- 18 files changed, 156 insertions(+), 69 deletions(-) create mode 100644 Images.xcassets/Chat List/Tabs/IconCallsHW.imageset/Calls@2x.png create mode 100644 Images.xcassets/Chat List/Tabs/IconCallsHW.imageset/Calls@3x.png create mode 100644 Images.xcassets/Chat List/Tabs/IconCallsHW.imageset/Contents.json create mode 100644 Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Chats@2x.png create mode 100644 Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Chats@3x.png create mode 100644 Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Contents.json create mode 100644 Images.xcassets/Chat List/Tabs/IconContactsHW.imageset/Contacts@2x.png create mode 100644 Images.xcassets/Chat List/Tabs/IconContactsHW.imageset/Contacts@3x.png create mode 100644 Images.xcassets/Chat List/Tabs/IconContactsHW.imageset/Contents.json create mode 100644 Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Contents.json create mode 100644 Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Settings@2x.png create mode 100644 Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Settings@3x.png diff --git a/Images.xcassets/Chat List/Tabs/IconCallsHW.imageset/Calls@2x.png b/Images.xcassets/Chat List/Tabs/IconCallsHW.imageset/Calls@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..da6c6dd833607279052152ddc95cebf3d926a72b GIT binary patch literal 917 zcmV;G18V$hpxSYR?P3d0t;Ng}0HE3;flkx>+d zVXIJD%-|xm+{oajMItVYOllzmfv6)*4Fm>hiVA8NDJHdWRW@n`jnm@YnV$3Rd+*Np zrq!IgyXSY$ci;VU&Ygj*Wi4wNG#4dQP{T#8a)k?=z{m z0dA6)@bxLAjzgNXOW_#Y5@Gl8#^8IC*sEI#k-9XgN-8)e!gfl%ox)qD5b2dB4ciK5 z6AQR3^)Dy{KuRn9o^67)-UCPp;?)e=t>zb+f6Vdc!2EM$SG!gB8n z<>>))Xy#{9u&+#s?`{O(w)nOwz9uPu(wxeniN7R94f7wy1)LL!FGx@%#TvlHut7g+ ze4tpL)@jM2)e7(YuHJdkTPqncoyuu`BHgJb0P^|1tM@zk05nO*JW)kfnjDX9d|YDO z&_B*4e5OA>PN_kA9DVcls6iJTg)XQ;&7RLuy797P=wHH1w={*sh!IhPn$5XQ)Q|0? zoz`kmn{9zl3wl=g=XUkZiQbybK>Gox5G8++527qr0MMTqXpBh$V#nJ7xG#QC1$b{U zYLC!=%`GyQiqPE|HP)L!vvB2wMZm$pG6l9><16;F zpD)=<1E267Z?KG)GL5*5cc|kazi^8wVkT>nzxbIBcJel_rVlcUwbb(+_e=qe)*ZfO zCq-nr2kK`RKk~>HX7c)nQ-sNP7Bq(~{KRudLB%z}4^-lF0(CvTJa!FKT>o;IGCQd6 zGLRNfah<1J1vSWpw4=t?Z@g{=^%V{h%@}Nq7*RTSS@yc#%qVJn{YkMoYz^bH0yajB zajK1BzfcT3#UMx6OC@iyng9h95MVW>RPs4T_+8@M(_byAVIzvq^2hj1@7iKM;=EG) zefj}EQwVjPb(Y>YWn5RtQadxyT7^A3zyixJ$OZH(?BUlEgXAjx>Qbe{r&J-+HFCue z%?cr&lQW~X*h(A6>Ei}B=;JtTY}N5nsXm&f1LW~QA;6UxuR#53?GZIeo>vsIJs>YG zZ&Z3>yDYp_5})oarF@NXd5@C(0|8)-$)O!(jo|&hQof$J{HTKX>GaJ3j+y!&L)?5% z6*3-;%X<~XClhY(u&MuWg8xZ{jJ4>fuAn(p^d2v5Y3M>#et(b4y%WWKnpLc?qctq*Mh7nt5Ebn6+s7>fDwVJtWMW zq}P6hl(Hg8HHR<{rSskv@6G`!$z!@$tWyP?mQtVAQRdSr*=HXRWs4XwaUZ0X`MM=b zNcsweboKM8Wza-9!lLAP!d+d*zd6CD1X9*lbrzb?D0M001gPNzcXV}kS+93vcF;;U zhxvv!_E5z-7MgSjrz}6;-|KFtX6b`T^;2a|?1L`gbOvxzWac;#9(-&T{kVaMf6k7Dr&Uzf0PhDe1sU) zM*20ZqTFC3-D9J3u)7T=TtiwDR4jN+2#@2GHc8B5$Y9F0+nFyt?S?n9S@0c5G3yb3 zxKXTj`(J_@O!i&9;CoKj<5vqsd4oOJLerkLPxD>MGhL5oEY*DaO#ACXJGf`0I@BdV zkgF*@t`Y>6NOjz2)L{dL$EbMhnolpsrDFwDaU-_M7}XU~#XXx5T;=UBoDtk%RopSj z8TtkasW#~LMyRHc4U*qL$5e6U=Gr;h_qfRv4^L1VL|?N!?{OH{+Nsu@Y1}%~Q|+AP zQIm_fecCy1eyU}eo@%b+#^}WllxWq~B<&PaEc9walmLF|IkKy`|3A&se}ApptBqNR z<~puwuQm&Ct@Uad#|;bfvljq&lq!7qsM311S&f_AtGxiY_Li$9j?+uI#2L&8?w~4e zQ$}!`)TfP?(hhsc&Qx+Gm(vP+nU!|`@3|#S{|0xH7UnuLCCj70<&}qLo_Xe(XP()$ Z{{V9FxTuEzj!Xam002ovPDHLkV1njudL94( literal 0 HcmV?d00001 diff --git a/Images.xcassets/Chat List/Tabs/IconCallsHW.imageset/Contents.json b/Images.xcassets/Chat List/Tabs/IconCallsHW.imageset/Contents.json new file mode 100644 index 0000000000..4019ae2782 --- /dev/null +++ b/Images.xcassets/Chat List/Tabs/IconCallsHW.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Calls@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Calls@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Chats@2x.png b/Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Chats@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f33b70334829eaa5475a11c4163ba71ed3c58995 GIT binary patch literal 822 zcmV-61Ihe}P)tWZW)dWu|V_aGZ#tkFSZ4;Ew?<@SfRz(sL7>}K!1ee>Si z_hy60`CZ=o{)YLynfcA{%?vD+rSkul3fc%0BT1SxNn(U)qoTObW}?g?Ol*!Q&BcM% z6E{U_El#~!XbC;G(BIZWi7IS45yx18AVRqs>_kCWfndTrx}?C~{^_;H0q=2z&Ca!_ zNERN88@McBep8%ZF ze27h-4=Msr0dQ8MT(<__QUp!_a6_YfWtr8kmVpYc+=k zxvvZ>I0j%?-yOzH&Il34SWt)+YzNjDv@?3}D#J{uunc9uZi9L`f0%3OmmE>t*(d-P z4C;Vvj;}DQ2;2og!l1sxCyVMDCY69|fS^g#?2<32Dh22f08X2DURZ7S_jm?30i{fv z`W~=S2KIRjvjjfisMJ4A7dzQ#hMw_&U7!~5@!F=|H8b#A58&*{sl~F+IETy!d(=Z% zEeAG`lGYfsitIL**m2eae(A~U8++~cA+0>)Q-SFu!CC;WO4H~z=X>ljs;J|h18kVp z034D2YzEz&r+O`+AK0H;h?gvC-E;#EN}GGnaaQF1azmD%chTL^^fm(wx7J zS2mN;;to7Oh8ZS#$rHLc%vMd--NCR8^fTvG-}?nEZij|xpqi@OR46ZvlJxi-f3fd% z{WS52i~-#F_pX&2ImZxVyx|M8s;^a-%D-2B0VFf?qk_mn>Hq)$07*qoM6N<$f|E3S AK>z>% literal 0 HcmV?d00001 diff --git a/Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Chats@3x.png b/Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Chats@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..c6253384f1801c460ed5d0f5c1c8303759802b15 GIT binary patch literal 1270 zcmV+*ml#9 z@nP>yH=DULcV_S0UCNyEl)2~b`Iy{$&(9r*B$7xXiR4_C7;#ecl3|nyvSgWHlnlM3 zh!d+k+*bNHishn5>7%t$&||c7$Q8Fx57AzJ@HHG%2F~k2)|3ypi9z4Mc^#yw9LTGg z2#joDF~Mrn$lc78glu6kL$^8LDtbx=&T9`XV=D&KsLDyQ1iQPmAt{^0?TC4n^dvMYpY)9K1U~MN87Y-o4oevT^!C;Ny5=O z;oIhHb)#{C#3fs&*3r7wx6N6N+pno)Ng0DqiSg~+TPk#~#D(tVVbLqbw_x!$HKjmj zBrbGsM2n0VUoQgA<-wuHq=9AOan`1Ap#(euyzLf>i-`d?`bzRe$WmqF-%gwK`*Bk%cxe$62CFT&^T3r0?{ z#1Hfj2BE(eJ~udwZB$227(MVl5?&usP8uBLEu+x+CfPF%VatSp-0xWW2=* zdI`Uk0ktrn%lBrT$CJ*BVkvvd2>q;}*yOR|9b^^nmt}ES+$jh?l#Fk7--eAm=Wzq8 zU#CSOyOYcp32B3G^wYt0AgR0mUb3F7i>k8p(z{B!1_o-s<4jH;%_-Rl`9cJ0(orM5A z8uDS+DE#bDoN=51x=3=P8+3<}g!EFT1MUPzxj)ppaIx_6lFuH=E1Xvz=u_M*d^B@f zdDa;QBu(UbO~bIDJMDPzrQ(b~*~(>V{k*AAYeINTF$ASJU%kNX3<3E~yC1rOlM42~ zbG_g8Scm4kug5M_8zkjb@v^87_94(6bnzrlvz_PJ%@=|5?m2eYzgo>VN^{ofx~!|` zodC#x6=Z8Qih1Ou-b?7$edo<}1y$*=;;bL_UO`v$w=(co+*L61O1@Q|If7={rQ~+V zt^sp$H^+SZe-7w|-ss`*S9TWlENXbc^}4BX@hTrP#0cX|F|98x giX@UqB01;ee`CXAVMBEAqW}N^07*qoM6N<$f_DILwg3PC literal 0 HcmV?d00001 diff --git a/Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Contents.json b/Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Contents.json new file mode 100644 index 0000000000..fcc01c2388 --- /dev/null +++ b/Images.xcassets/Chat List/Tabs/IconChatsHW.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Chats@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Chats@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Images.xcassets/Chat List/Tabs/IconContactsHW.imageset/Contacts@2x.png b/Images.xcassets/Chat List/Tabs/IconContactsHW.imageset/Contacts@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..eccfc5f4f9598ee2bd8ae290e705ed9ddca15e3c GIT binary patch literal 918 zcmV;H18Mw;P)@D}?9h2kT%UPAAnP$*t_ z39ZROQ{LWSmCb(}+Re)o=u5iK9@x(E2{4z-w3o{&_n6=_n|$FlkGT%OAir%$g(AZs z0M~iUYre3_XC}BujeB4P0d|bChrD831m<#_R~#D0b_h`62HDI)!Q!Rn0?oycjjWax zsZgxaSO|HUm9irhiWM$9L&wepsZfkLA#Zae{@}2r^0N8}zYP5(%AZijTi3|9)bT_d z`6OSbBu!Hb)U)mixlTP$OIjSgZHG>a!f5@G`GAzz!)5m$w>M<--+_MU*9lFR8GX&|S zO7bdUt>yzA+9I6o2dW?oJ}#7tWArgDA68uzAB2i6 zX4^^>c!if9;i4}}00vyW+}wryVjHjvef$!H2TrTF0%13hLh*|$k~k)wU$XeNz}S`~ z#X2!re$!zUWHnS&_=e;oTEsw#3^$$5(rI57woD208&VG`%Tx(F?&%z(iCtGyKX<)8 zqOSD2G!=Rx_Z_wtW~S(|Tw~!p;(jqBJS%&fe^%Uml`e0Y+l*4_#`KkplnpuJ4w>su z=~DyKQV%LN$){YJN;c0_iA}|_VCy4Bf@Km+@{mD?_K{(bhfHRbG5V|vu+xWMSkW&1 sMSm_i?h;{*pZsKv2zUSg$8gT#4`N-_&}Y2D;ElhVi-|yp}0_H5TfHE z%wQHGBryb6f;*w(LR?6eEz=4L5|L4HBRGpB7&p;`C>=GLIO78h!I2mw!QhMZaJ$p- z_U(G!+mGAW=PbKU)kh`guXAn{l&x$(vMptjF;26pRDdHSNbruvQUUHr0w=h}>e2!( znLYk<9yq}z7Kb0VnwJZ}f0e@i9$mmq@LTwCe|F*i9e&)!F5Lf0;ol+Q@-prZj9bsC z4BS)HhZD4dMxJD#ru_+xRD=t*mIp%Av_GJ>kT`W5<1)PrGR$qFv{2*vwT)RNtmCt^ zxgu(4A) zu|Tk6EKkldqZv1%hTUn9u_@cYlyBH6Hq6hWSD>9L+%9eS)`hWq`05MxD|;5^*s2}f zC5K(bCr$8B#`tz$xa}Ep3~5Gxl7A*Vu3f6t6A`tBje2Hi)kYkb;r3|LtU9Z_?6!jK z&MFbBwdvL^tH5Rq)68u)8Znks6|d>iZCYHR)mx;Q+e|g$yB=hkKHY@vX}eXLxy?i) z+A~dm`m6BzD6~_G{8NHJ2G!dbT*V?t0 zdV|+l$^Cl<1n~QXWA_UH2Y7F_-a0StmH_2o3jUl#f2TO-12EIKWPeslgxKq{JG3z4 zW_4{#LXEq`R>+F!vm#*`4=wJv2={SlaUa_pgjeY+2vi?eCBNJd;hvBT{>%<`=NY+= z-R$7AV@`#s$$jM#CaL+ zK4qAba``ZMiluy?yd!w444g3g;%a586m$Ho>SCo+lg0fxeqp0Zv6OeJ!u3^eET_0J z`%2fQAJ#SScBcP67S~PDqMagFDW^*@$6NGwl~1*kWTu=WOuCnOtGVV8FI|c`{?z3D zvccfs%s%B*FY_9CXK{*I+)Sj*q&A2N4pq?}JNue_@Wza42}9fF`|8@e$KUtW{wjN$ zc^aGzP+_I_ID21h{H)#MfI9(}a`xE&zB+!#_L0DvBKB_Mtns6ZUy1_z#jma(C_*zo z%Yh&#&tySiCxf1t8+lbQ*jH=}ezyO_t%AVbVr{N!r$1bewDaLF`8~H)e-%f#Cp>*# z7(=}fo|gAG67;#7%+}M)1$v3|h`U_mP*Nce^HGcXk;A}R4snsYJR(jn7ieaEF`jI0 zVo(V?z^1T0i9INN5PLAJ&y6>8k{(8xW|~oYILT(pR<^R0p8XFKQ=-29#ZK-30000< KMNUMnLSTYB#e5?G literal 0 HcmV?d00001 diff --git a/Images.xcassets/Chat List/Tabs/IconContactsHW.imageset/Contents.json b/Images.xcassets/Chat List/Tabs/IconContactsHW.imageset/Contents.json new file mode 100644 index 0000000000..2554b4ce50 --- /dev/null +++ b/Images.xcassets/Chat List/Tabs/IconContactsHW.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Contacts@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Contacts@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Contents.json b/Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Contents.json new file mode 100644 index 0000000000..9a15c71190 --- /dev/null +++ b/Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Settings@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Settings@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Settings@2x.png b/Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Settings@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f1e7a1f97baaba07e3efaba518786ffc2a2006fc GIT binary patch literal 1057 zcmV++1m63JP)yy?RlwIT+KX zS0i3L`432Y^-=>3=|NElIRz?+f?fnq{sp2SRKy<#4~4YbgX?DZz1^4O@m@=3PP=b+ zzB{|KvorJHKcNcVzW@~+IDq?;0xcjA4&XBBWI#tHXb`xMd+JH)dZxh&4c0>-$VC{XY(=y8*ejNaXF z>uq_^381HgvkabX4=`c$)xtr`#;}D*E^q-ra~BWVvuNGqCzmz}41`>gFg|Ahm^5x| z2)$Q6wikF8+1<|py-I;8H(-{1HK_`~W@OM!0IIUJ;)3*yN%JzyvWvVRN18M_E*vB7 z=mYYywIu_(0u{dMpa+3qE8~QGu4X-V!j5Z-TvAcNT-K$hAOmC_;&P5FW^&fL?0vVM zf}s#`X`cgiFKsB$>$&w5q+$V0`T7pR^h|1dE$4YgMMbn8FdmyBS!n zSg%Y#Pm@++bq?PgiI$J13^zCzlN&6w3pz#Y4*y1r7%eo$gYN~5<7q30>uCneaXsQ~ z^40Igxr)(>PY&b*E&a}O9hM)pL-ChLwlvuER?LOI6Ipmn4 z%GaW&6)oNgt3oUy5FC;+Zfw*9>dCO$lmg}v>@g@??o=_OQpHS2syIWDQu{K%G!3<8 znDMQ-^Q8E9yP(so9zD}qMQatM%Dhbfhn(quF?zkB6xrP$lZpyD++l)f<3nW`UDK=) zq?D~y6c_Jl*3l*HDDU}bx9@$TFWF*+DVDYO>4_VLg>*q9vLvwP2;y4t`YUSevdspc zS!Izt)7?~$Z24+d%XoCqv!trKb?%L4$uqPaO$Ib=dHY+yg`{-tcjS2o#;N`_@~HeL bKX(2Adm;>w&G)BP00000NkvXXu0mjfK#=ek literal 0 HcmV?d00001 diff --git a/Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Settings@3x.png b/Images.xcassets/Chat List/Tabs/IconSettingsHW.imageset/Settings@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..72fbd229884a7df49c5415f4d5b78dd9af61db83 GIT binary patch literal 1576 zcmV+@2G{wCP)h33*^*2#E;|36;9xRTLT? zjg29Ii4+tPD2P9yfkImf-OxOuA+C>vhC~YjyA{4_3kXImcqE9L7_$Ww@`Syw*voK# z=H8jRyLVaQOgDFazCC;9%sDd$e%Ufj>}25@q)rZUF9wDd@}+XXZ8UM!$iwuN1MsE= z*bjMu4E5!qy@nF`JbM_-myh<^s}uN^*?y;VV5h03i3>j3Yn8CQJU83F^IP%3&Tx+h zJR#02-muIXpV%=M{6d$n_R8gZ)MqXXN#5Z=3X!X?r~#_D#t<*aDCOH?`*J%B;Jajf zfWNWs``y6cBja2(jhKCGZ5Y6V3LL$<#u)!N+FpmVxkictEUVq&06z)|_iI>(@*t@vErV+w*6uIlscFcI@=~}M!sG`o6zB;N1t7P3p>mLdp=8S z2y4(#AZ!k}L0E|mk3OeW>TsT0JogA-I)%=ri{jR#g${Rm^oZ&jvKEFNZuF9{2D3%; z!)Aq*SdxCf9OR%Fv-t*XLc@#cIQEIX;PxfHxZ-TzvSt~Y5QoB6QE|7#!I5x%>k0yU z)h63RuWPjEj`^tY*0PTHI#3yxgx%Ge$8C_B5xzvq79ZCH!~JL(+;6rGg%bD-nX~s> z+SY@h#%#YdDeaN3~LlTd6TpC6bt~Y|8;Rr7zoZP=*`&vNdQr=B=jG z+fAD*b3BGjLvJ^krk6(GMUjq)j=YZvAK6X|OeDV7@f^aQdMhi}j@`vEf+QPM*_^r3 zJCK3%BGyahp5GT&(0RJ&P-DA+EPe1Z9t=0(*gmBWEw2WF?Q%_8+Q5A+2;hit94Hr>J*-Sv1&1Ed6jz-19H|UIx8f(WzkFwC@AYu z_71NKDf3Ak`rx551()WKQnDt(!M#)jw?Ez+XAaLw?NA+A#e)JWcakLp1?RX0Ic#$kC1ygAti@A%?T>8lZE?h am;V86zL&F2ojU>m0000 Bool { + let calendar = Calendar(identifier: .gregorian) + let now = calendar.dateComponents([.year, .month, .day], from: Date()) + let target = calendar.dateComponents([.year, .month, .day], from: Date(timeIntervalSince1970: 1540987200)) + return now.day == target.day && now.month == target.month && now.year == target.year +} public class ChatListController: TelegramController, KeyShortcutResponder, UIViewControllerPreviewingDelegate { private var validLayout: ContainerViewLayout? @@ -78,8 +85,16 @@ public class ChatListController: TelegramController, KeyShortcutResponder, UIVie self.titleView.title = NetworkStatusTitle(text: self.presentationData.strings.DialogList_Title, activity: false, hasProxy: false, connectsViaProxy: false, isPasscodeSet: false, isManuallyLocked: false) self.navigationItem.titleView = self.titleView self.tabBarItem.title = self.presentationData.strings.DialogList_Title - self.tabBarItem.image = tabImageNone - self.tabBarItem.selectedImage = tabImageNone + + let icon: UIImage? + if (useSpecialTabBarIcons()) { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconChatsHW") + } else { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconChats") + } + + self.tabBarItem.image = icon + self.tabBarItem.selectedImage = icon self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed)) self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationComposeIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.composePressed)) diff --git a/TelegramUI/ContactsController.swift b/TelegramUI/ContactsController.swift index a0f0c490f4..cad551de3a 100644 --- a/TelegramUI/ContactsController.swift +++ b/TelegramUI/ContactsController.swift @@ -34,8 +34,16 @@ public class ContactsController: ViewController { self.title = self.presentationData.strings.Contacts_Title self.tabBarItem.title = self.presentationData.strings.Contacts_Title - self.tabBarItem.image = UIImage(bundleImageName: "Chat List/Tabs/IconContacts") - self.tabBarItem.selectedImage = UIImage(bundleImageName: "Chat List/Tabs/IconContacts") + + let icon: UIImage? + if (useSpecialTabBarIcons()) { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconContactsHW") + } else { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconContacts") + } + + self.tabBarItem.image = icon + self.tabBarItem.selectedImage = icon self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil) self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationAddIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.addPressed)) diff --git a/TelegramUI/EditSettingsController.swift b/TelegramUI/EditSettingsController.swift index e9438fbe32..3b803bd987 100644 --- a/TelegramUI/EditSettingsController.swift +++ b/TelegramUI/EditSettingsController.swift @@ -385,9 +385,7 @@ func editSettingsController(account: Account, currentName: ItemListAvatarAndName actionsDisposable.dispose() } - let controller = ItemListController(account: account, state: signal, tabBarItem: (account.applicationContext as! TelegramApplicationContext).presentationData |> map { presentationData in - return ItemListControllerTabBarItem(title: presentationData.strings.EditProfile_Title, image: PresentationResourcesRootController.tabSettingsIcon(presentationData.theme), selectedImage: PresentationResourcesRootController.tabSettingsSelectedIcon(presentationData.theme)) - }) + let controller = ItemListController(account: account, state: signal, tabBarItem: nil) pushControllerImpl = { [weak controller] value in (controller?.navigationController as? NavigationController)?.pushViewController(value) } diff --git a/TelegramUI/PresentationResourcesRootController.swift b/TelegramUI/PresentationResourcesRootController.swift index a8d8e30045..f4d269f508 100644 --- a/TelegramUI/PresentationResourcesRootController.swift +++ b/TelegramUI/PresentationResourcesRootController.swift @@ -34,43 +34,7 @@ struct PresentationResourcesRootController { generateIndefiniteActivityIndicatorImage(color: theme.rootController.navigationBar.accentTextColor) }) } - - static func tabContactsIcon(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.rootTabContactsIcon.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat List/Tabs/IconContacts"), color: theme.rootController.tabBar.iconColor) - }) - } - - static func tabContactsSelectedIcon(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.rootTabContactsSelectedIcon.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat List/Tabs/IconContacts"), color: theme.rootController.tabBar.selectedIconColor) - }) - } - - static func tabChatsIcon(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.rootTabChatsIcon.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat List/Tabs/IconChats"), color: theme.rootController.tabBar.iconColor) - }) - } - - static func tabChatsSelectedIcon(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.rootTabChatsSelectedIcon.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat List/Tabs/IconChats"), color: theme.rootController.tabBar.selectedIconColor) - }) - } - - static func tabSettingsIcon(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.rootTabSettingsIcon.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat List/Tabs/IconSettings"), color: theme.rootController.tabBar.iconColor) - }) - } - - static func tabSettingsSelectedIcon(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.rootTabSettingsSelectedIcon.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat List/Tabs/IconSettings"), color: theme.rootController.tabBar.selectedIconColor) - }) - } - + static func navigationComposeIcon(_ theme: PresentationTheme) -> UIImage? { return theme.image(PresentationResourceKey.navigationComposeIcon.rawValue, { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat List/ComposeIcon"), color: theme.rootController.navigationBar.accentTextColor) diff --git a/TelegramUI/SettingsController.swift b/TelegramUI/SettingsController.swift index 4cc17f524a..3a646f3cb7 100644 --- a/TelegramUI/SettingsController.swift +++ b/TelegramUI/SettingsController.swift @@ -714,8 +714,15 @@ public func settingsController(account: Account, accountManager: AccountManager) actionsDisposable.dispose() } + let icon: UIImage? + if (useSpecialTabBarIcons()) { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconSettingsHW") + } else { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconSettings") + } + let controller = ItemListController(account: account, state: signal, tabBarItem: (account.applicationContext as! TelegramApplicationContext).presentationData |> map { presentationData in - return ItemListControllerTabBarItem(title: presentationData.strings.Settings_Title, image: PresentationResourcesRootController.tabSettingsIcon(presentationData.theme), selectedImage: PresentationResourcesRootController.tabSettingsSelectedIcon(presentationData.theme)) + return ItemListControllerTabBarItem(title: presentationData.strings.Settings_Title, image: icon, selectedImage: icon) }) pushControllerImpl = { [weak controller] value in (controller?.navigationController as? NavigationController)?.replaceAllButRootController(value, animated: true)