From d6c6ac4ae84967e7861e8e5551501c97080d068a Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 27 Sep 2018 08:43:19 -0300 Subject: [PATCH] Composer layout tweaked (#464) * Composer layout tweaked * Fix localization error * Bump version to 1.3.2 --- android/app/build.gradle | 2 +- .../main/res/drawable-hdpi/composer_mic.png | Bin 0 -> 987 bytes .../main/res/drawable-hdpi/composer_plus.png | Bin 0 -> 276 bytes .../main/res/drawable-hdpi/composer_send.png | Bin 0 -> 1171 bytes .../main/res/drawable-mdpi/composer_mic.png | Bin 0 -> 594 bytes .../main/res/drawable-mdpi/composer_plus.png | Bin 0 -> 185 bytes .../main/res/drawable-mdpi/composer_send.png | Bin 0 -> 823 bytes .../main/res/drawable-xhdpi/composer_mic.png | Bin 0 -> 1252 bytes .../main/res/drawable-xhdpi/composer_plus.png | Bin 0 -> 312 bytes .../main/res/drawable-xhdpi/composer_send.png | Bin 0 -> 1472 bytes .../main/res/drawable-xxhdpi/composer_mic.png | Bin 0 -> 1940 bytes .../res/drawable-xxhdpi/composer_plus.png | Bin 0 -> 430 bytes .../res/drawable-xxhdpi/composer_send.png | Bin 0 -> 2252 bytes .../res/drawable-xxxhdpi/composer_mic.png | Bin 0 -> 2576 bytes .../res/drawable-xxxhdpi/composer_plus.png | Bin 0 -> 579 bytes .../res/drawable-xxxhdpi/composer_send.png | Bin 0 -> 2966 bytes app/containers/MessageBox/Recording.js | 36 +- app/containers/MessageBox/index.js | 116 +++--- app/containers/MessageBox/styles.js | 19 +- app/containers/icons.js | 4 - app/i18n/index.js | 5 +- app/icons.json | 370 ------------------ app/views/SettingsView/index.js | 3 - .../Icons/composer_mic.imageset/Contents.json | 23 ++ .../composer_mic.imageset/composer_mic@1x.png | Bin 0 -> 594 bytes .../composer_mic.imageset/composer_mic@2x.png | Bin 0 -> 1252 bytes .../composer_mic.imageset/composer_mic@3x.png | Bin 0 -> 1940 bytes .../composer_plus.imageset/Contents.json | 23 ++ .../composer_plus@1x.png | Bin 0 -> 185 bytes .../composer_plus@2x.png | Bin 0 -> 312 bytes .../composer_plus@3x.png | Bin 0 -> 430 bytes .../composer_send.imageset/Contents.json | 23 ++ .../composer_send@1x.png | Bin 0 -> 823 bytes .../composer_send@2x.png | Bin 0 -> 1472 bytes .../composer_send@3x.png | Bin 0 -> 2252 bytes ios/RocketChatRN/Info.plist | 2 +- 36 files changed, 178 insertions(+), 448 deletions(-) create mode 100644 android/app/src/main/res/drawable-hdpi/composer_mic.png create mode 100644 android/app/src/main/res/drawable-hdpi/composer_plus.png create mode 100644 android/app/src/main/res/drawable-hdpi/composer_send.png create mode 100644 android/app/src/main/res/drawable-mdpi/composer_mic.png create mode 100644 android/app/src/main/res/drawable-mdpi/composer_plus.png create mode 100644 android/app/src/main/res/drawable-mdpi/composer_send.png create mode 100644 android/app/src/main/res/drawable-xhdpi/composer_mic.png create mode 100644 android/app/src/main/res/drawable-xhdpi/composer_plus.png create mode 100644 android/app/src/main/res/drawable-xhdpi/composer_send.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/composer_mic.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/composer_plus.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/composer_send.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/composer_mic.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/composer_plus.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/composer_send.png delete mode 100644 app/containers/icons.js delete mode 100755 app/icons.json create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/Contents.json create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/composer_mic@1x.png create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/composer_mic@2x.png create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/composer_mic@3x.png create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_plus.imageset/Contents.json create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_plus.imageset/composer_plus@1x.png create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_plus.imageset/composer_plus@2x.png create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_plus.imageset/composer_plus@3x.png create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/Contents.json create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/composer_send@1x.png create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/composer_send@2x.png create mode 100644 ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/composer_send@3x.png diff --git a/android/app/build.gradle b/android/app/build.gradle index 53d06a32b..71c002d07 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -102,7 +102,7 @@ android { minSdkVersion 21 targetSdkVersion 27 versionCode VERSIONCODE as Integer - versionName "1.3.1" + versionName "1.3.2" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/android/app/src/main/res/drawable-hdpi/composer_mic.png b/android/app/src/main/res/drawable-hdpi/composer_mic.png new file mode 100644 index 0000000000000000000000000000000000000000..f54670fc8e7c3a1d4ad3b2e91a04b0aa80145c8b GIT binary patch literal 987 zcmV<110?*3P)^iG00004XF*Lt006O% z3;baP000A$NkluJ;(8QR&zL&L&761d3Hg?4I0^EK zV)mi*6&kH(ht8^Hz{<veRv6<=qAmMR-rLTG^|^ibgDnfk!2Wb?7UNjP_c z6WkVA^c{NXd&>i^5I^AIDc+8;+7+;AYzaeZ8Dwx<(w9DJ1FO~z4#y1$Jr}YxtHWq6 zMsG&laKwhW!9vy?!lm`XO=}!pl+U_j(jsFLaet;a{t(7uvv*$>`!QN351H>jR*t}e zl5R$?(tY+;)BKa&xqa;M1DWSz3A@P}ap;%u4Qo=5dmM-L(S-vVItV}{4fsfb`95yQ zhFoI=3xD_uc@Jc{hQY1LEETHl3wm|ZbH)BzZYjLJU!xDh7W|{| zeI-34s|2S=hAi2gz0IC#7ga%;{N8GP*kG%T{!hRo*;#}v)t~82$f5!r&5Fl6gj`n1 z5&2tqw6ZgI#-ytnq0s>YEPUV#j@XL$DPu3~0E*QPFU?Q5PXxHh2fUZUUuufm&)zze zGfo(BTE=p2o1b%iYBYJHz5A0xKMZz804Q4=Zt!xso9xjE3FOV|l zM&6U(S$CVPdZPsDhF*w!#qrI8g#E%l<^~=bXANLHR-JcK(^K9T%%cmfmd}^%w6WD2 z>jpp}$FsSkQi&#cqZccWitmWUH{=EUDR0i$l0^JY!lvI6<1JzX3_ zJb2$uv*kNvz|%V4IU>O=)#(w-oW7;(2`^t(F{!8t80&P*m?6JXRwl8<$TB#|y7Hv@ zYfYBN5!>&mD6lBJEic)W(?2a~<=*@2Y>lPVIxbw=WFNobUctuw8_Ih6HhL_`YMxLr zHzMGpSF=j9SOTAd7mFQ#(9xGER<~UYLqG0Hda7}9eW=)(&FjB+`kj%vd^^P5J*zuD zUd?KW?5d;Tw@(Lp1eE=CHZQ+k-?Zx1FTG`^%QfFg`0m*9XqCj-`5}ex&-X`EH;UCW Y1Us6FDKjzc0eXwU)78&qol`;+0DZ4)O#lD@ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-hdpi/composer_send.png b/android/app/src/main/res/drawable-hdpi/composer_send.png new file mode 100644 index 0000000000000000000000000000000000000000..37fadaa35b18b3b2819120237c9e00b17bfa8d31 GIT binary patch literal 1171 zcmV;E1Z?|>P)500004XF*Lt006O% z3;baP000C^NklGO4Mh;gaX>*q3v*3&BYl0G5~XAeYEIE~ht)%sm+% zwCtsEk2zf^xtl7EYZNN?LXZ%1=d$$Y4Iz`9bT*Ojc3#an<2ZjpISrE_Gpp8m5}DMC zcCwJC?L?er_EMGe2cw{z`sC%6cbT6rR23bQ!P5{Ej%1Y(zq=;_yOf#H!ts_zNLF!GazV%xJRp14Iggar6CpZMDy=nc`c>v$ruL3Wd`8 znvuTnYU^rNvxB4eh-r?AXLUrXJ3jp>Ls!&pC8NpR))wJ9hddTBq(bSdQeSutM!02^ z0L?QQ6A|+ME-@bik^Z1vg)|vPAVt#FAYt5#RDejkLjq$El|UprG-!@cl+J_59LR+< zJCG*2Fg7}HROijuI2M~W$ao4y@@3V=CB5Tji z#D3M;)sayKvY^>@cHoo~jSf&8b5XSOx%Z2SYYE?)_5&iMia9=IM6xd-L&^g`BrTkUU@ zP02JG`|rm;`j=PfA3u(N9%xAZ#b)#GPdd+5h)ApO)F=!R ze7G4AY1c6s^d@B?i^mVbp|*FRiCw*Qb?jrEW1X&RGWagZ;Z<-z2aXgT zI{q9v+BJ=`YcdkEzdxc)mC;6uBn~3ko3Uon{u&**`sXNt>1VtY*R_M*lgLPi0IH7; z)&3M)CDb!AiG+CsVZK;#jGuXQ=vGN6yPlCjAs3LFH_N~zK3jO1{!mU@l|3UP9S#l0 lry;gR66VfU3H)#E{sn>=XS{-Hm&pJC002ovPDHLkV1j|>EmHsh literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-mdpi/composer_mic.png b/android/app/src/main/res/drawable-mdpi/composer_mic.png new file mode 100644 index 0000000000000000000000000000000000000000..0a0674918169be1360bf8b03da02a51de20c1303 GIT binary patch literal 594 zcmV-Y00v@6uoy|q|J+<8;gZD)*2BM74#2uXQj|>Hg2VY)Kybl zW~Vf+EG~*$H`x}%y0U+uf))j7sBK!T=tjZ3R5WwFXP7DJq#u94fydl?&benk-n)3|teUE|PcD?zye?5qOTn|SIIOZM$AsQs6oo~r{NbP#GCrzl*X!( z1Bb@Zsa$-xJBl2`$7Rov*Iq!aVI!}#QBHl%+LI8Y>(DsV>AWpgS_^m(yJk`j8fa02 zTE4j;C%&z;wev_-PTN-dgBoN57xR~0JC9U$$2(+SYO}mDC(}DH z!AkLP#lNx_dX(DAbN12`@jXV##Ru$jin4tG?D{ER#KzMhSXF`YU2G8M&=m|`e2QzHjq6i|p(*OVf07*qoM6N<$f_m>5G5`Po literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-mdpi/composer_plus.png b/android/app/src/main/res/drawable-mdpi/composer_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..7b8db96b877b6af0848b3776e25bf640e21407d0 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mUKs7M+SzC{oH>NS%LflPZ!4! z3&G?B1%?#w{pt+{jHx_2Eg}X+e`Yg;Zf2MtrB*X($%$Sm7mF<`#N2uom^6tTl?eO) z|NH@dp_G)AA03LEqCd_b2yrkKf4GT7PcQt}S7wgGtOW)uo-GP&E@&~BWN`IRM?xiw gSB{6+;}j+a6#IXybHcFc1M4I!ZcvK2QLFT};q60( z{Y4J?SW&N1+!7T@ie~d;-tk1#xmo{UmYbHA3q8zyevN~piV1994})X{sticeq}Wa2 z08wVR&?U$IwdD6erHi;gf&m7M&}XL%Ci>mloSIsc>2OiZSNkPD9T;^Ef-Yc#HY^dK zQ?-=HC}v&pQ9#5K`P`0v@l`2r%W_IB`=^W?+i-VyP{=9;SHO&ohy+@|$1Balu%n4? z+i|EoGrZCnF!f>bEL83U4#71l!w5+*6WUw3G>Evk4hqv_(0~7V%sXJ=iG4%(^A0BysuKa2B*`O82sI!qA-nyHIk!t2m1M)uur7%e z5)RaDi-IA(tEIB8Ej!%)9J-g zZ_19vZh%K8ZNK9(?_DkWFL8nLq&I-E?#HesuVo=it2Rb#RVhX%qW!hNKZYvG#48~~ zr0&&%B|h>1qPXgQYqL8Iz|U&09kF(FqFme7E4D89+#va=>&en3N8-ckn*VsMVLsw4 zck6=7YA2y@lwNE(7**rc)^=pFKIIbd;cDs~QZtJhC|Uqcv*sn-`*vJw>sBs-fR971 zEdqIPPu^Um@3l}n-V!|Hxlggh7ku#g6;h&OFLGP(7g;JI6*r+CsaD@Qk2F5Fpg6lF z%q|i{SjfSI90H z?wa17?as1-hiRCpSMPn_d#_$q^;8Y1+kEN=Z%!)?Use%6&Wh@wlj4?g=to8FN39bZ zW^czO6$MXwT)N>0rv(3sVsXvFHUR?2jc<8I4a6ZsXug6q#YMwt~H0g(`FaV5Y3H|NPuKvsL~ z!{KInWdY&Foxt^PVlU)i%UHg_emr^!t~DIPcE`D1j&$ivz} zOu`+8FOa}6>iXzM35+T*s=%lMqY8{FFviR@b+Ge1ep=>El)sb%1+UM~OtzPFyfFli zqUdwLMMm=lzW%Ex9nXm(zBdWR4<)jZXxT`UhxtAu4{HZ82{*wfF%a8vNyUc@IZ&<$ zpf4SLHizvUiKA@E#@Jkgwqqc+>;hUeMmZu+898oo<1tS}4V->WH{EKRU}C+^?JEak z(4teSmE|f$A?(a*r(8nrj2%Fb>z3->c*M>RI6A8Pq^^UIP%edtCi% zIrv>lutgh4&6aA_U6(z&f&N;btsZae`t4t2nx}g{XyKmm%7Yg@YNH=-DJW=+pOKsb z7(f6K*`vRf2i#Qf05ME(_>2=kr**t`QEIXWG9Dy>($yQmOX-E#Lu7vg3l6x+$OS9D zbqtFZPl2VwwtG(I>x`sOiS?u|k#gRjsFlB$MR`5eTLSj^lHYj}I|++9F-cV=xNOU> z5?xQqOaP|(A%8pnOW#NmdQBum3W?MO`N^CUoq3CH7DrPuT6xK^n_wZ)0?M8qxxoxg z001n^tA1yn{Nr&z_W6V%6=|{6oBsqa%E+IVQSMqf zN`utZ!HPeNeSY~}`rBBBwS^L}$q#tEsq1&9Bc{Eq!e?P4<$moDpT@iW509?e_&j+m z50JL^1Dvbx4;~epPCzR1+g!79E{!eHAJ~RP2DB+3@` zOLd1JIa8HyyVkRZuMkys*xJwT{JxRUCe~pZ`pf!gskyWy$6Vo7NcQ2Ig*$7#g|)!k z`Q8vB>V%vSB7k(?At!_gAl-Ke5sLOBSqN@Xa7h=UEs-=yt);5a_3WrT+lAfHMxrZ2E{??C%`U z-FCLi?Ck8!bf(n%F!#>6=brn`opa8;Gr;}_dTXC5P_=K-fyeqYD^M$TeUMh4XNWNli~OP&fYJjj3h+A<7`<>V z^CU9t!Gd-lF@gcNgbfU`(TI42-&|Gj=3ez)#l0a^PDtyc=$mRwd)n!?$h4>vD)A`uW<9O~APW zm6^UUo)CX&ib`!1y)Td-j+!Ysl${ZfbxsXNUj9{vi|sNtrVHxl^j2@TYlmXt-=#~% zLst4#8Dm9%`tE#zZKf65Nd7Ka4X*5?x0XSKw{B-BBUvhD&MXC_z6|savlN zAnZ&fq?fGps=#&SSU)boqS{41Nd|DGE;p+Q`YUp|P5kZY{iRLovbvwL$9i36w+@8h zp5*q(_g4Bf!SzA(kqXOu>7$itn<+m%L4I0Jp`>#@AP8?Huh+4@^e)QPFY5Pp zYjTsHQi=5}bl zszor`FX@>H=ObI*r@XFdIOxg-Kq0`S=41l?s5jolCsb{dw9-#$8cWpHu+zf*2G zY&xSs2!i#w+n`>)^#z<;hhY66B{wMz+q~ zW@EX`S8zT71X;Da@E@5V?&tk(i|^p69nn#8ms6F1lqx?Si&y{1tkkL3_8oi%;L6lU zC&78S3Aec*;LC2}Zc#qJoJkIdU(Y;{`|E;$pL`9}P)K-yGRdnAVR)1R)76>X{bMeo ak^cb(_19}YNTh230000e`a@;3mgRY2b4%4LJZ;H!FV9?qT%<3#0VaU z#F!ZOMd9&U9 zdS>67StdwkHk(&nT|ZxSSO3hb0WpW4$9l(>Od)RcQ9LIEJW8e)70lld0!f{P&%C# zAg(EYD3(&%tVa~{E&sGsz!!j0 zwiAVTpZE*(zCt>!sANq5tG)^2l~f&I~+&c?B}tS{d&<@py$R+|a%nxyDTy2U1*0p8~=@RaIe zPh9XEAj`6j87!s(+a`CmR^kAHLu$q>FIdj`8BRQkby!!Iwr%TurRc-~6i(QpJ>G3x zIbRegL9mY6sf>PgdK;YC8WjXkydDI$!>w{QPpg^`sb-+Pd+f6*^nT-i zrtcrPCK4A;8H_sao)N{}_v1{I!YMuUwHK^G7}L^QF%ytYf$<)Q-mV$%iEQa|Z4h8p zbxhm3t_u@mm-8A^cXUBTqj)63n_-xBEh=8jbS0yFUvya-rft2`fr+up$?568b-4mv z<`o}a)#d5!+IlWt=)5>I>#(jVYuYyZtXG=U$=GGKzvU*qu+165C>9%St-+;Itw|Lo zF`p|hIxh~bsx?;0$+m6SiC}^pW0zFkp^7J7)`d~PGkRO6xz0-gdpeKHMqISedF5!9 zEtHxxG4KN08cQQ>OpKYahX>g?O_ocD%RAnhSZVMI4X&V&-chS>!L;Xp7bggoVOi2Q zHV?L0syd^v5GKo~!mI*FN%+R<6vFeV665}Gk(vv0dM}OWN-i69bmw-t)&%pok7Za^ z*A0q%VxP`4Xa|-MGgW$2%@#U)^Vg}^R$RQ)F|@O-<%vv&%Ak%G9{uKF1&!okdv`J=!xsP8LmXzE zawE^ufp2UNHTlUH8EeQ>YanbaeLLUjP2jI6uqov6tbmXkvj>{LE%HhbbNO?dj-K)7 zQTV4R1&f1BSC5HQ6Fh$HgY-xU!3cnv?LA`$gS-tzC~8g-nR+VQ-*jn)d+(@@zKK=B z_kN80lmX!5(E}~ry60kaA@kwZbcQO|gJGMW%8=)sRfhGBdq6868_RF^B{^1OahlZ+o@@~TmmKOG2J?Ggb<^2=_tRFp){=wy=WB@GO*`41;0elq+ zLRo@QS{!>{Zf*X$)M4jxsPp)cQfH0YD$U)79PT^AkPF%>q$GE zLL+2gNJx2%4wBQ^51Wji(S$PgQ{8R&df@xpqlZ*M8pJI+rnZ(E`OxO90kB|UO`M@1 zR)>ntC%_fDC4Nss_b2t=px^%mUr@l~E6O6$U#xDG(TkaBjy4g>`3;OWg!eRFwIeNifaG^}%r`j0A zaXO^li8JcD{lo!;%1iqu*Lc47ia>t@<#D<1(4k7?NzQKykZ0&_^SORKhzOQpR2)EP zllE+&FDdIhA2$*2S;}#Gqk*kqzxjk*;oILizR%Myw=U4xqHdL@T>Mtm0oblMpsv3B zX5Yt?dY_cAb+|u$s#?IhO{ODP30oj(n*q|_U$!3e<{CWvnDYQ^;P<-yzYn0QHPHFy zZmUKs7M+SzC{oH>NSs54@Q$1ZA zLo!(3&T{l)Hso=A{L*7VQCpX6ka@@Bf{8^OM;xo>CN>}8D`XS!2t2D&vc%x7g!am{ z7vC?Nd7|vmf3?UzW-YCCD@x<9^WTqt_h?s4JKx{uw;vz%whXVnb6wA3effhO{Dya? zeU^D-V0V9N@z&$9Z=2#?Ei}|uS@N5~aAi>3BZo8GoG#oFSr#G1h))qdvUbODoj>Z4%BCBuK zo!)oui1I7%pu{%j{O2c0S_MrJ0Y4xhv1tRxXJP zl0REN<;EMkwvYd2#ETsMeOYu*_1W25ZWy;6Gg;r9%GVLOYJH^i5tCJs&l+Yd{WWW= zqtD`5xP;Fob(;Qf&-`>r{dT32MP$ll<9+`Z9^g+8bKIX^{n`!~0Sun5elF{r5}E+M C?Z*@V literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxhdpi/composer_send.png b/android/app/src/main/res/drawable-xxhdpi/composer_send.png new file mode 100644 index 0000000000000000000000000000000000000000..ef40c99a7f4e0f2c7179a77c02fbc073d67b1ecf GIT binary patch literal 2252 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 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxxhdpi/composer_plus.png b/android/app/src/main/res/drawable-xxxhdpi/composer_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..eba3561892b6e7f29ec6849151ba2a36f0697bf6 GIT binary patch literal 579 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Ea{HEjtmSN`?>!lvNA9*{_=Ej z45?szduyZbVF!t$A9r_X@d_(wWtlnX9574dWV&qNc%y+&HS`FJiKgW_rRVQO->*tw zzI4Age%{MT^RJ$CYU=Mbb3T{--%wL@{n@K?&!Sdr zKbP)V{`FSx?zo^^SN?@JisdDjC^7^@++dlI+9|YP!v;=;(?Y5aiHX7v(^S104joc! z(D9za(Aw(D5IIeQk&Ama!zP_TCJ`|+#+1lKEE+mFOeZ$EaFSxcv6p>`ryf~&B;?Oo zb!KPG^hxLLK7T&P&g|Z|R z-mPUnI!!yzNiN{?SHP^lJ-0bgPKb5_+eOdMANXX%o2A-}khLvq686-v4G6eBXW;D`> zVq7An#+(wcg~`Lzhwa3I4Au!*Gk7LAUgT1^Y9Oi5yhzkxRicpto2zyMi3ViNd3T}c woDGl9wUv_!)dH@sbDk4j>+AO5KW7c>z9$gzn9?1f~iGPgg&ebxsLQ00-*zJOBUy literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxxhdpi/composer_send.png b/android/app/src/main/res/drawable-xxxhdpi/composer_send.png new file mode 100644 index 0000000000000000000000000000000000000000..4867567f1bf9fb68ec5ca626d26d401d802a9b73 GIT binary patch literal 2966 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 M07*qoM6N<$f>*7!p8x;= literal 0 HcmV?d00001 diff --git a/app/containers/MessageBox/Recording.js b/app/containers/MessageBox/Recording.js index ee8f49ea4..ebf8d087e 100644 --- a/app/containers/MessageBox/Recording.js +++ b/app/containers/MessageBox/Recording.js @@ -4,6 +4,8 @@ import { View, SafeAreaView, Platform, PermissionsAndroid, Text } from 'react-native'; import { AudioRecorder, AudioUtils } from 'react-native-audio'; +import { BorderlessButton } from 'react-native-gesture-handler'; + import Icon from 'react-native-vector-icons/MaterialIcons'; import styles from './styles'; import I18n from '../../i18n'; @@ -119,24 +121,32 @@ export default class extends React.PureComponent { testID='messagebox-recording' style={styles.textBox} > - - + + style={styles.actionButton} + > + + {currentTime} - + style={styles.actionButton} + > + + ); } diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js index fdfa1a107..5f8e98a3b 100644 --- a/app/containers/MessageBox/index.js +++ b/app/containers/MessageBox/index.js @@ -1,13 +1,14 @@ import React from 'react'; import PropTypes from 'prop-types'; import { - View, TextInput, FlatList, Text, TouchableOpacity, Alert + View, TextInput, FlatList, Text, TouchableOpacity, Alert, Image } from 'react-native'; import Icon from 'react-native-vector-icons/MaterialIcons'; import { connect } from 'react-redux'; import { emojify } from 'react-emojione'; import { KeyboardAccessoryView } from 'react-native-keyboard-input'; import ImagePicker from 'react-native-image-crop-picker'; +import { BorderlessButton } from 'react-native-gesture-handler'; import { userTyping as userTypingAction } from '../../actions/room'; import { @@ -17,7 +18,6 @@ import { } from '../../actions/messages'; import RocketChat from '../../lib/rocketchat'; import styles from './styles'; -import MyIcon from '../icons'; import database from '../../lib/realm'; import Avatar from '../Avatar'; import CustomEmoji from '../EmojiPicker/CustomEmoji'; @@ -182,35 +182,52 @@ export default class MessageBox extends React.PureComponent { if (editing) { return ( - this.editCancel()} + style={styles.actionButton} testID='messagebox-cancel-editing' - /> + > + + ); } return !showEmojiKeyboard ? ( - this.openEmoji()} + ) + > + + + ) : ( - this.closeEmoji()} - style={styles.actionButtons} + ); + > + + + ); } get rightButtons() { @@ -218,35 +235,44 @@ export default class MessageBox extends React.PureComponent { const icons = []; if (text) { - icons.push( this.submit(text)} - testID='messagebox-send-message' - />); + icons.push( + this.submit(text)} + style={styles.actionButton} + testID='messagebox-send-message' + accessibilityLabel={I18n.t('Send message')} + accessibilityTraits='button' + > + + + ); return icons; } - icons.push( this.recordAudioMessage()} - testID='messagebox-send-audio' - />); - icons.push(); + icons.push( + + + + ); + icons.push( + + + + ); return icons; } @@ -653,7 +679,7 @@ export default class MessageBox extends React.PureComponent { underlineColorAndroid='transparent' defaultValue='' multiline - placeholderTextColor='#9EA2A8' + placeholderTextColor='#9ea2a8' testID='messagebox-input' /> {this.rightButtons} diff --git a/app/containers/MessageBox/styles.js b/app/containers/MessageBox/styles.js index 5fa1aea79..ed4f2a587 100644 --- a/app/containers/MessageBox/styles.js +++ b/app/containers/MessageBox/styles.js @@ -25,25 +25,26 @@ export default StyleSheet.create({ }, textBoxInput: { textAlignVertical: 'center', - maxHeight: 120, + maxHeight: 242, flexGrow: 1, width: 1, // paddingVertical: 12, needs to be paddingTop/paddingBottom because of iOS/Android's TextInput differences on rendering paddingTop: 12, paddingBottom: 12, paddingLeft: 0, - paddingRight: 0 + paddingRight: 0, + fontSize: 17, + letterSpacing: 0, + color: '#2f343d' }, editing: { backgroundColor: '#fff5df' }, - actionButtons: { - color: '#2F343D', - fontSize: 20, - textAlign: 'center', - padding: 15, - paddingHorizontal: 12, - flex: 0 + actionButton: { + alignItems: 'center', + justifyContent: 'center', + width: 60, + height: 56 }, mentionList: { maxHeight: MENTION_HEIGHT * 4 diff --git a/app/containers/icons.js b/app/containers/icons.js deleted file mode 100644 index 236466031..000000000 --- a/app/containers/icons.js +++ /dev/null @@ -1,4 +0,0 @@ -import { createIconSetFromIcoMoon } from 'react-native-vector-icons'; -import iconConfig from '../icons.json'; - -export default createIconSetFromIcoMoon(iconConfig); diff --git a/app/i18n/index.js b/app/i18n/index.js index aeaa983df..5cd2cb383 100644 --- a/app/i18n/index.js +++ b/app/i18n/index.js @@ -1,12 +1,13 @@ import I18n from 'react-native-i18n'; import en from './locales/en'; import ru from './locales/ru'; -import pt from './locales/pt-BR'; +import ptBR from './locales/pt-BR'; I18n.fallbacks = true; +I18n.defaultLocale = 'en'; I18n.translations = { - en, ru, pt + en, ru, 'pt-BR': ptBR }; export default I18n; diff --git a/app/icons.json b/app/icons.json deleted file mode 100755 index aee0103de..000000000 --- a/app/icons.json +++ /dev/null @@ -1,370 +0,0 @@ -{ - "IcoMoonType": "selection", - "icons": [ - { - "icon": { - "paths": [ - "M438.857 0v1024h146.286v-1024z", - "M1024 438.857h-1024v146.286h1024z" - ], - "attrs": [ - {}, - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "plus" - ], - "colorPermutations": { - "47526116572821": [ - {}, - {} - ] - } - }, - "attrs": [ - {}, - {} - ], - "properties": { - "order": 28, - "id": 2, - "name": "plus", - "prevSize": 32, - "code": 59648 - }, - "setIdx": 2, - "setId": 6, - "iconIdx": 0 - }, - { - "icon": { - "paths": [ - "M192 256.3v511.4c0 35.542 28.768 64.3 64.3 64.3h511.4c35.542 0 64.3-28.768 64.3-64.3v-511.4c0-35.542-28.768-64.3-64.3-64.3h-511.4c-35.542 0-64.3 28.768-64.3 64.3zM115.2 256.3c0-77.942 63.136-141.1 141.1-141.1h511.4c77.942 0 141.1 63.136 141.1 141.1v511.4c0 77.942-63.136 141.1-141.1 141.1h-511.4c-77.942 0-141.1-63.136-141.1-141.1v-511.4z", - "M384 499.2c-63.623 0-115.2-51.577-115.2-115.2s51.577-115.2 115.2-115.2c63.623 0 115.2 51.577 115.2 115.2s-51.577 115.2-115.2 115.2zM384 422.4c21.208 0 38.4-17.192 38.4-38.4s-17.192-38.4-38.4-38.4c-21.208 0-38.4 17.192-38.4 38.4s17.192 38.4 38.4 38.4z", - "M362.1 661.315l142.276 97.378 216.661-204.97 119.31 88.168 45.643-61.765-171.023-126.383-218.354 206.571-141.706-96.989-215.826 199.756 52.167 56.364z" - ], - "attrs": [ - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - } - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "image--dark" - ], - "colorPermutations": { - "2372372371291162451461152331": [ - { - "f": 0 - }, - { - "f": 0 - }, - { - "f": 0 - } - ] - } - }, - "attrs": [ - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - } - ], - "properties": { - "order": 27, - "id": 7, - "name": "image", - "prevSize": 32, - "code": 59649 - }, - "setIdx": 3, - "setId": 5, - "iconIdx": 1 - }, - { - "icon": { - "paths": [ - "M536.525 899.948l-24.525 20.355-24.525-20.355c-2.383-1.978-6.519-5.545-12.158-10.619-9.205-8.281-19.41-17.9-30.368-28.777-31.205-30.973-62.381-65.972-91.538-104.393-84.606-111.487-135.811-228.912-135.811-347.961 0-161.866 131.854-292.999 294.4-292.999s294.4 131.133 294.4 292.999c0 119.049-51.205 236.473-135.811 347.961-29.157 38.421-60.333 73.42-91.538 104.393-10.958 10.877-21.164 20.496-30.368 28.777-5.639 5.073-9.775 8.64-12.158 10.619zM524.949 806.045c28.795-28.581 57.619-60.94 84.462-96.312 75.394-99.349 120.189-202.073 120.189-301.534 0-119.356-97.376-216.199-217.6-216.199s-217.6 96.843-217.6 216.199c0 99.46 44.795 202.185 120.189 301.534 26.843 35.372 55.667 67.731 84.462 96.312 4.618 4.584 8.948 8.792 12.949 12.611 4.001-3.819 8.33-8.027 12.949-12.611z", - "M512 550.4c-77.762 0-140.8-63.038-140.8-140.8s63.038-140.8 140.8-140.8c77.762 0 140.8 63.038 140.8 140.8s-63.038 140.8-140.8 140.8zM512 473.6c35.346 0 64-28.654 64-64s-28.654-64-64-64c-35.346 0-64 28.654-64 64s28.654 64 64 64z" - ], - "attrs": [ - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - } - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "locaiton--dark" - ], - "colorPermutations": { - "2372372371291162451461152331": [ - { - "f": 0 - }, - { - "f": 0 - } - ] - } - }, - "attrs": [ - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - } - ], - "properties": { - "order": 26, - "id": 6, - "name": "locaiton", - "prevSize": 32, - "code": 59650 - }, - "setIdx": 3, - "setId": 5, - "iconIdx": 2 - }, - { - "icon": { - "paths": [ - "M192 396.8v384h435.2v-384h-435.2zM704 320v537.6h-588.8v-537.6h588.8z", - "M704 669.575l179.2 58.183v-226.793l-179.2 58.183v110.427zM860.987 427.431c51.738-16.799 99.013 17.465 99.013 71.914v230.034c0 54.383-47.285 88.709-99.013 71.914l-233.787-75.907v-222.049l233.787-75.907z", - "M243.2 243.2h332.8v-76.8h-332.8z" - ], - "attrs": [ - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - } - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "video--dark" - ], - "colorPermutations": { - "2372372371291162451461152331": [ - { - "f": 0 - }, - { - "f": 0 - }, - { - "f": 0 - } - ] - } - }, - "attrs": [ - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - } - ], - "properties": { - "order": 25, - "id": 5, - "name": "video", - "prevSize": 32, - "code": 59652 - }, - "setIdx": 3, - "setId": 5, - "iconIdx": 3 - }, - { - "icon": { - "paths": [ - "M512 179.2c-56.554 0-102.4 45.846-102.4 102.4v153.6c0 56.554 45.846 102.4 102.4 102.4s102.4-45.846 102.4-102.4v-153.6c0-56.554-45.846-102.4-102.4-102.4zM512 102.4c98.969-0 179.2 80.231 179.2 179.2v153.6c0 98.969-80.231 179.2-179.2 179.2s-179.2-80.231-179.2-179.2v-153.6c0-98.969 80.231-179.2 179.2-179.2z", - "M473.6 716.8v153.6h76.8v-153.6z", - "M358.4 870.4h307.2v51.2h-307.2v-51.2z", - "M217.603 410.070c2.746 224.36 103.388 345.13 294.397 345.13s291.651-120.77 294.397-345.13l-76.794-0.94c-2.268 185.24-72.292 269.27-217.603 269.27s-215.335-84.030-217.603-269.27l-76.794 0.94z" - ], - "attrs": [ - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - } - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "volume--dark" - ], - "colorPermutations": { - "2372372371291162451461152331": [ - { - "f": 0 - }, - { - "f": 0 - }, - { - "f": 0 - }, - { - "f": 0 - } - ] - } - }, - "attrs": [ - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - }, - { - "fill": "rgb(29, 116, 245)" - } - ], - "properties": { - "order": 24, - "id": 4, - "name": "audio", - "prevSize": 32, - "code": 59653 - }, - "setIdx": 3, - "setId": 5, - "iconIdx": 4 - }, - { - "icon": { - "paths": [ - "M4.676 67.568c-7.948-17.050-4.542-38.646 10.218-53.423 13.625-13.64 34.062-18.186 53.363-10.23l1080.886 463.755c17.031 7.957 28.385 26.143 28.385 44.33 1.135 19.323-11.354 36.373-28.385 44.33l-1080.886 463.755c-19.302 7.957-39.738 3.41-53.363-10.23-14.76-14.777-19.302-35.236-10.218-53.423l196.421-444.432-196.421-444.432zM1007.221 512l-864.028-371.686 148.735 335.313 238.431 2.273c26.114-1.137 47.686 20.46 47.686 47.74 1.135 26.143-20.437 47.74-47.686 47.74h-249.785l-137.382 310.307 864.028-371.686z" - ], - "attrs": [ - { - "fill": "rgb(46, 115, 233)" - } - ], - "width": 1178, - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "teste" - ], - "colorPermutations": { - "2372372371291162451461152331": [ - { - "f": 1 - } - ] - } - }, - "attrs": [ - { - "fill": "rgb(46, 115, 233)" - } - ], - "properties": { - "order": 15, - "id": 0, - "name": "send", - "prevSize": 32, - "code": 59651 - }, - "setIdx": 3, - "setId": 5, - "iconIdx": 8 - } - ], - "height": 1024, - "metadata": { - "name": "icomoon" - }, - "preferences": { - "showGlyphs": true, - "showQuickUse": true, - "showQuickUse2": true, - "showSVGs": true, - "fontPref": { - "prefix": "icon-", - "metadata": { - "fontFamily": "icomoon", - "majorVersion": 1, - "minorVersion": 0 - }, - "metrics": { - "emSize": 1024, - "baseline": 6.25, - "whitespace": 50 - }, - "embed": false, - "autoHost": false, - "noie8": false, - "ie7": true, - "showSelector": false, - "showMetrics": false, - "showMetadata": false, - "showVersion": false - }, - "imagePref": { - "prefix": "icon-", - "png": true, - "useClassSelector": true, - "color": 0, - "bgColor": 16777215, - "classSelector": ".icon" - }, - "historySize": 50, - "showCodes": false, - "gridSize": 16, - "quickUsageToken": { - "UntitledProject": "NTdjODdjYjc0ZDI5MGY2MWFiYjIxMjg0ZmJlZTE1OTgjMSMxNTEyMTU3MDcxIyMj" - }, - "showLiga": false - } -} diff --git a/app/views/SettingsView/index.js b/app/views/SettingsView/index.js index e8213ad01..b4fe49450 100644 --- a/app/views/SettingsView/index.js +++ b/app/views/SettingsView/index.js @@ -128,9 +128,6 @@ export default class SettingsView extends LoggedView { } catch (e) { this.setState({ saving: false }); setTimeout(() => { - if (e && e.error) { - return showErrorAlert(I18n.t(e.error, e.details)); - } showErrorAlert(I18n.t('There_was_an_error_while_action', { action: I18n.t('saving_preferences') })); log('saveUserPreferences', e); }, 300); diff --git a/ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/Contents.json b/ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/Contents.json new file mode 100644 index 000000000..1532f5ff4 --- /dev/null +++ b/ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "composer_mic@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "composer_mic@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "composer_mic@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/composer_mic@1x.png b/ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/composer_mic@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..0a0674918169be1360bf8b03da02a51de20c1303 GIT binary patch literal 594 zcmV-Y00v@6uoy|q|J+<8;gZD)*2BM74#2uXQj|>Hg2VY)Kybl zW~Vf+EG~*$H`x}%y0U+uf))j7sBK!T=tjZ3R5WwFXP7DJq#u94fydl?&benk-n)3|teUE|PcD?zye?5qOTn|SIIOZM$AsQs6oo~r{NbP#GCrzl*X!( z1Bb@Zsa$-xJBl2`$7Rov*Iq!aVI!}#QBHl%+LI8Y>(DsV>AWpgS_^m(yJk`j8fa02 zTE4j;C%&z;wev_-PTN-dgBoN57xR~0JC9U$$2(+SYO}mDC(}DH z!AkLP#lNx_dX(DAbN12`@jXV##Ru$jin4tG?D{ER#KzMhSXF`YU2G8M&=m|`e2QzHjq6i|p(*OVf07*qoM6N<$f_m>5G5`Po literal 0 HcmV?d00001 diff --git a/ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/composer_mic@2x.png b/ios/RocketChatRN/Images.xcassets/Icons/composer_mic.imageset/composer_mic@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fbc22b4d819a7923fffeb4d46331fe33215b938c GIT binary patch literal 1252 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 gSB{6+;}j+a6#DB+3@` zOLd1JIa8HyyVkRZuMkys*xJwT{JxRUCe~pZ`pf!gskyWy$6Vo7NcQ2Ig*$7#g|)!k z`Q8vB>V%vSB7k(?At!_gAl-Ke5sLOBSqN@Xa7h=UEs-=yt);5a_3WrT+lAfHMxrZ2ZmUKs7M+SzC{oH>NSs54@Q$1ZA zLo!(3&T{l)Hso=A{L*7VQCpX6ka@@Bf{8^OM;xo>CN>}8D`XS!2t2D&vc%x7g!am{ z7vC?Nd7|vmf3?UzW-YCCD@x<9^WTqt_h?s4JKx{uw;vz%whXVnb6wA3effhO{Dya? zeU^D-V0V9N@z&$9Z=2#?Ei}|uS@N5~aAi>3BZo8GoG#oFSr#G1h))qdvUbODoj>Z4%BCBuK zo!)oui1I7%pu{%j{O2c0S_MrJ0Y4xhv1tRxXJP zl0REN<;EMkwvYd2#ETsMeOYu*_1W25ZWy;6Gg;r9%GVLOYJH^i5tCJs&l+Yd{WWW= zqtD`5xP;Fob(;Qf&-`>r{dT32MP$ll<9+`Z9^g+8bKIX^{n`!~0Sun5elF{r5}E+M C?Z*@V literal 0 HcmV?d00001 diff --git a/ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/Contents.json b/ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/Contents.json new file mode 100644 index 000000000..20f85cbce --- /dev/null +++ b/ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "composer_send@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "composer_send@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "composer_send@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/composer_send@1x.png b/ios/RocketChatRN/Images.xcassets/Icons/composer_send.imageset/composer_send@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..597972349a1ea13f34140d0df2b4ce12684036b2 GIT binary patch literal 823 zcmV-71IYY|P)IXybHcFc1M4I!ZcvK2QLFT};q60( z{Y4J?SW&N1+!7T@ie~d;-tk1#xmo{UmYbHA3q8zyevN~piV1994})X{sticeq}Wa2 z08wVR&?U$IwdD6erHi;gf&m7M&}XL%Ci>mloSIsc>2OiZSNkPD9T;^Ef-Yc#HY^dK zQ?-=HC}v&pQ9#5K`P`0v@l`2r%W_IB`=^W?+i-VyP{=9;SHO&ohy+@|$1Balu%n4? z+i|EoGrZCnF!f>bEL83U4#71l!w5+*6WUw3G>Evk4hqv_(0~7V%sXJ=iG4%(^A0BysuKa2B*`O82sI!qA-nyHIk!t2m1M)uur7%e z5)RaDi-IA(tEIB8Ej!%)9J-g zZ_19vZh%K8ZNK9(?_DkWFL8nLq&I-E?#HesuVo=it2Rb#RVhX%qW!hNKZYvG#48~~ zr0&&%B|h>1qPXgQYqL8Iz|U&09kF(FqFme7E4D89+#va=>&en3N8-ckn*VsMVLsw4 zck6=7YA2y@lwNE(7**rc)^=pFKIIbd;cDs~QZtJhC|Uqcv*sn-`*vJw>sBs-fR971 zEdqIPPu^Um@3l}n-V!|Hxlggh7ku#g6;h&OFLGP(7g;JI6*r+CsaD@Qk2F5Fpg6lF zE{??C%`U z-FCLi?Ck8!bf(n%F!#>6=brn`opa8;Gr;}_dTXC5P_=K-fyeqYD^M$TeUMh4XNWNli~OP&fYJjj3h+A<7`<>V z^CU9t!Gd-lF@gcNgbfU`(TI42-&|Gj=3ez)#l0a^PDtyc=$mRwd)n!?$h4>vD)A`uW<9O~APW zm6^UUo)CX&ib`!1y)Td-j+!Ysl${ZfbxsXNUj9{vi|sNtrVHxl^j2@TYlmXt-=#~% zLst4#8Dm9%`tE#zZKf65Nd7Ka4X*5?x0XSKw{B-BBUvhD&MXC_z6|savlN zAnZ&fq?fGps=#&SSU)boqS{41Nd|DGE;p+Q`YUp|P5kZY{iRLovbvwL$9i36w+@8h zp5*q(_g4Bf!SzA(kqXOu>7$itn<+m%L4I0Jp`>#@AP8?Huh+4@^e)QPFY5Pp zYjTsHQi=5}bl zszor`FX@>H=ObI*r@XFdIOxg-Kq0`S=41l?s5jolCsb{dw9-#$8cWpHu+zf*2G zY&xSs2!i#w+n`>)^#z<;hhY66B{wMz+q~ zW@EX`S8zT71X;Da@E@5V?&tk(i|^p69nn#8ms6F1lqx?Si&y{1tkkL3_8oi%;L6lU zC&78S3Aec*;LC2}Zc#qJoJkIdU(Y;{`|E;$pL`9}P)K-yGRdnAVR)1R)76>X{bMeo ak^cb(_19}YNTh230000I=p0i}Pd(QljV7RE$QFwy5W z0wQ{(IIi6++f(k&)2V*h_k}wBR%rtxajRvDPXZ8cBLGs4?x!Uv{logDwh+1LxAZSS z)5Y`ZI%?Oyxx$`yT2C8L`o1ZaGSj$82)5C(#cD^vFmEDuoT=(l4(+=dlr?#gen&U1 zg|ocHE*qc5@=zSbqP&Um-EZcpG(!Xu)0^785FC5fw#-dmnhw=@15Sb}Wec0WX7*GcDV)4n@ z(habNoOROtxLeS6)Zsgxej`u+cJuBkC^F>kA1PfaY>}IrF+PvoLv;(-&N?Siw{+xu zU2(M4kQYV7|Mu15EZ3m_A8~SB}i`>x}{YE&=#c?UsDj#ku6J9*p0*VZ|g=u^RmXO04WHqzB zrteNWw&52i$9rG)nmsm9WXL@;TZtud2)VDu@@OjL_7XJCcJgqr&Kxa+(mzyQYYQ_M zSIF%M)~+`(np>o)kNWX%3Y1lOaZX7$zJ#sxtCl!XGcGM|T)`8*9RWe_2ESx44NkPNvm^%>uhE_}Ho zjOgoJp+mN1A7~B`#t^|y1OXxys)AApxwn_ST-he)Y+?{q5Zj4D_r+9#8wGk?_ zUbAfMhfK@dRAK81QyvOKTUkCUM~qJ}OYB1Kb|B24PS7CF@fzcNQ*np7|GW|LKGW8p zZzYd{rMJJhQ@cEj>|BQ5u#Vp)1rP*QWuyo5XJxgu5)he@H*I5YD}YEK8s$yA07@M- z%CL^ko=&}lf#84QDP_}}+k5{iX|BwRRN;ue2Y`h7!d`p<$?T$RW{-FO!X7>~nwGa> zFD-2DYz=Gpzp#!?Q)B8C4j|IU6=sZI0FckLDh*Dak0UmbTY0DlheZ+^*DfbcKa|3S z8WkfE=6{Tn_MzfV^#Li1!@6(S_yLx5<;KowYxd14I5w%}4IJhl>0gfNr7t2Ux*5`4 zJm1rf68(dSZz+yv_PM$D4HT?jDW6~d=l~wODvF{I-Iu-#3aX&N!a2k7B6P}rds8+CiN1%l!Xl#Z`&Xzo*j z>@8@!27*@uKZnNqO$KrHt@AYXd(Y>|Y(%$WsI;Dhy$^n*r%``1ZHRTA!JW?fsAEGb z_Ww2cEGBq%)m{4XQkiYSR`)f4b9ACav zTl(ia$%x9UB~WT78yGIFHidl~+AhK0AvLS+cs)<+zIN-^rtv|Y;sIH*v#0jfD*?6&rew>^=ffv zc8wp6Umy4DY*!x+c)MCX;Q7ghO(8J5<~P3MpbXq)^udQ*>nBu8eYiB|J^s!;h=0dH zv8>DqY~|H6PLP06`@#9QllRiUqK>Pj?>H#MQTh+geb3Yi5oa0xq@|@JW$8F5l}RbS zvyBVTW9NKOtvg`4XacKU0cG7K+Fqo>{uwA;L;|Eg9`U*~kHV@epgeX1SzOT1q6iv> zRmeKP52xXs$}k4ROUB9m*!FUcNLV1puF|% zIcj1$2%xTmk|K2i>!|u)SwRBV_tW&cb-l3$gIx!uu!D}{US@Z_vf)}Vc9-1Z!%>H$ z>N+S=OkzDvJKR){@=!Qc!&4;!l&SIbUjWSu;l(~hiQVf!VSDEFsN;g@69I}85+QnI zYiTua;ss7(K;c^E*AUY8w`dELfOF2U@R#Nb#s*Xp14`vTvm#{7H?X*z_PuA&_x}j_u_kiF7$hrJcI}xz&0C+nTxn0000CFBundlePackageType APPL CFBundleShortVersionString - 1.3.1 + 1.3.2 CFBundleSignature ???? CFBundleURLTypes