From bd4aa2eb2bd50b511aa804f4ebb88077c8250fc6 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 16 Jun 2015 15:47:50 -0500 Subject: [PATCH] Add gtask and custom filter nav drawer icons --- .../todoroo/astrid/core/CustomFilterExposer.java | 9 +++++++-- .../astrid/gtasks/GtasksFilterExposer.java | 11 +++++++++-- .../drawable-hdpi/ic_cloud_queue_black_24dp.png | Bin 0 -> 433 bytes .../drawable-hdpi/ic_cloud_queue_white_24dp.png | Bin 0 -> 425 bytes .../drawable-hdpi/ic_filter_list_black_24dp.png | Bin 0 -> 107 bytes .../drawable-hdpi/ic_filter_list_white_24dp.png | Bin 0 -> 111 bytes .../drawable-xhdpi/ic_cloud_queue_black_24dp.png | Bin 0 -> 534 bytes .../drawable-xhdpi/ic_cloud_queue_white_24dp.png | Bin 0 -> 537 bytes .../drawable-xhdpi/ic_filter_list_black_24dp.png | Bin 0 -> 103 bytes .../drawable-xhdpi/ic_filter_list_white_24dp.png | Bin 0 -> 103 bytes .../drawable-xxhdpi/ic_cloud_queue_black_24dp.png | Bin 0 -> 784 bytes .../drawable-xxhdpi/ic_cloud_queue_white_24dp.png | Bin 0 -> 785 bytes .../drawable-xxhdpi/ic_filter_list_black_24dp.png | Bin 0 -> 112 bytes .../drawable-xxhdpi/ic_filter_list_white_24dp.png | Bin 0 -> 107 bytes .../res/drawable/ic_cloud_queue_black_24dp.png | Bin 0 -> 279 bytes .../res/drawable/ic_cloud_queue_white_24dp.png | Bin 0 -> 276 bytes .../res/drawable/ic_filter_list_black_24dp.png | Bin 0 -> 89 bytes .../res/drawable/ic_filter_list_white_24dp.png | Bin 0 -> 90 bytes src/main/res/values/attrs.xml | 2 ++ src/main/res/values/styles.xml | 4 ++++ 20 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_cloud_queue_white_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_cloud_queue_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_cloud_queue_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png create mode 100644 src/main/res/drawable/ic_cloud_queue_black_24dp.png create mode 100644 src/main/res/drawable/ic_cloud_queue_white_24dp.png create mode 100644 src/main/res/drawable/ic_filter_list_black_24dp.png create mode 100644 src/main/res/drawable/ic_filter_list_white_24dp.png diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index a9894b5c8..507bbaf43 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -15,6 +15,7 @@ import com.todoroo.astrid.data.StoreObject; import org.tasks.R; import org.tasks.injection.ForApplication; +import org.tasks.preferences.ResourceResolver; import java.util.ArrayList; import java.util.List; @@ -32,10 +33,12 @@ public final class CustomFilterExposer { static final String TOKEN_FILTER_ID = "id"; //$NON-NLS-1$ private final StoreObjectDao storeObjectDao; + private ResourceResolver resourceResolver; private final Context context; @Inject - public CustomFilterExposer(@ForApplication Context context, StoreObjectDao storeObjectDao) { + public CustomFilterExposer(ResourceResolver resourceResolver, @ForApplication Context context, StoreObjectDao storeObjectDao) { + this.resourceResolver = resourceResolver; this.context = context; this.storeObjectDao = storeObjectDao; } @@ -43,11 +46,13 @@ public final class CustomFilterExposer { public List getFilters() { final List list = new ArrayList<>(); + final int filter = resourceResolver.getResource(R.attr.ic_action_filter); + storeObjectDao.getSavedFilters(new Callback() { @Override public void apply(StoreObject savedFilter) { Filter f = SavedFilter.load(savedFilter); - + f.icon = filter; Intent deleteIntent = new Intent(context, DeleteFilterActivity.class); deleteIntent.putExtra(TOKEN_FILTER_ID, savedFilter.getId()); f.contextMenuLabels = new String[] { context.getString(R.string.BFE_Saved_delete) }; diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java index 111dd0f39..c3a8ee354 100644 --- a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java @@ -26,6 +26,7 @@ import com.todoroo.astrid.data.Task; import org.tasks.R; import org.tasks.injection.ForApplication; +import org.tasks.preferences.ResourceResolver; import java.util.List; @@ -44,12 +45,14 @@ public class GtasksFilterExposer { private final GtasksListService gtasksListService; private final GtasksPreferenceService gtasksPreferenceService; + private ResourceResolver resourceResolver; private final Context context; private final GtasksMetadata gtasksMetadata; @Inject - public GtasksFilterExposer(@ForApplication Context context, GtasksListService gtasksListService, + public GtasksFilterExposer(ResourceResolver resourceResolver, @ForApplication Context context, GtasksListService gtasksListService, GtasksPreferenceService gtasksPreferenceService, GtasksMetadata gtasksMetadata) { + this.resourceResolver = resourceResolver; this.context = context; this.gtasksListService = gtasksListService; this.gtasksPreferenceService = gtasksPreferenceService; @@ -62,9 +65,13 @@ public class GtasksFilterExposer { return emptyList(); } + int cloud = resourceResolver.getResource(R.attr.ic_action_cloud); + List listFilters = newArrayList(); for (GtasksList list : gtasksListService.getLists()) { - listFilters.add(filterFromList(gtasksMetadata, context, list)); + Filter filter = filterFromList(gtasksMetadata, context, list); + filter.icon = cloud; + listFilters.add(filter); } return listFilters; } diff --git a/src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b7ecbeb27aeffb16f3da6e5bbb12bf06e7e3ed99 GIT binary patch literal 433 zcmV;i0Z#sjP)?*5PoRT!uG_K?U|Ao*u3q-Khy4S4s6!ChwTncU zPoRHLDU>0lR2qc_U%m(b@YA1jD}2pmbmsGQW}KntgYod09j++zLY6(g;Gt`7zEh^w z)GEXoq6<@;QnP611hMH8cN$8wL4ZN}@UzaLetXXhHjI#y=|$FP7Nsa-S%&H8zf3JK zZL#TsjQ_)ug9v{(*5xl_Wl6@XRwp${E@JtMDKlH>SQxeixpl(~qe!$=|}6bY?N-lKdS97x<_l=ZtwvrK+3R8M#?l;&|k0wldT1B8K;k*AAeNCo5DGm3l+3L=Lu)PK2K z6(dWz6@&-RC`6Y)gifU*)TCiW4)t2FXm;2ua);ke1YA>Asd=;ph!PC{xWt~$( F69B-SBB1~P literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png b/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7e8a6b536bdfcba999ba36bfdba7ca975fd7b68c GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;nWu|mh)3t!ix)W=3^i9)=*PRbX!`Z{(xG- zsi`dK2c#82VqQsZ%i#epSG^vO+x@)DdEva@hx5G8<*HCsRn;cP-S@_{f96ejZB)0M zOl)`4PsK88$_?ABQNJG%SiZ<9snvR@Siu^zF5Yg#2=DQeVGQ|QUkQc+Fz9pMB+38S7Qu~-s9&@rZoTTR0tH8k|^&?-C$Gx(&IevO^ z$>-LoK#b|Q8rkWJ{}U}1G9Oe%;*#+++5B}_Haf+aLbI7DF_=N4I%9Aq<$yDavBsUZ zPkqX(?J}YeS-rvq#mv`Ti=6f+)A(Ts YKP!&cPd7X?ApigX07*qoM6N<$f=~+n)&Kwi literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_cloud_queue_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cloud_queue_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6ef11bb1b4c927e0fd1db2cafd0a321a7f11e8fa GIT binary patch literal 537 zcmV+!0_OdRP)TM_`n(_N56JKA34ml zs-uS#1xnph4Y-3@p;eVJPL}O{(XJZMK?ZY9m2iulo~uSAF$tB&7)A5M>BUnWxPbBb z%qxb8suVqBF*zpG06N+33qvX*g~@S74WW&l9um-xSU}Ilaj<6%m!!W1Oxb(QAu=>#cU8Kq9!rGGG+-+TewEi z0yj88n;JljL1yp?j3~fO+9 bC{*GfFr^hdp^68Y00000NkvXXu0mjf&bH|D literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b64df3612a16d378c6cea2299ab28c16c39252b7 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tJx>?MkP61Pmkk9O9C(-xe$W4< z+^EJn^QP;8P@4v;`gEqsfM2hC7=F!@<&mdKI;Vst0N}G6 AdH?_b literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png b/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9416c70ec0a0a230648075ebc449e2000f239d72 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tJx>?Mkcif|mkfCs7&s0X{F%+h z&%)%Mop4@>VctnaroRklqT+)Y_}1iWG8C+2XgDPM|LJEjE1*sWPgg&ebxsLQ0G~@6 Ar~m)} literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..eb6122a48165e08a20b08779cbc2ff64880b6a7b GIT binary patch literal 784 zcmV+r1MmEaP)QnC*o{P8blHVPUKk50EMf!^WK)a0 ziO5zG5}A-?ExK?m$mT_sTSd{0%f+v|m-pdx#yQ(L?}2(h-}~{L-}5{#JX0!_N~O~O z*v)o2;zQs0!=f90H)GOs9&(d{bs0A4FHxrjrwv)H5UU+9D;nqrkFTb^M5KeF0%e?X3D+EiAlR|gXOy2b&<74gEqJ*>Na5|j*G05jb86*Q9pxLVo+rL zr~zwzA<}&BumKx&Te-CslG}RPA@^C;=+`D(wo64TeJ*Oc>&kMmTl4rTSV5+Om*~7LyyQ>;DpF}w(|?((d0im6~)^svaYdN$GtM+Wo_Pl9dA+1SAP@)yzFW*;9s9Y$ zzr1Cd54>TRUjAe)KgeH%X{DDbGD&ig7AoZjD%s8`xp>AlDpgvnKhd-Dm zU(@_Xg}g@%=P1-!qVg6o`bhVRV{By^a|sb)9xK?&aVAN3ooac9FxN=+fL6kq1rav# zkW`ll%PSnkZGtvsMFs6l;C4vfU^8wvsaFnINFQ$NRXpbN8rvDd$`Mh{VjHJU#iASA zc`B6$LR`Ssr9!ckUpUPGA2EigRi213jPZd+<%>-=uIGVw2j1g*766_|s1NwpnY^^FeA~euOFR9k)Gk(Q*iX-2! zl0j_$6PLu_7<=U_VqC}eyCfcAG|6Yg7{nMSEG9APHp5e%MG-A9I4cIowceG>lOX3#B zD7Eq#S1~#zu?gEr`HEH8nkC^dgl)fkL!4oZaYFixCfrUDlMje<1KTdm;0SJGY{F4V zv5H}A&xvaWRoo@jC>^X}F;RJnD2=ppl~gUVQO6+VbWo|N;|}HW5027NMHl685J#D? znnC>ZoEBw=!v^~B!#KN$D>p1*J3ZWIf+XHb@{)c!X(psVAP@)yzB!)&{TJ-X;+Ry^ P00000NkvXXu0mjf(%D+n literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2314642f936d4617377df066a4837b44b18a53ba GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw%spKkLo)8Yy|R&!fq{j^@VEY1 zE)kPS@efw@GcYu)w3(yeXy43W@jK74iG^{)mj_KOoJzG^v6L%NQOF98Gg2B_( K&t;ucLK6U<10nJN literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1263ae82e71dfbfd5aba9a11483442542e74ce15 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc`BYRjv*C{ z$r6(m{IloyqulHooWQ^35x=C46!WwH>?aa9)4kR*{W|XsGR4!?&t;ucLK6Tv CS{)|< literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/ic_cloud_queue_black_24dp.png b/src/main/res/drawable/ic_cloud_queue_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ba74612d9b6e9e9365205492b99e1086e646e9ef GIT binary patch literal 279 zcmV+y0qFjTP)b+;oGBaiJ~nJzJzOI90(n|hVAGG`$iPi zyc!6HMjZ)FhOKD`A+*dJwV)+z0^XsAg1?Oyosqyp50hLZ6v#BZ1IPpFut;s@+eb;V1!T_gYi002ovPDHLkV1ivJc!U4| literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/ic_cloud_queue_white_24dp.png b/src/main/res/drawable/ic_cloud_queue_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..94e4392a7578344cbbec791ea01ff2b2fdc9823a GIT binary patch literal 276 zcmV+v0qg#WP)sVfg`y%;7uHMC!%Jqdj^e-_#~;3v9s?> z{vp#2-FebhcVH^N(P!JUPEWSdog=(DHK(Xx)`=JF=VzAjXdxZUd&E+{Qn2aDGgk7A zRotbMNi`oD`tywe4b0?|A-AY0DdtCxaqmni?`)!GG+o*8X*Y>Wl=26o*0fNL7K-VC zbyTB;;q<^5nsI@0dSD#Q*g)M_{-lCx47x$xqLFlETtyq@Bqm(z&0anjRB`S>cTH90 a{1b1(A{#CnJi;6R0000&Hr5(PMPpn nt`GJgTe~DWM4fp6nTa literal 0 HcmV?d00001 diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index a8746a8d1..6ee605f80 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -55,6 +55,8 @@ + + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index c1558b35f..e49a73ed1 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -65,6 +65,8 @@ @drawable/ic_history_black_24dp @drawable/ic_label_outline_black_24dp @drawable/ic_label_black_24dp + @drawable/ic_filter_list_black_24dp + @drawable/ic_cloud_queue_black_24dp