From 1fc441daa8150e835fd0c67fe87ae8a216bd3fe3 Mon Sep 17 00:00:00 2001 From: Chenxia Liu Date: Wed, 2 Mar 2016 18:00:03 -0800 Subject: [PATCH] Bug 1227120 - Filled bookmark star does not easily convey bookmarked state. r=mcomella MozReview-Commit-ID: 8fSQiEycSGl --- .../base/java/org/mozilla/gecko/BrowserApp.java | 3 ++- .../gecko/widget/themed/ThemedImageButton.java | 6 ++++-- .../ic_menu_bookmark_remove.png | Bin 611 -> 0 bytes .../resources/drawable-hdpi-v11/star_blue.png | Bin 0 -> 754 bytes .../ic_menu_bookmark_remove.png | Bin 825 -> 0 bytes .../resources/drawable-xhdpi-v11/star_blue.png | Bin 0 -> 1000 bytes .../ic_menu_bookmark_remove.png | Bin 552 -> 0 bytes .../drawable-xlarge-hdpi-v11/star_blue.png | Bin 0 -> 685 bytes .../ic_menu_bookmark_add.png | Bin 529 -> 0 bytes .../ic_menu_bookmark_remove.png | Bin 390 -> 0 bytes .../ic_menu_bookmark_remove.png | Bin 662 -> 0 bytes .../drawable-xlarge-xhdpi-v11/star_blue.png | Bin 0 -> 794 bytes .../ic_menu_bookmark_remove.png | Bin 978 -> 0 bytes .../drawable-xlarge-xxhdpi-v11/star_blue.png | Bin 0 -> 1193 bytes .../ic_menu_bookmark_remove.png | Bin 1188 -> 0 bytes .../resources/drawable-xxhdpi-v11/star_blue.png | Bin 0 -> 1398 bytes 16 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png create mode 100644 mobile/android/base/resources/drawable-hdpi-v11/star_blue.png delete mode 100644 mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png create mode 100644 mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png delete mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png create mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.png delete mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png delete mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png delete mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png create mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png delete mode 100644 mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_remove.png create mode 100644 mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.png delete mode 100644 mobile/android/base/resources/drawable-xxhdpi-v11/ic_menu_bookmark_remove.png create mode 100644 mobile/android/base/resources/drawable-xxhdpi-v11/star_blue.png diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index deb69af4965..e712654f1ab 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3154,6 +3154,7 @@ public class BrowserApp extends GeckoApp } Tab tab = Tabs.getInstance().getSelectedTab(); + // Unlike other menu items, the bookmark star is not tinted. See {@link ThemedImageButton#setTintedDrawable}. final MenuItem bookmark = aMenu.findItem(R.id.bookmark); final MenuItem reader = aMenu.findItem(R.id.reading_list); final MenuItem back = aMenu.findItem(R.id.back); @@ -3387,7 +3388,7 @@ public class BrowserApp extends GeckoApp private int resolveBookmarkIconID(final boolean isBookmark) { if (isBookmark) { - return R.drawable.ic_menu_bookmark_remove; + return R.drawable.star_blue; } else { return R.drawable.ic_menu_bookmark_add; } diff --git a/mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java b/mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java index a91eee3fdd5..2c564f3f912 100644 --- a/mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java +++ b/mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java @@ -177,9 +177,11 @@ public class ThemedImageButton extends android.widget.ImageButton private void setTintedImageDrawable(final Drawable drawable) { final Drawable tintedDrawable; - if (drawableColors == null) { - // If we tint a drawable with a null ColorStateList, it will override + if (drawableColors == null || R.id.bookmark == getId()) { + // NB: If we tint a drawable with a null ColorStateList, it will override // any existing colorFilters and tint... so don't! + + // NB: The bookmarked state uses a blue star, so this is a hack to keep it from being tinted. tintedDrawable = drawable; } else if (drawable == null) { tintedDrawable = null; diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 09be9ac33e596cba603e6bac61406428bf5a17a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 611 zcmV-p0-XJcP)E-E-o} z%XjYBd(^7d2{FW#;R|dyr@ZA#zO7;YV#7J*DMzRo0IA$~R-W$Mr~wjuHy;=`7!QDY znWuNJUR<^ zj@AN1LY<+sw0iaGUX~Y@^iRGw3^>_4{u3AE(evPp~|ZiLj=n z0A!xtIzF#WyvclC-%6RYBYB6^E;1G7h@^p#{n{iQvP?c~m zZiaV!-fK{Q@wtd};iV|k3?#4J%UA`ZSkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?o251o(uw`eYU|OuNf4=OM$idmzUD{~!{GrUTJ^5IGYp4iuSjpJCNYkO)xa zoYx@6;x|z4%=-*8z{)_f5Ck+3V$OXiV;j(9h*9@IMnNsQ&oJ{p!+fxsnGYCdJY<*! z)(A9h)qjSW4;iN4W0(ms5U3X@_y}YgL_JUe$clR)H6R3Z@I8k8|DnzXN&z*_1}cEK z1m=rrK)WDL1#5vga@t+StQ=d7OtklfGb_*bp0T=~^MJ%2w#TP>^f#_yiCpx@ zM%?&k?Z=rGeYUAxYrA&^J!Ap~yQ-&)V~EA+)+^V`4jJ&UB`|XqHf-x*O3mlGTm9bY zd)~@>|9!n4SvlIt{SRGIBffEsuv3eRuC|xYNrn`kXM)QjjTTI4Klk;SObB)tIpnIc0boE^wxQTGHYZ(ywejI9j^78Pde@VmYH|0m12 zieF4O-!;zesptB-z~4M9BcMk4%i;7lRZ~wt|KEM#$or{Xd-SH=;8VCVt4zw*I_HLO r{?BNR((1Q$?D9J<=YQYz<|F@`b@$TRrymOk#tDO`tDnm{r-UW|Jj_=h literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 12b161c8f88b5973b33935e18fa5394f6e41df22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 825 zcmV-91IGM`P)&7k>PLyE}zj?^t#^^S-Y} zcedWE*h|6+3XYdoO8}mtpw}#&5Du%t9P|w#^)m{3O`oxJfdCvq#NQ7t^(dAO$Z*|4 z0`T5P0x0fh0~BGlgL~MY2!AfPhePbHeun&$OMS~%0O-3pIeGut+xI2*B%=8RwGgur z4FP@;fY+i50KA=(qyDz9?}O^_8Nz;Dsjp>yKjQ}u`a&E6Zsg|X{$Wq`CARY?>?@*& zE!F>)OFS310I9ErLZM$-&~QLUh)^QIL3Ikc`d$;P*hqNT zk%M0DOE7j3YdNT{j*CrmTvfJ4jT&DYA0`QOk zJ^PKYFhCjN#QZ?Z`^%YxekAolGG69LnHNS}iSrxt)tpQH$p6Q725~0tj0TeZg#9N0 z=0A(rAHFu?g1 zlV3<2S$?QkQGFu-SJ)>2SCjK)v7m{fR*3h*mZwr$$(A}1mMvCyw0%<&-=&RVXegfQ)v;5A43Yj38@o+lbLC7z|ARi znOh4$fWDBz1?v(s37U;kJ&5U`*j)9wu99j2Avdp@$us|O0FILzys*RG0c;ohnw){= z24ErPn-p*$fR*?lGlVaM#5)0Wp}UluC5vp&E1uvWyvadzr=ZsfiQuXPOBNxCwc|{D zUjPm!BleLY931b7ABRXCmMny)TEv*}33-_Osz%?v{2Rc>u^pSJRwhi`;265g;*f{s zS&X2+<$#M~xX~O^z%CTmJD#e_5(NF01FrKIpeLHReeC*~itly2NPTlwUDf;C&W~~% z@Im~qSCRmRKd%{;!K|4lh47v-efEDD|jF*bI@^|sP400000NkvXXu0mjf DBp`{o diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..661441d24087346f7187679cb216cff12f3aef22 GIT binary patch literal 1000 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6;x#X;^) z4C~Ixyaci{0(?STeKHFfrrl+j`IKS$T@Yj1JrHBne}@16LEP#07-mAmfodKw%m%Ze zDv{WWo`bZ^egx7EG6W)Zk74dJhB*(RT%b8K?n4z!e*m@)tQce+P$STMAol@O!NMmX z#^N^&`@t@mc^~8wkg-7L0oh=OK`jD`-(#2$G#My(7s{CT1Z+Oc84#5qi(WDSjRL6z zn+DMZ;m&|K8z>8LFvL2D36G(!0-69+JPS789-matN=-YjGFN{ z$QBp@)vtJH}?B`|^T7Bu;?^aQ%@1OXCE?&@@ zR{!%Q=Y4ahITM6K`B<0&{MV`{R8QHr(mh__TBSsl?9#s{HZOc<#-lMa^)tu1t8p>! zEd;mpem#Fob@89(J8F%*4X+~G{`w{=PnS~*4Mj6MNL}v^7GpKcW*6y=eI1Hp!w{xtC!;%EryUV))Ig=!{$MSrZ2bZb|#WBn;6SAA0%e5+*=^zJ7 z<&@`t&pRb+N39&f{gc)y2{n*mj)M7h@Rimr*l9uq6D@%+LXV~keSgy?ro;BzGnz!1UoleDn zHLZ)D&?En(PWEe+)1mqwv#;K`c=GeTIU9WTaa-19#>VWQA$)$m|5mZEz3q>eTMLMP z&|M~QB6@Rl)COh#InhxS&Rmh14>^w>FOZjY;K;Uk$e}3npry8@pjkLz`zH%O4y6_q zKaT@8#cje)JSu0p8#2^{MR|QDe9(+AwYafvrR<^KAGn3;er$EEeq5^d+tmI~D+~Mf zFY~haf_LB9qH;Af-_b^|=j!wO6CA>ipX03f{VywhV%xLSxu;_j1JG(EO%27?8iD#N&;_TU(oF38++uv^f-LN=ix5f7^ZrQXbrk(Mbh;9E% zS1JOEA$9_!jk!0`dubeo1I-@+>6);FX(;6TQV^vRrUA&8qXr8zXHAhFMFka>F!R@0 z&S= zM#|mm7b+T}Wh7(r#wHI7;GG7|2mFI+zXveg^a~b^q`|=)Eqa~&hc2L9En2R@W<1d+ zD6nX`1}mE~TwDsT#8p&Jw37M4E-VN5<-c2ntoowm8f+o$DJej| zz~&tQ+^l$g`Oqumt$_5scstQbW=CHr3gweZCAwAAE_I{yHWs3pS+$kPD;0000!lvI6;x#X;^) z4C~IxyaaMS2l#}z`eYU|OuNf4?H-uC%P<|tcnD(80Wx5MAjSib;HpO;awbsybB38u zVeESh(}5yLX!?DISwKS|;$TC73VH=8@L?C-#Hf}EgdOx5f z$S;`T_naE>e3}R_&zrvVI?4i67E)tsk3I zE;Z)6Y*oj_;i_wkh^L%bE<$CzcM50#Q`=8mtsaKTrIsW7?zjG7c2sBL&xvDZToyTBe zb^@D$uSX?I*&n05dO>|Asx^%5Fmf||g zwH}YZ7S1SoC6&}|_H3@%TH({Cwvip$-ztOCmfNpp2yl$K`|sZa-&4Djz6QKu?7!Eg Vv3FZL4=@}UJYD@<);T3K0RZA&Ka>Cf literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png deleted file mode 100644 index b9159d684156a36bf0bca3ecc064371d3f066a31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)TL5;Y!ji2v!AMfqPwW7LV5gUzJ1a(l`wr#te?{4?(+hme?^L_KZ`R1WY zE{D5fI|6ypC*b;1OjrIxFiT7;T97;9s1`IGd9o-mW_zO{M52cf$eA6SP{efd07PIr zYF!*IY$dNU)Aac}zfs@=PPh(HJb%8tn3eNpb z%3{U?4!G#i{m`m1)3Tb--OiyvR^O`8b2{Ln2fdiOva+&i2q>}bmIPc?cX@4Ce&1|j z;DD9Tu%bUohtNOeY2moUki#mvh-ZC9&L+U1;>jATmeDbb`Rtm-B?g zyJoaP``oLZ^zaOv;mXOrT)vL`AXilQEg}M@-yNZ^fhoHWGK!Uyl+-25e~I`ieC;-) zg>RzT4+L`5fPn)pdNMva^$Hv(TZ>5GUDC^o8et(0xZLZP-mWd?CJLxY7MQl2k30#d zo(%i*7e|HUC)(#~!!R0Y963$53Yg|GTQ14+cNWj-b=blfYn6@%3>H2gtet)2{LG>c~VV_iU%E6MOTM4A?x2^ z5RzWkgy5pGIqn05KIK$~4s=oY3Ivodj7X+!%Ya44y~cPr?gtcl*0K;7WS{J|pXdKF zB3ZK#*%~rN!`yG7ZvDpFA(9mf5w7UUQd3i(YYep3_XHVDAx%rsR-1y1wvZzkk0G)R zsTI-!QQ?2{kq{VdA+MC))<->pqE~o4o;TO`GcuG{AT5J?yEj5$bUG}jVnnP!8Ug|7 kyT)VJ+f|PdBXjrOIcIg`Jt&nw9w%cL$pYO z%P@u8JtDBYVpm>(8l&@}&Z27C%>a_0Da`5}=HA<05TKmlOQFo7!l)hq92pb+LYO_V z-Z>y$k$*`KaQ0X=Dg50rAk3tJLGh*Qj8-~_%h-$8TNp-3Pf7Y3Mrp;Mwi=@`5^4$J ztQ7j-94r}3LEI4Qvm_s5YA&i9p_}y_h)VReoMn8gr zgBCPX%alzqEGR%|6*6NM6a0pQhP%9vi5WhIvl;H|4o1Q+K=_8n|2=~mr>%Yg!nYTI zmwg1h?3OQ0XY|o8K=^i5k|G`V`n-%1j3*d6Nr3aUp*J+Np8gAioZTgxruX zpww{F`+J>7N`4jveG1{SabA5yXt)S-^d{-vx~VV`FYMi=nu%5#rxQs&-?%u%_E??M wE3_+A(;m^cZ{Ok`b!B_%jLyI}H1hlHFUiq2#7ctSsQ>@~07*qoM6N<$g83vn$p8QV diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..c0278d5748c13bd37a4168b322af42fde6db4b2a GIT binary patch literal 794 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxKmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIN*C0X`wFKAD9KGw(A@zsE4`E&~1k&j3U~!RbJ$`%v+DPoNCA`dJS^A~RqL zro*_??=sAUn+7%+qz23YN&y)l5`s|eg^Gjig{TLSFf}vof;ED<^Y1gvcnIRoyvH!> zF<1>)9OMz0dY~-G!21k9#Xxb8lYmk{Hq7c({~4wM-3-wP@4pR9e}b0$KDXPobM3|APai)lf8VFD zDW!Myg?&YrR|RvJOf;AAn{z~e*ZkL&Hw-1hyeE4`pUq=)I(a|Pdx3NvF!)_PT^vI! zPS3rPKDo(2fbD_D#^xKl=e>Os_x`Wn`tSSx|L>RK3UYEX`d-&GH@(bh6N{q1(WW_$ zHiC>Ua^JbC^ei8g@L4M^>prB!s1{@TKyLL@%Ndqw2iB_Ee95#uKXGgkX)d9rZYQkJ`_Ugw0@Tu3}x zdrfne_rqX8#oZn0HK$S{-2T6dP(D11UF^h$hTQ=Zc$$C2ufDX+{b<4@w#gDA836|p z&KrhETlcYkH@LAqZNb*g3r9nff8IO(;J})A`x)iO)qk?Sh!fzj6E{@s%e)7VfKiIcT7S$6uH=`LCYYd*QelF{r5}E)pOmAfX literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 42d1f962259047228452f937c0078b1dcb94b5ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 978 zcmV;@11mKX3|>S#4rHv`~6qENO; z9WWVrG8UNa%c+WTIgoXG0LDc*m!9adJXjal*w<h8U|)N zB$LUEomg1KvJ60)kup`4;HgNiZx&dy3`=B`l`)GD%WusBLyB#X#F6s1w$%$@g&xPr>#4>v6rK55EhoxvXZRDqRfg#1V>OU~cshxm@ z$jFt~hBK>FWkJn0t3o-PjNE`Jqw)FGt;ooGSh^C+aTH3KsIpkY16{FL zoKkbN9&xlMvAyW;?8FcF;Y0}oCd*4TU7|v}7nrsPf+>1LF`Ar=y|l-?nL2?Dj9|rX z=EigZ#tU5%)5tf21sJT@(L6g?fWg`$o0xuq^`ET7VQGg2W1j`ToRC&nu*I!|&q^CC zn7|fyj73H+P75qpz*KiRso7qWbXYJnyy?JtRI}WYR9JX#I(e{05KN$1?nxl*J@DT0 zHc%URBq^})3eW9b#4eR4BbKLqhlNLY?a;p1Ohv}N=qoI|!DFYh9Mfr**L{P9CwOy| zv$8WI#hM;$6Zk_X zu$wVY+Qy1#SbWtxz^fY)+vi&SeRy+F(QcM(-i&-eMz(9Ps%}h-xMb|`X4`=`2UAj% zY21MQ8VmbOCNoL1?cn54XhpMqx6$_Ct@FSf?a~0~&o!M^C{(8JKtaufsL>!}Kdaxa z?CfF=-lxuhbTw)$T`Xsb?UCBZw{dO5n*(53F$VO(Ze$)ZK`;ZV{01s(gf};P;n41i zazJh5Q)0PJh1K=DUa8AG7Yfv{Q-T+GYUcZY0P}z*tsLU5jgR3=A9lx&I`x0{M)^LGDfr z>(0r%1hN+f_=LFnWEL{azt1q^A;a{$4FCT#%mku)46FV#OuGw3K*2@N8D`vP*bfoB z4^jz|y$4eRWpO}6^Q^ZpFfa*tx;Tb-9G`nFJzUCBgzbT&K$#=U%C0Wn zH48ery12rEd`$L!U$*RfQj(|7=YOvRA`;5V+ce*se>+$FZO+`8r(IY0MJ-zvH6f*H zH^Z)~r)zQrx^8apd?+x*NU?SO)Q|JdtbX4#EnVnF+8f18~zbEw7f*@N*bf};unT{#1Aaz74tJIy8YTwxsCfy#l@6^-`g(R zNf;*YICN*7+V9(+&961in3%uw$~Q@+;+S7Gd5*n|+TWw}%j*y9yZ3(Ue0_FvM}>p8 z|NWV@)MI*>$b_yEBpW=iK`L>t_DDMuOAX}A3forQu+bYWb%S=7J*yWAh)j3z<3im|J(z^TP)tvm- m3ES`WeAgELa5i!Of5yuAo0a#y1PXvDmci52&t;ucLK6VcQ9RKA literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xxhdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xxhdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index a61b15b0445ae8b3f070677af2ae1ef2f2ab449c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1188 zcmV;V1Y7%wP)U8^_a&<;x`K1p) zf5LyIx#l{tD=3X2U6x8Xp65+XY=7(%5bO`4+T3Z(nh(bXhGC@b1*w9wsqas!SiTJr z&~J!_>3O^Y*{?4sjUk<#3OHMBwbg`5%NOASg2}H$X66+59;Wu881kJQ+n)(a}OTNB%hB7`%v(x*Twr1fI;xyKtA5bLeC-Z*97Ead6h zw#4=z#r7J-@-iX}79NxRL0Vo%Ve4r*tirY&IXHkok*ESGdVw5FEY}g+S9&Qp;{|75 zBP}=l53c0b7KIDwzS8zhiP#>hSgx9mekj4fV13=&9Fd7@!pvt~GhtXnB4m+2*4{Fi__wB0x*Gv26P)5nn z4;ZN(DyQUNhCW)SHx@CmoUigb=OVCZR%nhvELUa~4(drTD6|?&EMdk{T5if<_IxX@ zz2gEkOW~hb?(4d6-Do2-zS8nY2H-q~ws4O-q2-B{wojzkAwPv3m;QRnL{kvk=TjKU zUn~~Ql!Y)xu~?l3gPPO)i=&Hj%B~PY%-c{@&mD1F`jMZz{;Ql^4RPU zpJGhQE`$GgnLT0y1PMw462kN2RIEOj00;eOoTAK+5|A~277H8{vPlW^rBZ1!=YWt` zBn1#s66b)RkVsJFPH}|z0}}&Cn?vF_v2#TN;KX;v1Kqd;?Xf@W9#Dcr4>$th^hE_k zc7~+2JDh5&iOp(>1H`p8UFJYGfqm%h-2u|(xQKc;zrrHwMW5(0#NQga9#Gp$p)iHv z>+m&8a=Sx7;prLyyU}4?qUyqm<(3fdpf{Yr!3KXg+G%;D;#XJdARw$5(iZq1&>Tb# zsOXz{`>czeg9f>W_U?xG+kWPDav)f7ZQ~vvr8hlY^XmV_=zUB-Iu5Sj|LSE86>T;h zxJEs({e)O{!YQCIPZUvLcf>|um#??5E&%P=>0Xr5vXAF^6GXKZ{NI=Zb9ERkcXCmr zZq~-f{Dk+9K^0PPG%y$D#N4d`+09&?BK&le$r0ID&cWLi;(W6M*3c-*V$E2)!`Iu` z2T;*NN}^bfZ!8LkXJ9SJ_K~k)jaaKvwFP?lzy1biZ9Zr5-&W!P0000oWpA6$T5a-438W+ z)}5p9(8?~#vBO9Dt23hk+3I!pChPGH> zNJJE19aUzr3g3K{f=&vSK?bWe2WT)jgh3XhKqr~3%Jh+J*(wTy%BU=~2U%rvhyi4w zBCNY-v8+ykEa>XnM39KOV&Nf@emD_z4tYLb>kyA3VM;sHfuqr84rf7&v_(Ll0@>(; zf>N*xSulmHtiwAZg3ACR5pQUVWe@Rxm?8n%h2C-(j*#$0AkNXDAeV(_i5yLYhH3j3Br!760!W$cQrTp6C<7*v>^pG9p;2L?GNaj`2&_5Nc z;&WLNy8k^hz+c~#og6qXmiF<~3^!IZEY1gKm>Bu3Ms@zm05>u&tSoMLOh&JeEVHZ>_I|HlLg8j&Uk!0M zd^AzT|1MJ*%gLDib<*d~&-vn(#X2CuB~spmh~c>)r|>YYkAHWIHxA@!BQM)dFfA8aF4eEAj`vP0DXEpT}qv zx8ho`&p*U#?_*c*Hu&h175t?e&B#xB*Cn6bpZ2?KwoC8Vt{(DPA~uir#F>A&9aNk- zZg)bH8DJ&69qorv-X5BXnfROAPb=bzoEV{jIa*DQ(30eUGpaPitRO>Cc#O#~V2b T2~{KT{{a@Jc#}#a_o)8?;c}1n literal 0 HcmV?d00001