From 4caf719e883d9ec40cfe81f1da2fb09f753e0ed4 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 4 Jan 2012 21:23:03 -0800
Subject: [PATCH] New I've Assigned filter

---
 .../astrid/core/CustomFilterExposer.java      |  18 ++++++++++++++----
 astrid/res/drawable/filter_assigned.png       | Bin 0 -> 1635 bytes
 astrid/res/values/strings-filters.xml         |   3 +++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 astrid/res/drawable/filter_assigned.png

diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
index ea2f2498b..b2485d4c6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
@@ -24,6 +24,7 @@ import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
+import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.FilterListActivity;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.AstridFilterExposer;
@@ -86,7 +87,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
         TodorooCursor<StoreObject> cursor = dao.query(Query.select(StoreObject.PROPERTIES).where(
                 StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME)));
         try {
-            Filter[] list = new Filter[cursor.getCount() + 3];
+            Filter[] list = new Filter[cursor.getCount() + 4];
 
             // stock filters
             String todayTitle = AndroidUtilities.capitalize(r.getString(R.string.today));
@@ -109,16 +110,25 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
                     null);
             list[1].listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_pencil)).getBitmap();
 
+            list[2] = new Filter(r.getString(R.string.BFE_Assigned),
+                    r.getString(R.string.BFE_Assigned),
+                    new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
+                            Criterion.or(Task.CREATOR_ID.eq(0), Task.CREATOR_ID.eq(ActFmPreferenceService.userId())),
+                            Task.USER_ID.neq(0))),
+                            null);
+            list[2].listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_assigned)).getBitmap();
+
             int untaggedLabel = gtasksPreferenceService.isLoggedIn() ?
                     R.string.tag_FEx_untagged_w_astrid : R.string.tag_FEx_untagged;
-            list[2] = new Filter(r.getString(untaggedLabel),
+            list[3] = new Filter(r.getString(untaggedLabel),
                     r.getString(R.string.tag_FEx_untagged),
                     TagService.untaggedTemplate(),
                     null);;
-            list[2].listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.gl_lists)).getBitmap();
+            list[3].listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.gl_lists)).getBitmap();
+
 
             StoreObject savedFilter = new StoreObject();
-            for(int i = 3; i < list.length; i++) {
+            for(int i = 4; i < list.length; i++) {
                 cursor.moveToNext();
                 savedFilter.readFromCursor(cursor);
                 list[i] = SavedFilter.load(savedFilter);
diff --git a/astrid/res/drawable/filter_assigned.png b/astrid/res/drawable/filter_assigned.png
new file mode 100644
index 0000000000000000000000000000000000000000..51bd7ecf3eba5c644a14f110ebcfa8f28a5f23fe
GIT binary patch
literal 1635
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
Z?|J!{&U#iBJhT8MZckS~mvv4FO#pDZ#CQMz

literal 0
HcmV?d00001

diff --git a/astrid/res/values/strings-filters.xml b/astrid/res/values/strings-filters.xml
index 2a44fcf65..3aa2713e8 100644
--- a/astrid/res/values/strings-filters.xml
+++ b/astrid/res/values/strings-filters.xml
@@ -15,6 +15,9 @@
     <!-- Recently Modified -->
     <string name="BFE_Recent">Recently Modified</string>
     
+    <!-- I've assigned -->
+    <string name="BFE_Assigned">I\'ve Assigned</string>
+    
     <!-- Build Your Own Filter -->
     <string name="BFE_Custom">Custom Filter...</string>