From db7a69b487a811f2b4b045cd44a4db7f549ffbfd Mon Sep 17 00:00:00 2001 From: Tim Su Date: Tue, 19 Apr 2011 23:28:14 -0700 Subject: [PATCH] Move 'filter by tag' to a task action --- astrid/AndroidManifest.xml | 7 +++ ...extAction.java => FilterByTagExposer.java} | 54 ++++++++++++++----- astrid/res/values/strings-core.xml | 3 -- astrid/res/values/strings-tags.xml | 5 ++ .../astrid/activity/TaskListActivity.java | 2 - 5 files changed, 54 insertions(+), 17 deletions(-) rename astrid/plugin-src/com/todoroo/astrid/tags/{FilterByTagContextAction.java => FilterByTagExposer.java} (62%) diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index baf309b74..56bd26d27 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -286,6 +286,13 @@ + + + + + + + diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagContextAction.java b/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java similarity index 62% rename from astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagContextAction.java rename to astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java index c038f775d..1b5533135 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagContextAction.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java @@ -6,9 +6,15 @@ import java.util.Collections; import java.util.List; import android.app.AlertDialog; +import android.app.PendingIntent; +import android.content.BroadcastReceiver; import android.content.ContentValues; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; import android.widget.ArrayAdapter; import com.timsu.astrid.R; @@ -18,31 +24,56 @@ import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.api.TaskContextActionExposer; +import com.todoroo.astrid.api.TaskAction; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Metadata; -import com.todoroo.astrid.data.Task; import com.todoroo.astrid.tags.TagService.Tag; -public class FilterByTagContextAction implements TaskContextActionExposer { +public class FilterByTagExposer extends BroadcastReceiver { + + private static final String FILTER_ACTION = "com.todoroo.astrid.FILTER_BY_TAG"; //$NON-NLS-1$ @Override - public Object getLabel(Task task) { - TodorooCursor cursor = TagService.getInstance().getTags(task.getId()); + public void onReceive(Context context, Intent intent) { + ContextManager.setContext(context); + long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1); + if(taskId == -1) + return; + + TodorooCursor cursor = TagService.getInstance().getTags(taskId); try { - if(cursor.getCount() > 0) - return R.string.TAd_contextFilterByTag; + if(cursor.getCount() == 0) + return; } finally { cursor.close(); } - return null; + + if(AstridApiConstants.BROADCAST_REQUEST_ACTIONS.equals(intent.getAction())) { + final String label = context.getString(R.string.TAd_contextFilterByTag); + final Drawable drawable = context.getResources().getDrawable(R.drawable.silk_tag_pink); + Intent newIntent = new Intent(FILTER_ACTION); + newIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId); + Bitmap icon = ((BitmapDrawable)drawable).getBitmap(); + TaskAction action = new TaskAction(label, + PendingIntent.getBroadcast(context, (int)taskId, newIntent, 0), icon); + + // transmit + Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_ACTIONS); + broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, TagsPlugin.IDENTIFIER); + broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, action); + broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId); + context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); + } else if(FILTER_ACTION.equals(intent.getAction())) { + invoke(taskId); + } } - public void invoke(Task task) { - final TodorooCursor cursor = TagService.getInstance().getTags( - task.getId()); + public void invoke(long taskId) { final List tags; + final TodorooCursor cursor = TagService.getInstance().getTags( + taskId); try { if (!cursor.moveToFirst()) return; @@ -59,7 +90,6 @@ public class FilterByTagContextAction implements TaskContextActionExposer { Collections.sort(tags, collator); DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { Tag tag = new Tag(tags.get(which), 0); diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index bf9cfde4c..f3c4ae66d 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -116,9 +116,6 @@ Copy Task - - Filter By Tag - Delete Task diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml index 2dba4c1d1..c2e8b5ed9 100644 --- a/astrid/res/values/strings-tags.xml +++ b/astrid/res/values/strings-tags.xml @@ -15,6 +15,11 @@ Select a tag + + + + Show Tag + diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index a491ec015..df9779f1e 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -93,7 +93,6 @@ import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.tags.FilterByTagContextAction; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; @@ -154,7 +153,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, @Autowired AddOnService addOnService; private final TaskContextActionExposer[] contextItemExposers = new TaskContextActionExposer[] { - new FilterByTagContextAction(), new ReminderDebugContextActions.MakeNotification(), new ReminderDebugContextActions.WhenReminder(), };