archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Timers work. Task adapter cache is messy.

Browse Source
pull/14/head
Tim Su 14 years ago
parent fa84414676
commit 7f3f92eb63
11 changed files with 111 additions and 64 deletions
Show Stats Download Patch File Download Diff File

2
astrid/AndroidManifest.xml
Unescape Escape View File

@ -250,7 +250,7 @@
</intent-filter>
</receiver>
<activity android:name="com.todoroo.astrid.reminders.NotificationActivity"
android:taskAffinity="" />
android:clearTaskOnLaunch="true" />
<!-- rmilk -->
<receiver android:name="com.todoroo.astrid.rmilk.MilkFilterExposer">

16
astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java
Unescape Escape View File

@ -9,7 +9,6 @@ import android.content.Context;
import android.content.Intent;
import com.timsu.astrid.R;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.TaskAction;
import com.todoroo.astrid.api.TaskDecoration;
@ -54,19 +53,10 @@ public class TimerActionExposer extends BroadcastReceiver {
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId);
context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
} else if(TIMER_ACTION.equals(intent.getAction())) {
// toggle the timer
if(task.getValue(Task.TIMER_START) == 0)
task.setValue(Task.TIMER_START, DateUtilities.now());
else {
TimerTaskCompleteListener.stopTimer(task);
}
PluginServices.getTaskService().save(task, true);
TimerDecorationExposer.removeFromCache(taskId);
// transmit new intents TimerDecoration
new TimerDecorationExposer().onReceive(context, intent);
intent.setAction(AstridApiConstants.BROADCAST_REQUEST_ACTIONS);
onReceive(context, intent);
TimerPlugin.updateTimer(context, task, true);
else
TimerPlugin.updateTimer(context, task, false);
}
}

33
astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java
Unescape Escape View File

@ -11,16 +11,13 @@ import android.content.res.Resources;
import android.graphics.drawable.BitmapDrawable;
import com.timsu.astrid.R;
import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.activity.FilterListActivity;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.model.Task;
/**
@ -33,19 +30,12 @@ public final class TimerFilterExposer extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
Resources r = context.getResources();
if(PluginServices.getTaskService().count(Query.select(Task.ID).
where(Task.TIMER_START.gt(0))) == 0)
return;
ContentValues values = new ContentValues();
values.put(Task.TIMER_START.name, Filter.VALUE_NOW);
Filter workingOn = 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();
Filter workingOn = createFilter(context);
// transmit filter list
FilterListItem[] list = new FilterListItem[1];
@ -55,17 +45,16 @@ public final class TimerFilterExposer extends BroadcastReceiver {
context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
}
/**
* Build inbox filter
* @return
*/
public static Filter buildInboxFilter(Resources r) {
Filter inbox = new Filter(r.getString(R.string.BFE_Active), r.getString(R.string.BFE_Active_title),
new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
TaskCriteria.isVisible(DateUtilities.now()))),
null);
inbox.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_home)).getBitmap();
return inbox;
public static Filter createFilter(Context context) {
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),
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;
}
}

72
astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
Unescape Escape View File

@ -1,11 +1,24 @@
package com.todoroo.astrid.timers;
import android.app.Notification;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.NotificationManager;
import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.activity.ShortcutActivity;
import com.todoroo.astrid.api.Addon;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.model.Task;
import com.todoroo.astrid.utility.Constants;
public class TimerPlugin extends BroadcastReceiver {
@ -22,4 +35,63 @@ public class TimerPlugin extends BroadcastReceiver {
context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
}
/**
* stops timer and sets elapsed time. you still need to save the task.
* @param task
* @param start if true, start timer. else, stop it
*/
public static void updateTimer(Context context, Task task, boolean start) {
if(start) {
if(task.getValue(Task.TIMER_START) == 0)
task.setValue(Task.TIMER_START, DateUtilities.now());
} else {
if(task.getValue(Task.TIMER_START) > 0) {
int newElapsed = (int)((DateUtilities.now() - task.getValue(Task.TIMER_START)) / 1000L);
task.setValue(Task.TIMER_START, 0L);
task.setValue(Task.ELAPSED_SECONDS,
task.getValue(Task.ELAPSED_SECONDS) + newElapsed);
}
}
PluginServices.getTaskService().save(task, true);
TimerDecorationExposer.removeFromCache(task.getId());
// transmit new intents
Intent intent = new Intent(AstridApiConstants.BROADCAST_REQUEST_ACTIONS);
intent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, task.getId());
new TimerDecorationExposer().onReceive(context, intent);
new TimerActionExposer().onReceive(context, intent);
// update notification
TimerPlugin.updateNotifications(context);
}
private static void updateNotifications(Context context) {
NotificationManager nm = new AndroidNotificationManager(context);
int count = PluginServices.getTaskService().count(Query.select(Task.ID).
where(Task.TIMER_START.gt(0)));
if(count == 0) {
nm.cancel(Constants.NOTIFICATION_TIMER);
} else {
Filter filter = TimerFilterExposer.createFilter(context);
Intent notifyIntent = ShortcutActivity.createIntent(filter);
notifyIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
PendingIntent pendingIntent = PendingIntent.getActivity(context,
0, notifyIntent, 0);
Resources r = context.getResources();
String appName = r.getString(R.string.app_name);
String text = r.getString(R.string.TPl_notification,
r.getQuantityString(R.plurals.Ntasks, count, count));
Notification notification = new Notification(
R.drawable.timers_notification, text, System.currentTimeMillis());
notification.setLatestEventInfo(context, appName,
text, pendingIntent);
notification.flags |= Notification.FLAG_ONGOING_EVENT | Notification.FLAG_NO_CLEAR;
notification.flags &= ~Notification.FLAG_AUTO_CANCEL;
nm.notify(Constants.NOTIFICATION_TIMER, notification);
}
}
}

