From ae4f6b1dd4af6b8dce07d6dfe4024ed95f738511 Mon Sep 17 00:00:00 2001 From: agrajaghh Date: Mon, 8 Jun 2015 17:54:16 +0200 Subject: [PATCH] add dark theme to emojiDrawer Fixes #3240 Closes #3353 --- .../ic_emoji_emoticons_activated_dark.png | Bin 0 -> 599 bytes .../ic_emoji_emoticons_normal_dark.png | Bin 0 -> 499 bytes .../ic_emoji_nature_activated_dark.png | Bin 0 -> 832 bytes .../ic_emoji_nature_normal_dark.png | Bin 0 -> 641 bytes .../ic_emoji_objects_activated_dark.png | Bin 0 -> 803 bytes .../ic_emoji_objects_normal_dark.png | Bin 0 -> 631 bytes .../ic_emoji_people_activated_dark.png | Bin 0 -> 811 bytes .../ic_emoji_people_normal_dark.png | Bin 0 -> 660 bytes .../ic_emoji_places_activated_dark.png | Bin 0 -> 618 bytes .../ic_emoji_places_normal_dark.png | Bin 0 -> 499 bytes .../ic_emoji_recents_activated_dark.png | Bin 0 -> 745 bytes .../ic_emoji_recents_normal_dark.png | Bin 0 -> 589 bytes .../ic_emoji_symbols_activated_dark.png | Bin 0 -> 464 bytes .../ic_emoji_symbols_normal_dark.png | Bin 0 -> 374 bytes .../ic_emoji_emoticons_activated_dark.png | Bin 0 -> 386 bytes .../ic_emoji_emoticons_normal_dark.png | Bin 0 -> 350 bytes .../ic_emoji_nature_activated_dark.png | Bin 0 -> 499 bytes .../ic_emoji_nature_normal_dark.png | Bin 0 -> 403 bytes .../ic_emoji_objects_activated_dark.png | Bin 0 -> 519 bytes .../ic_emoji_objects_normal_dark.png | Bin 0 -> 426 bytes .../ic_emoji_people_activated_dark.png | Bin 0 -> 496 bytes .../ic_emoji_people_normal_dark.png | Bin 0 -> 426 bytes .../ic_emoji_places_activated_dark.png | Bin 0 -> 414 bytes .../ic_emoji_places_normal_dark.png | Bin 0 -> 327 bytes .../ic_emoji_recents_activated_dark.png | Bin 0 -> 458 bytes .../ic_emoji_recents_normal_dark.png | Bin 0 -> 388 bytes .../ic_emoji_symbols_activated_dark.png | Bin 0 -> 339 bytes .../ic_emoji_symbols_normal_dark.png | Bin 0 -> 279 bytes .../ic_emoji_emoticons_activated_dark.png | Bin 0 -> 808 bytes .../ic_emoji_emoticons_normal_dark.png | Bin 0 -> 680 bytes .../ic_emoji_nature_activated_dark.png | Bin 0 -> 1182 bytes .../ic_emoji_nature_normal_dark.png | Bin 0 -> 883 bytes .../ic_emoji_objects_activated_dark.png | Bin 0 -> 1122 bytes .../ic_emoji_objects_normal_dark.png | Bin 0 -> 861 bytes .../ic_emoji_people_activated_dark.png | Bin 0 -> 1147 bytes .../ic_emoji_people_normal_dark.png | Bin 0 -> 853 bytes .../ic_emoji_places_activated_dark.png | Bin 0 -> 654 bytes .../ic_emoji_places_normal_dark.png | Bin 0 -> 483 bytes .../ic_emoji_recents_activated_dark.png | Bin 0 -> 1070 bytes .../ic_emoji_recents_normal_dark.png | Bin 0 -> 786 bytes .../ic_emoji_symbols_activated_dark.png | Bin 0 -> 585 bytes .../ic_emoji_symbols_normal_dark.png | Bin 0 -> 457 bytes .../ic_emoji_emoticons_activated_dark.png | Bin 0 -> 1237 bytes .../ic_emoji_emoticons_normal_dark.png | Bin 0 -> 990 bytes .../ic_emoji_nature_activated_dark.png | Bin 0 -> 1895 bytes .../ic_emoji_nature_normal_dark.png | Bin 0 -> 1529 bytes .../ic_emoji_objects_activated_dark.png | Bin 0 -> 1765 bytes .../ic_emoji_objects_normal_dark.png | Bin 0 -> 1332 bytes .../ic_emoji_people_activated_dark.png | Bin 0 -> 1737 bytes .../ic_emoji_people_normal_dark.png | Bin 0 -> 1305 bytes .../ic_emoji_places_activated_dark.png | Bin 0 -> 892 bytes .../ic_emoji_places_normal_dark.png | Bin 0 -> 729 bytes .../ic_emoji_recents_activated_dark.png | Bin 0 -> 1617 bytes .../ic_emoji_recents_normal_dark.png | Bin 0 -> 1210 bytes .../ic_emoji_symbols_activated_dark.png | Bin 0 -> 864 bytes .../ic_emoji_symbols_normal_dark.png | Bin 0 -> 675 bytes .../emoji_category_emoticons_dark.xml | 8 +++++ ...xml => emoji_category_emoticons_light.xml} | 0 res/drawable/emoji_category_nature_dark.xml | 7 ++++ ...re.xml => emoji_category_nature_light.xml} | 0 res/drawable/emoji_category_objects_dark.xml | 7 ++++ ...s.xml => emoji_category_objects_light.xml} | 0 res/drawable/emoji_category_people_dark.xml | 7 ++++ ...le.xml => emoji_category_people_light.xml} | 0 res/drawable/emoji_category_places_dark.xml | 7 ++++ ...es.xml => emoji_category_places_light.xml} | 0 res/drawable/emoji_category_recent_dark.xml | 8 +++++ ...nt.xml => emoji_category_recent_light.xml} | 0 res/drawable/emoji_category_symbol_dark.xml | 8 +++++ ...ol.xml => emoji_category_symbol_light.xml} | 0 res/layout/emoji_drawer.xml | 14 ++++---- res/values/attrs.xml | 15 +++++++++ res/values/colors.xml | 9 +++--- res/values/themes.xml | 30 ++++++++++++++++++ .../components/emoji/EmojiDrawer.java | 5 +-- .../components/emoji/EmojiPageModel.java | 2 +- .../components/emoji/EmojiPages.java | 12 +++---- .../securesms/components/emoji/EmojiView.java | 6 ++-- .../emoji/RecentEmojiPageModel.java | 4 +-- .../emoji/StaticEmojiPageModel.java | 22 ++++++------- 80 files changed, 133 insertions(+), 38 deletions(-) create mode 100644 res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_nature_activated_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_nature_normal_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_objects_activated_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_objects_normal_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_people_activated_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_people_normal_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_places_activated_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_places_normal_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_recents_activated_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_recents_normal_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_symbols_activated_dark.png create mode 100644 res/drawable-hdpi/ic_emoji_symbols_normal_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_nature_activated_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_nature_normal_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_objects_activated_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_objects_normal_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_people_activated_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_people_normal_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_places_activated_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_places_normal_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_recents_activated_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_recents_normal_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_symbols_activated_dark.png create mode 100644 res/drawable-mdpi/ic_emoji_symbols_normal_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_nature_activated_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_nature_normal_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_objects_activated_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_objects_normal_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_people_activated_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_people_normal_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_places_activated_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_places_normal_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_recents_activated_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_recents_normal_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png create mode 100644 res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_people_activated_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_people_normal_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_places_activated_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_places_normal_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png create mode 100644 res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png create mode 100644 res/drawable/emoji_category_emoticons_dark.xml rename res/drawable/{emoji_category_emoticons.xml => emoji_category_emoticons_light.xml} (100%) create mode 100644 res/drawable/emoji_category_nature_dark.xml rename res/drawable/{emoji_category_nature.xml => emoji_category_nature_light.xml} (100%) create mode 100644 res/drawable/emoji_category_objects_dark.xml rename res/drawable/{emoji_category_objects.xml => emoji_category_objects_light.xml} (100%) create mode 100644 res/drawable/emoji_category_people_dark.xml rename res/drawable/{emoji_category_people.xml => emoji_category_people_light.xml} (100%) create mode 100644 res/drawable/emoji_category_places_dark.xml rename res/drawable/{emoji_category_places.xml => emoji_category_places_light.xml} (100%) create mode 100644 res/drawable/emoji_category_recent_dark.xml rename res/drawable/{emoji_category_recent.xml => emoji_category_recent_light.xml} (100%) create mode 100644 res/drawable/emoji_category_symbol_dark.xml rename res/drawable/{emoji_category_symbol.xml => emoji_category_symbol_light.xml} (100%) diff --git a/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..79110bd85a2249b9ef30649d193e7d002a9dc987 GIT binary patch literal 599 zcmV-d0;v6oP)pJ zd`V#wQivo7HVRf^1VMa3QQ`R<+1=aRU2b=0UvBsA@7$foHO?fkg(>pM^RC8c9?=ucInY z3>-G5|H>YZA$T;`rWUo{!q#?e>>WmWF(x4;i#yO=R7UsFjKolrpdW!rf09KB8DfHg z?!g${7l)b>vqhNRE$D2t7OscufmCNLxHgU`KRm$ry9O~BuwaiQPkfwmFf+jTzqP5M z0#izsTG=(eecq=AHFU)WPtJ*_(XyBaSMPx4tp<72(6-+a8^a!b?$*?^<}Y~?f5f1yi+$XzuB4B?7_bNX{~9fBT>d6^{-ZMs|r$O(5m5q*Y!(^C?rAF zdtSog!z&?CM6C*oPZ!*mwXQs#d(VM`TSX%6h;&^Es~ZhTnqzUw!2zd^nzUc|6ha6= zbCYV@=&ZwF{<+La?u1&50UyF#dNX!22cb(zc1VM}2;r#WBaGdTK+<&!5t(ClV#5%IV%gGh+&X`B%d+^# zmqV~%D2<=;PMlHKKTP-7x0V3eHR+$tdvQknWhTuN>Q=`Bv&XYC5OvF}!5YpP(zM}6 z=O&n7-Nze}FFQ&oy_NM~f&q3JiPFP1DH?qP%qD6|m}%Z<8!&jA6x8lR&4$3dPxDHc pct5p4+dfV(YL9;u#J>Kzz5qV+8%HbS)V=@!002ovPDHLkV1h@f;F|yd literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..8ae67c762a46cd122a5dac9570e2e9536404320b GIT binary patch literal 832 zcmV-G1Hb%p% z2l6E0Se<2lB|6(l6&Tk~HftG>@$ZKQ0z zNy_{svPYFyu1K5Ah`>%KXBU|3nz$XUej#=$Cif!7=Ix zTO6=Ql9zav_et}N&?vpKsCrM6Vv`9)lVTl+JrYQUWFFyHn)pGRf~j3%hXNCq&Sf`e?w?aXf}|M zki509P{htqng%6&s?>BpVdKWq)`gZ7t%_B$6%4g{OXGaX4;=Cdi%e_K5u>4(t(3xs zB8z;?p_rf9X0+NjC)p?JDLy|j?6!Z1ABCK0n!Yf*#Rn-p7uv1L50)ch?LloRD-&HwNGx zViO3<@~DltHI2kv8u8Q~ChpQmf__6SjffSu5w|YvIZ+Chy6W~pZn?y^ZTYdTNLGvr z&v#nfyIjgV)(rV3NVOIA&0oQ@_DfvBXSQRV`GGKBU31tiea2 za@192>%CSWpCV0NcFeddkc$78lKnW#tXSr`YxQ@%`~O>WKiA)}nnPAp&*lvP0000< KMNUMnLSTZp`iiOm literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..fd22d38a4f210b739e8dfdee30e6df1b51fc3190 GIT binary patch literal 641 zcmV-{0)G98P)brHfq0>KQ?K2A z|F81nXtY|bln@(u;gXT9otfj~-Sy1b{P%zSvBAb)HJ^;BEc?Bs*kbJJaL=Rco~}h= z_7``Cxkw7xBj@REwW4C5Az66;EgmQH+=j@Gvi&wRZ}3z&#^zny*y(<4{;`ccZ`Ury zX5(2<@F4immR1{4&0O9gl`@486@7c+r$j@W!2)LwY%+>O$MW=okgXW4C(3XUT=S7W zrACGB`+T5|FIlj=k|?2?2yRrelAQ18^Xs0=TLhY#iJ=?n=Li=T_Of<*#{BonsKj;@`ig7W+%nikk{4>E?6ONY?%~utf)&dOqYqKZHSgIC(A^c^|_bT zGA~%ZM3gI9hP=0;$X1jAJ>GN2t?m;B& z=Q3$p$4+}0acpxGWn{z_E|HO=^+W?I6ShUDqq9`ltd5j5q8AOy%{yw_rIVFXJGC9E z$=j&*0Ta4Q;{Pc`x{Nt!bquA&zeiy(HR$Ga)G%MGvM{R0bJZsHG;R<6NS=pkmP<@oUYVGpE^!Gf-3y?Zw{bTWhcN z&A0YGGqd2I41#{6Opp9R84FpgM+j!=&ou-Eq#}&71pDq0N0~zY6%tP94>dAl7$8w$ zrAFp)x(M|xCz5E>H`Df$W0uLv4yLGZV^dK*!^CPi=Q*gVHKIcLSZ(mDmFw)*6cunu zquIt7g>#8=nI+ea%}6OJ8qrCLwEY|$q-aEjf@|#23QIVu6;^Ug^D{W*^>s~|lxvB_ zRJoD)L3cRf_RZERNcNzg6-Cj&5;r!8PSEVL8$zd7q4FcRO{BuwP|VyU%|IcFXvmYQ zBI|Kc>>*Nq8a0|8t+_lb?oGox%`}N_th{~9aKVSDmVE7mwC1AeWRp8lrCyQJa+ByX zQ`C6B7R2z1I9-uW)kw8@piQ`VPK3e{wBw+aP^0aOG;8NGr?~@sW~cJj@R|V}J;u`!Ah7j{9D+@qNZL3SfH!W1`DwqK$ohSmL4Qy}X*`q{{426>B} zJnCfamU%U>qFvbNm$G=l^-OY3?UV_!$TNXHF$YzFiIVt0uTW(XOB=)7CyE#z2x^gM zj_mYcqcSkjUS@DH!5DU?1%2TSy|TK*8)aO~$yaJU+5TS0Rb-Jtx>zP@GE>QxNUGtb zE6Zkkz`skvSjlo_%gm=B%~r5TCHrmdFyCK8h&$wB`=<2$^T;esf$wo(89002ovPDHLkV1j-ge0Kl< literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_emoji_objects_normal_dark.png b/res/drawable-hdpi/ic_emoji_objects_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..140172534d1e64d808c825e3993de9abade92250 GIT binary patch literal 631 zcmV--0*L*IP)YO5*gMI8xW z;D&+{NR(bu7Aq1OQix;A`0OR3Wg4mru)O3ODp33e&=;%R)HA4|sH#4fBp^rxo;kk64SlbMUAOtKl)g;ghf; zE_U(`3RO`}FZ}4Sb#re6c+ocCiU~hz2FQ zr#fBk_-md{0&V11BKLH|(S7q3-svXS3D`6Z?1;(JO3Zks&;~EE8@_>u%a~i*jKwFw zCEy}oXq};)PlI}RZXfx~vuu718&9HV(+IgZ3@{VJ4Py=^a>Q7!&k6$rkMpTIl0GVw z=rH6Kiz0s*8dju=LmzjVjy9R#^J3r;;Pc88eO~bia4~-IHFA$1iwavI%JNhU#ESjj z`7+J_nZ=@@z+wh0=JMxghky8tvLT;#FwGvdxWXnISG1^Tp|`#$`Ivc6>pvJ)LN4lw Ru+snl002ovPDHLkV1hQ_9;N^Q literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_emoji_people_activated_dark.png b/res/drawable-hdpi/ic_emoji_people_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..e70241562c1a299b2f1e03a518259f7c1c690ca4 GIT binary patch literal 811 zcmV+`1JwM9P)AF$#daPAdRZ|_*xLd)J7inM&6AGjWEow)n>T-1g zY=rfNin3&pP$V<2J^fKjZS}Yg)c}V!I?*wnT~%VKxIU{;o5-B$i-KF-oyyjntCw$dhb$cA)C}XghM6T(5S3-fow@ay+-jS zu==nq%8-(IV!0B%F+w&jGnT9|Un?=@f=l_dGAio3j*;33OD`@nPv^dOFpr6tFrEwH z(vlLjw5>wOa$DKxiLzMD3u_y8LX<_zpQoT5tJHj0yUS{5Q_~^L{%RUa1COnHm{gD` z5@Ye_nboOI^jSFzspzko>Jx~F*Jcw-6Hmp2bFkY)&01;~T31&+z2Yv%^_-9&1T~a* zp**7|*1n#}Sg?CUt-FwkRncy%j4{hqBB)R9<0+)jt(^G z`KQQRiP}g7>y&dQiRh?CG?wtHRmarOxRLAv{y#l(Mo|r->O{LxUb|@_TaZ*Q4J<6k zK|(og`_vc@M?AIYWkb28F%<@23rK7@xr<@Gh% zv~e4;-gr+{b)j~20y;_JN}4R p)5lAGM7Y%8&zk@Kp>>&0zkl-fh0?Sg*$e;x002ovPDHLkV1kdieN6xW literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_emoji_people_normal_dark.png b/res/drawable-hdpi/ic_emoji_people_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..aea6cfe795a6f91bf88e485c7528f9426e7b38af GIT binary patch literal 660 zcmV;F0&D$=P)uI>nR%L>{a6or`{^>Sz{$8<=(0qjAxJvqT$uq#^<9setI!G*^d4bS zvw2dk%ok1ds=aDj3r4WNl(|xl%nvPf&{jLuw6#jG4x_COSaV0}OlF4bhJacx0wL)=TT9!zQ$O)#oW zZ88rb@bboZFsYgdnA40hEv+(7t<2emY^9#8T1#b7MrOLVl`52m@wJoF6|7nDDr^O( zO-{jOs8Dz(r}n+NR%ro_?~VoTJp$;jwiM0R>nVxwH|+UTf7l+OZYgC)0^ z1n(VDw;`uyy=rhzFQMHL@}>sBb$3aV7rgv9?on=#QHk?Cilr3no` z1tsngvBkJ7l*Ci(gg>>o*jBM&2iTTzv7O}y-&B!s=>toJ#~@yQXG5CHAKQ9c2W(TU z_{1C1JtE+%-G~)oF)G+K)`53KoI`8VTjTiGfJErkuuQ8xv_uho`5H+?R<-~K8dD0r zIV{%Z8d)jpyx0sA0v1|<1-(ggPd)_CpTe{2s`Vd8|Elf(^6!3*#wX9wqwwy2AXg_3 uFYzQuirmz#ftr#_csIp0000f+>*0n)N9d> zhi;o}^NBILc2-{ByNpF{Ta^>oC*eOf|K3q{%eYNZ3Hw&%?C1@@IVpI#=5iwPtyMY9 z245Mmr>hl8Ia(31$4GR;D(40}d74#=QB+WXOFK%f-fw_BjlQZ(4jz1 zC?Xc=lhCs2J3&WGE$A6F9&#=;pqo-a%(>i}sGfCnT95(*9P#Mlna8POI! zb_b25=enxc>-Ff*1@-Y*pAj#NcLq&}crQ?k1BTAgh8&o`E;3@`4obKp<^wI-L{c~x z6xx29mZ(^Ck`?rgfB^|3E9yF=UAc*TRM%$8i=0{z?|slR}_#X%t+mj&|j zJDPAs#06Vas8h>OUGA2sNOZC=vXT2(V)ooeCqCx*^oKXca4*DLfKWzljF`qZj(f|Me07*qoM6N<$ Ef?h5hsQ>@~ literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_emoji_places_normal_dark.png b/res/drawable-hdpi/ic_emoji_places_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..4527cdefced59a65318f25b6bc72237f8944e2c4 GIT binary patch literal 499 zcmVXZ7=E{j?4Er=r62m4U6o6IzwvHt&m z^7V8G6q>o66#D2rFNX8&;oe-#ee>`2S{(g1ii%Z1)smPSx&^u^w96IGjD&(lQCH@G zDd?Ub-0_}sJ{UTed#9j#BPhk3uqSZw8!@;Gg2xEOt<8zn7e?Nq&Lc zlAx}vzXt_+yr8#*J5q`0ME3cuHN2$t9;nI(OVlX(CHF6K$`hS{-JahR- literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_emoji_recents_activated_dark.png b/res/drawable-hdpi/ic_emoji_recents_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..9ee13353c812989a374e19b098fdf0b6ed407b77 GIT binary patch literal 745 zcmVaW{3*&vuM(6@WCUWfSZXv%(@p%}2znWSOl9g_YLuV7;vxT6`eS;r(R)ooDCbKU@qLaG|Da%l?cAh=>UMIBbkO3K_E?qoAUq zAY;Lp5P|tYin%0ZO^2gXlhvBf#1_iJ%qZz;XmPaEY}iomR}DQS(-V||S<7TdFDHBwG;V3fhV;ITXt+&5G%}1%@$kj4PS9QvF3__M{G~|)yCxfU`NI~ z?DE?$q|x+;TvPLe~CyZ zW;?~3{Xaj7=dW9>-1%GW*_*$A97V=BT4*%B0a+al$Omgc{`<(j6wLWQBF_I=bIuQ~ bGhDv`Fo1Sly0WbcEP)55p^)jf=O6gS5iB1&VfFh36fryu(B5ptt7oeaU zP;{>7xSc3?nb};@)Y7JDT|rmz7`}nnkhD1|g6MfU(96lg!}}e`zdyau(0-83e}7Lf zDW7`83~JG^ zuZcj%G|;iI#OWjfNH9}4Sf4Q|Gp&r0qR**|j|81M7xIsy&m1)jtS>RBF|X)^#&sy@ zhLqaaSMkuX0@3kUlM^x9Nt36783bWcp+H(r#q!yu8R8>OG}(*cBtBW5aYB5=35OT5 zU7ciJhhaW#PDgUG3uX)*JHkhturV0#h!W6g=)8inJL>=v%napln}F3Dvymt%`Vv=s zI>*4}Dxz>1`vNXk) z#{>N><_~wNg3$YtAcS*sXmU4=A`vPadc>k|5DLpmpit)YyGEv&bZc5;Pza+ith@A_QzDE| zB^QBBL_F6*TcWU@Ys?Qut~U#4qEAXu3l*gF{d;b)!c-{Boo5q6c4+d3Y2F$6^(>{Q zv1!@XBur9=RIrm~N}!eWv^G68LBdQZ$URnY*50(icwNn~Y3rGKF+xonnuys_dP5~I z#PvNh`OKb_WnR<7fD}!J@?3@{Wl-&zv&ZrgFw35sN)sclxD4LtuYVRo*E@#u3Er7L U+m5nEMgRZ+07*qoM6N<$f@~S0#Q*>R literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..6a94d111baf193243c408c44ebd8a192afa5703b GIT binary patch literal 386 zcmV-|0e$|7P)bEYs_*czOXFe_a&kExsbpHGQ z=l>suKj<2`?*0GrPvtu=7AO4?`7QFF=|9tVqi@z-Rh=A$0&uxI_c z`Rkc4XFi|#TnTddf0lO(-=2AIjp-zW)3*O#2ZrYu{zIbgKbV1OHuHaGr~)Q1WQ5rG zdhP2o?{qPg|K$7H_hsUDA$0M-oUabOJoOnvoZ+hp*xmN%;%~KHo_VIhjBr2qf`07*qoM6N<$f^`SM$^ZZW literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..79457301789a22364a74e33876b64136e8e95d32 GIT binary patch literal 350 zcmV-k0iphhP)fv!bX)KL{|Wt=%i1Ps zS5t}B;!B!A_onAQgk0{)IVXws@9=3HG|sIiY%T;EO=ykXW4)@~12jG+)hi1dOYPTb zk7ap**qj2rR@iEtHfke&D)-s6gyLD~3Ibp96`#s|VHArzs%%w6n@>6u^{jH)cTwku zpl<^Vd8e#~&{@cU0)f&KsM}+I16y}L0ns`2h*x^$Wq-iNe+TR;M+NHFzJ3+g!5Z+; zQe&}u`cT`$&yg+Chzvusv(7g;m;3l6h16GEE7!?QdAl=Yo7r6g+0~x7!}rXOlDGJU wnc6rMX7Us-vzay)#EgT~?Q}<@LE7KP7m-+jLl1wXxc~qF07*qoM6N<$g5k}bGynhq literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..04d0559515d7153ab4817f3df930b51924472745 GIT binary patch literal 499 zcmV;(1<1r^jyU06_e1sz|ZgnEsFsEiKu2pvhY zgG5B6(3x($(Ya9bFulsxKNHP`GhxjS&cDC4*0|TWmkr(*K70*-zi4zm>m>Rd7bNJS z?&so@{BpzGlVU{9Z?neVOC;S7DN9EV@!mCqTqw0y?i_<0=W;z9aLJHoM+#K<;F%6~ zD3E7Y?uim*t~}f2Na-(_tg(P8MOeiYDRSa!-EOs)SE^*l5hpFhP)Nkl{5U7FreYI$!`iQ4*ixxlAKxTt@@WBcRdd{9FhVD5PH+zSnnScw%5Rug65C!x)2cXR!Bnd+*23l9T$Ja2J^ZLIQ%MZl|iB5`v%v z-IjbXD@c%A1^S%#OP7{{6_Bg=rtY36YXNi{lX-5Ny{@UaWZEZ3R6RxjA^=*N=1h5H z)&uv=dFYCHP0Ik}0Lb(x-LYBS&6V%8N&R}X0}v7bRl`bEt(7Iof;PEDxzFa;Ziq@F zE?W=;l!y|NE;rVLgzw&2761TAyB`3AkBrr8^n{yrul3E~ z>igg|0-NWWq&2y7T5asjv%_Y@=NM3k*cwAp#?0RpME%-K>mKq%Y!h^fU>ZslFc6-6qj^)p-o5F z)oSQ@~07*qoM6N<$g0s}X&Hw-a literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_emoji_people_activated_dark.png b/res/drawable-mdpi/ic_emoji_people_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..faf91ff98e98b5e6225e6c63e7020dde975e48f9 GIT binary patch literal 496 zcmVPk9XGCo2(`+X1GktY3CcJk z5@n1+s}re|(Gg<2qoyRr_{>6PXonywsil&-Dd_Q+0wa^)k1WAN;-U6Q{5QVQFx+tV8yD`NSx+%1~x(p%_+So)1^-cZ%zvT2` z7`T^|EadeNICJJ>GIMVX!=EM~I8yEy27939AX*_}7(P?3cU3xq3YMd!DTDB}4(fGP zr!UaKdX#mVl6H92MgLT4qfASX!Ag`1p5RETzfr9vBn+@Y?eTgS4_B^l94nKjrbM<< zi#IpLJIr*Tb>aI75x%Pe@4?3R`j0d%jlHPhK^<77dZJ*KpslV}e_`+2c$c|b3+r*! z))K5orB3$>V;w+7MCCJ3>B!cXK4?7Q)LIfzV|haD38RP!@s%<$!w8aBibFps@SOFb zIs)tL9v?bgYtU4CHs0!_GdQWm+M|ZJ*5u%<(w%m?sI!C)wnL$QJh=2~Gr7^bBmcVr1K ze#4nDJ+<9B8p#=pG&3!f^>lfqt@mYSvc71GbS;&cFk!0SATPO7?k(l)(&B}ovrBgR zP_$*qPiw#%9Rlivp6YTtqJ!+ACZx=GWWmzYLhej-;+{X^ffHxeJaZ&*bd<9eIVllY z+8RRU0zJy~g*I$Iw9!{zZclVh_|;G&W<^8QwW>tXowQXIo7)hLsreK71Pn+mZc>%X z2}HaJAxlnDtbk&Uc5-54OTQsuBX}UmN=_=0_ziPePcjQ7l4Oq*v9dq4NmX^|D3a3@ zIV(}O1}(j~W3Q*^q7+jCA}R)Rl3NiCyj{F2@*~X~KK<)@2ig>Oy~r_M>v zWibg2ANpoXiN4d=SB`w~@_5C%&vK8^ji^@JGZ`g?Q7L+sTc=Yr1X?;Rmnzbb{#1bz z8X1`IMw93$*HO#^t&EzzR^UEUh;*V&106jF?VhyrkLzA1Q4S1rX~3ZlWUC!SCeI-X3@fIF;K7Z>);(P+|fYL!*#xU?m7B>_kMRgT==XBvzcOi&-u9WKn5d> z1Y`6G{xbv`C2HK#Wgv7F)x~&@#gQM;dF51*i-y>gw*8k(USq6d)xKD%4S7ULjHcNL`Jkz1!PXa(N+q>1boilxVrv+2oz2a6Ly8WHO$}WVc2Hyu z?=-DJtX31L0#kIvfFWfkr4d(p7A;eeVnAdJA&(0T_iQT)guEe_lCkXbz=Rgjd`h{Z zt)<8%pFDGn?-rfkR)awB*b;j;o!M=j9bA8QaL&!pNf71_ZgFe)LLhr#+8QsmHI{0= zH@Eo~w|CiT?;E68?E+a#NR7_?65Q058O0u;{lg~xBvhE07*qoM6N<$f=`pn AumAu6 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_emoji_recents_normal_dark.png b/res/drawable-mdpi/ic_emoji_recents_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..6c0b551073bc76c7bc02c7563cfc67c549b12019 GIT binary patch literal 388 zcmV-~0ek+5P)C`~z4P1>9F#)&4Tv}n;%`~QE*^R2UC zWI{;bB`_cF?d-=a0W5Bae|BIVL+-vY;XNZV^avSVQKBMBS{WiE>Cxxd;esm~9EgV2 zg^_tr0>v6vp+tIL8smf)@%_6XW8rLZx40tj2|kS=Cu8eu z36yAXKPpJcDE%6ku5dsiWH0!@v&`QkA!Co&3$Py$l(^H*Qh`n>)hQ8=cy|XzshyHt zbcYa6_`*?+QWtHu)in8x(KqMmwhkPeilou?;Ko`*;vo?*dc;}ApV)j8+FR(u7wBi~ i0!_c7(|-b!e>1-rcp}iH$g0@@0000Nr*PEHJ@y6UN*>*OZ4?)iDIZc;P<^w6R;Jp+=m#In0ahD>$Fxx0q)E-ys7 zjV!*<1yQ(ca4BY0TZ{?9m~Bte>CACMBo`vL%zK*5-{XzIPzb!U?`a}`fjgcV*f3Cc z&!U;y`~#&r-+0v9p_!We6&@&@Z>TFYSv6a^|08_=ZwQ(ko2`(qQ828)6KyLd3@6@y zSspY!wW1{7U_@SdLM~==@{Fsb;kvxe9bV~^*Pt(U*Gex;MUM|6qZ&l9J*@ot2HJF3 lPoN`3_NSjd`x(EC{sg^qd0oJ?P<;RZ002ovPDHLkV1gqBk%|BS literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..62fef53d33733cdf27e1a3afbe5de302a02e08b5 GIT binary patch literal 279 zcmV+y0qFjTP)}{|&4Y7?J3t^P&I%002ovPDHLkV1iwpbHo4u literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..4c75aa7cd21a20fe02338151708ec54632cf0fc8 GIT binary patch literal 808 zcmV+@1K0eCP)bBAd&y2%|dxS9Jc6TWjF zznml|hGRJX??45WB=s!3h-uUlDuODG_}|*=;Z;nbn#lZvnKrb++wrec2_=CQ1ed)n z4?J*p{OJTX3Ki6YoV)FU3(jV67FiM*N_)2*5b)P%pqj)%k28n5iuE`4pec>{@wzj1;rAU)KfHHVtaA#1-f{(`^I$)JWxFI6c__o1WOSHNhllAdVXL0v9K zDr$t<)9da%cgf8=c~01Qd&z$3oJaNe?vchy9cqHbfx1#8a0(7^!X{e8A@E6L(e?T} zp|_xx$MoO@XbX5Dl9Qg`Q>gV7$Xn25umVxi`TCK*7f7(L^{=2t1rCS-3q-kcFF8}r zv@_FV%D(0ss6+*RQn`+LuqN~s zuqdW7`jj`zm-(`DQ|4_e9<=Iah4f{pNj+$c^d%dJ5???~;@zC7>xqdsM1^!`wB2D6~%_`{(nwvgVG^|J^#Q?DZ+JmH}1Lo4QcWcM7~b9V5nUG3_>E+o+#WJr=TV8KuSI?5tVX#HW{ z2OqpfP(YfDLB^|l;DXx-a!8V~Fx=nL0K|Q`my8AVJ_v~6r^u4&L`r<;;DFP1pL0w| zkV=TolWx%g#RW2L`T5)ENRmUUvj^wa21(m9km$)9^M?o|&9Jcf6=Y7?h8av@c7#-` zaZy>xLkQv7=2wvL11TSKgG|rhScyXb!Ksb`rl-v*OkmQAbi#@x%7pa*B)>wfQ^nNu zPRhd=?4o8D{_F*%;Qd^!XPGLtgd#z*X7FPIBgy0=Qr(y;mQnodR)m5}oQm^R>_2Vu z+|<4`8^#U}Mu)tRJCuDdl5>L!>V_>{c-y zUd8f#u=HYz)GP2RuZnj_wHA{a-1ng;85Om@WUt_~RchM2ghbrE+T1v(=cFzlUTkB{V#eQApX96qw;<$GDtRepnul|Nz0Z` z>t=`vLu7SsZAh(B7Zg=w&rH5vf_k+sm|!+129g9WkAqK29(rYD3EYZC1@pm#4s>gN z`o-6eWMr6)SiVyqCvrT*GCB+SgzneWyfV+7*U8AMJqV^o;;we}uh(A`cFd3rPO0Yr O0000nn3TXvznsG^CVUfb6MYPgKB78sHSs{V6_=*(_(t#MP&>i)tnD_=^8=rEW z5sp%UKpDir6ao{6p^!l12;Xp>Gi(=RYFgYyISmby+ z(40WNiipWF<7jcsbOk4ZS}c-cPaqaHmb}yKWjFI=up)vyqcNrqk7N@ibkflt3S1+} zEK6dLB_2@2C7OLC1Tzgoln5Q50#V2bU$Xxb$+8qOwOFkHIJN+a$ddv7LLB>x@1lj$A}8JmE&LnD*~u0v*}*Y>C66i7J6L>#pai`h ziF7Le*~j-3Nt5T>DEi2odajWtO^GpHS%X~H#ZJ&kALls58#Gcy8w=cF=fCj=5jhCk znMS9bY8rW+RyydTllQ4BPa#V7a0{0r4nnFV&;=S4h#Ifv@yLpI=pkwWpT05#0;uLbk?V+97-ad0%C!(N*^gu~ z9z!hhCrM?zLQuo3LLedpH>oJQ1C4PZNXH-uAp>}%Fhz7sY%-Mii~6zzwaif>gN=+9 zN#Qaq{bi%*e(vE>AWs1o2b)I>F~z%OKk_?FF~lQm99%&;c+7I3d{h-y8fasXtMqf0 zCJvIMnRzCtjnZP6NZHCSEYL!d12l1#ey%b|JG<8Pgf(|)k(_dD033=EeRPD940AlR>L7~NdmPbTg=fUpInkZTD)Mlg)b?PQO=0T3=jD( zkcUiTD(5W23g>t}b|DjHU|%`m1|>eB8=qxzcwD3%HC!9`NS2P9aNa`TO12uOj=NF9 zxknviO4gH%!4W~nTK{DQEQykXyo4$Lq|I(#McNU8!{fmp~GmG(DPnjs5>z#GgI?03qFizO7WtJ^%m!07*qoM6N<$f^fkX`2YX_ literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..8b9a9a1b17646d92ff26d18b522c8cfc6cbb6946 GIT binary patch literal 883 zcmV-(1C0EMP)XV{1c^EynKI^z?J|sZ0{Hen zy=2Ukd+O!zp0ObzMKPc%wm!-RP&{nU)FX>z|>`cA|a8)-=KEJHKTIJ)RX06XOR^F5&szt z2^@GLViZHX!bN5Enh1eGo=?1^A@&Aso}7`08!F;iww^iTGm14S6Y9B2nUJzZG3BgW ziM^-KfF51m(4@*OAqyILKA_Hmh&!q@c|(^T1NwBReY+vg(I_$$TF%T94+Ok3W3Qaa z@tNQVk=lQ7T1vGo_@8GZN$iIThW94Y_-Iej&nx-rLyNZ%t(lG z9x-3=$^=Lb6Tp_23z1A$tf=of5Gxe2B?lsnzdy+>p3!8aWb%x8!6)F-O|qSR!2+Kb zVlu~TN$VRegC@6(m@wp?HZ43lgv_alle@gfoRDigTC}-m$b=DhG|N;)6Q4{9&ELfp zkC7BwhEMZ5$(}2|qHIH$bB?!N{4H~*Rea^DH2L$2p5(yom{FS{|$0{AB1oU|Qoi}XcH-GtMkehLU>-){l z^}Tz@>$?aIp6v(7lEyJUp<4JXjgI+4EXNS4ct7`N>@PWj{12Kz^ZhsE-?ab$002ov JPDHLkV1oB~rAPn( literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_objects_activated_dark.png b/res/drawable-xhdpi/ic_emoji_objects_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..7e751087a396b54d8566ee729b35e35b55a17d00 GIT binary patch literal 1122 zcmV-o1fBbdP)sV0S1kf%D7Sd#$zCtS{&6vrpQRJJ=Fdnjr_8D)>&)Hvx6!tZ-ZGFQ7SvY zLDbT$(n=4nqIseACLq9SjkbOy!27!UkUryubi9wah|ju%FKE_izC}hs4Zji8>@(i@f%)Dd0RoP1 zZ1Ll$lL;_4x|dp1V(d*nN6k8d^l-`81HWtw=Nza7C@T7l!zO?-0j_dSA#%pGB$X>S z0d#N(dDb~Fp6yn`tTvjhWPmKsxL8!hi;OYI{YG7d>Kf4c!XLYGqUhjvYQi4I3FEN2~LIyxhS<451dhM=fVa5g{r?7^a^qq}^EHKI*8a zm!#IVcmp^($=~F-r7^F0+L62&X{somqieq>Fl6FeH0-X2g1|y6~qvSL?-XwZCnQ&q$r<`V0 z{>3@xqjgFJ%PSx;C|KkMYz%hQp&UBEC`sZvx) zH(9O-q;)p&r=ruWlK-gC!?y!?nG9hmO*b|CtY`?~SWh((Qi`(tKrQE$jYz|sSR9~< zTTGH;iW%m}YtAXobDeSW@}`;6d{e8=${ZIwyhX;}ZTo29eW`_zBu@(Q0UF&1sZi6( zTTAF9`($;rv4<9q3bB_4^h@t2c|ZT6=kHND{^2X{0KaSxaeBGzQN2X@*gHUC8RgvV oU8-Kb5C8xG07*qoM6N<$f{Tv^U;qFB literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_objects_normal_dark.png b/res/drawable-xhdpi/ic_emoji_objects_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a2e37c2bde53daa4c7217714df3cc29fe428e99b GIT binary patch literal 861 zcmV-j1ETziP)_cUonvTj{W7me{ot4GHOL1Vtv?(^A!$=mfmM=WKV0 z$_%M#1O+DOC3?dYy#ozC-8_<~{Hzfe%v9mhku!9HbKZ)yli-LEhSuiA)+rJKt;H3c zAYG0rW;z6e1(#aCCaRg~-56v1)86*zr3ol7XF)L)^$?pSMeSN`=XHW(EXwIsV}ZwW z@vA6a;NgUop|m(jCHtNwA+40HOTdc9DO&@ZyIEdty`;LL^9&o8KE_7T zhPW|~Q?oUYPGumd6VX(%+!;PA9G?EAD@unIAu^K5{H=MF>Fr91B{RxNx>Euy0zM>` zGqL!aZ!WIzILt&KMY={7E{4GXmlbx5$KtJsw!&dfDb|hn(k(wBBec_ z=yH&Uph1L(F9`7!0%>M|pZ4IfW{i=C;0L^9RtCuw`5e=fB@>+?b~0c6yac{n>M^9q z6~3gul;!&@TEGP*rg#$PGT4W}j&Y*<&I+`3{tpc(`Vo zkDyA2wxAWGoyhMHN%Otq^*6T3CSAF^Y-rJ;o{!)c{*d}-L&)!Zlq)k6w6U2n&xjc- n-sdZm!JV8i{;QVVp4;;$HY9vAaA|2=00000NkvXXu0mjf%6^#R literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..91dd01151f087812eafdc167f90e287aad745150 GIT binary patch literal 1147 zcmV->1cdvEP)x4s7~K{`@pL%6RZx#TG=Mzpiq89{)3Q zX71cGIipj?aPB$7znmba5smWn=uDIQ=LtrDmkT-z3P=%q9D|S-^p@tetQD>6K3GTk zR-foi<-Om~39JCG=yRO(hUDRnmK2Cs7gw8q&D)NcEKJ}8%>HOQ5|VVb6F`O^gLr)f})`k zXd!LsYZa;ajHbX0QW4D-mX`Br=uls2+@b@-=%3T~jH*K5fjYVi*>r63Xp2}oc$M(} zLqBMuKSgZxKjK^lPn77o^1;3b!F!R%Bf+ywk|QF=j3u7H1ufxNBH&QJ>XLJhFQ2zu z!t>Bl+;S|j1ZH>-*NUTG(F^<@jg$K%c$~rWXSIo{5O>){MH1xP#@tfVE$k|?b3~t= z0-Jd~uV3_p$R-Rg^_D3d|4nt>(k6P{MvpeW0RtN;h)CRWcf&IE(!c6QdKp*VeW2SpxFR7!bQ%o5k+(jmKJQr;itT=hC7gFJk`M4)N3wiAC?Ae6Jdf$ z-B+puJ=ByB8Tdu>3C_WApcJ;rzbDviQUfXyR6?xI(M}=wb=ug#@o`4!&cPt|F zsPKnfNo^JRHRk59i))#HOkhp%nze``(WS^?XVY2q$F*tZ^pp`+c;di<$DDa*AJ;aW z*TN5u(|w>r*B?dbtsnaE_^`end~ikv_+&cWyLyC{#K0E@BD9aJqdWPNX%#yke)KKH ztiEx9Z9P^B9wRXjw6l&X{OE6Iee}b&rEP7?m^CgJHLssYdk?H4&7*Nm3m#$HawVf} z@ns4dFLdKh50ECoxRcEiZ@h+X9nlv2xR45Hg4PkxojPr9_~w@rwjXG(2F>qxM8Ys= z``+nk-#2ypxP3pT3rIyYo5$^YQ&07!jeg(@$d#T8NCU|(AbO~M)q)F1S37!V@C%4f zabCAh;|gW4fQzSa35;H2KkdK9qAhs8|K&y8V-)1F|CR6`|1;#2@fVdQ{+ff__-p_G N002ovPDHLkV1i|a9wh(( literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d6f523aa29fdad4f721df8bfc88338b82c34d7c5 GIT binary patch literal 853 zcmV-b1FHOqP)EWaa6sqLtBb$GNeLLk5^EXjp$0mucEtRzrCtCo0Fgg=9i zOrQc8K}vp!1!+kxl@SCIHlyWfr4Vp1L@GTGkdS-CHM(4hHkzb1xh^G-)FiavNXQM} z9RMDFArtV3j(0dm^S^dYYVK$eNsuSpz*U4dIl}{ScX$ zr?|(VH3?ORLt3WdlVKz%7Wh-73V(~eg0anO4}aEvXSNV6_=pj(O^wtm3-K3;c=~8> zHycS_M{GwW@TTvPdgjw)m>f_Y$}oGm3B2vOA-dfEn@m$klzovH0S40l1b1-X04ST0 z24)ab2bZ3SjA0;%hQmE#>3{b{ts$Qgk)De#rcUk8WehQqJhT5NG+wbiqNx&(JY^~^ zxR^TeXue9>PDD}&&_^c2yH-`j0E%+0D1CDkCP=B$31X`_McTTGGBNk$EfR#J<3a{q z!6#jri)`v7z_DN?L~}OHXNaj<=G&w~n&y(W9Of||HZ*8pE(2bmS?dn}jD_IL(bx>& z?>2ykhkS}Ef94d;;FTndz!jvR3NvIrWt;gZZve@WARS%(b=-mtVhKdPg1Jb zDWuidc2t;$-TBJ|$r$Eh9$JWCwCae5aoAapYrQ}d0oe-AmgpsE9M`rB=W=}jUm(p# zVfLQd3$ZO;I0u4Qer4(?mXs1M52JiWjZ}2jE7N}IYd(#|G1c-nCdZCYD!F4``qqkc zvus&c***Mb*g0uRu7~|spOUhryzr96QwQCAd96pzQg~G<9SQAiymefobj;}K?5_CD z=;hTf-y4MeQY_y|F}WXbYCk~8El7d=0aE`76B@L8$0UjW!D8V!!QIq$eq@zso z2tlGsymBOV#@>}3Zz7j@k}sEAtc2E{om>3{%+X3)obR5QyK@o#?`1vXMPie+c*ne< zjv)lG(xY!sPY6Rmk1Ou^VbHx0y~v}=bH!guX3QfsqZHzk(h<$s;X4JMQS|;tcnYC* zS{p@Io)0XT^M#bxG5r@;D(<;ZAGJd339hO5!)3_a*wm#E71vs!rTiWvN<4>;C`r3C z;1EwK|Oz4wvlWw&^7q!XKqzfVE+=h<%mYf2|d%A4XH)xx#P)_Ka zcUo=b9?n^c!Ru_AC6pI>$@!Y|lkk}ZjtQlx5S4MNy%QV@sgkU|K`EJ-yxMYwavVOa zC*FyUTSlrC8v%WEhD8MxV^Kw+fos+9>O9jA1vm;G81hCma_8pgLsy?N|MKGhF*+V+tf-uff| zkJr>I<|sujSYFidMg}OTZ*i)<)&Psl0i{vK08hrqpbQ@$pe6>qBBdXpRGfpF4FsfQ zOmU)V{U<{9 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..425e2cc036decc5fdfc0cb78a98f61f37cf904ac GIT binary patch literal 483 zcmV<90UZ8`P)6CgLd;zkaMPI%MQpsP&H|F1}sTEVlL#iq0Xtuv1~(+k-_5~LzBUf3QuLM zQ>R}61X3&tUK;5$Q`#Fd!0b$pKdk&ik5HLcMvwH5i!j4-LExc7x0YlYx+8 z!{=|0Y-%-wsG5UMQAa7W7G1oe5K6(PuE{{x%4Hwp<&-BWW5eIRMT@Rvs!XqFuXU|U Zt54M4f(>PN^)>(i002ovPDHLkV1nZ*$AJI< literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png b/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..944a180feaa98b6b6bad4901632d13cfb638d5db GIT binary patch literal 1070 zcmV+}1kwA6P)r zcfPsjKJGalNJT+sIw%u{1D#@t zm@c7MkC+X@aQ!0@m;7Cgh32D&hM=m39 zjjh?o`sT7A`>6zXofj)$+`lQ%$IksK&oRb$&TcITVoZ=f5YrH5pX-jL0wz3X*&uQg z`%wA@=nxgArCG@ob%y)w6B4n(`NLtd-+zb1O>Mx-j%ej8)CiSnh>opARy)~_v#1&j&+lmfB`ESqO?VKacA4JPWtusPkJx43iG0s|8Z7TJ^>4JCROX&bVIpbE8dA?j^B)!d3r6fU9=JTC z&o=Mm9~FAog~U{ydS1p?alwlCn=jonVNfL|%sT8+ho5+lYiqhlFY+BfbH)jHk82Im zOa2ST8>|xN4?gggxp0ajT$wrfYa#E-)Ok3Uap~umB=*w()pzOJv?V@r+H%8_wrH3< ziI-Y#;&mdaqnKo;nmUe_{LW;KV1@;g{N7_q-RGz815Mv~#PUJfS&w_!ZNL9l z`Smc&OWk#F*^-wyENnb8|NoieoVnz~`}okHVSiT}THga&UV`F!EpVD#a?gk{b5>sF z{%yoP7c^^-DEJBAm=cqFNr+Vv`8#InSC3V@Iy{FAa00wxjUz${h;Xdg2$5sJVMPjo zzhOx(P)zBULZRQAXa7hp z>KQZ6%plY?&X|#jP0m124ESqR%@}h~P~K&Azzb@}jYVK1 ziAGM5AS59yBhZMNkctlvWj+MVNM!##S*}JP7Iejjgc(6`@rsy@e-?VJDiY|`TPVtv zp#DS9Cl~jIx>T7!P=<=qFQ70Y!^r{FA?PW}sIbVGl*r3PErJWdNEvTo5HKf^ge=#@ zBxoD=x+BRv;gw+9ctz|*&20~MCj&kb3eJkww()Wgf|bO`Cq0l#1Ocym9FfzzI^aM_ zb{)~2pyH1#TA!IpsZ3e&m8K?a^GB`_rs_o>M=B&QTq^K(nCASba?y&d%o8bzmzW_( z_C+&Og+cO#sZ`^PkXt)d6q8+77tKPchn4UL@!3pvcDgqFIOZp>T3U^CT`V|vdspKo zosxocTC}%Irg>O)$+U~UO<@#$qa*!)ZOhv?UbS1t+-@D~HorMf1ohkZ7Hy8U+IL4n z#&;U^2M|Z-#n}T${ShiMMyOgtU}_D4b;sDgj?+a-u@+)0Lf9h2 zj`-M-hE1EM$?Z&UJMDC)ZPL5xKk_pt(RVStnVFtWEc86NO*)zLzR&NR=e|kTE!T3z z76l4>$VQ=9i2o}LY0>_z79+0OGl+k-@r@p?G;rzh zo$b~P;{P_|nSWszQ?X75_7aE_L==F-ZO&#Qn=XJT!0EmOq5Us`wY-nx`DL zYGLqsCi(f3VaRjymW}@tlAf3(O(*Rb-Voxb4IBdA+QjpMj0e3%$i<9tmDAtEC;Y?) zKA+iac4YT|jgfM_@wi^s8Fc?UsOlFSyXY!Abp|azcNi!8m$7lz?8@SQ9}POUS7t=Wraabe+ysm=WfvFD_cz^-T#gB@l?jfO;btpzl$GuxN|pf@%YK^ zID_P$djvFDu~3tM`=;98$8(J-6V@y=VM<*c-<+dDnOhbrQ{l`%{fSq!mt<(U{+IO& X=!qDY3UCI700000NkvXXu0mjf<_sNS literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..cf5c6747db2810ddc36e13a1741731e069e83223 GIT binary patch literal 457 zcmV;)0XF`LP)r-8X2OXMYEtRN_~;NFoQJGC}X(oZVSKvM|m29 z3mVSucJGMD^P?BNIp=xKE(a{^YhT}rBE>&$VA08KIniGoFG@ZBFP8x${3xTm_*;0m zQ3S1g9G(bpq6AFx;J5H`Vgm;s%di7QUN#2ID4FHIAc)(?iPv;#(18kX2st2*;GK#& z{#!!XUOEucGvvS_cKkp$<6%=X!+*E2|Ml-M)NzpQ8?yP9I5f1^#KTs8=`hyiZzFJb zM9|i9U?TYw9j0c^L-GipPDTex%oGL)=9IJXcXzI5eNEjA4pdnna1|n0P)*O@SK^mv zqo2}&nmi9m@vu2c$3K+kP1)gI#X+`j;$}!wc};uX} literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..e2ec29d53d551f5a6157b3c8eca8f4499905c754 GIT binary patch literal 1237 zcmV;`1SJQ=RLMXlwGYNv5OEi3k6$bMMJYBQlv!`6d*-F zK|x3)q@_rTr6LlWG^Al^cB?eFLPB!25)x^V=I_9!71TAKx6m2^%J9DJWzuRD?ZT z9@d8QD8VE>C0ikd)@N=|8+gR?;ayVFP{>xu7_5Xk{g5guu(RAaUZLSK>BMZJlIg~A zQrpA%{%?J+7qL5d4LZ~;i(ZF4_#n~=h~7FJ=-IB3fpV`(GEBE7GO3WIk~z2=R7r;M zcg8nhTrjm!m>}`L8r;F#EW>oy;Dpt7p3>*vk!2z_QHFjALPH|G5O11^nMmd&gc>Agk;Imn^; zrD_Pl>ba{Evc=mrEo2XGO?3Xg0wFh8O{g%fmk8n2!&v7^gzO+b!3D7n5ejKZAt7_= zLgJDWEcj3SEq^sh2pZe;lRZN2X> zJEcQ(-;kK8sm7YyvCjUV$M3?C9nUO(XX>1)MK`mw8PuN@G9guzVai^E%wWE=H#w&| zAHn3LPPabh(S4R-8ryK=qgN`edv`jI+FQgU{~cIq+ZmU<)BKiYnC3&6C`ylI;%;vf z7W9-CX;B!c>{lb1x>v777ljMH`w+vsnp#JJhSJe{EWe`9|yk|B0c78lJ-bQDhKPgsR%d>IFjZ5|Nme> zk*_T+6x{7y?^RO3EnXqFWPP6>`0e=c?%jLW@+^rYl1L(n|25cJ$iJdPCYi|=)0u`+ z%7t|Qz`yZx%s?gO`N@uMMijX6pMw%nE;K4|ogv3$DW+qV)Cu_qs6#zEEP;}yT1oeF z!*3o%u18r$6z7QPqg|on0^TvxRV!)C@JyEq1{G0BYD-%iZM!DO01kD|CmBZ6DiLOk zwowNd6mi>P4gdncr{uP!2By%lsa+kXV+jQ^8q)zyZXsUUg8~Wx&Ktf`tg^iSG@(H0 zJ}c4Of;HTnO*wtQzT~4sIy<0qbx$V(6O@RA5E-XYi1SsU~4ih z(k^kCUV!ro55LUrqso*msT^s8Jl8==kR!4LAs>(xVre1MsSa>~3rW;s z?;3SzhdMj5La@;I5M%_$%!uZPtu114d+ZkjnSgFls){h#`gqST0(;^z8c`vOK&g2l z)M?Ys2?|N~X$=UzYOY}#Gw1*+MOHEFd>|9h`NH%#%@K*{Xx;~$;Q>wncAGPMX0qZA-CwFOe8y;GSlaU{Pj@h4p_dB;TC5$3h6x}#8NHP z0alWsaDpR&jNlJKcPkSjZr(X_$^skd1HE$Z9e!D~<~Bl^Ca_c?>@0XsnmhE1kG`RRk5JiK9bS$MAN&U1o^t zkQO=-LJgpa!&PFV#%cGXbL&vxyK_3+WJL1%k+MvXLAuh{56vw_+TRubWm4;Ga2JpIV{cvV#@NnJg{+epSJ>I%;7V*7U&ktkI`to&ofy|M=W}FERj{z1SV6-y z%5Y5S#~^&ft4`;X{f220`O(@rkU<*daKj{(hMV?LzYH8XFNBW7h8=+lV(sH9v1e9z ziG51ooUfZgrbcU(B@B(ojFNb6X}?4nz&cd-77e$&vs15xI*nsysMH})fth->Mv-eg zUn*aET5mxFX}rf7uS`g9?$vI&%1@wn?qt+f4`~!Y26Y;TN~;Hj4j!^|2|DWkT5!`f z6LhNeQfG5o%qo?%#_QTeKRbKvS9!`b8xFeAN&ezYB8eoDNMdF28!HrCd~vX}RR910 M07*qoM6N<$f?tu$TmS$7 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..4439faa92edfe0122ecc060c8a04f8ad12d28434 GIT binary patch literal 1895 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..720aec5ebd11f996bbfd72b40641f09aa70748b8 GIT binary patch literal 1765 zcmVCC;mbX!Hl_*Z<~ ze1Evvo4L=hJ9pQpne$CM_jx(@`99}4=iKvbW?H(^m9AiuX%94~6a4QB78zEy-@oRp zrT0H#A+lt6lp8T0iiJg%eO#~S^n}{KM2j6^A6XM2Q68Yo-R(TdM7EOy`v@cW3~1?O zch2%K@3PZ0BSH@AeF>3cjV79Rzm7Z;{E93VR$_Er!&&MaVX4Uun)PvRHxP;okMnh@ zmRZl98tlcMjSmgu;qz6@uj|L* zCev|fD?53^7+W?=c#=95hRMA@p+%ggLX|)BAtR;5G`I(goPkguhd4&g=*}PJ3_exH zSu`69y@*eZXSfW@7$ZJAFnie*9OqRuYM^`%b&m11mP1d>Grc^3$4#hZAT-J@jV6cv zN*rEjn>fG6TdYpdH+;$aIW4!&8VQ}^C6*cqt>rxXOoY^bkXMvIXOo9SV-F|jGagxv zKQhiWhCGyE0~dIntdY(N&hTLJhE3JZcc}1rEuBp0Wv2LykW+ zJ#(&y_%8ooJysGS<*FJZ^d=tIM{)2u%i=^r7VCJAJLXh=h{PHKer?#t2RMs|%bNIW zQH$HCP$ADU!=g_R@+p%$n5&*XUchG+R>G23kf)5_T7t=Cf5tgVI9!`R*WxNlyl5;; z+7_x0@b|c5M})4$p-7Y8wH&EUmV-1YqHjG`iwAAu9e#qI=SpZ04}He71HbNXx@_3WAGnTgL~l9YJchA5ytyJH6OyOSX1zK~P98K#fs#<9#t@6q zqAEBYvD)*8kr(O?^yG=#3^l=kd%ixgCT;>kXO;^{H^xrFW1D9wONl^dd> z{s?vQgy{0r86gXc9-d&5JRUB0v78k=%{g33F;sbz(^N$->Q$yX$|@GIngi5v@HoYa z&In0l>N^R@Q;;QI<2Y3cxG^|##a@+WmS&4yiJpU2Iut@ z5)j4^AP}~o$t3SEA+0+9WDDA6hlI3~#XQOZcJtgccI$U;*v*i%rvI@gsxpm8DP6(R z2joX=;l8%m5}RSd54kSok;$zeVu}V$BB&K_PZB2d##;?0*dV7)NoWVvctBHZ3GTy; zP{xg+gcDB=l(~662>q0LEHf9$M{NP0PxB?3v4mMv-5uBS_{w|}atIh=Jr0$qC*BPQgF`Hp?k{za3q+`h&j@{3x|6O$Jq(k8o#wo_5>*o@oRy^L$=3R}qt8yH(yAMz=38~yx(fHFlbUSqQ;?Vv#!5hq|f zmvJYaXd4No&qD<&jB*GcXGVVUxsL~F=vjTZRM?LkeE##$LtKcmZa{-DmbnA{KgC7$ zsU{8V4Cbn=~V}bOnpG+`s^zO^E>p zxgK4Z(v`41yw1CXOr}K0-*^lCnISEq1C$x%Y)Xvc@+!;cgU|^7Qdp+YI literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..7d026ed57fa208b9431e4c93bd6dee466631d7e5 GIT binary patch literal 1332 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 SJMC=%00005P)9xw`iV8(bzl#%tA zTWTsw1y|JEGRAVlLrrPOD9FhMI;S9`VLI&Ye5a(a-tcpvH^M0`F$rv#U8fQ!r{bEq z^(@S?_nL}aBAp67D9|NO0x?VmKaL4T4)?^R(EY^@4?GFtjzqzCE$th-0k_Alx2|D} zurocY_rf*po%{rEz(*Q#N^*`=CfX5&&>B8@9#G=!@k6#(d{vwH_fn(MlJ~qKNuV=o za_gGu(1tnY)G^PznOq?+%zC00XhPAxv@753yR4;Q8@@1BYuPrR*+|pY?E0PMy~N3= znQ7F=ap%-z66r&4u57$%PhvPx4fNVo{5eDN1tao^`srx-cK%e%yoh6Qq^4z>_90_BwQOfwk*CAoK$PC`H+K^PY7vu)Rc zHI-+iZbCpH`4HsImJ=tey{gnn2(3`X!u_%-Us-s*z-~fd%k~-lHWKzd>eEdK3{;Xm z-@rDR$9wA}=vC-oaD{}RcZcSK?~o9Nyt0$9SJs0NJcs7IBDHId37bP5gaMN}!;pnf z>JGyH@mZ$t7$^q%Cjyl^)(d2mtPx1I?T{*XN60FH5~aWE)dHoVAr#0Yte*9H6Fzc)(fE&i-g%!qnamqH z%bxCR-ix>ANz66AH{VB>m&mswWu!z+cm&bi|WmsZ@c&!*q zyHH0h`KkY%rtI^ra0c2DgKev;&MGc(IBnSE721HN`$uF@gMqXuNjm}y+! zQU_KABpr`aB`biIIIHrB7?8?n!Ut64Sm=v0j;k@k=7`{q9*}V5h(@~{F5{scnPgD_ zHWg4G83p8Uo%re^8fe5ZY|uu1KxUwN`B>7QS)nR_aMEalX0U}dP@Z~TR#I2*7;Iq;Hu+|9 z+APX*J-SAh+%?_gn;e4-JTK4la&2-9GB_w2C{MENSWbm&B-36M;%Q%K?_kT_!z%a$zD z{{NrybatZIIpfNU4{OFB(0%}~?&Z<#-s)~oKRjIby&f)nB_LRIuPh)NC7?ouDpmPQ zaBnP6n1F3sgq-n#FGLI(67hu(oDtGuTgwHd0qN845OU6djEo5>DM>E!{{+zwI45L> zyynV*^m+HWAY#gtgb^a+S;@5tQYPYpHo;O*OW?HVk;s_LqZDAtcqQ~`8Au)@^oTA3 zGe%MLzr>L-^CbkT!=t+)-EC}sBO+rw*O7E3zhcCxW6=us9Qc?i1D@SwoNSyLuf1#V#Ty$d>O2ZSaYVSR0!Vb4=ZQ zak%&E91}B9q?n9PY%B{T&DD56GddZUJl6Zm1k%S`-fHPRwW1ha+|=nzBU8F;6rk8x z8+4h@Aia`1%b4tdbf$q*0>$w`3T{1M%F_a*|E>Nb0|9byY(v?`I}s!Wir7{pbA-;A zIyhYerJ74%Vx2ii86Cr9`Yb<_I5X>thUgdIM8sT^@rOhpBdT3FGcKVedfQ|@F;^aU zVtz7=RV9}4{L7I76(j92B*|N!(6dY?Rra0eI^o#B5ul-f^N#{8MtVWYSY=JS$NK#H?VM5=E0yJ%MmB&{8)Yo}bZE81e9kZEq=ls=oHUn!8t zCVlnNDPb{?GZ4Vb2~uJ78L7h z{HcoG2gt6Y@kl(iH3y^;Do{pOij@K+t#+KA!s2QF#+mZZO9guFO#L^-)4t~ft+wb& z0TO9zKPkPUSyrK+14(dimI~BlM3MvbsT2VX)c0c=r2=gdYhQyRpeo;-NncwUD3o7! ztW|S>hExki=w3iKyi%848PHc!FO!Y)=zd01p;lnBfX{wTtuM9FfU*@4l1b##{85H@*BA`g^jJFa;_P4C;U z4!@VH0p%J`;6C$uE4?d?T=<{-&wiqX{vQ(9pIY>+Pc7E?W0dv(T<76>xJtPG Y18_u{nFs=rBLDyZ07*qoM6N<$f?a|)wEzGB literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..1e55d5d30589d3ff2312769244bbf96f471aa6d1 GIT binary patch literal 864 zcmV-m1E2hfP) zFSISLxZ;W{E-gipWLsQ|776=U#SO+-ZND?3CuERdgx@wsNkmRa2(XD6EEGTJl~1Do z!LCuov{B`{d=j-j+fi75u_IEAFi7%%5+*{%q{KtoBO^r8KK7EwLNsz-^X!u|kxY+` zPM%RFgN1_(WhPl6=b{m$>kN0)v`kgaigDCY`u& zfyBsjR*D7m+I^@#&aRYd9Me2Uq%{-T-XDj+_MaZZ?2uYU={nFXLzwS_JX?_}?M(#>yzxwPZhZQh#?2+z%cF)V1 zaPgNvuRWo&>76$1_Hl?J3Kb|J=~v{atk7(nrkJ8c1}k7>nByhgvPN^`e4>T8aDN&( zC95=}PY)l+V`)O3Y1YU(-u*S|GS01!_BmO}dt7{>pp{U8ubyJWk&!FZ>hq&*j;=cE zx$D!9={#L%ghGyOUNkbeN0Bt9W~3={-@|5v4!*HKm6~Q$S>QVzUhY7LdCE8w+A+>x qOPktA|KkY>Mq6BQ#T8dvZuJLU0|=fIaVORQ0000-IBi_>M z$Jj(CF^x>Oopw$7oKJjva^~J#(!JNEOP4NPf&@W23&r_mhM4yp66b%-MWNSx=LdTT zG7oi@nV`|!vN9iz4oFcbQV!=~h903X=p4gZ>&wmw7M0ggSWbu#q`mohmfLX{p0_wh z^f>$N=Z~Xv`tA97L7LZbC{kXw!hrKT{kSs{BS_Qd;$Ne^7245&D-7Bb!xeE@Kf9#p5~S=pNA=fP zWbDp`2MWWOC08lrx$wZ95hTpHm}1Z+F(@8{adhOh?nUeWA%vfG^voC@*XjsC7&$*P zI2sWlb^6)FpevBD=^RzB)8~uxGozym`n5e9TYl%_jx(}d*OSFulb|b-a7|p-$CkwT zso*GK&pld|k1b;ix&{p6ivMXN2>br$!efs15u}QrhptRbrBy#o$Z}j|hMr(* zH)MD^>-6;ajIF(pWke4_%FoZR{JMLt|8RymV!%bPLSGq__p?pP6diym8Lvt@Vu2eB zIuM323+4RmVbKAxyzz9D*ID9QwT1Us{t3(8&&Gi}7r`oJ9QgWK4P3_Ib4Cz8Vws`> zGsW`B + + + + + diff --git a/res/drawable/emoji_category_emoticons.xml b/res/drawable/emoji_category_emoticons_light.xml similarity index 100% rename from res/drawable/emoji_category_emoticons.xml rename to res/drawable/emoji_category_emoticons_light.xml diff --git a/res/drawable/emoji_category_nature_dark.xml b/res/drawable/emoji_category_nature_dark.xml new file mode 100644 index 0000000000..e54e35885a --- /dev/null +++ b/res/drawable/emoji_category_nature_dark.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_nature.xml b/res/drawable/emoji_category_nature_light.xml similarity index 100% rename from res/drawable/emoji_category_nature.xml rename to res/drawable/emoji_category_nature_light.xml diff --git a/res/drawable/emoji_category_objects_dark.xml b/res/drawable/emoji_category_objects_dark.xml new file mode 100644 index 0000000000..4ca7bc6355 --- /dev/null +++ b/res/drawable/emoji_category_objects_dark.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_objects.xml b/res/drawable/emoji_category_objects_light.xml similarity index 100% rename from res/drawable/emoji_category_objects.xml rename to res/drawable/emoji_category_objects_light.xml diff --git a/res/drawable/emoji_category_people_dark.xml b/res/drawable/emoji_category_people_dark.xml new file mode 100644 index 0000000000..8ffc79c280 --- /dev/null +++ b/res/drawable/emoji_category_people_dark.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_people.xml b/res/drawable/emoji_category_people_light.xml similarity index 100% rename from res/drawable/emoji_category_people.xml rename to res/drawable/emoji_category_people_light.xml diff --git a/res/drawable/emoji_category_places_dark.xml b/res/drawable/emoji_category_places_dark.xml new file mode 100644 index 0000000000..fa62492587 --- /dev/null +++ b/res/drawable/emoji_category_places_dark.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_places.xml b/res/drawable/emoji_category_places_light.xml similarity index 100% rename from res/drawable/emoji_category_places.xml rename to res/drawable/emoji_category_places_light.xml diff --git a/res/drawable/emoji_category_recent_dark.xml b/res/drawable/emoji_category_recent_dark.xml new file mode 100644 index 0000000000..5d8581dbaf --- /dev/null +++ b/res/drawable/emoji_category_recent_dark.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/res/drawable/emoji_category_recent.xml b/res/drawable/emoji_category_recent_light.xml similarity index 100% rename from res/drawable/emoji_category_recent.xml rename to res/drawable/emoji_category_recent_light.xml diff --git a/res/drawable/emoji_category_symbol_dark.xml b/res/drawable/emoji_category_symbol_dark.xml new file mode 100644 index 0000000000..e98cbee842 --- /dev/null +++ b/res/drawable/emoji_category_symbol_dark.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/res/drawable/emoji_category_symbol.xml b/res/drawable/emoji_category_symbol_light.xml similarity index 100% rename from res/drawable/emoji_category_symbol.xml rename to res/drawable/emoji_category_symbol_light.xml diff --git a/res/layout/emoji_drawer.xml b/res/layout/emoji_drawer.xml index fcdf3a477f..65e96350f2 100644 --- a/res/layout/emoji_drawer.xml +++ b/res/layout/emoji_drawer.xml @@ -7,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -16,22 +16,22 @@ android:layout_weight="1" android:layout_width="0dp" android:layout_height="match_parent" - android:background="@color/emoji_tab_strip_background" + android:background="?emoji_tab_strip_background" app:pstsShouldExpand="true" app:pstsTabPaddingLeftRight="@dimen/emoji_drawer_left_right_padding" - app:pstsUnderlineColor="@color/emoji_tab_underline" - app:pstsIndicatorColor="@color/emoji_tab_indicator" + app:pstsUnderlineColor="?emoji_tab_underline" + app:pstsIndicatorColor="?emoji_tab_indicator" app:pstsIndicatorHeight="@dimen/emoji_drawer_indicator_height" /> + android:background="?emoji_background" /> \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index b4cdffb32d..48cc16ea4c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -41,6 +41,21 @@ + + + + + + + + + + + + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index d0e49d9d8c..75634142db 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -9,9 +9,14 @@ #ff000000 #ffeeeeee #ffdddddd + #ffe0e0e0 #ffababab + #ffcccccc #ffbbbbbb #ff808080 + #ff595959 + #ff4d4d4d + #ff383838 #ff111111 #7F111111 @@ -50,8 +55,4 @@ #ff222222 #400099cc #40ffffff - - #ffe0e0e0 - #66555555 - #44555555 \ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index 772cc06343..11a3b90752 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -86,6 +86,21 @@ @drawable/ic_photo_camera_light @drawable/ic_attach_grey600_24dp + @color/gray12 + #66555555 + #44555555 + @color/gray20 + @color/gray5 + @color/black + + @drawable/emoji_category_recent_light + @drawable/emoji_category_people_light + @drawable/emoji_category_objects_light + @drawable/emoji_category_nature_light + @drawable/emoji_category_places_light + @drawable/emoji_category_symbol_light + @drawable/emoji_category_emoticons_light + @drawable/conversation_item_background @color/conversation_item_received_background_light @color/conversation_item_sent_background_light @@ -220,6 +235,21 @@ @drawable/ic_photo_camera_dark @drawable/ic_attach_white_24dp + @color/gray95 + @color/gray65 + @color/gray78 + @color/gray70 + @color/black + @color/white + + @drawable/emoji_category_recent_dark + @drawable/emoji_category_people_dark + @drawable/emoji_category_objects_dark + @drawable/emoji_category_nature_dark + @drawable/emoji_category_places_dark + @drawable/emoji_category_symbol_dark + @drawable/emoji_category_emoticons_dark + @drawable/ic_add_white_24dp @drawable/ic_group_white_24dp @drawable/ic_search_white_24dp diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java index 7719b480b1..4a39605183 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java @@ -1,8 +1,6 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; -import android.support.annotation.ArrayRes; -import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.view.PagerAdapter; @@ -13,7 +11,6 @@ import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; @@ -169,7 +166,7 @@ public class EmojiDrawer extends KeyboardAwareLinearLayout { @Override public View getCustomTabView(ViewGroup viewGroup, int i) { ImageView image = new ImageView(context); image.setScaleType(ScaleType.CENTER_INSIDE); - image.setImageResource(pages.get(i).getIconRes()); + image.setImageResource(ResUtil.getDrawableRes(context, pages.get(i).getIconAttr())); return image; } } diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java index ead5ada69e..acfd81458d 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components.emoji; public interface EmojiPageModel { - int getIconRes(); + int getIconAttr(); String[] getEmoji(); boolean hasSpriteMap(); String getSprite(); diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java index dfc1064d47..8634c7ef3a 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java @@ -7,7 +7,7 @@ import java.util.List; public class EmojiPages { public static final List PAGES = Arrays.asList( - new StaticEmojiPageModel(R.drawable.emoji_category_people, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_people, new String[] { "\u263a", "\ud83d\ude0a", "\ud83d\ude00", "\ud83d\ude01", "\ud83d\ude02", "\ud83d\ude03", "\ud83d\ude04", "\ud83d\ude05", "\ud83d\ude06", "\ud83d\ude07", "\ud83d\ude08", "\ud83d\ude09", "\ud83d\ude2f", "\ud83d\ude10", "\ud83d\ude11", "\ud83d\ude15", "\ud83d\ude20", "\ud83d\ude2c", @@ -35,7 +35,7 @@ public class EmojiPages { "\ud83d\udc4a", "\u261d", "\ud83d\udc46", "\ud83d\udc47", "\ud83d\udc48", "\ud83d\udc49", "\ud83d\udc4b", "\ud83d\udc4f", "\ud83d\udc50", }, "emoji-people.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_objects, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_objects, new String[] { "\ud83d\udd30", "\ud83d\udc84", "\ud83d\udc5e", "\ud83d\udc5f", "\ud83d\udc51", "\ud83d\udc52", "\ud83c\udfa9", "\ud83c\udf93", "\ud83d\udc53", "\u231a", "\ud83d\udc54", "\ud83d\udc55", "\ud83d\udc56", "\ud83d\udc57", "\ud83d\udc58", "\ud83d\udc59", "\ud83d\udc60", "\ud83d\udc61", @@ -64,7 +64,7 @@ public class EmojiPages { "\ud83d\udcfc", "\ud83c\udfa7", "\ud83c\udfa4", "\ud83c\udfb5", "\ud83c\udfb6", "\ud83c\udfbc", "\ud83c\udfbb", "\ud83c\udfb9", "\ud83c\udfb7", "\ud83c\udfba", "\ud83c\udfb8", "\u303d", }, "emoji-objects.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_nature, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_nature, new String[] { "\ud83d\udc15", "\ud83d\udc36", "\ud83d\udc29", "\ud83d\udc08", "\ud83d\udc31", "\ud83d\udc00", "\ud83d\udc01", "\ud83d\udc2d", "\ud83d\udc39", "\ud83d\udc22", "\ud83d\udc07", "\ud83d\udc30", "\ud83d\udc13", "\ud83d\udc14", "\ud83d\udc23", "\ud83d\udc24", "\ud83d\udc25", "\ud83d\udc26", @@ -96,7 +96,7 @@ public class EmojiPages { "\ud83c\udf06", "\ud83c\udf03", "\ud83c\udf0c", "\ud83c\udf09", "\ud83c\udf0a", "\ud83c\udf0b", "\ud83c\udf0e", "\ud83c\udf0f", "\ud83c\udf0d", "\ud83c\udf10", }, "emoji-nature.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_places, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_places, new String[] { "\ud83c\udfe0", "\ud83c\udfe1", "\ud83c\udfe2", "\ud83c\udfe3", "\ud83c\udfe4", "\ud83c\udfe5", "\ud83c\udfe6", "\ud83c\udfe7", "\ud83c\udfe8", "\ud83c\udfe9", "\ud83c\udfea", "\ud83c\udfeb", "\u26ea", "\u26f2", "\ud83c\udfec", "\ud83c\udfef", "\ud83c\udff0", "\ud83c\udfed", @@ -118,7 +118,7 @@ public class EmojiPages { "\ud83d\udea6", "\ud83d\udea7", "\ud83d\udea8", "\u2668", "\ud83d\udc8c", "\ud83d\udc8d", "\ud83d\udc8e", "\ud83d\udc90", "\ud83d\udc92", }, "emoji-places.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_symbol, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_symbol, new String[] { "\ud83d\udd1d", "\ud83d\udd19", "\ud83d\udd1b", "\ud83d\udd1c", "\ud83d\udd1a", "\u23f3", "\u231b", "\u23f0", "\u2648", "\u2649", "\u264a", "\u264b", "\u264c", "\u264d", "\u264e", "\u264f", "\u2650", "\u2651", @@ -156,7 +156,7 @@ public class EmojiPages { "\ud83d\udd04", "\ud83d\udce7", "\ud83d\udd05", "\ud83d\udd06", "\ud83d\udd07", "\ud83d\udd08", "\ud83d\udd09", "\ud83d\udd0a", }, "emoji-symbol.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_emoticons, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_emoticons, new String[] { "=-O", ":-P", ";-)", ":-(", ":-)", ":-!", ":-$", "B-)", ":O", ":-*", ":-D", ":'(", ":-\\", "O:-)", ":-[", diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java index 946161bc83..1aaa17eec5 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java @@ -5,7 +5,6 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.graphics.Paint.Align; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build.VERSION_CODES; @@ -13,7 +12,8 @@ import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.View; -import com.google.common.base.Optional; +import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.util.ResUtil; public class EmojiView extends View implements Drawable.Callback { private String emoji; @@ -58,7 +58,7 @@ public class EmojiView extends View implements Drawable.Callback { } else { float targetFontSize = 0.75f * getHeight() - getPaddingTop() - getPaddingBottom(); paint.setTextSize(targetFontSize); - paint.setColor(Color.BLACK); + paint.setColor(ResUtil.getColor(getContext(), R.attr.emoji_text_color)); paint.getTextBounds(emoji, 0, emoji.length(), textBounds); float overflow = textBounds.width() / (getWidth() - getPaddingLeft() - getPaddingRight()); if (overflow > 1f) { diff --git a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java index 67cdd75f5e..9691b33721 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java @@ -42,8 +42,8 @@ public class RecentEmojiPageModel implements EmojiPageModel { } } - @Override public int getIconRes() { - return R.drawable.emoji_category_recent; + @Override public int getIconAttr() { + return R.attr.emoji_category_recent; } @Override public String[] getEmoji() { diff --git a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java index a6cd52b967..1c6639cfd6 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java @@ -1,22 +1,22 @@ package org.thoughtcrime.securesms.components.emoji; -import android.support.annotation.DrawableRes; +import android.support.annotation.AttrRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; public class StaticEmojiPageModel implements EmojiPageModel { - @DrawableRes private final int icon; - @NonNull private final String[] emoji; - @Nullable private final String sprite; - - public StaticEmojiPageModel(@DrawableRes int icon, @NonNull String[] emoji, @Nullable String sprite) { - this.icon = icon; - this.emoji = emoji; - this.sprite = sprite; + @AttrRes private final int iconAttr; + @NonNull private final String[] emoji; + @Nullable private final String sprite; + + public StaticEmojiPageModel(@AttrRes int iconAttr, @NonNull String[] emoji, @Nullable String sprite) { + this.iconAttr = iconAttr; + this.emoji = emoji; + this.sprite = sprite; } - public int getIconRes() { - return icon; + public int getIconAttr() { + return iconAttr; } @NonNull public String[] getEmoji() {