From 2b0bf554e4989e1b0a26736ee40038aec11bee46 Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Thu, 12 May 2016 22:47:32 +0300 Subject: [PATCH 01/11] added tabs component Former-commit-id: 1fd3f86e235db34dde4ed04bc5535027d4a4cdfc --- .../main/res/drawable-hdpi/icon_tab_chats.png | Bin 0 -> 401 bytes .../res/drawable-hdpi/icon_tab_contacts.png | Bin 0 -> 746 bytes .../res/drawable-hdpi/icon_tab_discovery.png | Bin 0 -> 891 bytes .../main/res/drawable-mdpi/icon_tab_chats.png | Bin 0 -> 307 bytes .../res/drawable-mdpi/icon_tab_contacts.png | Bin 0 -> 525 bytes .../res/drawable-mdpi/icon_tab_discovery.png | Bin 0 -> 617 bytes .../res/drawable-xhdpi/icon_tab_chats.png | Bin 0 -> 442 bytes .../res/drawable-xhdpi/icon_tab_contacts.png | Bin 0 -> 994 bytes .../res/drawable-xhdpi/icon_tab_discovery.png | Bin 0 -> 1226 bytes .../res/drawable-xxhdpi/icon_tab_chats.png | Bin 0 -> 613 bytes .../res/drawable-xxhdpi/icon_tab_contacts.png | Bin 0 -> 1394 bytes .../drawable-xxhdpi/icon_tab_discovery.png | Bin 0 -> 1512 bytes .../res/drawable-xxxhdpi/icon_tab_chats.png | Bin 0 -> 893 bytes .../drawable-xxxhdpi/icon_tab_contacts.png | Bin 0 -> 1892 bytes .../drawable-xxxhdpi/icon_tab_discovery.png | Bin 0 -> 2016 bytes src/syng_im/components/chats/chats_list.cljs | 20 ++++--- .../components/contact_list/contact_list.cljs | 4 +- .../components/discovery/discovery.cljs | 21 ++++---- src/syng_im/components/main-tabs.cljs | 30 +++++++++++ src/syng_im/components/tabs/styles.cljs | 49 ++++++++++++++++++ src/syng_im/components/tabs/tab.cljs | 20 +++++++ src/syng_im/components/tabs/tabs.cljs | 23 ++++++++ 22 files changed, 146 insertions(+), 21 deletions(-) create mode 100644 android/app/src/main/res/drawable-hdpi/icon_tab_chats.png create mode 100644 android/app/src/main/res/drawable-hdpi/icon_tab_contacts.png create mode 100644 android/app/src/main/res/drawable-hdpi/icon_tab_discovery.png create mode 100644 android/app/src/main/res/drawable-mdpi/icon_tab_chats.png create mode 100644 android/app/src/main/res/drawable-mdpi/icon_tab_contacts.png create mode 100644 android/app/src/main/res/drawable-mdpi/icon_tab_discovery.png create mode 100644 android/app/src/main/res/drawable-xhdpi/icon_tab_chats.png create mode 100644 android/app/src/main/res/drawable-xhdpi/icon_tab_contacts.png create mode 100644 android/app/src/main/res/drawable-xhdpi/icon_tab_discovery.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/icon_tab_chats.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/icon_tab_contacts.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/icon_tab_discovery.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/icon_tab_chats.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/icon_tab_contacts.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/icon_tab_discovery.png create mode 100644 src/syng_im/components/main-tabs.cljs create mode 100644 src/syng_im/components/tabs/styles.cljs create mode 100644 src/syng_im/components/tabs/tab.cljs create mode 100644 src/syng_im/components/tabs/tabs.cljs diff --git a/android/app/src/main/res/drawable-hdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-hdpi/icon_tab_chats.png new file mode 100644 index 0000000000000000000000000000000000000000..c6792ef46c8aa0bb341a471c797c88a343dcdd9d GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSc;uILpXq-h9ji|$mcBZh%9Dc z5IGFOjG_g;PC!A)64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&`8-`5 zLn2z=Uh~a5`*KDr`{{vB`yIe~d%^hW8 zINDw=V_V%DFXovp_Ss2nW=%``AHk{n#QZf(1Rk0-yRJ6TE|W{}o5}bufniZ&_Q6y} z6;X#EMitXtr2(21d*qove5^ch>tCA7g&eD-ogJNv6&aSUtfz(GJ*W*O482b_>(mPqs@}zWRG9WX-2qedFgVO|+%v zSBmG~^qtVX=eGgdgb)T#RtPcSBWKEn7j5wozyEC7bNTWFpdUe-HVDK?`y85}Sb4q9e09-wsUjP6A literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-hdpi/icon_tab_contacts.png b/android/app/src/main/res/drawable-hdpi/icon_tab_contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..44ef070f465c57050e984a1d16bb6a9d2862fb09 GIT binary patch literal 746 zcmV?SXyz*1rVT&b-}gQdcL ztlc`+PF-_-UVr$NMC*tr1g$q!EV~qAOv`!v|7D*vk)|x|SUkMj%h1hkZlo=o)Y;GD z)|>pS`E37a@bSxGq^=)Y=zh-O(b!dN>*5~nqzr?7hQYor#%?>j`+N|3t%aJhd^W}O zcsi8K-`JKgJ)S0?O|?(x!JS?t&d1FOBCQ;46S@_nYsbwIO6YrxCK)$JD4|bZ57D?= zFQD4W(KeydPMwwY8lE5B%JY?#^%|v}dZ_r&WnV12eA}u2lYOX4$bYk%>+`;N5IT7b zszy{dle|L|M0L|NjjVQBB%oZmukx34p8x;=07*qoM6N<$g8zA3B>(^b literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-hdpi/icon_tab_discovery.png b/android/app/src/main/res/drawable-hdpi/icon_tab_discovery.png new file mode 100644 index 0000000000000000000000000000000000000000..1166cab6f6c310a4665ce573ccdddd14daccf27f GIT binary patch literal 891 zcmV->1BCpEP)y&9LdK$vW)%pHuhO1`<(`M|ZK(8}gzuZHpgfRVPy zJaDYSH)fZTtPit0@Mv7#>VOOYjA&fmn%#ltNulsnG10bRY6M|2d{s=;y}BE+rBq>@ z2){ZeV}TiO?q;8*hj^_UGWND5z+CiRy3V`=A{vdS3e)#OkkHz-rWtAuw6Kv0s2-&R z_uIkKF$oCuDToeuF&tFj@A2UC_Y1extJ6xl$MO`eY!4ndIh^UOJkfRI$oSs)iLr0`q zJ|o0Xzt>Sl(;0;e!5$(COL$1GToVm?9m`}&6&PZ<9{>zW&Sf4m98?_3oEC+L3xK%} z<%KGcIb==<|Ij9Rsg?t~Ce)|YP3=Y)Yz~<)%sB}_R-{gJ;Q8J$82FPdL(|27AOKkz z677NU-fa#0|D)-QOsRsiqK?yI1({N%Ss6g0Jz1;jyQ)X2!sXWC@A2U1@ub^^)y?zb>#fPI2h@U$uQD6e=u%+RVTDPgIkq+a{!Jz zpmVH}Z_a+Cezdu+&Ihhl_{Q4WQ;c+@Q!DVlTsBzwXRc%H{4*C;cG`WV_ZO`gO91aL RA^rdW002ovPDHLkV1n=?iQ)hN literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-mdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-mdpi/icon_tab_chats.png new file mode 100644 index 0000000000000000000000000000000000000000..8d9d11dbb0dc1aa8bd8de78e46dc9df29ce93bd7 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4qAg>%FLq!S`Gd_1Dw=Dxnp*rw|1?8L{N z{wdvu8Ilj4N&lbuq=JpD?coF;cU_6C4Nf2CC#pv!e&4^*-gi~wtTKh44ZqryBORm< pOG*F%SDIb!kN^Menb#UHJk_0$e9&a)Q=r=!JYD@<);T3K0RTA_ZY2N! literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-mdpi/icon_tab_contacts.png b/android/app/src/main/res/drawable-mdpi/icon_tab_contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..ba6be3d17f46bd8fb9c02a0398b08db720c254eb GIT binary patch literal 525 zcmV+o0`mQdP)DC6&g&MrxM>@nhi3rsfZ*@4DMd*8u=6Hb$*JKyT=Ymg=eu{OWWET7-PX(#Z`R>}n`gyFwF1 zWRT0m=HN4F5rSMMCR#2wn6>4vIcbBS5*oDFc&VJUL9IT3GvNzyXTnjd4}=E7Q`8%J zC{?@59#gTw%;fH|FH^dp(1-l%4vfSaj`lPh8X6K?^QE1>i&x9R%bNqMGxcSV^XvBF z1OXiHZ{jQ~_XggZHX6;*k2&8Kous2ua8d35U9^X%p)};TTHhfznj^gTrYjk88^Ql! zKQV=am?6QzK}tEpx~30=G!Ko P00000NkvXXu0mjfUANnr literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-mdpi/icon_tab_discovery.png b/android/app/src/main/res/drawable-mdpi/icon_tab_discovery.png new file mode 100644 index 0000000000000000000000000000000000000000..6b726371f7e244f75a97edb3d9b185b9298003b3 GIT binary patch literal 617 zcmV-v0+#)WP)|WK~zYIy_UaD8$l3p_49sdULy zk2cZP1K!oH-(b{NpkNWcPZROWha1_ms8K~9_G;b^M%AYf2Pj}veXr*2M2({eLeJ~i zQ({9S{@Yo%<<`4CvLktP-e{`D53|+=U%X$Pm)U|n0IAlKfSoMy;^dB zqHWiDKFRCs{Fwd98>_4P6xF}-pNta7r4kd@E?a$zz9}io4wjePJ82ox(}tUlH3C%F zxMEpNPxk&-yN@5=Cqty62)be{E1A0&tfvh>uX}ty@7mM>P8{ID2o@LSIK8;#%F|r7 z`rLH%BRn6`c=ke5!LTsZ8H)o_IoM9O6+oAl6`(mo^=6k$6~bnBw24OiGK^28DbR>t z9!|GW9UN|C&qQSRiHB$r*^N%MXCImWf9OY<#c#`BAo|FT_xb#{00000NkvXXu0mjf DFQpAT literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-xhdpi/icon_tab_chats.png new file mode 100644 index 0000000000000000000000000000000000000000..7c188096adab636ad2e38f2c3da23031d45f2f72 GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}?=AJH& zAsLNtXBzq)b`WsAFC`N6ps9%|>Rp0)%t6`o1+1K%Qc+7ftjZUB)|_L##FvYUE7)S% zg-Zf1ISI@s&PfT1|`2MGwW8>FtdAqNb?(6)e$j5bN z`fB;LrE~LzM1Ur($~#{fTK#F!8{7LT65yN)&?8N)JcQFL^u z$oN!Y47dlxLI|`KD!{~p-%^tb3cCUXWNfOVSll~LL+cz{@4Wz-QR9d;x^5hd;Hmddt7Mba*o z>wGfdlJ1XjHW}gEHxU3{y{)lPtdU!-P%L>i-KAvw_y6?pafc(o@KBtQOcxPXzBs1l zDYFY(%rBL(;uLUgOd>$`mu@chb{;q`;tIe1e2T%IPNwHJt%z_e%)#(b{LtX{a)*AM5dspctaxfuxWb%Mr%NTOXs6}-y0>F=pdPJ ziAN89C*^9LV#%Xe+F^OU%0FvWqly$*zz=;WvephmqmzC3q(uIW|Kn+(LjL!^6+U3kK~!jg-I~u&8%Gq!zi+&2Ao!5T753Uh6svzilM_-8s8{eM z97=LYf)t6il0m3P)UyRh4V5CHBvR8{!Ueci9FRDLO8o~~C<^x4s8%=_Fy3We54(1- zW93G454%Y_Ey~_6+ zC7vbbIRGIqlQy8pL}|5`7SazQ$8K(PY{0}S0)y}MM-up%fT$;#Enpxgfcb-4+VeN} zaPH(DM+W@x;$2KJl{El&{EBqQj;WZ*rw?yuTXk${z|6DUT^76sKx>yehv+0Jx%edd zwpl09>|$y~pOk{PaP{H=K$C*EQY-povrd-vRVvj!$s5wLfgPfa`kXo{(< zO{^kt@y8ki2H)$CaCKXy7w*^^t5id1?p40uIF)~Q>LJxG7|5x8;;YINyXpa>#Iv8e zcmN?464*;Q{LSq1+SZ%A(X#@dU zSVbZd#Bfx_&Hey>+3=J_g9VKPcuA?ncYWL+_z&*$`IhvkgrNaTY$6)O&_ED9Dpjxl z_0K7O+dT3*{0SYOf1${bI!Y|tBK~G5fMNUJO+qE)Ni86bafU@K0XHXtjMxwqkxaU&da}z+S$LqoSjiZY`0ZZABD~ zP3{kzz+*C3AOB|tWBoo@%t)>1Yha9f8Rf^ZFpiGTEy4LR z^n&603F`>L`qGq^w9f;)0gxvHyyo+MA<652eI_=_ybhq)6(!y%mQCIOYy+03;{_&4 zcUO~hm?&K-h*VPvwU-tc$aPPaGZ@IJy|hqiR}Dx%h#U)GzB{sAK7%6P=U-;6aIFj7 o7rC~d8q{-bKlW%uH$S)eA5^*kJhc&9-2eap07*qoM6N<$f;qM*;{X5v literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-xxhdpi/icon_tab_chats.png new file mode 100644 index 0000000000000000000000000000000000000000..82dbb8ff905cd315118d659e4bdb04c99ca8a264 GIT binary patch literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!EX7WqAsj$Z!;#Vf4nJ zXtsecqtcuEJwQRp64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&A9=bs zhE&XXduOj#vZGAfNA*Zi&&^`dtYSJkOqsz;zF7rDMnqI{R^ z&`O;mo_kNvsy$;W<{Zsg`^FkaBkEWsRpprAc`&g}Ph z{mZ^a%rvRAEsm*7_pOOM`pR^FHT%wVg^7(WY(kPADYzM1KHp@PcG!P;QT2}V@8fqf z+_ASY-dUYwGI#Tu7jw#s&#&)(l3c&7&cMR%!HT`%zkaWYFxXT3?Ed~~-_KxOiSmaFl>DqHsaDZaJu z2fy^GZ7s$t>MTAaE~t8RpuOQ$H?z=+dlmw$Mtm%dJ)76DoUoX^m(l3lZL@}+;A>nb fEEdi>*7=?3oHgTe~DWM4fPk{Ek literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tab_contacts.png b/android/app/src/main/res/drawable-xxhdpi/icon_tab_contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..01e00d5632bdda3781c0c7b7594cc9d04b54812d GIT binary patch literal 1394 zcmV-&1&#WNP)KOa9Z#6SqI8UjhArmcvIIlK2uoP9#8bBnkvcFjhb&}hJ4Wh+1Ve^4Dg|nZsHjacAQNzTg#Zo@U;Dbl^(Ahw zu_@==YwG(+2=V&;-|wD#&$<6Gzbl##u3Un`qcId|4o6UCvJn9G~jb{B)QV*w0X~&raVVZF6Mxq zk)dG1yu|L|$jPP?!wIgt50;yOSN#8HtCNxhE((lwjw9zN9-v2HEC3yH(=9Mo#}2va zas(Yumj@f4tpb&T_C_yljb7RsytFm?09ag0u(+u@b&=;zv zHx$4vj{f}GB|q0L`2k4jFcH~dG7=|cgD1-cwbpz2`erRH^~EjN-2(c%s_DG!=Z7a- zENy6tGyFF>&YwDNbW{-@Xee4vHZApD!UGN5=%`YVS$-@N)LQRl;CgM&OR8Ah0tT)Z zKl)@~i6FOtuWp`BPIjzsB*iKQOJ1fgR86bIv))qgr7u)1E#7e`7Zj)z^o9b`QZK7OIbWKxIrby{VY}F_i6yMXCjKrnKos7gS zDWq94i%mp!q}FkkH#8<9JJRAEhb4kiI{f%#OUk8|(&2kav5LX6b3(m=N&E#R@*C^U`$Q zP1AV~O|>4*`A>Fk-tOzHZY5cLlVtTxioZ8C{(N;r=}w_7ioh2Dj`8KbCD+K#ZrR!zI~-pllZ>QizRt)YLF&q z_dw_2_-hhL%l7~dNhH%e9DmL3fxHtX^(Gx%)p#_yiEe`EQi_J$5 z7@OE+eLE#PbY9lCQ;bb)Dk=UeDR(?u*yoSvzSMF@F03ebD60qQI{fy0kC~TyXTD$- zL*f67={hC9_jL?0fzjl{Avd#*pyQbp7%gHPax)_^T2dtK&ZGoM0@EVXTxi(tY)X*f zk)hyVs^velT-jXyRoZW@WY0>qL z!Y#Vsa3u8r-%%d3TN2|~d)}7=dAi`4IBf#qA1b)i9}_s)Y5)KL07*qoM6N<$g3dgO Ab^rhX literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tab_discovery.png b/android/app/src/main/res/drawable-xxhdpi/icon_tab_discovery.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc25d2ab39a7f287dcf68a96cd9da448a46e376 GIT binary patch literal 1512 zcmVP)sFTo&mX-(}ioxcTTv}RC z4AP6_)Sl)LXz4CZ4c?G7Ly(d2FkkFfU^q9Ql!D%==AX3 znsMEKv-{@l?7ANqSl6BRe(%fg_vZckO~`Q^bP`Y4qrfm=$m>eMXMku+{1eibwG6`H#UWs5I_z@x2 zW6Lyhsw+?`P&{FWfN9_x;2mWJS4R?<1r{ySP}V4A0>u;dhrqYMbtMJX&N?t-nZ_?F z3aeY7c*1@km;*jhVUR*rf%}$e{8>*SH479^*kRxya1RL8V}y@5z&!B4GL7R}3aCk- zc*1@YSOCUrsk8yC0Cz0Y_}A-=o&}00?011>;F{OU8q9Oxwq+WBd$}p><;U@a{V}jc z^N9n(<~7-ds;OF_c)~Ujt{U@bSdfSTE3z$BQB{aZ)mMOy+HDIIN5Hsc8b4L~VMT#t zpR-1DdrmPjzz3E3q_QCdd zgm9VRYAUUK8_dlVjTERbTn781#JasLH*M}@eXig|c!~jVPBLi=6bL7IA zaPi7v&f&qMG{^q#oL}!m93;@j&5;YdceShTa<+D}ev1Pz97dd~&_Xx_1HDltW%=Cy z*4^QGoKp%-9W=-g(}F7R0Z8fdAi{`4lD?y=|H&L2kvTY0QdSjg zhY_boeMi+3OsDq%wibc9A|Z?(H6Em~{{bnG?;$qO8!bC4_kzYJ80ZSIp?)>tb(nLo z_w;*^?*ggnpfycU-PoOooebYlF+n}dIc)7_`R%X&6j@a@8~HWqf2co2peR=_NBH{F z%bxDZ92}9_$&yOv*xbot@8xuR4!{e`G~UjyC@ukC_)$xx$NRA(=2n|hkkn3A=QyVv zO8~wLRM`LI!zGo@v6;@YwVTy7@$||mfu10?I+X8h#4dL5Ecvq0;o_BjgeIr9o*x09 zHO{6$@q=X=pTp^$)uqPR5=c(8a0~Ppv2lOiNg}iWTms3{46}`}C}7OG6Y~n!gBH=a zM;1WV5gMFuN+5Z%YDT9;0b`~xTk*__qCBIws?DU}uv#ojvDA|5eZsh8|F4DXS zb{T}{R3#3y)50s_d2e1;aD(O=0<0jOR-VLx8U%uqr`sgrWhOx$aXSbbCu@1@0<>Rl zQjzxSaVntfe2_F~47fvMRwk3O?lD#3K>HP46=}cZtpdIaR7kVECh&iY%M+;K@21)S O0000_ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tab_chats.png new file mode 100644 index 0000000000000000000000000000000000000000..c434e665881c13c152957e2ded26dcd57626d22e GIT binary patch literal 893 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf4nJ zn8$)Jqhx~{kij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6axd(FHaZ8 zkcv5P@9fW(DwH|)@p!kIAg9yHW>x#PT`3%m9t$Q%GB2!mn;X0<#b zO!-=sxKx|Fz3T+noey?NEH03}f4+PCvr;{Mk0R&oZ6E&yr!ybm zY_Mgh^q67AaE?JH^wiJpBM)DmWow9M*mURhENfea+hTHcpSJ#ak;*tHqGHEej^p!K z?|z>7N$fY*v$;$YG#O@+OhjJ#av;X6GfA=cY7AGlelSDB>f46vb|;(MaxST!ymQ|F zkVhZB95XZGaLCkdZoVtJWKw5(zodUo$m`lG=h#2|UQ{^${f}L0Oezd}Zr3-S{i^DJ ze7m0ek3WC6KQ|Zr{`0cLPacijRGWAkhMaZ!3%5+2Is4~j7QP9m)e1N4e)M|}(8MR3 z-pM-xO;IaoNK$-Taej{4RG)<98{Smi@k^|H_VcLIEW7)@4;WVOymIFGx~F2jGLMg( z-r8yl66>#D)moZ&=lSl7;)a_JFs{oxzHpxO_n&!8>^t7ERWRSJRz7a=u_!n3e7UfN z!(!Vb6_5UFpR7n)d~;v1?Yf)$W>?lNwp{|2+-~l;_1^c|I3V#QM)lq2yAnSI*3IR= zuuG=WZeOXT)7u&Y^Uup8D?Wcays^{q>^FhK)za%fcSmfPBcE3L`{wcM^7S?L?w!AD z)Q`<;v+Mf(_|Xl!zG*jKbW4yPC3ticl!`RG_F=53V(1f5sFG!fXUGW$rjmyLACCQt z(A;ljRuEXMeIUPKTK=IP#w|6$X&eil&VFJHP;-|?QNZ~N-60J92%r>mdK II;Vst06lhy2><{9 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tab_contacts.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tab_contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..faa0af93ceadb6a393102d65ca9e58e793929f7e GIT binary patch literal 1892 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 Date: Thu, 12 May 2016 23:46:17 +0300 Subject: [PATCH 02/11] fixed discovery tag navigation Former-commit-id: 897ee3dcd672dd64c339155e2c009b5767a0b474 --- .../components/discovery/discovery.cljs | 3 +- .../discovery/discovery_popular.cljs | 4 +- .../discovery/discovery_popular_list.cljs | 4 +- .../components/discovery/discovery_tag.cljs | 38 +++---- .../components/discovery/handlers.cljs | 4 +- src/syng_im/components/discovery/styles.cljs | 101 +++++++++--------- 6 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/syng_im/components/discovery/discovery.cljs b/src/syng_im/components/discovery/discovery.cljs index 8d6ea4ad4d..3cc2e65373 100644 --- a/src/syng_im/components/discovery/discovery.cljs +++ b/src/syng_im/components/discovery/discovery.cljs @@ -61,7 +61,6 @@ :style {:width 16 :height 12}} :handler create-fake-discovery} - :title "Add Participants" :custom-content [title-content @showSearch] :action {:image {:source {:uri "icon_search"} :style {:width 17 @@ -73,7 +72,7 @@ [scroll-view {:style {}} [view {:style st/section-spacing} [text {:style st/discovery-subtitle} "Popular tags"]] - [discovery-popular navigator] + [discovery-popular] [view {:style st/section-spacing} [text {:style st/discovery-subtitle} "Recent"]] [discovery-recent]] diff --git a/src/syng_im/components/discovery/discovery_popular.cljs b/src/syng_im/components/discovery/discovery_popular.cljs index df33467899..a829a7ae12 100644 --- a/src/syng_im/components/discovery/discovery_popular.cljs +++ b/src/syng_im/components/discovery/discovery_popular.cljs @@ -12,12 +12,12 @@ (defn page-width [] (.-width (.get (.. js/React -Dimensions) "window"))) -(defn discovery-popular [navigator] +(defn discovery-popular [] (let [popular-tags (subscribe [:get-popular-tags 3])] (log/debug "Got popular tags: " @popular-tags) (if (> (count @popular-tags) 0) [carousel {:pageStyle st/carousel-page-style :sneak 20} (for [tag @popular-tags] - (discovery-popular-list (.-name tag) (.-count tag) navigator))] + (discovery-popular-list (.-name tag) (.-count tag)))] [text "None"]))) \ No newline at end of file diff --git a/src/syng_im/components/discovery/discovery_popular_list.cljs b/src/syng_im/components/discovery/discovery_popular_list.cljs index 0291a1bb82..428e647d8f 100644 --- a/src/syng_im/components/discovery/discovery_popular_list.cljs +++ b/src/syng_im/components/discovery/discovery_popular_list.cljs @@ -26,12 +26,12 @@ :key rowID}])] elem)) -(defn discovery-popular-list [tag count navigator] +(defn discovery-popular-list [tag count] (let [discoveries (subscribe [:get-discoveries-by-tag tag 3])] [view {:style st/popular-list-container} [view st/row [view st/tag-name-container - [touchable-highlight {:onPress #(dispatch [:show-discovery-tag tag navigator :push])} + [touchable-highlight {:onPress #(dispatch [:show-discovery-tag tag])} [text {:style st/tag-name} (str " #" (name tag))]]] [view {:style st/tag-count-container} diff --git a/src/syng_im/components/discovery/discovery_tag.cljs b/src/syng_im/components/discovery/discovery_tag.cljs index f8a7fa88a8..cf6d76ffa7 100644 --- a/src/syng_im/components/discovery/discovery_tag.cljs +++ b/src/syng_im/components/discovery/discovery_tag.cljs @@ -19,8 +19,7 @@ (if row (let [elem (discovery-popular-list-item row)] elem) - (r/as-element [text "null"]) - )) + (r/as-element [text "null"]))) (defn render-separator [sectionID, rowID, adjacentRowHighlighted] (let [elem (r/as-element [view {:style st/row-separator @@ -29,8 +28,9 @@ (defn title-content [tag] [view {:style st/tag-title-container} - [text {:style st/tag-title} - (str " #" tag)]]) + [view {:style st/tag-container} + [text {:style st/tag-title} + (str " #" tag)]]]) (defn discovery-tag [{:keys [tag navigator]}] (let [tag (subscribe [:get-current-tag]) @@ -39,21 +39,17 @@ (fn [] (let [items @discoveries datasource (to-realm-datasource items)] - [view {:style st/discovery-tag-container} - [toolbar {:navigator navigator - :nav-action {:image {:source {:uri "icon_back"} - :style st/icon-back} - :handler (fn [] (nav-pop navigator))} - :title "Add Participants" - :content (title-content @tag) - :action {:image {:source {:uri "icon_search"} - :style st/icon-search} - :handler (fn [] - ())}}] + [view {:style st/discovery-tag-container} + [toolbar {:navigator navigator + :custom-content [title-content @tag] + :action {:image {:source {:uri "icon_search"} + :style st/icon-search} + :handler (fn [] + ())}}] - [list-view {:dataSource datasource - :enableEmptySections true - :renderRow render-row - :renderSeparator render-separator - :style st/recent-list}] - ])))) \ No newline at end of file + [list-view {:dataSource datasource + :enableEmptySections true + :renderRow render-row + :renderSeparator render-separator + :style st/recent-list}] + ])))) \ No newline at end of file diff --git a/src/syng_im/components/discovery/handlers.cljs b/src/syng_im/components/discovery/handlers.cljs index 44d24c99d9..0139316849 100644 --- a/src/syng_im/components/discovery/handlers.cljs +++ b/src/syng_im/components/discovery/handlers.cljs @@ -37,8 +37,8 @@ db))) (register-handler :show-discovery-tag - (fn [db [action tag navigator nav-type]] + (fn [db [action tag]] (log/debug action "setting current tag: " tag) (let [db (set-current-tag db tag)] - (dispatch [:navigate-to navigator {:view-id :discovery-tag} nav-type]) + (dispatch [:navigate-to :discovery-tag]) db))) \ No newline at end of file diff --git a/src/syng_im/components/discovery/styles.cljs b/src/syng_im/components/discovery/styles.cljs index 0044f86c94..465d3a25ba 100644 --- a/src/syng_im/components/discovery/styles.cljs +++ b/src/syng_im/components/discovery/styles.cljs @@ -39,14 +39,14 @@ (def discovery-title {:color "#000000de" - :alignSelf "center" + :alignSelf "center" :textAlign "center" :fontFamily "sans-serif" :fontSize 16}) (def discovery-toolbar {:backgroundColor "#eef2f5" - :elevation 0}) + :elevation 0}) (def discovery-subtitle {:color "#8f838c93" @@ -71,86 +71,86 @@ ;; discovery_populat_list.cljs (def tag-name - {:color "#7099e6" - :fontFamily "sans-serif-medium" - :fontSize 14 - :paddingRight 5 - :paddingBottom 2 - :alignItems "center" + {:color "#7099e6" + :fontFamily "sans-serif-medium" + :fontSize 14 + :paddingRight 5 + :paddingBottom 2 + :alignItems "center" :justifyContent "center"}) (def tag-name-container - {:flexDirection "column" + {:flexDirection "column" :backgroundColor "#eef2f5" - :borderRadius 5 - :padding 4}) + :borderRadius 5 + :padding 4}) (def tag-count - {:color "#838c93" - :fontFamily "sans-serif" - :fontSize 12 - :paddingRight 5 - :paddingBottom 2 - :alignItems "center" + {:color "#838c93" + :fontFamily "sans-serif" + :fontSize 12 + :paddingRight 5 + :paddingBottom 2 + :alignItems "center" :justifyContent "center"}) (def tag-count-container - {:flex 0.2 + {:flex 0.2 :flexDirection "column" - :alignItems "flex-end" - :paddingTop 10 - :paddingRight 9}) + :alignItems "flex-end" + :paddingTop 10 + :paddingRight 9}) (def popular-list-container - {:flex 1 + {:flex 1 :backgroundColor "white" - :paddingLeft 10 - :paddingTop 16}) + :paddingLeft 10 + :paddingTop 16}) (def popular-list {:backgroundColor "white" - :paddingTop 13}) + :paddingTop 13}) ;; discover_popular_list_item.cjls (def popular-list-item {:flexDirection "row" - :paddingTop 10 + :paddingTop 10 :paddingBottom 10}) (def popular-list-item-status - {:color "black" + {:color "black" :fontFamily "sans-serif" :lineHeight 22 - :fontSize 14}) + :fontSize 14}) (def popular-list-item-name - {:color "black" + {:color "black" :fontFamily "sans-serif-medium" - :fontSize 14 + :fontSize 14 :lineHeight 24}) (def popular-list-item-name-container - {:flex 0.8 + {:flex 0.8 :flexDirection "column"}) (def popular-list-item-avatar-container - {:flex 0.2 + {:flex 0.2 :flexDirection "column" - :alignItems "center" - :paddingTop 5}) + :alignItems "center" + :paddingTop 5}) (def popular-list-item-avatar - {:resizeMode "contain" + {:resizeMode "contain" :borderRadius 150 - :width 40 - :height 40}) + :width 40 + :height 40}) ;; discovery_recent (def recent-list {:backgroundColor "white" - :paddingLeft 15}) + :paddingLeft 15}) ;; discovery_tag @@ -158,22 +158,27 @@ {:flex 1 :backgroundColor "#eef2f5"}) +(def tag-title-container + {:flex 1 + :alignItems "center" + :justifyContent "center"}) + (def tag-title - {:color "#7099e6" - :fontFamily "sans-serif-medium" - :fontSize 14 - :paddingRight 5 + {:color "#7099e6" + :fontFamily "sans-serif-medium" + :fontSize 14 + :paddingRight 5 :paddingBottom 2}) -(def tag-title-container +(def tag-container {:backgroundColor "#eef2f5" - :flexWrap :wrap - :borderRadius 5 - :padding 4}) + :flexWrap :wrap + :borderRadius 5 + :padding 4}) (def icon-back - {:width 8 - :height 14}) + {:width 8 + :height 14}) (def icon-search {:width 17 From a03b1a03575a6da6cec68cb705d1a1d89465ea78 Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Tue, 17 May 2016 17:03:21 +0300 Subject: [PATCH 03/11] use the new defview Former-commit-id: dfc772d0cd61f60a245b8c1c624228fae2a5eac9 --- src/syng_im/chats_list/screen.cljs | 8 ++++-- src/syng_im/components/main-tabs.cljs | 40 +++++++++++++-------------- src/syng_im/components/tabs/tab.cljs | 15 +++++----- src/syng_im/components/tabs/tabs.cljs | 15 +++++----- src/syng_im/contacts/screen.cljs | 4 ++- src/syng_im/discovery/screen.cljs | 4 ++- 6 files changed, 46 insertions(+), 40 deletions(-) diff --git a/src/syng_im/chats_list/screen.cljs b/src/syng_im/chats_list/screen.cljs index 55c4457540..023422efe4 100644 --- a/src/syng_im/chats_list/screen.cljs +++ b/src/syng_im/chats_list/screen.cljs @@ -14,6 +14,7 @@ [syng-im.components.drawer.view :refer [drawer-view open-drawer]] [syng-im.components.styles :refer [color-blue]] [syng-im.components.toolbar :refer [toolbar]] + [syng-im.components.main-tabs :refer [main-tabs]] [syng-im.components.icons.ionicons :refer [icon]] [syng-im.chats-list.styles :as st])) @@ -37,7 +38,9 @@ :renderRow (fn [row _ _] (list-item [chat-list-item row])) :style st/list-container}] - [action-button {:buttonColor color-blue} + [action-button {:buttonColor color-blue + :offsetY 72 + :offsetX 16} [action-button-item {:title "New Chat" :buttonColor :#9b59b6 @@ -49,4 +52,5 @@ :buttonColor :#1abc9c :onPress #(dispatch [:show-group-new])} [icon {:name :person-stalker - :style st/person-stalker-icon}]]]]]))) + :style st/person-stalker-icon}]]] + [main-tabs]]]))) diff --git a/src/syng_im/components/main-tabs.cljs b/src/syng_im/components/main-tabs.cljs index 479ba57511..7116b6a3fe 100644 --- a/src/syng_im/components/main-tabs.cljs +++ b/src/syng_im/components/main-tabs.cljs @@ -1,4 +1,5 @@ (ns syng-im.components.main-tabs + (:require-macros [syng-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] [syng-im.components.react :refer [view text-input @@ -8,23 +9,22 @@ [syng-im.components.tabs.tabs :refer [tabs]] [syng-im.utils.logging :as log])) -(defn main-tabs [] - (let [view-id (subscribe [:view-id])] - (fn [] - [tabs {:selected-index (case @view-id - :chat-list 0 - :discovery 1 - :contact-list 2 - 0) - :tab-list [{:handler #(dispatch [:navigate-to - :chat-list]) - :title "Chats" - :icon "icon_tab_chats"} - {:handler #(dispatch [:navigate-to - :discovery]) - :title "Discover" - :icon "icon_tab_discovery"} - {:handler #(dispatch [:navigate-to - :contact-list]) - :title "Contacts" - :icon "icon_tab_contacts"}]}]))) +(defview main-tabs [] + [view-id [:get :view-id]] + [tabs {:selected-index (case view-id + :chat-list 0 + :discovery 1 + :contact-list 2 + 0) + :tab-list [{:handler #(dispatch [:navigate-to + :chat-list]) + :title "Chats" + :icon "icon_tab_chats"} + {:handler #(dispatch [:navigate-to + :discovery]) + :title "Discover" + :icon "icon_tab_discovery"} + {:handler #(dispatch [:navigate-to + :contact-list]) + :title "Contacts" + :icon "icon_tab_contacts"}]}]) diff --git a/src/syng_im/components/tabs/tab.cljs b/src/syng_im/components/tabs/tab.cljs index af9aeab37c..bdc4043a13 100644 --- a/src/syng_im/components/tabs/tab.cljs +++ b/src/syng_im/components/tabs/tab.cljs @@ -1,4 +1,5 @@ (ns syng-im.components.tabs.tab + (:require-macros [syng-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] [syng-im.components.react :refer [view text-input @@ -8,13 +9,11 @@ [reagent.core :as r] [syng-im.components.tabs.styles :as st])) -(defn tab [{:keys [handler title icon selected-index index]}] - (fn [{:keys [handler title icon selected-index index]}] - [touchable-highlight {:style st/tab - :onPress #(do (reset! selected-index index) - (handler))} - [view {:style st/tab-container} +(defview tab [{:keys [handler title icon selected-index index]}] + [touchable-highlight {:style st/tab + :onPress handler} + [view {:style st/tab-container} [image {:source {:uri icon} :style st/tab-icon}] - (when (= @selected-index index) - [text {:style st/tab-title} title])]])) + (when (= selected-index index) + [text {:style st/tab-title} title])]]) diff --git a/src/syng_im/components/tabs/tabs.cljs b/src/syng_im/components/tabs/tabs.cljs index d9fd94be55..257cd60260 100644 --- a/src/syng_im/components/tabs/tabs.cljs +++ b/src/syng_im/components/tabs/tabs.cljs @@ -1,4 +1,5 @@ (ns syng-im.components.tabs.tabs + (:require-macros [syng-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] [syng-im.components.react :refer [view text-input @@ -10,14 +11,12 @@ [syng-im.components.tabs.tab :refer [tab]])) (defn create-tab [index data selected-index] - (let [data (merge data {:key index - :index index + (let [data (merge data {:key index + :index index :selected-index selected-index})] [tab data])) -(defn tabs [{:keys [style tab-list selected-index]}] - (let [selected-index (r/atom selected-index)] - (fn [{:keys [style tab-list]}] - (let [style (merge st/tabs style)] - [view {:style style} - (doall (map-indexed #(create-tab %1 %2 selected-index) tab-list))])))) +(defview tabs [{:keys [style tab-list selected-index]}] + (let [style (merge st/tabs style)] + [view {:style style} + (doall (map-indexed #(create-tab %1 %2 selected-index) tab-list))])) diff --git a/src/syng_im/contacts/screen.cljs b/src/syng_im/contacts/screen.cljs index 3e16b78380..74f9ec23cf 100644 --- a/src/syng_im/contacts/screen.cljs +++ b/src/syng_im/contacts/screen.cljs @@ -9,6 +9,7 @@ [syng-im.contacts.views.contact :refer [contact-view]] [syng-im.components.styles :refer [toolbar-background2]] [syng-im.components.toolbar :refer [toolbar]] + [syng-im.components.main-tabs :refer [main-tabs]] [syng-im.contacts.styles :as st] [syng-im.utils.listview :as lw])) @@ -32,4 +33,5 @@ [list-view {:dataSource (lw/to-datasource contacts) :enableEmptySections true :renderRow render-row - :style st/contacts-list}])]) + :style st/contacts-list}]) + [main-tabs]]) diff --git a/src/syng_im/discovery/screen.cljs b/src/syng_im/discovery/screen.cljs index 8f51f391ac..c7f4948c1f 100644 --- a/src/syng_im/discovery/screen.cljs +++ b/src/syng_im/discovery/screen.cljs @@ -9,6 +9,7 @@ [syng-im.components.toolbar :refer [toolbar]] [syng-im.discovery.views.popular :refer [popular]] [syng-im.discovery.views.recent :refer [discovery-recent]] + [syng-im.components.main-tabs :refer [main-tabs]] [syng-im.discovery.styles :as st])) (defn get-hashtags [status] @@ -49,4 +50,5 @@ [popular] [view st/section-spacing [text {:style st/discovery-subtitle} "Recent"]] - [discovery-recent]]]) + [discovery-recent]] + [main-tabs]]) From 8d8170d9ab95ceddb1f3e7e3e8e08c6b4a101b76 Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Tue, 17 May 2016 17:09:19 +0300 Subject: [PATCH 04/11] fix discovery tag title Former-commit-id: ea63b1df6884dd6ff6d59fe8922db7360d33bbd1 --- src/syng_im/discovery/tag.cljs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/syng_im/discovery/tag.cljs b/src/syng_im/discovery/tag.cljs index 455adce8fc..0251e1fde5 100644 --- a/src/syng_im/discovery/tag.cljs +++ b/src/syng_im/discovery/tag.cljs @@ -17,7 +17,8 @@ (defn title-content [tag] [view st/tag-title-container - [text {:style st/tag-title} (str " #" tag)]]) + [view {:style st/tag-container} + [text {:style st/tag-title} (str " #" tag)]]]) (defn discovery-tag [] (let [tag (subscribe [:get :current-tag]) @@ -31,7 +32,7 @@ :style st/icon-back} :handler #(dispatch [:navigate-back])} :title "Add Participants" - :content (title-content @tag) + :custom-content (title-content @tag) :action {:image {:source {:uri :icon_search} :style st/icon-search} :handler (fn [])}}] From 97f1a4bafae111144608950f1f8345db37b7863d Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Wed, 18 May 2016 21:42:40 +0300 Subject: [PATCH 05/11] change icon names to keywords Former-commit-id: 74e5c4128d428826da3f092dfdf9ee328391e2c1 --- src/syng_im/components/main-tabs.cljs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/syng_im/components/main-tabs.cljs b/src/syng_im/components/main-tabs.cljs index 7116b6a3fe..1dff88ab18 100644 --- a/src/syng_im/components/main-tabs.cljs +++ b/src/syng_im/components/main-tabs.cljs @@ -19,12 +19,12 @@ :tab-list [{:handler #(dispatch [:navigate-to :chat-list]) :title "Chats" - :icon "icon_tab_chats"} + :icon :icon_tab_chats} {:handler #(dispatch [:navigate-to :discovery]) :title "Discover" - :icon "icon_tab_discovery"} + :icon :icon_tab_discovery} {:handler #(dispatch [:navigate-to :contact-list]) :title "Contacts" - :icon "icon_tab_contacts"}]}]) + :icon :icon_tab_contacts}]}]) From aba7d4fae0e4bfcb5ee3e1fa159aeff0432120a2 Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Thu, 19 May 2016 18:41:25 +0300 Subject: [PATCH 06/11] fix padding Former-commit-id: 0556e299d6fea7bb50c106a65cbe4b1f75df19a7 --- .../main/res/drawable-hdpi/icon_tab_chats.png | Bin 401 -> 537 bytes .../res/drawable-hdpi/icon_tab_contacts.png | Bin 746 -> 792 bytes .../main/res/drawable-mdpi/icon_tab_chats.png | Bin 307 -> 295 bytes .../res/drawable-mdpi/icon_tab_contacts.png | Bin 525 -> 504 bytes .../res/drawable-xhdpi/icon_tab_chats.png | Bin 442 -> 435 bytes .../res/drawable-xhdpi/icon_tab_contacts.png | Bin 994 -> 936 bytes .../res/drawable-xxhdpi/icon_tab_chats.png | Bin 613 -> 651 bytes .../res/drawable-xxhdpi/icon_tab_contacts.png | Bin 1394 -> 1329 bytes .../res/drawable-xxxhdpi/icon_tab_chats.png | Bin 893 -> 777 bytes .../drawable-xxxhdpi/icon_tab_contacts.png | Bin 1892 -> 1775 bytes src/syng_im/components/tabs/styles.cljs | 4 ++-- 11 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/res/drawable-hdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-hdpi/icon_tab_chats.png index c6792ef46c8aa0bb341a471c797c88a343dcdd9d..cd49ce400390d2675e7c9a175095ea2b9ec01894 100644 GIT binary patch delta 437 zcmV;m0ZRUn1DOPnZhw|ZL_t(oh3%NJZh}A<$NwlMrYTK|4v35C*qFFT9J+P2K0qI! z%=Qg5eE?nS1M~r!=xAJ=bYU^EgB!*)wjHW172mv-y=2AE zO>EW*5WzjfglI4!8cc{r>=0DW%$8_X#+c=--g>n3uKJrknAglI6K{lo?U?LEYC zJrMLluo*U0sna+tMCy&ZOf3W%06^pKxM#^oy`jpX$u2nY5IUaBW_UvER(;fK&iELO fV?V4YL{8`z=Wh4nYWPAp00000NkvXXu0mjft_{i! delta 300 zcmV+{0n`4O1d#)fZhsC*L_t(oh3(c&YQjJmfZ=yka3KN7Mko}zE#wLwz>ByJJ;C$@ z-8Q{Q58xF7-3p}vH$fa+2!`pV2CI!<7D;Co^FkJxe1wPm5tY6cPbf4H;WmRst28Ti z9$-$H0sdeBqJe9{WdS4=KvDrDHM(_BDR{ge1Mu;Az}o(1M1Rn1I%2tqiK8I^rKxy( zFWGF5ozI-tc+2L=q&^8i91WQ#lU`<8fs%)@xYpH7D^R{Zh-+QVv;wX2J*BDY{nAvd z@_jEe=czO+8lQO=Z`n`U%kV;$^f+w|@cMH3oUCuoxK6a zLNlvZonR%Yy_=qs1S38_(SEK0NKqK5BMg9W7)ntlDE9eXDIPQU^xgpA^ui*UviuR1 z7}iT+FJ<_p27hX95{wVOrN67?L3`pP%i8uWx%>iB7YsmuR}16AZ~ZRo z4=5fpJYmYA;xXg(fZQ_^bc~mLyR2671$25*Ig(Vyc*z$~GG&oC$v)ekILZ1Bf8Q=! z+rIULa>L%QJf9yb%H<{BHgDMclc`E#3=HHdnFgimfE~h9umT&!uU+C z$oHK)e*R9^CNTN+@(%K!iX07*qoM6N<$g8#o!Y5)KL delta 648 zcmV;30(bqG2I>WnZhvPcPX(5wtym%&^ni?>Kz# zo8QcP-}`2ss44&gGQU`TVwyUoA|pVCWT}ekX4A;(%el-O1%Cw)Rpr^+-G1A*mr*7X zmN*+>&9l6jSC0oOMnF0$1E5UUzP&6UGQUun6J?=eGN(}CsWDBR>a<9JY3h_YS-_V9 z6&bOKSxo|r<{a`vJq%p$0$_LVn9}wU8)dguGSSJ{aYm&bi`mI*4EJ~caXp_+k(Y-rp#%E`@5N)yoN;9i6JzabIz4HEj5~Rk{8Mk^&}D-5LqZ# z!0nC=h%A&ek%e~mjuVLuh%8jvK1w7uAhOU#*=4KJxG-+3(qNxd@=tv6LHyA)$g%X$3&Wq+SEk)|x|SUkMj%h1hkZlo=o z)Y;GD)|>pS`E37a@bSxGq^=)Y=zh-O(b!dN>*5~nqzr?7hQYor#%?>j`+N|3t%aJh zd^W}Ocsi8K-`JKgJ)S0?O|?(x!JS?t&d1FOBCQ;46S@_nYsbwIO6YrxCK)$JD4|bZ z57D?=FMpug%F#BV(oUU~^%|ZZ-OBTomGv5>oqDMF&}CmNyL{WJ|C4>FO2~h+n(Onv zcn~^y45~&{HxowS|p%pWK~d==Zn=sM~`CwgtZrQnMtFdp5@ITtaVbx iv%DDvmCJUd_Zw-f{;%?vbe{kK002ovPDHLkU;%=?+((fB diff --git a/android/app/src/main/res/drawable-mdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-mdpi/icon_tab_chats.png index 8d9d11dbb0dc1aa8bd8de78e46dc9df29ce93bd7..6bb1a35f9219f474c85b3fce4c2aefa0f9cd4902 100644 GIT binary patch delta 193 zcmV;y06zb-0;d9yZhxdnL_t(YiDUf#|33pQ0TWG4r-ubBFh=3b=Q|h}8QiI6@_&Y% z{ppe(2p>?>a3u4FejJQiK)wYIdfW^RF=7l3dfX(75p4lK7c+)o#E21P!GTL(89sjd z%W&Y*SCYk$0VAxiE1dP5>ZM+Pnk3^ePDP^@F#KoO$-sbAA37k(H1?-SHBieQG#^mc vaEOur|1o%p!ZKc)LHL-N5h>HjmIRIstNJ#?Gkdqv*A~pa-@UwVMz%f;7YU0{qg_5J@Z-vhNrp{k`J2fe98a>p00i_>zopr E0Hp9%#{d8T diff --git a/android/app/src/main/res/drawable-mdpi/icon_tab_contacts.png b/android/app/src/main/res/drawable-mdpi/icon_tab_contacts.png index ba6be3d17f46bd8fb9c02a0398b08db720c254eb..277368a9b873bf85ce1acea18e14ce124dad01b3 100644 GIT binary patch delta 404 zcmV;F0c-w^1o#7xZhv)2L_t(YiN%$%YQjJOhQCWv5D|0|GKCIOD5X+_P6ffC@6g#- z=-?wb_zKQ-@77IlsUW4L2;xvOg=T3(iwH4Z2NPOt5@Q{h!Fa}KI>TGWdgwn5VyRW~T-Co5493IBZ0oa1 z5`$pp+vZXm{DnjYgYoYu!sfzA)WK-F65A{}GXrnADl|!{o9w-V*b^A#15OWfoESOE zrS+xu`+{e4&VSR(9Mg7pH#k39fA=>jmoyrs0*z{co4yknUt~m=XN5@dUDp2JcX0Rc znOG!lZDa?-$&A-GH?xv0LjI_x?PA(4xAz}g&Jc`gQG(O||zV~}_?|Xj; z=Ny-}%y2zYB;Z*9I)aID5L2bRP|oWXxwvT?o`+`u@qpm(vVSQ>N^w0>3;_-Ran~b7 z<+ClJh=6BRNc4O=N|DRNkkr=!04+8~tv*0+=!urc z6Gdc@%f#m3GiecmTqY)3E;g98<*zwugP;-`wAgs5oU}o$K7cdf3vp+{QL7Jx2EtR+ z8+s^JyUQL^v46qL-ORV0UYmd;w&ro2Hu-C8qLvy9SlyY9TC`F2cR3ZSd6@VEBsZfekIj>tEpx~30 T=G!Ko00000NkvXXu0mjf^vuOV diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-xhdpi/icon_tab_chats.png index 7c188096adab636ad2e38f2c3da23031d45f2f72..87c2bc79f9631099195b1c953320e45b3540bf84 100644 GIT binary patch delta 334 zcmV-U0kQtN1G58=ZhtUIL_t(&f$f+vPQx%1hCi21S(wY-rE8^5l{g0%$PD5F^Z-?v zd!9^@x>iCxKyQ!@%m79xiJL|xeSYG7lWkei|HXcaW9Pj`Gb8B$mtq3an1D3n`oQD% zxO9#+o`po9P8_B8Jiq3X0$Nre>F@xag>$S!x4DH<4j=fHQGb06n1D1UAdLw~V*=8c zfHaNMXcsplm`^j7vkZV@U$Hw>ynhTk@6QD0(~O7v+n;`Dmv7ae^J4VgLg7tadn|_f z8t5%h?3+t_jj80%8M#LHwAE+W-In07*qoM6N<$g4WfY?f?J) delta 341 zcmV-b0jmD91G)o{ZhtpPL_t(&f$f!W0f+id@@41Rp zmIv@8&M}EpmS5vZBIyo)#RQ}=0clJ?8WWJl1f<#BCUmgBLw}aWoE+@|Fki07i;}13 z7m@r&+~suPL*=i}4jGT!#`UW9+&w(D9@2HbN$?fQ(ztbVfbqzYrE%~1CP9Jqwr;!D zb-s!EAr1=6m#ZJGb)9b#6v&H`s&3DDReSQH>^5;K9p&Lu0X^lRC7`Q3 nYzXKp5AOmx%L7E3%LBXuB&4~0iu00000NkvXXu0mjfwN0Mg diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tab_contacts.png b/android/app/src/main/res/drawable-xhdpi/icon_tab_contacts.png index 29bbfd2a167ae9998ab280c37822a0932e860e14..9192c55522d6ac78452e3611ebe9ff96306e5dd3 100644 GIT binary patch delta 839 zcmV-N1GxO+2dD>-Zhs|7L_t(&f$f@2Pg6k@hM&3Rqb)H7BA7x1A_RzCC?bI^Y)Ftl zAh0921>%k$;Lb!gE?^7z2hb%ffhZ9dkV2492{ZvTG{&|T+Huj3To5R8nSL3c)$Q%% z&inSBnR8~QLP|*?W8_-EZ7I6yix(GIw?sDBHlGvxz{7L zTbDHw7eh#Z7@P8s0~V5Tq~1VG+MbjD;sG2nDF%`s zQU-*KJ>Z!7z8hxQ8$?sy zPieg}ky*jzv@z6EPE$?Ex%-~FQap8~JZW+;vv5Kn7}eINwo*dCrQ*#r)s!&QQ;yKp zDH;uQwK}gApQNd#gsxVnu5R@i@HE&n(l#C13?v7v?tixFDEM+(n}NOK(~PuDhc*N2 zyWxzqO@}rE%ibW{2a&YxwhtmKdxN^V)n`BgGYcozn%F*wFtc!?D;oovGjSjoJf;n^^J&S<)CL*YSTE%{2vY;8tTm0FNHnd01zs%4MU;`4_5*qG7N3#R}k2BtX{K>k{T5_`# zLT!x>hI=cN#b1WIvWVf{3fda2?I$Q3sIM+&u-m0|Q6hlBZWr~{>Q$<;fzB2uHbbZU zI5tDj*`mJCQ8v(ATdLeiCZApK)2On6t^MDb(0^h1*~$i1HiJZC`cHMDG0DoNdi|tq zz;}4c>|#J`RVjhl#Q?rT^_7~XiTv}|5Ro%!DUn^|wu#Jg@9VxW8@_N}l@fjw_eUkL zwi9M;N8cLvhWL{grtNjPnr#(UF>5t#uN$9oBS#%6_}hRXqVI^G2Ie~J R!v6pO002ovPDHLkV1fyul41Y= delta 897 zcmV-{1AhFd2jT~iZhv1%L_t(&f$f^XPg7YGhrjc9mDUCu$<#@M!bAzgnGnZm8Z#Rb zS5CymtZ`{NTTplW0q#s>Ik1+si@~rn!^RlW874%Ggdr*7G_i)HlG(> z-tefIZ~N}K=lovIJ@?%AuBa+|xjX%Opsq41N?JwIK#FiFh<|EMg`6Wgb3fa&viG4h z1qjIaRACIb2gE`Mv=u7A#Dm{blL`vE0t94iy6}f6*Fz4lB~*AknN8hLPzPXqsxa0r z!2^hLeK%W>J5w72b#)dwzG<@`6-VknI(3y%+Any3SY2h*5hWdVBta1+?d+DywnRnJ zE|%+jGU1Z$kAHDC8R6VF5ddDjt+7$8kz1`$EO|EFrDXi~|Mc*2havrsp=Th;S^-!SGQ0(BSuS zvA2`qp|}m#<^qxlmyt}DZ@ZC97s-Tq0vHQO_s90l`G13mxWZ5UQB(Kk0?sBQfo;zv zPnfzl7tkz~M{V20$|4REV*#(;)AM5dspct< zp1!lz2Y-R3W)2!6{#+`vyuN*u?X*1sO^PLtxt#ws5tRQovao4;0Y+;;fJ^72eBT=- zndl&yaEV6`ekbK>onpzOSlVHEy~;mpRila&Silc`QARRdq`Li05sx~=qbK<8TgVK= zC~P)1!sq#5yK%&pZ-S%bFw}6$`t#_SAF}H64 z&tAS~r*5m4{KQUOdG_+XZ#&-t@^5N9d{VO34nw1pefXqA{*C|RX`n*>_rDcBcp7LU z`+6MHjV!SD=lLqj`RcJ~B?<)mN1(vsT9w5$^TT;S3XZ7e!t!p4sOB6M+E#!HImZ#5 zq45X2-KaRCGtTbagNd-C3BbhtY|qNqan(RUC$p&=z-^9qI#qz%&ER3rZIveNcHQP9 XOPF0evFa|w00000NkvXXu0mjfYS70^ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tab_chats.png b/android/app/src/main/res/drawable-xxhdpi/icon_tab_chats.png index 82dbb8ff905cd315118d659e4bdb04c99ca8a264..382bcaaaf6a062ccef0103f8ed7b9defba0a384b 100644 GIT binary patch delta 553 zcmaFL(#<*{x1Nc^)5S5QV$R!JhJH+r5=TFpOFIgCYFuGj)N2-Yp@J!DeL`wu=Unp( z!Z#*nEbI;6@RY^mLb4|7Muo;BD++a3Vz1maUn5=qcuzg6_0LH+<0F`Kjzw{c#!mRk z_Gw;&2a^(Khl;`^2xE)L)`F7GL#y`MZ#X8yeB<|F+tm8d;}N%K&3JXzRrvho=7|o$ zb5`%a8Lf9~^RbwFX1%3sA@}1v_sqMx#(O1W?v%&t zukHA{CN0*BH^ZU|CS3YnPI!H~>Fb~@hqw16{vN#CpZ)is@U6Xt@6uw80{<7;?v&B_ z^Zok&PnIw0_e2_QKE9Ia@AN|szg9U433xiFFivD~!OpnDH+v#&|2|z-6n`jug1m);l0tn!Lu=!oLyTffpZM7e*ggrf7chMi wXJ6n@_n2X$!y(3`JloaZmA-^F!-MV%+vx?bA2Muh&0_!pPgg&ebxsLQ0HyBwF8}}l delta 514 zcmeBXeabQ+x1RBlr;B4q#hkZy_If2d%Cvn{j}-OXEEdfwrlZ4@8NB41RZwI^L?vex z>upZ6u$_FbMKYN+gE$VY)VZVPk}TmlZk`6? z1?|id%;5(L+Qa9}et*}$>}$kKlS-U-n zgFUrR-v5bT`fSS7nod)NU6KupzsWT}W|k72C9Ea6;(n&9`R1J~>z0Ss&$L`Psc~2P z@94GxaI*pBJSp_}%_|?V7W>ek)QIoV>5xa#OOkXReG4t zlUp00i_>zopr0L{|i2><{9 diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tab_contacts.png b/android/app/src/main/res/drawable-xxhdpi/icon_tab_contacts.png index 01e00d5632bdda3781c0c7b7594cc9d04b54812d..19f17a094278dce6050f899d72d668a15272e085 100644 GIT binary patch delta 1235 zcmV;^1T6dV3b6{1Zhx*xL_t(|ob8-FOdD4mz<;*k>_TF2L?8%4Kx&|h+Dc6@EnB4o zDP1Ztc7i1=oji48h*T*|>|}u{Lk6TykqAR4%12s>s8Jx1f*{CzDS#V{@yEHt9g%$; zJ|DdM2)>_$kj?q||9rP~ZnJ7#b6noa^-+h z_h{i8T0wX0i^a8c7rxL6>c*oeNxTd?Ns$9>dt>|9s=Y~~vqj?i)oQL^Rc^c1wll14 zXINfOv$9!oBwz(a4jgNcLz0jF-Y`8~H7EX7cO$^pH-AF>)D3e>NhW6!q|(mJTR9@A z$eeh~~ zBRx5jVE-Uz`g8jSIVNWk7DQAU+Xbc4c_ya!Oi9{5$T2a!=g5fOk#7FoMw&-Yx68WR z=9ZE?db;h%NFE%V4@#x;Jo$59NHvZ10UGP8XsoNEHe~MH9HeBn_Oop5W!c)xv9X)s_4^}a*`mNz zEEDASL-&_o(0BVX4Po<>^jc~|emX)D9R+jJJBb`qfB(nA+e6DlSt970_7Fe+5Ede) z6n_oj0KfcLPv7m!{P92nik%Ry;?nDd}^1Sg!#q6v$B)OF+R1+t5xyspe3XEmwziM z{#{K8o$k=%vz_h$kY$)#K4jtT;f0zoizE2I?PXcH?5s$Ci-;G#(4NK@HU{EWiX3PK zE!Y@{TPZ2X%OFjXXa&uqJeF9gWKkS^qDYYXtmcTF5xI;J?UogKeeFY(N2Du_MU=W1 zaYB&#-1s2M!}gUz24#zi6Qf++yG%882Z9)tAt?jIPTRl3+uY==o14I=Oo{@(bFq52 xEJ~fCrQ|>v`v)E4ZLs8_i?^y_fG5a+{{bo#shXu8`2GL@002ovPDHLkV1i=%UvvNf delta 1301 zcmV+w1?u{-3i1k&Zh!AdL_t(|ob8-DOj}nNfIlBUFvLIzuNneLq^7NiisS-nl`I)R zVyeX0b_h#Yvcyxj43Ro8F^4QbiKwVeG9VLhd4&KD4`2Jb!}TR@ zu(2uU+-vIlNeJ=!{on7Nd(XN5F~2LFPLq%DXsj9N0lI+h%zx)#-aj}S#DLk%#|$t% zG8A0N_sgzag2JOQA8-%&7VxOavt&pD!@&KKp7F`(0m>`I6^U~pt8 z7|H&o$o?Wc8oL8bQGRm3IOeI0gF_BSP-f&z0bc8KD=9SKb8{rQ(&@B$&zYt?M@}y0 zfS!?|V8Xn_?tkIP$)*#-39h>jmYacB{QqaGlad533XFA*Bj+d{phsXV03CAEEihKc z4!P-a1RYP82OFQQ0+oXHMlWrRUfLSGv^DwwSX@i6xUR9drV(A!i0|okr5Lp3=Ij>G z7pkT=6u>Qx{`}e{Ki4k#0Z8dE5!qof5+`MYC(8x3)_;5X`erRH^~EjN-2(c%s_DG! z=Z7a-ENy6tGyFF>&YwDNbW{-@Xee4vHZApD!UGN5=%`YVS$-@N)LQRl;CgM&OR8Ah z0tT)ZKl)@~i6FOtuWp`BPIjzsB*iKQOJ1fgR86bIv))qgr7u)1E#7e`7Zj)z^o9b` zw$ z7Evx}aqY-f)0v2EqF&Itx@RYqu}v%(K?(&ajBTP^P;^aGQl?1hMr_q67Zl&qnT*7x z$DNGCEh(f~GK)<_cBIyEmNzseB0JLJ9fu`?Qhz%9_+(4UrIym+dr7g1!LoJG(uT(4 zr>8rxln#%dZn11(RngLt>o4=WEUaiJD!H00Z)moZTwQk`Ea!iVnIZ}m?XxMnqCFS~ zJwCg`&+~6fecQ+0J^A>a&V2NM`RIY2X&j65uv!2|Pyrl41#kovz!6jc<+GR&@X5sr zK7Xk5(sbTU(|Hd~wI0s-Pj+tJ?(3{>C0TuwWc5vozc)4he06}Xcm<$LkPy)QVI_T^ zRnt)8K6Sive!&&Lk1NgZ>d@=kDJFj3VdmwYGEqua(w|=T^W_&cQp6O)`gV$+e%0V@nm(-sI(0ZymxVGiq@N7u@QtqrFM) zUYRsORTYBU{TJ|gY_OBT=W%hn{{mGN^3J=oNLO2Z1Wq_JsUYANTy2%Np(yQ$K5mtN z{r^{F<|0kdM;r=}w_7ioh2Dj`8KbCD+K#ZrR!zI~-plYjWW z&Wj~^Z)%VxX!k(p;rMG3Nz3;D4oM`_JRE<`?t#1$CG{p9UDbFrxruIrBRvg|CO3($ z%H0-{K8wvq4;Y)+WPLj&J9J*ww^NKwY$_@KD=Bw8TiEB1=)Tl)M=q==cPOg|={o%O ze2d9VU(e2dB~=-G6xI-r0?J z@7%Dq{<7YnF!^o5p#urYOx?{oM-rs0A|`zc+0p!c@AHQD>B9H+$n4K|dB>!-`KHf@ z%I9_svF;4UOfv)z^f08c7$`SLGM?c`a03bLJ-_M2>F*cQJ?q6M`Ker8EO+snr01?_ zCHLN5sbBiuXIgB}Z|gtvCuIfl<(K!U$}U$lErbKDst zZ-%(fhbs-e@3GFrVhcf`X)o(HFH}^SbZhOZKECf?Up{8{yma^P&!wkV4D*;=A%%Stm&jK=wO{UiaKEzI?`v;O_O;zD-p%@l zH{r)>4v~h3>$Myh+V=OEG8_CUT`Sn|uzf=kL!105E=Gwu4@;ong(8-OABHJB2Rq>k>@3&BZ30g)#DGREmD@tt{Sx|#t9JYD@<);T3K0RUE&LgfGe literal 893 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf4nJ zn8$)Jqhx~{kij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6axd(FHaZ8 zkcv5P@9fW(DwH|)@p!kIAg9yHW>x#PT`3%m9t$Q%GB2!mn;X0<#b zO!-=sxKx|Fz3T+noey?NEH03}f4+PCvr;{Mk0R&oZ6E&yr!ybm zY_Mgh^q67AaE?JH^wiJpBM)DmWow9M*mURhENfea+hTHcpSJ#ak;*tHqGHEej^p!K z?|z>7N$fY*v$;$YG#O@+OhjJ#av;X6GfA=cY7AGlelSDB>f46vb|;(MaxST!ymQ|F zkVhZB95XZGaLCkdZoVtJWKw5(zodUo$m`lG=h#2|UQ{^${f}L0Oezd}Zr3-S{i^DJ ze7m0ek3WC6KQ|Zr{`0cLPacijRGWAkhMaZ!3%5+2Is4~j7QP9m)e1N4e)M|}(8MR3 z-pM-xO;IaoNK$-Taej{4RG)<98{Smi@k^|H_VcLIEW7)@4;WVOymIFGx~F2jGLMg( z-r8yl66>#D)moZ&=lSl7;)a_JFs{oxzHpxO_n&!8>^t7ERWRSJRz7a=u_!n3e7UfN z!(!Vb6_5UFpR7n)d~;v1?Yf)$W>?lNwp{|2+-~l;_1^c|I3V#QM)lq2yAnSI*3IR= zuuG=WZeOXT)7u&Y^Uup8D?Wcays^{q>^FhK)za%fcSmfPBcE3L`{wcM^7S?L?w!AD z)Q`<;v+Mf(_|Xl!zG*jKbW4yPC3ticl!`RG_F=53V(1f5sFG!fXUGW$rjmyLACCQt z(A;ljRuEXMeIUPKTK=IP#w|6$X&eil&VFJHP;-|?QNZ~N-60J92%r>mdK II;Vst06lhy2><{9 diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tab_contacts.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tab_contacts.png index faa0af93ceadb6a393102d65ca9e58e793929f7e..d5bfcba9d2ce1084f88421aa3a85bf214abe9d60 100644 GIT binary patch delta 1685 zcmV;G25R}_4(|<+Zhve^L_t(|ob8>@PZU=iz(2dgT3{Cz3)n0aYhu!fKUztRp;!$m zkhDF}V0ut{^1`tRe*xjxOG!L(uX-wxOPeSOsg=^khNddoCME_7o4R0G7+7_8c6*rJ z6y4c%f6ROHaORWjh3vlf<@=d8Gw;3G{rWPQ3?9zmcRB#K<9`Wo7*Bx1)KvPxk%{OV zKp!v&bOMp=D`Zb-%Ay0&?CU--1x$|*N1j#En6KQ6@W@2;ZD15Q$LpW$Qqh5{z}Wb3 z-1*`-NijT#$mC4>V$WGxO|leAvKULEC(;f_T9CZl zR=go26U`3;T@Cbih0rX)}ywqIlw?ygKh2E ziE;u$b$%hq>hB5>s#EUYRZqbF)_{=Hh2}TgR(}oU1at^YlE}6zMLhv60tE zkX>HbZEaVIasu3jasrlO&v#|pm7<=2RdH)KBHOMM^#sHO3J}oZXh*UdJQh z5q~Ht0AP77$>eNxi8InLIUBciG}(>PTavdHwt4hVvaBu194l+dU9lypv;Z(i!Z(wv zMK|Sl;%&+cz(~UnzisluH);JVh*S z@OV8%ES}W(M`8Mphxl%GgFBC&O6_0jMfmj5AQuPrDwF)3G=(%S4(#Rh(V*0R zrHz2oM}nN~X_VDnMfiM}F=pWAy)7wyN*Mv|%>f3x)qFnRioxy%+9iFfMv8#*y$jg$w9Dr1rNIiyM0X(!8L#yAXzq z*o6yt7=5n%E^vH@WIfBjrbH@7RqE`^5+d{E1@8HL+0k)E!K5IsSTMN>$>5{hK%%e zf;*3%vatBf@h!<5@h!t$Tao}qI>W7nZGQPPA$(K55U$>o&yg}R{CIbZTMOIXV<|h( zk^I}CMmj_ENs8!`-8*Y85r6&VKUf`JQ3-*#mAu?~0_0MXfcp{xaVvSbwGuETArQBc zms=|V(^y=%@m#JOCI)+z|3hLmIAW%t}cm; z$YoqAROYtWG;<8IDyT_RS=8<2tmN1mKC7HE&2KXB9?x+|E%p9F5rJ6RBQByugw$kb-a1MnlE=fkm zoI8yby4xv4*#dH8i+=WDmgnoltdSMr^_QY!E~-T_*LJ3WX{$+ADO4=L!ydeca~;ML f;4q#5hxrc*b~aapWDd<;00000NkvXXu0mjf#&R`S delta 1803 zcmV+m2lV*w4df1xZhzrPL_t(|ob8?6YZO-)ho709eC=*FYt+b?f`UY9YoLuHRo#cM7L(=oTEDrEQH<3zHi>&`FzhgIa;|~rW*P)Ruga#=zjxt0A}SCuj&h4U2MRr zyhecmU?`n3=c@T-?Rf(9XROzNQ^1FW!LAk?_#8N$PMMFM_28-k^k=LVyug0~wA9+e zI-v-h#S@~q(gQ0B(4Vn31DAl^fx1^e+yvfFr_71vAN)sv{*2WPTn0MD_*OTJ14q*- z^S8xsE)k$o@_&CK41Q3I1A7+N1l|9k(&k?x41SPw0+%YW1{Mi`*Wre3e(>zZi#1Sb zf+|DJKL|%Vq9_8}(<$?jUjt4N245up5FhQt`H3dr3E?D5G&Zn7$4f7S!52>)IH=?0 zc0%OPr{g8oLgcVR$IEDj$iWN+kc(;Xl61gEM5AkSBY!)$HnS;dkcjFeq7eXc1(#f* z#NSzm+xMR`HZhOmR=3U}nYec1{Djh;CZalrds^Am)k0H)R@Lv!EtL6XtjLw&S#pI^ zz#gs*L$(8}VMH`~d*U4Ej?rjT7kHnh2914hMA^N)g=-^u28V5BYlM;lv_^G~_qMa8 zqhU?o(|>4a9C|y>_Rc0Q3{EqvU~SN!|A<)3c7v10Hmo`Li`mlAz{z79Fx%BDZ%PT! z8r4Z1X(t(r)cm`Xu?VRn?X*Uf`jgcWz=&uZ?+qsSKFL^wN^!CJS z+U%^xmW~E`d(;_uDo_cji@jZlJ0?@Qm!}KKGFrKcccrDE4X!O+eZNbU?sB9H;JDrbx@dkGD=M*0EL{MAE5ozQJK};d z@07VRJS)uJvrs~ST%p9Zk-RW_*GBS6jDSE90RRSvZ5~W61a9ZSq_@t)I z(Syka&Rl$gH7$SQwH)OH0Iw#T`*Mn_x9l~Ij^>>*S8v&z`*KRTlJ6sbMPd~kx6D^R z&+_e^{42dVSNYx1KCkHZbaiXMavZnJ=)*ZiA6E5mcwQQm>;vkFPyoq<0!StlKz}l! z0Fns>kW46mWR#c(M0AagWQ2}3gNzty3=e0LgfSj}NV5|4wmd)j(h$u>Z{%AM8trGWSAg8lI13xPC{> zCIKNepmTi#eS6h76ju#>dt2#TAN-M75G24y@3kp$Ag)@Bh{i|nwF$8mxPJiK%tm3Q zsg`uEZ(y4l{2{);1=#y~G-wlnA;R~-1u)ksG1-10MED-K0PP9&hMd(R!uK#4Cz-$n zn9j*RhxMX}@I7z=tbf$ojaDrpd=FfJ8}|x9n+OaMz6UPApVmC%Q^9XLuQlUS3;byX ze}qX$C;ZvhGcV0fHSjipeSh}#j1XHw1Q?%MVBm%tM}n$h;Kr=5S}Sapbp1{qG&uH7 z0!`7hP`L~jf5-{Tgo5BD$?LcCWNkNGkXeNAJi*BQr`-K(E?knVASF@bmdbp0x4@6T z7Xx3EUkz0j<)voI9JkCjxAS~=w@}yHQfwsOA>fwESksP@XSf2!)_?IXA`X#*6$&61 zOUJv0J46nnI^G@VA#xbdfg!w(I7BQqFr=qb<{aJy^dVyTJe@M<{6Y3ONvF&S z|BWSymdXc5Di4O#mVa^J=;GkR3M*pilsN+IA#9Fn$xXbH|J(8pR!lWkRC*WqlyG#k z7K(T=e0O=t_gT^htVDmtdJXRa`VVCaeAc=ylu;oZV* tR$lckij9}hwD9t31He#ag8N+l1sg+%xhh9VegFUf07*qoL Date: Thu, 19 May 2016 20:05:04 +0300 Subject: [PATCH 07/11] add gradient Former-commit-id: 799808965dac2236d21cd07e6a32e664f17e6711 --- .re-natal | 3 ++- android/app/build.gradle | 1 + .../main/java/com/syngim/MainActivity.java | 4 ++- android/settings.gradle | 4 ++- package.json | 1 + src/syng_im/components/react.cljs | 9 +++++++ src/syng_im/components/tabs/styles.cljs | 25 ++++++++++++------- src/syng_im/components/tabs/tabs.cljs | 8 ++++-- 8 files changed, 41 insertions(+), 14 deletions(-) diff --git a/.re-natal b/.re-natal index 54a57bc450..e3b67b5de2 100644 --- a/.re-natal +++ b/.re-natal @@ -14,7 +14,8 @@ "react-native-vector-icons/Ionicons", "react-native-circle-checkbox", "react-native-randombytes", - "dismissKeyboard" + "dismissKeyboard", + "react-native-linear-gradient" ], "imageDirs": [ "images" diff --git a/android/app/build.gradle b/android/app/build.gradle index c291fec7de..5f502d9326 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -128,6 +128,7 @@ dependencies { compile "com.facebook.react:react-native:+" // From node_modules compile project(':react-native-contacts') compile project(':react-native-i18n') + compile project(':react-native-linear-gradient') // compile(name:'geth', ext:'aar') compile(group: 'status-im', name: 'android-geth', version: '1.4.0-201604110816-a97a114', ext: 'aar') diff --git a/android/app/src/main/java/com/syngim/MainActivity.java b/android/app/src/main/java/com/syngim/MainActivity.java index b080070f49..556050c853 100644 --- a/android/app/src/main/java/com/syngim/MainActivity.java +++ b/android/app/src/main/java/com/syngim/MainActivity.java @@ -10,6 +10,7 @@ import android.os.Bundle; import android.os.Environment; import com.github.ethereum.go_ethereum.cmd.Geth; import com.bitgo.randombytes.RandomBytesPackage; +import com.BV.LinearGradient.LinearGradientPackage; import java.util.Arrays; import java.util.List; @@ -78,7 +79,8 @@ public class MainActivity extends ReactActivity { new VectorIconsPackage(), new ReactNativeContacts(), new ReactNativeI18n(), - new RandomBytesPackage() + new RandomBytesPackage(), + new LinearGradientPackage() ); } } diff --git a/android/settings.gradle b/android/settings.gradle index 784925e19a..cc6a4e9391 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -13,4 +13,6 @@ project(':react-native-vector-icons').projectDir = new File(rootProject.projectD include ':realm' project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android') include ':randombytes' -project(':randombytes').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-randombytes/app') \ No newline at end of file +project(':randombytes').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-randombytes/app') +include ':react-native-linear-gradient' +project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android') \ No newline at end of file diff --git a/package.json b/package.json index 48ab8e052a..561b5de8c8 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "react-native-contacts": "^0.2.4", "react-native-i18n": "0.0.8", "react-native-invertible-scroll-view": "^1.0.0", + "react-native-linear-gradient": "^1.5.7", "react-native-loading-spinner-overlay": "0.0.8", "react-native-randombytes": "^2.0.0", "react-native-vector-icons": "^1.3.4", diff --git a/src/syng_im/components/react.cljs b/src/syng_im/components/react.cljs index e19ffe11fe..aea94bdac7 100644 --- a/src/syng_im/components/react.cljs +++ b/src/syng_im/components/react.cljs @@ -36,6 +36,15 @@ [image {:source {:uri (keyword (str "icon_" (name n)))} :style style}]) +;(def react-linear-gradient (.-default (js/require "react-native-linear-gradient"))) +;(def linear-gradient (r/adapt-react-class react-linear-gradient)) + +(set! js/window.LinearGradient (js/require "react-native-linear-gradient")) +(defn linear-gradient [props] + (js/React.createElement js/LinearGradient + (clj->js (merge {:inverted true} props)))) + + (def platform (.. js/React -Platform -OS)) (def android? (= platform "android")) diff --git a/src/syng_im/components/tabs/styles.cljs b/src/syng_im/components/tabs/styles.cljs index 59d106c904..4a161ba2b1 100644 --- a/src/syng_im/components/tabs/styles.cljs +++ b/src/syng_im/components/tabs/styles.cljs @@ -13,18 +13,24 @@ (def tab-height 56) (def tabs + {:flex 1 + :position :absolute + :bottom 0 + :right 0 + :left 0 + }) + +(def top-gradient + {:flexDirection :row + :height 3}) + +(def tabs-container {:flexDirection :row - :position :absolute - :bottom 0 - :right 0 - :left 0 :height tab-height :opacity 1 :backgroundColor :white - :justifyContent :center - :alignItems :center - :borderTopColor "#1c18354c" - :borderTopWidth 1}) + :justifyContent :center + :alignItems :center}) (def tab {:flex 1 @@ -46,4 +52,5 @@ {:flex 1 :height tab-height :justifyContent :center - :alignItems :center}) \ No newline at end of file + :alignItems :center}) + diff --git a/src/syng_im/components/tabs/tabs.cljs b/src/syng_im/components/tabs/tabs.cljs index 257cd60260..c784287c5a 100644 --- a/src/syng_im/components/tabs/tabs.cljs +++ b/src/syng_im/components/tabs/tabs.cljs @@ -5,7 +5,8 @@ text-input text image - touchable-highlight]] + touchable-highlight + linear-gradient]] [reagent.core :as r] [syng-im.components.tabs.styles :as st] [syng-im.components.tabs.tab :refer [tab]])) @@ -19,4 +20,7 @@ (defview tabs [{:keys [style tab-list selected-index]}] (let [style (merge st/tabs style)] [view {:style style} - (doall (map-indexed #(create-tab %1 %2 selected-index) tab-list))])) + [linear-gradient {:colors [ "rgba(24, 52, 76, 0.01)" "rgba(24, 52, 76, 0.085)" "rgba(24, 52, 76, 0.165)"] + :style st/top-gradient}] + [view st/tabs-container + (doall (map-indexed #(create-tab %1 %2 selected-index) tab-list))]])) From 322622ae52aeddf5e4807504a66139a7d1f7141a Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Sun, 22 May 2016 10:22:22 +0300 Subject: [PATCH 08/11] rename main-tabs.cljs Former-commit-id: ebe61c9d9514a2baf31f49291b95f12ce60356e0 --- src/status_im/components/{main-tabs.cljs => main_tabs.cljs} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/status_im/components/{main-tabs.cljs => main_tabs.cljs} (97%) diff --git a/src/status_im/components/main-tabs.cljs b/src/status_im/components/main_tabs.cljs similarity index 97% rename from src/status_im/components/main-tabs.cljs rename to src/status_im/components/main_tabs.cljs index 5b8751b39d..3464550156 100644 --- a/src/status_im/components/main-tabs.cljs +++ b/src/status_im/components/main_tabs.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.main-tabs +(ns status-im.components.main_tabs (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] [status-im.components.react :refer [view From 2b70ed56f4bdf795cd8f9fe6860c84d6620052c7 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Sun, 22 May 2016 18:17:22 +0300 Subject: [PATCH 09/11] fix typo in ns Former-commit-id: 547ececac372fafe71a643b72d04dae008187ad7 --- src/status_im/components/main_tabs.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/status_im/components/main_tabs.cljs b/src/status_im/components/main_tabs.cljs index 3464550156..5b8751b39d 100644 --- a/src/status_im/components/main_tabs.cljs +++ b/src/status_im/components/main_tabs.cljs @@ -1,4 +1,4 @@ -(ns status-im.components.main_tabs +(ns status-im.components.main-tabs (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] [status-im.components.react :refer [view From 563e0d69c776ec532401295c2712b68ef29aaabb Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Sun, 22 May 2016 23:36:43 +0300 Subject: [PATCH 10/11] fix last element scroll Former-commit-id: ff0307d4ce1c9e2b03640ec08f6623ba18e79e66 --- src/status_im/chats_list/styles.cljs | 3 ++- src/status_im/contacts/styles.cljs | 3 ++- src/status_im/discovery/screen.cljs | 2 +- src/status_im/discovery/styles.cljs | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/status_im/chats_list/styles.cljs b/src/status_im/chats_list/styles.cljs index 645db00014..26684a82b3 100644 --- a/src/status_im/chats_list/styles.cljs +++ b/src/status_im/chats_list/styles.cljs @@ -134,7 +134,8 @@ :backgroundColor :white}) (def list-container - {:backgroundColor :white}) + {:backgroundColor :white + :marginBottom 56}) (def create-icon {:fontSize 20 diff --git a/src/status_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs index 4cbec2cdff..0629575db3 100644 --- a/src/status_im/contacts/styles.cljs +++ b/src/status_im/contacts/styles.cljs @@ -14,7 +14,8 @@ :backgroundColor :white}) (def contacts-list - {:backgroundColor :white}) + {:backgroundColor :white + :marginBottom 56}) (def contact-photo-container {:borderRadius 50}) diff --git a/src/status_im/discovery/screen.cljs b/src/status_im/discovery/screen.cljs index 00c49e1c05..ab2c80e314 100644 --- a/src/status_im/discovery/screen.cljs +++ b/src/status_im/discovery/screen.cljs @@ -44,7 +44,7 @@ :action {:image {:source {:uri :icon_search} :style st/search-icon} :handler #(toogle-search show-search)}}] - [scroll-view {:style {}} + [scroll-view st/scroll-view-container [view st/section-spacing [text {:style st/discovery-subtitle} "Popular tags"]] [popular] diff --git a/src/status_im/discovery/styles.cljs b/src/status_im/discovery/styles.cljs index 3b94fce516..beb1209498 100644 --- a/src/status_im/discovery/styles.cljs +++ b/src/status_im/discovery/styles.cljs @@ -58,6 +58,9 @@ :paddingTop 15 :paddingBottom 15}) +(def scroll-view-container + {:marginBottom 56}) + ;; discovery_popular.cljs (def carousel-page-style From 2e49994c862111b9af43f0809a8bcbb7b023ddbd Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Mon, 23 May 2016 13:13:06 +0300 Subject: [PATCH 11/11] small code clean Former-commit-id: 45c35733be4f1c4c09d7d563f84d62020729287a --- src/status_im/chats_list/styles.cljs | 5 ++- src/status_im/contacts/styles.cljs | 5 ++- src/status_im/discovery/styles.cljs | 67 ++++++++++++++-------------- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/status_im/chats_list/styles.cljs b/src/status_im/chats_list/styles.cljs index 26684a82b3..592a882d3e 100644 --- a/src/status_im/chats_list/styles.cljs +++ b/src/status_im/chats_list/styles.cljs @@ -6,7 +6,8 @@ online-color text1-color text2-color - new-messages-count-color]])) + new-messages-count-color]] + [status-im.components.tabs.styles :refer [tab-height]])) (def contact-photo-container {:borderRadius 50}) @@ -135,7 +136,7 @@ (def list-container {:backgroundColor :white - :marginBottom 56}) + :marginBottom tab-height}) (def create-icon {:fontSize 20 diff --git a/src/status_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs index 0629575db3..7455363d38 100644 --- a/src/status_im/contacts/styles.cljs +++ b/src/status_im/contacts/styles.cljs @@ -3,7 +3,8 @@ title-font text1-color color-white - online-color]])) + online-color]] + [status-im.components.tabs.styles :refer [tab-height]])) (def search-icon {:width 17 @@ -15,7 +16,7 @@ (def contacts-list {:backgroundColor :white - :marginBottom 56}) + :marginBottom tab-height}) (def contact-photo-container {:borderRadius 50}) diff --git a/src/status_im/discovery/styles.cljs b/src/status_im/discovery/styles.cljs index beb1209498..979cd287a0 100644 --- a/src/status_im/discovery/styles.cljs +++ b/src/status_im/discovery/styles.cljs @@ -1,14 +1,15 @@ (ns status-im.discovery.styles (:require [status-im.components.styles :refer [font - title-font - color-white - chat-background - online-color - selected-message-color - separator-color - text1-color - text2-color - toolbar-background1]])) + title-font + color-white + chat-background + online-color + selected-message-color + separator-color + text1-color + text2-color + toolbar-background1]] + [status-im.components.tabs.styles :refer [tab-height]])) ;; common @@ -39,7 +40,7 @@ (def discovery-title {:color "#000000de" - :alignSelf :center + :alignSelf :center :textAlign :center :fontFamily "sans-serif" :fontSize 16}) @@ -59,7 +60,7 @@ :paddingBottom 15}) (def scroll-view-container - {:marginBottom 56}) + {:marginBottom tab-height}) ;; discovery_popular.cljs @@ -74,12 +75,12 @@ ;; discovery_populat_list.cljs (def tag-name - {:color "#7099e6" - :fontFamily "sans-serif-medium" - :fontSize 14 - :paddingRight 5 - :paddingBottom 2 - :alignItems :center + {:color "#7099e6" + :fontFamily "sans-serif-medium" + :fontSize 14 + :paddingRight 5 + :paddingBottom 2 + :alignItems :center :justifyContent :center}) (def tag-name-container @@ -89,12 +90,12 @@ :padding 4}) (def tag-count - {:color "#838c93" - :fontFamily "sans-serif" - :fontSize 12 - :paddingRight 5 - :paddingBottom 2 - :alignItems :center + {:color "#838c93" + :fontFamily "sans-serif" + :fontSize 12 + :paddingRight 5 + :paddingBottom 2 + :alignItems :center :justifyContent :center}) (def tag-count-container @@ -105,20 +106,20 @@ :paddingRight 9}) (def popular-list-container - {:flex 1 + {:flex 1 :backgroundColor :white - :paddingLeft 10 - :paddingTop 16}) + :paddingLeft 10 + :paddingTop 16}) (def popular-list {:backgroundColor :white - :paddingTop 13}) + :paddingTop 13}) ;; discover_popular_list_item.cjls (def popular-list-item {:flexDirection :row - :paddingTop 10 + :paddingTop 10 :paddingBottom 10}) (def popular-list-item-status @@ -140,8 +141,8 @@ (def popular-list-item-avatar-container {:flex 0.2 :flexDirection "column" - :alignItems :center - :paddingTop 5}) + :alignItems :center + :paddingTop 5}) (def popular-list-item-avatar {:resizeMode "contain" @@ -153,7 +154,7 @@ (def recent-list {:backgroundColor :white - :paddingLeft 15}) + :paddingLeft 15}) ;; discovery_tag @@ -162,8 +163,8 @@ :backgroundColor "#eef2f5"}) (def tag-title-container - {:flex 1 - :alignItems "center" + {:flex 1 + :alignItems "center" :justifyContent "center"}) (def tag-title