15
astrid/plugin-src/com/todoroo/astrid/timers/TimerTaskCompleteListener.java
Unescape Escape View File

@ -4,24 +4,12 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.model.Task;
public class TimerTaskCompleteListener extends BroadcastReceiver {
/**
* stops timer and sets elapsed time. you still need to save the task.
* @param task
*/
public static void stopTimer(Task task) {
int newElapsed = (int)((DateUtilities.now() - task.getValue(Task.TIMER_START)) / 1000L);
task.setValue(Task.TIMER_START, 0L);
task.setValue(Task.ELAPSED_SECONDS,
task.getValue(Task.ELAPSED_SECONDS) + newElapsed);
}
@Override
public void onReceive(Context context, Intent intent) {
long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
@ -33,8 +21,7 @@ public class TimerTaskCompleteListener extends BroadcastReceiver {
if(task == null || task.getValue(Task.TIMER_START) == 0)
return;
stopTimer(task);
PluginServices.getTaskService().save(task, true);
TimerPlugin.updateTimer(context, task, false);
}
}

BIN
astrid/res/drawable/timers_notification.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

3
astrid/res/layout/timer_decoration.xml
Unescape Escape View File

@ -2,7 +2,8 @@
<!-- See the file "LICENSE" for the full license governing this code. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:paddingLeft="3px">

4
astrid/res/values/strings-timers.xml
Unescape Escape View File

@ -10,8 +10,8 @@
<!-- Stop Timer button -->
<string name="TAE_stopTimer">Stop Timer</string>
<!-- Task Detail (%s => time) -->
<string name="TDE_label">Elapsed Time: %s</string>
<!-- Notification Title (%s => # tasks) -->
<string name="TPl_notification">Timers Active for %s!</string>
<!-- Filter Header -->
<string name="TFE_category">Timer Filters</string>

11
astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
Unescape Escape View File

@ -313,16 +313,7 @@ public class FilterListActivity extends ExpandableListActivity {
Filter filter = (Filter) item;
info.targetView.setTag(filter);
menuItem = menu.add(0, CONTEXT_MENU_SHORTCUT, 0, R.string.FLA_context_shortcut);
Intent shortcutIntent = new Intent(this, ShortcutActivity.class);
shortcutIntent.setAction(Intent.ACTION_VIEW);
shortcutIntent.putExtra(ShortcutActivity.TOKEN_FILTER_TITLE, filter.title);
shortcutIntent.putExtra(ShortcutActivity.TOKEN_FILTER_SQL, filter.sqlQuery);
if(filter.valuesForNewTasks != null) {
shortcutIntent.putExtra(ShortcutActivity.TOKEN_FILTER_VALUES,
filter.valuesForNewTasks.toString());
}
menuItem.setIntent(shortcutIntent);
menuItem.setIntent(ShortcutActivity.createIntent(filter));
}
for(int i = 0; i < item.contextMenuLabels.length; i++) {

14
astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
Unescape Escape View File

@ -24,6 +24,7 @@ import android.content.ContentValues;
import android.content.Intent;
import android.os.Bundle;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.api.Filter;
@ -90,4 +91,17 @@ public class ShortcutActivity extends Activity {
}
finish();
}
public static Intent createIntent(Filter filter) {
Intent shortcutIntent = new Intent(ContextManager.getContext(),
ShortcutActivity.class);
shortcutIntent.setAction(Intent.ACTION_VIEW);
shortcutIntent.putExtra(ShortcutActivity.TOKEN_FILTER_TITLE, filter.title);
shortcutIntent.putExtra(ShortcutActivity.TOKEN_FILTER_SQL, filter.sqlQuery);
if(filter.valuesForNewTasks != null) {
shortcutIntent.putExtra(ShortcutActivity.TOKEN_FILTER_VALUES,
filter.valuesForNewTasks.toString());
}
return shortcutIntent;
}
}

5
astrid/src/com/todoroo/astrid/utility/Constants.java
Unescape Escape View File

@ -32,7 +32,10 @@ public final class Constants {
// --- notification id's
/** Notification Manager id for RMilk notifications */
/** Notification Manager id for sync notifications */
public static final int NOTIFICATION_SYNC = -1;
/** Notification Manager id for timing */
public static final int NOTIFICATION_TIMER = -2;
}

Write Preview
Loading…
Cancel
Save