From 4557c0dec16459f6d948aa01dc96409389b04377 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 7 Jun 2014 14:41:17 -0500 Subject: [PATCH] Remove getDrawable from ThemeService --- .../todoroo/astrid/api/FilterListItem.java | 8 ------ .../astrid/activity/ShortcutActivity.java | 2 +- .../astrid/activity/TaskEditFragment.java | 2 +- .../todoroo/astrid/adapter/FilterAdapter.java | 2 -- .../astrid/core/CoreFilterExposer.java | 12 ++------ .../astrid/core/CustomFilterExposer.java | 5 ---- .../astrid/gtasks/GtasksFilterExposer.java | 1 - .../todoroo/astrid/service/ThemeService.java | 26 ------------------ .../todoroo/astrid/tags/TagFilterExposer.java | 2 -- .../astrid/timers/TimerFilterExposer.java | 5 +--- .../src/main/res/drawable/filter_calendar.png | Bin 914 -> 0 bytes .../res/drawable/filter_calendar_dark.png | Bin 950 -> 0 bytes astrid/src/main/res/drawable/filter_inbox.png | Bin 781 -> 0 bytes .../main/res/drawable/filter_inbox_dark.png | Bin 790 -> 0 bytes .../main/res/drawable/filter_pencil_dark.png | Bin 710 -> 0 bytes .../src/main/res/drawable/filter_sliders.png | Bin 693 -> 0 bytes .../main/res/drawable/filter_sliders_dark.png | Bin 699 -> 0 bytes astrid/src/main/res/drawable/gl_lists.png | Bin 382 -> 0 bytes .../src/main/res/drawable/gl_lists_dark.png | Bin 382 -> 0 bytes 19 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 astrid/src/main/res/drawable/filter_calendar.png delete mode 100644 astrid/src/main/res/drawable/filter_calendar_dark.png delete mode 100644 astrid/src/main/res/drawable/filter_inbox.png delete mode 100644 astrid/src/main/res/drawable/filter_inbox_dark.png delete mode 100644 astrid/src/main/res/drawable/filter_pencil_dark.png delete mode 100644 astrid/src/main/res/drawable/filter_sliders.png delete mode 100644 astrid/src/main/res/drawable/filter_sliders_dark.png delete mode 100644 astrid/src/main/res/drawable/gl_lists.png delete mode 100644 astrid/src/main/res/drawable/gl_lists_dark.png diff --git a/api/src/main/java/com/todoroo/astrid/api/FilterListItem.java b/api/src/main/java/com/todoroo/astrid/api/FilterListItem.java index aa454d897..16230dc6f 100644 --- a/api/src/main/java/com/todoroo/astrid/api/FilterListItem.java +++ b/api/src/main/java/com/todoroo/astrid/api/FilterListItem.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.api; import android.content.Intent; -import android.graphics.Bitmap; import android.os.Parcel; import android.os.Parcelable; @@ -23,11 +22,6 @@ abstract public class FilterListItem implements Parcelable { */ public String listingTitle = null; - /** - * Bitmap for icon used on listing page. null => no icon - */ - public Bitmap listingIcon = null; - /** * Text Color. 0 => default color */ @@ -54,7 +48,6 @@ abstract public class FilterListItem implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeString(listingTitle); - dest.writeParcelable(listingIcon, 0); dest.writeInt(color); // write array lengths before arrays @@ -67,7 +60,6 @@ abstract public class FilterListItem implements Parcelable { */ public void readFromParcel(Parcel source) { listingTitle = source.readString(); - listingIcon = source.readParcelable(Bitmap.class.getClassLoader()); color = source.readInt(); contextMenuLabels = source.createStringArray(); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java index d1ca38ee8..65b4f9200 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java @@ -55,7 +55,7 @@ public class ShortcutActivity extends Activity { public static final String TOKEN_CUSTOM_CLASS = "class"; //$NON-NLS-1$ /** token for passing a image url*/ - public static final String TOKEN_IMAGE_URL = "imageUrl"; //$NON-NLS-1$ + public static final String TOKEN_IMAGE_URL = "imageUrl"; //$NON-NLS-1$ TODO: Remove this /** List of the above constants for searching */ private static final String[] CUSTOM_EXTRAS = { diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index da82201c9..380d71189 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -963,7 +963,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } item = menu.add(Menu.NONE, MENU_DELETE_TASK_ID, 0, R.string.delete_task); - item.setIcon(ThemeService.getDrawable(resourceResolver.getResource(R.attr.ic_action_discard))); + item.setIcon(resourceResolver.getResource(R.attr.ic_action_discard)); setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS); boolean useSaveAndCancel = preferences.getBoolean(R.string.p_save_and_cancel, false); diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index 146a3c54b..e827b24d0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -151,8 +151,6 @@ public class FilterAdapter extends ArrayAdapter { private void transferImageReferences(Filter from, Filter to) { if (from instanceof FilterWithUpdate && to instanceof FilterWithUpdate) { ((FilterWithUpdate) to).imageUrl = ((FilterWithUpdate) from).imageUrl; - } else { - to.listingIcon = from.listingIcon; } } diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java index 445dfd980..f2c085bc1 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java @@ -9,7 +9,6 @@ import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.graphics.drawable.BitmapDrawable; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Criterion; @@ -26,7 +25,6 @@ import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TaskToTagMetadata; import org.tasks.R; @@ -81,32 +79,26 @@ public final class CoreFilterExposer extends InjectingBroadcastReceiver implemen * Build inbox filter */ public static Filter buildInboxFilter(Resources r) { - Filter inbox = new Filter(r.getString(R.string.BFE_Active), r.getString(R.string.BFE_Active), + return new Filter(r.getString(R.string.BFE_Active), r.getString(R.string.BFE_Active), new QueryTemplate().where( Criterion.and(TaskCriteria.activeVisibleMine(), Criterion.not(Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where( Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_NAME.like("x_%", "x"))))))), //$NON-NLS-1$ //$NON-NLS-2$ null); - inbox.listingIcon = ((BitmapDrawable)r.getDrawable( - ThemeService.getDrawable(R.drawable.filter_inbox))).getBitmap(); - return inbox; } private static Filter getTodayFilter(Resources r) { String todayTitle = AndroidUtilities.capitalize(r.getString(R.string.today)); ContentValues todayValues = new ContentValues(); todayValues.put(Task.DUE_DATE.name, PermaSql.VALUE_NOON); - Filter todayFilter = new Filter(todayTitle, + return new Filter(todayTitle, todayTitle, new QueryTemplate().where( Criterion.and(TaskCriteria.activeVisibleMine(), Task.DUE_DATE.gt(0), Task.DUE_DATE.lte(PermaSql.VALUE_EOD))), todayValues); - todayFilter.listingIcon = ((BitmapDrawable)r.getDrawable( - ThemeService.getDrawable(R.drawable.filter_calendar))).getBitmap(); - return todayFilter; } /** diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index 1e224c05e..acc08c0e5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -86,9 +86,6 @@ public final class CustomFilterExposer extends InjectingBroadcastReceiver implem TaskCriteria.ownedByMe()).orderBy( Order.desc(Task.MODIFICATION_DATE)).limit(15), null); - recent.listingIcon = ((BitmapDrawable)r.getDrawable( - ThemeService.getDrawable(R.drawable.filter_pencil))).getBitmap(); - list.add(recent); } @@ -103,8 +100,6 @@ public final class CustomFilterExposer extends InjectingBroadcastReceiver implem deleteIntent.putExtra(TOKEN_FILTER_NAME, f.title); f.contextMenuLabels = new String[] { context.getString(R.string.BFE_Saved_delete) }; f.contextMenuIntents = new Intent[] { deleteIntent }; - f.listingIcon = ((BitmapDrawable)r.getDrawable( - ThemeService.getDrawable(R.drawable.filter_sliders))).getBitmap(); list.add(f); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java index 353a5ff27..1fa91f906 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java @@ -70,7 +70,6 @@ public class GtasksFilterExposer extends InjectingBroadcastReceiver implements A GtasksMetadata.LIST_ID.eq(list.getValue(GtasksList.REMOTE_ID)))).orderBy( Order.asc(Functions.cast(GtasksMetadata.ORDER, "LONG"))), //$NON-NLS-1$ values); - filter.listingIcon = ((BitmapDrawable)context.getResources().getDrawable(R.drawable.gtasks_icon)).getBitmap(); filter.customTaskList = new ComponentName(ContextManager.getContext(), GtasksListFragment.class); Bundle extras = new Bundle(); extras.putLong(GtasksListFragment.TOKEN_STORE_ID, list.getId()); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java index ae480f630..116ba36aa 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java @@ -7,7 +7,6 @@ package com.todoroo.astrid.service; import android.app.Activity; import android.graphics.PixelFormat; -import android.util.Log; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; @@ -80,31 +79,6 @@ public class ThemeService { return theme; } - public static int getDrawable(int lightDrawable) { - int theme = getTheme(); - boolean darkTheme = theme == R.style.Tasks; - - if(!darkTheme) { - return lightDrawable; - } - - switch(lightDrawable) { - case R.drawable.filter_calendar: - return R.drawable.filter_calendar_dark; - case R.drawable.filter_inbox: - return R.drawable.filter_inbox_dark; - case R.drawable.filter_pencil: - return R.drawable.filter_pencil_dark; - case R.drawable.filter_sliders: - return R.drawable.filter_sliders_dark; - case R.drawable.gl_lists: - return R.drawable.gl_lists_dark; - } - - Log.w("ThemeService", "No theme drawable found for " + lightDrawable); - return lightDrawable; - } - public static int getDarkVsLight(int resForLight, int resForDark) { int theme = getTheme(); if (theme == R.style.Tasks) { diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java index 990b4c0cc..bdc58f7f4 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java @@ -152,8 +152,6 @@ public class TagFilterExposer extends InjectingBroadcastReceiver implements Astr r.getString(R.string.tag_FEx_untagged), tagService.untaggedTemplate(), null); - untagged.listingIcon = ((BitmapDrawable)r.getDrawable( - ThemeService.getDrawable(R.drawable.gl_lists))).getBitmap(); filters.add(untagged); } diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java index b3466aa0d..3da013181 100644 --- a/astrid/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java @@ -9,7 +9,6 @@ import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.graphics.drawable.BitmapDrawable; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Query; @@ -70,12 +69,10 @@ public final class TimerFilterExposer extends InjectingBroadcastReceiver impleme Resources r = context.getResources(); ContentValues values = new ContentValues(); values.put(Task.TIMER_START.name, Filter.VALUE_NOW); - Filter workingOn = new Filter(r.getString(R.string.TFE_workingOn), + return new Filter(r.getString(R.string.TFE_workingOn), r.getString(R.string.TFE_workingOn), new QueryTemplate().where(Task.TIMER_START.gt(0)), values); - workingOn.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_clock)).getBitmap(); - return workingOn; } @Override diff --git a/astrid/src/main/res/drawable/filter_calendar.png b/astrid/src/main/res/drawable/filter_calendar.png deleted file mode 100644 index ea3a75141f71f7eda5165b24a5db76ff9e1e11eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 914 zcmV;D18w|?P)Q55Z}bSJ5p1V>!B z5EPu}Xmsfp2qF$U5&u9G#H}KN;xCA}allQ!z>N?zMpQH+h`3dvCL!rDRh|py!Q zYP*D_7kO|}-Ko0wop`V6DP$(`;ebJ=4|oMUr|?1G0#NUOjOcg_yd$wQz^I`^$h?<78-XA6sa7=akrV~L zfLaG+`YG4&tUGOxiG+ucX#y34OpBRtoS(ND)@!%q`JL2XranuDkZFpWzA^REK!Epp zidzNZvh083MpMgI>kIJUqES?jp*k#mp*zM=LNj5zT%qk&C{W0JJa0M9l?uqOP z;4W|t7-wd>CA#hd`+-wTasQB_>lyc}>aIOV#+ppTQw;NzzGdC!1H7LY){iKs$qaUF zqwLxMF0t>_3^%!1q^e9^^ZHJM-~HgPdb3Q80q?u1l1FAAgECeb;o@aP1!$e4sT)z7 ztmb}z4^#e-+AmeQN?ld-G}C(l%iI9I0}l+#>;NtT4}mX+WiA0*f!hJgTy^_tH%%Cm zSd)aLpuJRers~DP6o;`y)tS@mf8$1K59P&7!i{62PQ*M(VhmyKnyC9uSH%BoGRbP4 zDN<+V0=+4t$!FBuv%tC5&9^gr-jA6UWo8XGl|rd40&fCc`xuFSGP?FUc4i6S-$vKo z!$5r<=-MOPud3@zEim!*lT=+1b*}E?J$>4Y_u{}?MMT|Zow*!H?We#;;JT68Vzpbq zO`cw-_8nj^a4wMAk3x0EP4e2D?i3XzQ}*1_quvBcd_FSX5*(TGYHAlrZR@9xRAo;Z zcs@1c7jtwk*~=O`OC5}z6=Uq|FFJPW)J}8UndQ9b#W}JOk+unyB?Ecf=B+RKkNAuK oC1%F>ic(*}*pVF^>Y8wrLkJ?5=YsppGftiWr$N1d7-QoRcnc9m*cr2Uh^Pla;FU@x zFNz{Bj^nUgF26HkM!*-IsWkM%5ottx1GNHT`Z=$`Yh&*#gw@;awr6NIn_i_-@gZ)+ zh-rdI5z}HM9N_<>%Ikiln zt}w*iMH*XAH8CD5YpRIxdG9b+>F%t3_y9kTmEHF_Pl_4r*+SW~4(ze+)Rbegy+~DT zbUv+w!8Xev}rYKL$IGr*O5n=shk8sdBTT|PjHkr*`2OsAA3Guu{*z$bz zz?EJ}dQ$1FjGeg(K7;$p&TIu|!2|G7*_m@-6PU@^nM?M0@|fnC+@#O6n9yE`JX3Z2 zV1dn8Eb`1T*1tI=w1@J1CRW-6nWdP)ilbB}EqT0(~lcR}iGRqa9mhBeid%67tmPs+}Z`(XbTK#cJGOn><-S1iI z+m-(aEL#1E2xwbm+~4K<<>6}3r`pe~K(n9*WI`;>0k8_Xt+;3C_c8CfEv5l9(*FYP zTY+zaJK!7lP>_>WZVk|3T#0{#`5Mf=(PH#VOJIS1E0_Wwz(B~&EP}J(EI0?!jJrfJ zChrb0rV?--TgKTCvHOaI$6uH6^UP-X2z5{Knz(0<^78As7vs#w# zvZ)IcB42X-0b^&wo)QT>#6$M00000 LNkvXXu0mjfJw_;1GPtOJ@T~_o zfgbuz&Y!g&<||hdvln!z@i(x<+0<&X${WEpjysrdteTik&`SR;I0B|(T#a4e0ocbp zomz}%J$yj<&jW<`5zscpxIy`Td3X!RsPQW+&{L2A#Skm88O(!2R@~$CGt9eai%Ee! z^k>0iEATCFAN=GQTF*^uv?k~(G4%cR@>pLo4r|W}JeG->vfIwV0hCtpYq!{sg!JUhry$wI$Y) z4_5qh^wZ4$#fUiwlJsZ5Yx+01O<%$Jh!xr8R&D3XoMikNUhgFH-!o$RKm+|}ya8fu z;I^m^C<9@v!r2dUJkLBs%-d(gG_&{^djgi}Uj-jIGq=X-`yPDec$s;IRIzOqG3}t2 z|CGIb$yrEodc*!v%c{6)bxK_6Ugjw?zKq*_9w2i|3fxcW8{_QWTVw3j3+&cO<|(iW zOa8RXctE`{Nwp1J4H3H`COrOi8NbYY#s=hpeyci~o+Vdujsk54 z`hC@<<&Yg?iQdhkG|JlIu_xVRiFem|Xr*dM7VPJ960g;__B2a$ztWaq zwQOADP**5KzT}Pu{GJMWDeNtgz{550000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Xh}ptRCwCNn9WO6Q5eR@ajY~k4Aj(0 zNAn|f5rnvq&`GjTT+QF$f6%f`=Nx$MIaBvV0%HX%Ye>DxDO@jBThGa}aHo${`XJZsuABUJeutJN%Vgk&IWl@T$1}{Os##pgzDJn5d;1%d$ zPvLJnQ_nR|*gVNuG^P4EZ222)~<%MRSa zj6BpBD}qMACol_k{R1iy(*f3b)eXtST-ZZfG55i{kQN^nIq-ru1%^$Zxx=b4$%x0c zUnn;yX|Y(>Eret)6Jjc+Q|YX_vBQ05PiJt-z?x-4As&U~btmX#rj6Eg8&*xmM2L=< zv_(dwvp&_eM%N}ep)GK?)r~wm>#j||NR{cVVojH!HC7oZXH%LjyUVa@DiRWu8R;V* zcy`r|pR^`d>5i+4sR65(9G?BL&(7+(IESb<4f9&moSUOHPK5ZyjDlbEy{KW$v>0V>{xIuellluz3 sk$-W1NlLM5-f#<$CiXXRMR6g(05R%*LxW|KOaK4?07*qoM6N<$g6@Mw?f?J) diff --git a/astrid/src/main/res/drawable/filter_sliders.png b/astrid/src/main/res/drawable/filter_sliders.png deleted file mode 100644 index 635340024f33756c99a4e1b2f7af4ff63525c295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmV;m0!safP)50000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!S4l)cRCwClSWRoxP!xSh#yTBE7;F`a zR1^i#g{y*H2z4cHT=oaJQ}8cz;UCbIOWg{t6$POpx)LeHs-U2V7V1W*I5Tyc>GNDX z1D7}NCB~5?df?35d3m`xdGCHC6Ip9#jWIXDbEY~hgI6Mmc>v?QsU8nS%nuk7H4xK} z@i8#$T1nGr8& zgDYSPPJu_t5F=@Konj>}uwyX&DaYb6rcw4P_9EzE?GkGYWolzRB&oS`|d`2IM+WLVyukRBR3N~L? z?{Pe3O&an$eMW2#>);2@?Wyx8D9+HwuOO8M1lC0^K;{4X|uPan90~i6rJ9HFdypRHuKg behM%EZK4DHPC38-00000NkvXXu0mjfYL`5b diff --git a/astrid/src/main/res/drawable/filter_sliders_dark.png b/astrid/src/main/res/drawable/filter_sliders_dark.png deleted file mode 100644 index 8c65917b60044fab2cd6bca98af78c3f932281eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 699 zcmV;s0!00ZP)50000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!T}ebiRCwCln9pkyQ4q&>H?fVW6hd1C z5sSqZMZr_S-t0+45Fyk*pofA&|A1b-c(f-E9`xct=((PR^k6R)ky7=bqLeD=Md;6@ zb<_1b@C^*lefxHeB&!3T=H=z>?6>n~=569vtJTw<=RE+EUiYj9?iBIoA-L*w*RG3> zpvw`_HYsA7IT6zoF;Py$L`BO7``{DDWiV`W06s9f1uzPH%i49Y$MFd0H5b^#d;}Lc z9tSJ7(1J^#0ZL#y!RHis$?+R-!CVknF4XfSM|h7KuQn^W?i+YHvVTHMuaOrWF`aBb z!5XXK3o~A<0$zg<41zPA5F=%GpJJp;Zzz#6zYDH_*-nU&EgOjG6Gu2N)o`qx4(qB= zbDLhN_rB5G4#0_w0^Wgdyw8y8Ez)l`IKB*eOfhn^7Y^qqGm3c*mOvjkrSk0=BNee} z{wC%)_`&geDi)gni)zcVSU)3DHs&iT;(;w^D#qfLfJ#DZh~ga6-hyTND5$M(s_PD1 zXH(P27t`vT580Di?9ivrP000;W1^@s654Bdt0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzAW1|)RCwBA{Qv(y1FZoQl$HnLJ3#!O z3V10Hb0Ay70;PF?SQ&`l1MxB-J_(g0)teyo4}th6HcMcJffVFWJGfZT_)n17e}VWn z1<}BU%Mx^j>`-4aQX}H=g)t);@q#zF&;iJTvq1cS2+Kf*O9HVKsg{7iP9RP000;W1^@s654Bdt0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzAW1|)RCwBA{Qv(y1FZoIhzJP@kq1(H zfmoReW-bHbuA_aF7eRmSlpm64Vk#0zTm2CKoG_9S@l*lCSW_o3maGi#Al$cBV?%t5GRn6<8J}+1|sqaNZtdVB}{mN zFBgd8hzvSze8Ke+h}Qz~Yb@~07*qoM6N<$g3~6EM*si-