From be0ca330f5d70125341c2c557fd2bad5394bae0a Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Wed, 28 Oct 2015 09:47:09 -0700 Subject: [PATCH] Nicer looking attachment type selector Closes #4367 // FREEBIE --- res/drawable-hdpi/ic_camera_white_36dp.png | Bin 0 -> 1009 bytes res/drawable-hdpi/ic_headset_white_36dp.png | Bin 0 -> 683 bytes res/drawable-hdpi/ic_image_white_36dp.png | Bin 0 -> 474 bytes .../ic_local_movies_white_36dp.png | Bin 0 -> 259 bytes res/drawable-hdpi/ic_person_white_36dp.png | Bin 0 -> 460 bytes res/drawable-mdpi/ic_camera_white_36dp.png | Bin 0 -> 705 bytes res/drawable-mdpi/ic_headset_white_36dp.png | Bin 0 -> 457 bytes res/drawable-mdpi/ic_image_white_36dp.png | Bin 0 -> 351 bytes .../ic_local_movies_white_36dp.png | Bin 0 -> 215 bytes res/drawable-mdpi/ic_person_white_36dp.png | Bin 0 -> 360 bytes res/drawable-xhdpi/ic_camera_white_36dp.png | Bin 0 -> 1274 bytes res/drawable-xhdpi/ic_headset_white_36dp.png | Bin 0 -> 797 bytes res/drawable-xhdpi/ic_image_white_36dp.png | Bin 0 -> 614 bytes .../ic_local_movies_white_36dp.png | Bin 0 -> 231 bytes res/drawable-xhdpi/ic_person_white_36dp.png | Bin 0 -> 548 bytes res/drawable-xxhdpi/ic_camera_white_36dp.png | Bin 0 -> 1923 bytes res/drawable-xxhdpi/ic_headset_white_36dp.png | Bin 0 -> 1198 bytes res/drawable-xxhdpi/ic_image_white_36dp.png | Bin 0 -> 938 bytes .../ic_local_movies_white_36dp.png | Bin 0 -> 334 bytes res/drawable-xxhdpi/ic_person_white_36dp.png | Bin 0 -> 974 bytes res/drawable-xxxhdpi/ic_camera_white_36dp.png | Bin 0 -> 2533 bytes .../ic_headset_white_36dp.png | Bin 0 -> 1601 bytes res/drawable-xxxhdpi/ic_image_white_36dp.png | Bin 0 -> 1179 bytes .../ic_local_movies_white_36dp.png | Bin 0 -> 374 bytes res/drawable-xxxhdpi/ic_person_white_36dp.png | Bin 0 -> 1064 bytes res/layout/attachment_type_selector.xml | 171 ++++++++++++ res/values/attrs.xml | 5 + res/values/strings.xml | 7 + res/values/styles.xml | 4 + res/values/themes.xml | 2 + .../securesms/ConversationActivity.java | 31 ++- .../components/AttachmentTypeSelector.java | 243 ++++++++++++++++++ .../components/CircleColorImageView.java | 40 +++ 33 files changed, 487 insertions(+), 16 deletions(-) create mode 100644 res/drawable-hdpi/ic_camera_white_36dp.png create mode 100644 res/drawable-hdpi/ic_headset_white_36dp.png create mode 100644 res/drawable-hdpi/ic_image_white_36dp.png create mode 100644 res/drawable-hdpi/ic_local_movies_white_36dp.png create mode 100644 res/drawable-hdpi/ic_person_white_36dp.png create mode 100644 res/drawable-mdpi/ic_camera_white_36dp.png create mode 100644 res/drawable-mdpi/ic_headset_white_36dp.png create mode 100644 res/drawable-mdpi/ic_image_white_36dp.png create mode 100644 res/drawable-mdpi/ic_local_movies_white_36dp.png create mode 100644 res/drawable-mdpi/ic_person_white_36dp.png create mode 100644 res/drawable-xhdpi/ic_camera_white_36dp.png create mode 100644 res/drawable-xhdpi/ic_headset_white_36dp.png create mode 100644 res/drawable-xhdpi/ic_image_white_36dp.png create mode 100644 res/drawable-xhdpi/ic_local_movies_white_36dp.png create mode 100644 res/drawable-xhdpi/ic_person_white_36dp.png create mode 100644 res/drawable-xxhdpi/ic_camera_white_36dp.png create mode 100644 res/drawable-xxhdpi/ic_headset_white_36dp.png create mode 100644 res/drawable-xxhdpi/ic_image_white_36dp.png create mode 100644 res/drawable-xxhdpi/ic_local_movies_white_36dp.png create mode 100644 res/drawable-xxhdpi/ic_person_white_36dp.png create mode 100644 res/drawable-xxxhdpi/ic_camera_white_36dp.png create mode 100644 res/drawable-xxxhdpi/ic_headset_white_36dp.png create mode 100644 res/drawable-xxxhdpi/ic_image_white_36dp.png create mode 100644 res/drawable-xxxhdpi/ic_local_movies_white_36dp.png create mode 100644 res/drawable-xxxhdpi/ic_person_white_36dp.png create mode 100644 res/layout/attachment_type_selector.xml create mode 100644 src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java create mode 100644 src/org/thoughtcrime/securesms/components/CircleColorImageView.java diff --git a/res/drawable-hdpi/ic_camera_white_36dp.png b/res/drawable-hdpi/ic_camera_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a90b8f1b21d28189f05e1a0de11f6c720c83f8a7 GIT binary patch literal 1009 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00U`BL_t(o!|j+$NR>epfRAOSX%8!lvZ5l4R=q5fGNe@x zjY1_2C5a+xWrelTUQj|0iZ&G#v=F4Q2T{?kD55MelfbMf(~OKDf;4-6EgY`@z5mSo z|GhpI(V5+ubLac-nK^UL89@ea$bZ+Y1MH%RbQ1alwwMz%;+9i=3meK- zn$XK<#v%xL)KW-vZ(-|c!7SSmgjkvZXkvBbunFA4CeImyAe1?D)r^S*mPk8xS&1Md z^EF7@%7RG#*)=Qbrn0JZ&2*9#4lD*in89}=>IX9sghl+(&Sv|CrE#A@2*P0_>^OoD zMU7#;lZAd@<7fjmBM8I!pk3-CqY#7*7B|0BVPS=J?^HV@5rmD}g|;9F3B0%N>QygT zPQdh-a@1qjBK6A2hwzfMHdqX=9h;n@E~-$;L=dLYRlJqs~ifgnt#BcS=lR0Lre{-oXnOLLhvDmUy6XbvI>gK5C8%+tsBm$`MW$MO0z^B`#eUx8^8=ipvkrjYS^YTSf@K6?G}H2EKc&Qt|Xc z?LwIa^pZ8beRLU20X3>e4t*Kuk*5^*{?R3PoY$PtIx3jo9}i`5q>@hw<&;xG0SkMw f@c;M5e-ri>Tb;+(J#6SQ00000NkvXXu0mjfH>|!b literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_headset_white_36dp.png b/res/drawable-hdpi/ic_headset_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8b8e627754fd5e0ae14edc0e79194f4b8f4c2247 GIT binary patch literal 683 zcmV;c0#yBpP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00JXPL_t(o!|j&OOH@%5$G>l!RK}zWg>u5v;g#2>g(bg;#sE^^w0<770$d|Pz6yf<&| zoBMt^3w!4+-hq40_w(Ml=e=_cqJ9>sBMVU%u@^9i0ra91tpM`)jtn-iilVjxb*=`E z@EuQB%}zMaI3qebwL>Dj&pp<%3@2##h4pidy0*eweqfLJ+a_7y7Sl{~iv`=-DIa)) z8JxBVm6_s0_Lz!gu!oQMm1RrZOLaNbu%t!eEpI9#`#5KbO}K?UHzj9zyJj2R;l3&3 znH$)MsWe~MruBKWGi56IurBNhf5^1YY$7zTW-iFQqiT=nyj$yxX`?`}g_|;WMhDi- zk_bQMbyui=*?Ey&OU`lwGaL@U#pOh89>gl~eutVB;&0?(bBx7&=Ul_wMJ|gGw&_m?#0e3Nu)5;}-;U6S~g|Kr4`wR1gG}Jke R8QTB=002ovPDHLkV1nUDFL?j} literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_image_white_36dp.png b/res/drawable-hdpi/ic_image_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ff74932d7240712f5b083f4f4a9489967a52b6df GIT binary patch literal 474 zcmV<00VV#4P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00B}-L_t(o!|m9;O2beT!10?%-K2wyh%aDDo*|)=NIEO{ z5)KZIc?H4AXK-*V6gS0J5VY-Dx(Pbj@^^_PN$<_)A#}LsZYSLPBRNCPxeC?YQWmpV zUChBFAZ)P$eB3Hn#0-g;Gb+O()=0&gs0ed}-s(SQIA+X4ItFGe5XS;D7K&q`#Vlqq zi&@NK&9GlCSagNmpcoePErQr%vM-jzmb_@P?;IriT%M({6+;gB%w@mvQag_fm8*^2 zqEMXjmC0V_I!=A%YGO~D-tUanCVQu8+vB#_2mRFZ>m>V1PlM?yR|EUO&mH&xEI2mI zDchB+fn9AK*JF}xJWDE98N1gWw^uTS#Z9m`_8X0S*~(SImYg)6Fw>Q*gpG+?tntqM zVmcj}d~wV(V=i-1YFaerDn_CM{CQVb6Vp6px^x+|zI5@jAJATuS!~y^KR+ebKW literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_local_movies_white_36dp.png b/res/drawable-hdpi/ic_local_movies_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..aee9d8a6a908b088310a7c28e1c6f493cf28dce1 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&Rg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t(u z1*<(>977@wzn!t0x50pib*|?LwGEPq#y3=an0hB4YCY;+G^_aYlIt-`en>6%ex%08 z{7r0IM%c<_AJeX%ndJNUP}EjW!`|OHXO&iGHXJ>8ZlA(u<{KBqQ+_f1-uv>vq5nMR vCrGWFC004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00BfvL_t(o!|m2FO2c3nhw*gL1L&Y2E+SGo>!w(0H0_Cc z3MuGh7HfM0J%HGv;;eMgq$jW@(V?k<$5k|6zqG!oDBqI<{2;^sdo8TleU`xtCWjTM z(Z**)j7JM6Kdi(ZU%O!=53Ir)X+`WvVmKHma!yGNPE4d)IW2sBoxhnFiqypBYhq$cZLbmgGVv1aU zqdHkfc$$~`fF@528S=;}wz)wJ_TRBZs?<57OP`2@gb1GwP3lxxkiq7ua!gM<#66C1 zn42Ek!X;pm0$esH$Ly48%37C7c5Iake%d)JSumRc5Kbh-2?+ERPIkus?vAgU4XMiG2XYN#J5;3zpCT0000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00KElL_t(Y$IX^aNK{c2$Ir~v?wBHA~)5h)daPvMYN1k$p~AxsGvpkF{3#kQQ^q^S~Nc2 zx%a;5Ng(+FFc^ZOYR)j)BC1g|a31j`VfsIi~xe)%1QB%cE@ZxLpBYBXqXV6x0MgcAUqM5v{g3!!a|24z*8X9zJ~ z@G{CN)1VP!$wv^jvqL%Wawhj&g9^s<2bMeH-gkfs8Z>J;^gBQs1KVQW<}|2mIecfm z12ym`(6nRGIR~hoPt{W!a~85yL3YxDaNO`2S*&I!7-y6iF-8?Aqe1JcY`Gphgi`<< zLugSI?a-iFhbqq75JH+s06ww;;clQpHD+oTLoh`e5w83FO9*TE7ItWbRh5{gok3`( zO_gg==<#ociDqg2x*R z^oqE7|Ju7{Fd(v95W1a}+Y{x2?5rGvt05wr4~l;EE4!ZajFUpRZJn&X1;LO08cFk% nJS9pL7-o004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00BWsL_t(Y$L-clO2a@D!0}jgBNoJMThAfdh1e4)6<2~Q z$q{TQB~Z*>a2s5SH;`sg!~@h1yol7UOwzxLzD3%}B$H4?p)*LjkNt1PG~N!_!qU7rmeB*8r$RFM)7Gng6m48Uu01(N}7 zsZA|+`!$#VaGVYW0Q8M^vIoFp8dN0&;)Rvc^|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?sAC*Ipz z9uU90AZioOs-q?=8g-hb+<2u-GfqfP`SxGSlxG%G$l|a6wO_L7{`t?TR?Z_5Te?<6B{M2EulxI4@svV@$3>&m>w&93sIRyBw9t=r vr&Kg6r_rhDEn2(9UPv7iyuM~32NOf%x$4!jZXGf}FEV(#`njxgN@xNAu$_eS literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_local_movies_white_36dp.png b/res/drawable-mdpi/ic_local_movies_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d0ad003acf9b53a265cd95809d53dd287b21a91d GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?gTe~DWM4f{BAr) literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_person_white_36dp.png b/res/drawable-mdpi/ic_person_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..05d4ef6781a10025e77f2984059def7dc63930c2 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?h6f#1?q!w)$5x&O;+VBI}g zMdwO(_srmD-jN^9WtsW=em)x!F+cL!dM7^JWpj2sx_oS+Q{*(8Z7RBrbHv#a`f~ZU zUI;a9Ulx^-!#8(Jzz0{4`YjVJuUv2vJ^58%B+bpoXoBQ3{opB+>;z|93HQzUn9;`n z*uP#`zTuI`%SW5k9vtg!5Y?0AI&!}?=M>LQp=+&-s$bdWZx57uQ@LE$R4Fk)PJXgY zk(I_tvCC#EAuIZq%;S=E30UBC>E8r~U;o_`U-QM-&&lWXI6MdFR|Zd4KbLh*2~7aD C=YwDX literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_camera_white_36dp.png b/res/drawable-xhdpi/ic_camera_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9817b7e7e29c3dcf1c3410696d2ebb90ce6b2195 GIT binary patch literal 1274 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00eSLL_t(&-tC%wXjWAiz^BtpbL3Z=<%+Xn5^E}VFdE{MLS6&V%2Xuu1^`YZN5khnnC$lY8O(2Js90q=QXo>g59+lyWv{5K-?SI6R1#X~P z#nQJ_%2p*E1`ToS(lFI%UB#~e9F&bEF`!4Box5MQ#K!@6I{83xrDwe7i)J-@oMB^K zgjuxQ4z$%{+QM+7c^CIO|7nypdy5^Y!E3xh-T5D=f$Hr*hZXBakrGJ1?>E_j&MM4n z)P1x}33SE|lu|V?QwgN=9ih_>q?11+SoU2rmD`6ENW1)(sfVqmXG8Xn5~ww}C0ef{ z=i2X`)ce%0>PB@Rz2$AI&JMIq4b;g5Cq^-Mn!6F9QNGo;?%K@i2n+r<&aI=KD*3g* z)6$CMv#@gjcq}wiWcMNx0~*ZV034uyAeR;<=etJwNdUbn4_hQAHwG=|{d0TK|-!y}l3B?1`6ba7%hnhH}g@pjR7> z$$^?l+H_211fcY^Emy3?nJsUQlCV0V#5pM$`a3x9a4>G{7U3S1B_UEu&nGX7MU_); zQ@0$zj5tY8pZp@5!!)mVaG#{T4gs&nOAGttQ32EN}NjVNp%!Ya01nVWbQyqDm@qu zOiu2YyqJoNJ!q9TNZ#2!6P?_r7KOAqT=(59004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00NasL_t(&-tC&rYEwZNhTo~dfZA#hToxCSP(rO+H-;2S z@dk7ep_~3tC@8MH1x4>bY(;t0U>95S8=$9R+9Lkf4(098U_Z&c-g$sa#76 zln>3UP3D+nWk1WO0i8qLBA^pm58<3hgad*nSr4sC34mrogOy8+^Q)JF16Q#H%5p#O zDHl`WfZ)Zz=e--X$3?j>2HLZf8V3Y#1vKYvfJ9(NZ&*xp{UY#EQr%XsNNU%~KwGAq z;DF%OfbJD@pyj|O0f(s}DL*s?68s{$%{m2Ikd!~F22JI3Npk9Hw$LOg$DX7<{$~l* zt)nF6YdCazsrZU|L`|A&P*KWPo!@h+5jAOm3R1r59H<#llLly1%5OObYDxL?W@cE zAP?k$G(bNFR(sD3Xm4OZyJkSOfdOrr0j&-UXjOU6RHS004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00G`fL_t(&-tF4IOT$1E2k;kvG+1gd8R1k`jyW%R? z!6Dc|M2g}+AovG}e}F?kr;2O;0CBOcP)fzoNt~QoTdT;|!BX4gF1@ywqsqG*?{e=$ z?)6AtVu6OMjSzzv#2^L@Cn!Q`x}ypqg#JziIwV^XS$IthMTFf-h>2ob5Z#>|Eg9II z5+&$EWy^MraEKOZPc4VGjb*SPl4#2+G-(J_r>F|Z z7eH0oq}nincIcY+`@B~0|9a4N+FZv~nCpwKA9RDU<~mV4m;n_6#$GVfwo)8#;e)am zMMg6AiB->9PS~I)OoK2Xxl2ca)!Z;abu70^TF<`GjIj6>oJj+MQf;#msCA4zVoFlO z3(BN{KI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6pZ(DaSX}0_x7qHAAy^j{U;t6I2G zn1kcR>Hlm@Op}})9Cq<=cuePXQ&6yEVOeszp`m1^3`FAKf`yDsOiZ)pF`sDO#pukk R>NU_R22WQ%mvv4FO#md9Lo5IQ literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_person_white_36dp.png b/res/drawable-xhdpi/ic_person_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7239d88d7fa9ff1bfce4c03360e793e33245d4bc GIT binary patch literal 548 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 E0OF;k%K!iX literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_local_movies_white_36dp.png b/res/drawable-xxhdpi/ic_local_movies_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d526291117cbf11bf95456af09f9d34c9f4162ce GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq$Zg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t(u z1&?{UIEGZ*dVAfGtHFSWA2E2k`njxgN@xNAZxDNr literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_person_white_36dp.png b/res/drawable-xxhdpi/ic_person_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..58e532c015499b3573d50e68dad38cf3f12f02a7 GIT binary patch literal 974 zcmV;<12O!GP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00TxzL_t(|+U?rUOH@%5!13=mmYQioY0{vjX=qSkW6)D zoI7&Ptnaz=;obM%dFNiAur?zGg(*y73R9TE6s9nRxr|uPXUL_3V)Dr#37BG-9)djQ zqsQ}#cfVLUFYU5av`MY_y_?-TR;3KcO3^D7(FIGC`x0v0k@#qVrOO*}6790t{J-!S z|Ike56*&&ayr-0LyC3(7G&*L%Zl1E50;=qUUA7>@zc9BHbLn@TW1axtZM$L>26Ff*w{IyHTa?8pEZ<0$Jo{i7 zMzUnu2TQUji}pN1i76vlChda_8_Dv;K3I=MS&YJh7G*J7QswZ$KuNWYQQNNA0PU`G zG?`+Veca!2ouSUg>K^>`kn3W6CkO2O9-HT?s~*J_J73TM&$t)%*qgMO{41vWiW>-0 z5XQI`%9yhm25AHx-)Y^H@Wa+x@o$V$%xgy@+9);6!lO-z1i2e>Ke0~YqH7zeLi$!j zbxT?F?T;aTsg>3xQ9(H)G2YGY^ZZy}_TpA;Cdt4gLyKFrpS_*dr{@(FrZ9ymOkoOB zn8FmcM0j;xF`hhjv4boEq_Kq*5{M&)Ii{IloNtUU#323jF=KxboJ0`^DPj-V_(T5E z9po*YbkJ^Yuf-H>Bc&XpoV~7=_5$x{<^|3Cj65trH8qqOJ>vD7mo)H%k;uT3In4!% z@p*KY3avb*o{80L<`l|9nUU3qU-C!}uTIaSMuM{1(JD3K^AdJkIwVrjB`3UrWl5t% zIvOR{EG$N@$+XxIvvNJOrd=qk6br7^|Is9=Ci;qbG`QN%^CCWRl3sW3u^fVIwXnt= zqm1tGVF6m$ZfW^G!lC7AljUo>2iCG6K>c!s_HwX`=FWS15+z&;XDP1ZD`}R0O^%Vt ztkWx2Wjza0IpusQo{fqQK(%vNUR1yeo!?^EQdED26w(Xu1x)4rm@6s9nRDNJDs wQ<%aOwzgq004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00~`5L_t(|+U=cbY*j@R$6rg?WM4{IBcLd&KxIk6RDrMx zh$2XeC|e+ahKMXCrbv(gA`wIp!=hF}RsjiEC`$_!P{6PW0-_WIDNAh&6iT%K2Gs91tO$c=&putFI$CHb2 zp`ZE|HVw(>=`28{u>>Y$8PV4|i)}yPIrj1Z+F%6F4TK3jJtxsV4pp53Xs{7LlZi#( zh?Isu(8wus&|Y>tzoV4U%V=pW*U;V>fZAvsMJee^9C@!P=*d72XRKmhvEtcA^e|6R zSEddkK0q~bgAGqMnhN?GBTHFdruwq4ilYUBgulJR2Iv!_$5_n+Z-kwI8Y2a-6T6|a zEO@S?ilDm}gVx4&0Sd)A0Dq&r@SlDxfW`@WOX3uR-XxVHh&-MUB;4z87V+O5+8^UM zu>+pK^wW(;hAz8O8wRp&c)vL_gD>*kX>~$x<)xev_7NJU`E0SoHZvqGH&HzI-bA|sG?M~tBzI051@FKj?*~f zCZvr4)@7GGpkqv3FJ=c6%o>fBFUREpU1I8*x>VII9oYe0ln2BYyR+NC4tFIppmcda zoEPT<4a7C_+U@Vk1LE}SqD+IjxB1Nw~}&;c3mQj29N)7TEn1KJIK8Ojc*2Gf3R zhdiKF1^`h3FuG+T%gAEn0hzg0n8gmLWC3G(%p2G4=Olb#VYxaK}S=7U?W1ZxshXOZ*rEO5mt6pf-UIsCAK37iA3S zq=+ZQSB}O&0kp@GF+k1TVvRkiDNL4u7L5T7lrD;gr~?XPzBaQWqlml1B+JGCd3$h{ zZ(k*U-`#eb@ld{LQ@z$6Ksdh3nyX^<{G>Z_86rHsFK03NNdyO zx01$yAp9g{4=bx1%(B!rJd}sEKN~7#3}`PAtN59Iv`@HgfTj~qgMTYLWeoV*a-U5& z0_yhKf`^Lo7_N9#QQKmSQXEgjVQ*UiMJa~`Q^tUIEw${#1IUBJ#_{ac3M?N=xQLQO_?K#zVy_%6KDQCc@(S`)$>gGqJ!vqkyPr*YBk?PIm(gH2^0CFFIotD|&zDFJo0S@$4O8#}h|< z4UPbm@9O0JIih?qMl-`n<$fnLzc*MVEc9~aHIUhPSG2ChSWm_N@Brl>X2mQmlt0)! z)_qTeiO*uruQ0NZcN*nUsPjUs!g2_GOnnZs&X?`5;hy_0<&zrA0w`S$xEqLo0;0GG vTtF@$7my3c1>^#90l9$O;sSC387Th(#xynd7h!y200000NkvXXu0mjfpZ|TW literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/ic_headset_white_36dp.png b/res/drawable-xxxhdpi/ic_headset_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..46dc8a2a8ad8cb2cc099f534f60dd7c4bc15ff08 GIT binary patch literal 1601 zcmZ`(dpOez82&Z87+G2_C1%BwCAHKRlY_}+!(3MF6h}0*<`N}sR3{@vbJ#Ga3^Vj( zXL6}V5nUveXi4bom`jRDx^Bu+&Yb6||IYKg@Atm%_kMqWXM+QMjSMUd001x|lf0-p z{X;j#rT0)!>Y0RYlO_9E^`R!l1+n3mp_u=nr66@%e%y?*Gz zXZ^NFnIAQ0r|o#qI&QhCSHNogGjnS#wd@4nQ*-$|vbsIJkzcVR#D8g-z@z8FxwaK^ z1#8AD{(P>sH;JM)b=XY5lFKt&FsyOL41;}OVEEk-1AFb(>^=sY70<$Yj_|z&@a0)) zI=sojyS=>uJ}U9Gl3q3~l-!242OFSy#SiFaspwPw*Ru})*3OL}`M%xxZb@1RR|;dUxPLpWB9I$F=u$A?&lZy%By*Ia|BSQa4x zTA0H3a>a~kmHA})iy^A42P#hV79~iO&sF=Jey=9Uh7!aX)QM&dq0AG4qCiStM)$amiJ8uc-N0*XkNlf6tndE*BT_ z7(dD48+f0=IuAK^cH)Zz(OBN5aQN}8P?cK3>y*{#! zWdUlj;m$qRda(K1JaTRn%+ytS)$fNZch%GH`5~0M%;Lhb2L?+*23HfnsKyG7$xXkm zUdHFH2(0TO~=w(oU~SKQe?t$&w)B%U>t#zWGP@7p2;%y0q;xs)2R(b#dFPN~`gp zPZ97sWfYCIaW;DYZMDZ?DXueB8a_xkwj zaZ<=P3yz(Gs-xb3r*&5CQgMbt;?&$4JQqH=vSP!GO=Gn(P^w6$y-$=VbZ`(r?ZAK&k0FE z#p9WsgFFw~*jilF%D0{bzx7+QU*&m23rKX2>57Uky>s)Mk^_YcAMpoH{d79>Ghj?U ZIK>=(i2POqPtkpLfb1RURqGj<{x9Vl)rbH9 literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/ic_image_white_36dp.png b/res/drawable-xxxhdpi/ic_image_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7b75eaf4718b5cba0b141daea5c5487763a4a5a3 GIT binary patch literal 1179 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ(J6g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t)J zFt7-Fx;TbZ+~aO(B)Gj+P@=1cI#ZR+=pnNL5x`DwxD`(8*<^L7Rk< zkdUFMVDQmtVx6VZQPMdsTb8i~a;xY@nW^~iEx*6>`@Hh@$KT`kTF=?@Wpa7_^ZHr) z=1rQvV$UiU2PUBj4J;}OjGP`0S|9?-54Biev}(q=l(viNs`gLI?LPFd$1LA^!{M>T zA*ZUPUmjmLtGn%Dn9YLJIm_x#&7Zk`&Eu@XhAfLG9vgC=&Zu3G8dIiGy?SSwc!rFB z(Eoze>*8vkPpMt-6|*#}zn{=)yTEAP^0H^A>=#d+c_uy0!P@dc0{@P=hqpDnGd}IO zp!&>4)-Qd6d`x>2r|2%oUl|$lV`cuA&8$yeb!|g&F_PnnWG)C{z8Z9@i1F!aF{3Y! z6rVDk3Vj=Lfosa=3%8~_%QC%6v-`R~e*J?*4OQ3TzNN^+Ej(>dphRcnM)*;Y*RGh>meYz(bj-|D}pg~4?4 z!tP%T@w)kn&h5v)Zt$GKvA~}9p1`ab53--AYgI%(m{;IAg<(OSR_2etRZ6`)W^z9# z|GZ5^SB@047!dC{eeC$Z1|UX==(qS7U) z5#G$cJR-gzMLM{sXUlw-jZCEz7OEcq86-6$66myJ%Jbig>2xNsM)~H>({6pXdF!0d zfAbDb(r{Z46;>Vdb=G;kO-2_U3#oJ_F=wecFMlq(dFAr*zR&$LU)_|t<-2G`!@n(U z_qKKlH%2+n_7vd`D9e5kyFBvx<5;l*>nn?n~Q>&jZ=e*gAf zB+>9Mmv?WLhHnr51*uzJi%v8aZEuS+?Q~;f%nkV6W7@OLXOf1J!slxSx3uQC z2r|yx-sb7O$fM!U*0z&gi#Qto0Qp{v7BRDC^G=@Z;>yl-OG-_(^Naf&&p)N@khHFm zr11Chf2Oa~Ch{>w-Z49Lw%7fg(RHy4e0)|MA%_K{9g-^_-g)L8J7s3hg4A8LVY1z_ z%)8vSUUW(4Flk%PQ_%6;`01XFoGe#k3OQDESse~L>CV4n>f*i+IS+Rf>c3p=8FxyO zZP~wvQOUnve&lCaYQ#hk<1VgQu&X%Q~loCIC+)=??$^ literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/ic_local_movies_white_36dp.png b/res/drawable-xxxhdpi/ic_local_movies_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1c63e3252003b4a701d69d6888af40812ea7940d GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ(J6g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t(u z1>bqPIEGZ*dVAfFk3m4d)v@}&^W`iL7FO&1YKgnVx8BHMqD`K!}1=2BFnp^I;aL zgk7~kHo}OZGZa|^qtNOsIhdnBnj{;JXd!E0xXbKihS0$VGdSh0l#y16z}Zg+t^s|{ N;OXk;vd$@?2>>2jRD}Ql literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/ic_person_white_36dp.png b/res/drawable-xxxhdpi/ic_person_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..84ab7e6202e508f21bffcd617b68947b1851b5cd GIT binary patch literal 1064 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ(J6g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t)J zFfcFhba4!+xb^mqw?{~##IcW_zTHtFS(Z_U|Ur<}5v1kMLHjS=BQ@k{NGGbkX zl6kNA9l7Nu{zC2T?iCkz=$ea(BtBc~x#wTB3yb67GnUV-=e?i(yz+Z`n|%7d+m+{! zbgVR*%E6+dz{u(0z$7%GAp}G~`C2eR7LkCXmQIuOen}>EX|}ys-aY$D(8Tu+sV0}a zmwhSdyYz=;mC8x~O`fx)*PPQ|kfb+JZTg=Dt*t+qLVV@pCM6}?F+sjD(e4JnNs36ug}McriybC270G$n8}eTI_iE>| zpJz&gxsRR+%@%nv;jhE$p1iQru@>)Mn6Z61)%$tD=3@=7?lMFjXr|kKhLE{HO+b1v@3wKSFy+ZX1}+1q=@PQDYlL%HVX;f1s2~s zv*ra_-gjV^P&+00@pkw7eDhLC=}XVj)t}E@KBN7{B=;#TydfuSb50qr|8M?8bcO8g zOOk3A40C*9BOF9)whL*zO}+G;=}P0;mpsfFlET-Rd^aDn39vO=e$wUw^Xf*q+3a4C zyk9QbT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index d89c892452..a36cc0a386 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -1,6 +1,7 @@ + @@ -139,4 +140,8 @@ + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 87d8235aa5..7905261f8d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -561,6 +561,13 @@ New Signal message Contents hidden + + Image + Audio + Video + Contact + Camera + OLD PASSPHRASE: NEW PASSPHRASE: diff --git a/res/values/styles.xml b/res/values/styles.xml index 6b0026fb4b..a8928f2748 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -196,6 +196,10 @@ @string/conversation_activity__compose_description + + diff --git a/res/values/themes.xml b/res/values/themes.xml index f871e9b8ca..26c5f82524 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -85,6 +85,7 @@ @color/textsecure_primary_dark @color/gray5 + @color/white @drawable/list_selected_holo_light @drawable/conversation_list_item_unread_background @drawable/conversation_list_item_background @@ -190,6 +191,7 @@