mirror of https://github.com/tasks/tasks
First pass at task decorations, timer. Works but doesn't update.
Tim Su
14 years ago
parent
95154ca51c
commit
8f757ac9fa
@ -0,0 +1,101 @@
|
||||
/**
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
package com.todoroo.astrid.api;
|
||||
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
import android.widget.RemoteViews;
|
||||
import android.widget.RemoteViews.RemoteView;
|
||||
|
||||
/**
|
||||
* Represents a line of text displayed in the Task List
|
||||
*
|
||||
* @author Tim Su <tim@todoroo.com>
|
||||
*
|
||||
*/
|
||||
public final class TaskDecoration implements Parcelable {
|
||||
|
||||
/**
|
||||
* Place decoration between completion box and task title
|
||||
*/
|
||||
public static final int POSITION_LEFT = 0;
|
||||
|
||||
/**
|
||||
* Place decoration between task title and importance bar
|
||||
*/
|
||||
public static final int POSITION_RIGHT = 1;
|
||||
|
||||
/**
|
||||
* {@link RemoteView} decoration
|
||||
*/
|
||||
public RemoteViews decoration = null;
|
||||
|
||||
/**
|
||||
* Decoration update interval (minimum of 1000 millis), 0 to never update
|
||||
*/
|
||||
public long updateInterval = 0;
|
||||
|
||||
/**
|
||||
* Decoration position
|
||||
*/
|
||||
public int position = POSITION_LEFT;
|
||||
|
||||
/**
|
||||
* Decorated task background color. 0 is default
|
||||
*/
|
||||
public int color = 0;
|
||||
|
||||
/**
|
||||
* Creates a TaskDetail object
|
||||
* @param text
|
||||
* text to display
|
||||
* @param color
|
||||
* color to use for text. Use <code>0</code> for default color
|
||||
*/
|
||||
public TaskDecoration(RemoteViews decoration, int position, int color) {
|
||||
this.decoration = decoration;
|
||||
this.position = position;
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
// --- parcelable helpers
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public int describeContents() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void writeToParcel(Parcel dest, int flags) {
|
||||
dest.writeParcelable(decoration, 0);
|
||||
dest.writeInt(position);
|
||||
dest.writeInt(color);
|
||||
}
|
||||
|
||||
/**
|
||||
* Parcelable creator
|
||||
*/
|
||||
public static final Parcelable.Creator<TaskDecoration> CREATOR = new Parcelable.Creator<TaskDecoration>() {
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public TaskDecoration createFromParcel(Parcel source) {
|
||||
return new TaskDecoration((RemoteViews)source.readParcelable(
|
||||
RemoteViews.class.getClassLoader()),
|
||||
source.readInt(), source.readInt());
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public TaskDecoration[] newArray(int size) {
|
||||
return new TaskDecoration[size];
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,84 +0,0 @@
|
||||
/**
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
package com.todoroo.astrid.api;
|
||||
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
|
||||
/**
|
||||
* Represents a line of text displayed in the Task List
|
||||
*
|
||||
* @author Tim Su <tim@todoroo.com>
|
||||
*
|
||||
*/
|
||||
public final class TaskDetail implements Parcelable {
|
||||
|
||||
/**
|
||||
* Text of detail
|
||||
*/
|
||||
public String text = null;
|
||||
|
||||
/**
|
||||
* Color to use for text. 0 is default
|
||||
*/
|
||||
public int color = 0;
|
||||
|
||||
/**
|
||||
* Creates a TaskDetail object
|
||||
* @param text
|
||||
* text to display
|
||||
* @param color
|
||||
* color to use for text. Use <code>0</code> for default color
|
||||
*/
|
||||
public TaskDetail(String text, int color) {
|
||||
this.text = text;
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
/**
|
||||
* Convenience constructor to make a TaskDetail with default color
|
||||
* @param text
|
||||
* text to display
|
||||
*/
|
||||
public TaskDetail(String text) {
|
||||
this(text, 0);
|
||||
}
|
||||
|
||||
// --- parcelable helpers
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public int describeContents() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void writeToParcel(Parcel dest, int flags) {
|
||||
dest.writeString(text);
|
||||
dest.writeInt(color);
|
||||
}
|
||||
|
||||
/**
|
||||
* Parcelable creator
|
||||
*/
|
||||
public static final Parcelable.Creator<TaskDetail> CREATOR = new Parcelable.Creator<TaskDetail>() {
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public TaskDetail createFromParcel(Parcel source) {
|
||||
return new TaskDetail(source.readString(), source.readInt());
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public TaskDetail[] newArray(int size) {
|
||||
return new TaskDetail[size];
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
@ -0,0 +1,116 @@
|
||||
/**
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
package com.todoroo.astrid.timers;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Color;
|
||||
import android.widget.RemoteViews;
|
||||
|
||||
import com.timsu.astrid.R;
|
||||
import com.todoroo.andlib.service.Autowired;
|
||||
import com.todoroo.andlib.service.DependencyInjectionService;
|
||||
import com.todoroo.astrid.api.AstridApiConstants;
|
||||
import com.todoroo.astrid.api.TaskDecoration;
|
||||
import com.todoroo.astrid.service.TaskService;
|
||||
|
||||
/**
|
||||
* Exposes {@link TaskDecoration} for timers
|
||||
*
|
||||
* @author Tim Su <tim@todoroo.com>
|
||||
*
|
||||
*/
|
||||
public class TimerDecorationExposer extends BroadcastReceiver {
|
||||
|
||||
private static final int TASK_BG_COLOR = Color.argb(200, 220, 50, 0);
|
||||
|
||||
private static TaskService staticTaskService;
|
||||
private static HashMap<Long, TaskDecoration> decorations =
|
||||
new HashMap<Long, TaskDecoration>();
|
||||
private static HashMap<Long, Timer> timers =
|
||||
new HashMap<Long, Timer>();
|
||||
|
||||
@Autowired
|
||||
private TaskService taskService;
|
||||
|
||||
private static class TimerTimerTask extends TimerTask {
|
||||
int time;
|
||||
RemoteViews remoteViews;
|
||||
|
||||
public TimerTimerTask(int time, RemoteViews remoteViews) {
|
||||
super();
|
||||
this.time = time;
|
||||
this.remoteViews = remoteViews;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
time++;
|
||||
int seconds = time % 60;
|
||||
int minutes = time / 60;
|
||||
if(minutes > 59) {
|
||||
int hours = minutes / 60;
|
||||
minutes %= 60;
|
||||
remoteViews.setTextViewText(R.id.timer,
|
||||
String.format("%02d:%02d:%02d", //$NON-NLS-1$
|
||||
hours, minutes, seconds));
|
||||
} else {
|
||||
remoteViews.setTextViewText(R.id.timer,
|
||||
String.format("%02d:%02d", //$NON-NLS-1$
|
||||
minutes, seconds));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void removeFromCache(long taskId) {
|
||||
decorations.remove(taskId);
|
||||
timers.get(taskId).cancel();
|
||||
timers.remove(taskId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
|
||||
if(taskId == -1)
|
||||
return;
|
||||
|
||||
synchronized(TimerDecorationExposer.class) {
|
||||
if(staticTaskService == null) {
|
||||
DependencyInjectionService.getInstance().inject(this);
|
||||
staticTaskService = taskService;
|
||||
} else {
|
||||
taskService = staticTaskService;
|
||||
}
|
||||
}
|
||||
|
||||
TaskDecoration decoration;
|
||||
|
||||
if(!decorations.containsKey(taskId)) {
|
||||
RemoteViews remoteViews = new RemoteViews(context.getPackageName(),
|
||||
R.layout.timer_decoration);
|
||||
decoration = new TaskDecoration(remoteViews,
|
||||
TaskDecoration.POSITION_LEFT, TASK_BG_COLOR);
|
||||
decorations.put(taskId, decoration);
|
||||
Timer timer = new Timer();
|
||||
timers.put(taskId, timer);
|
||||
timer.scheduleAtFixedRate(new TimerTimerTask(0,
|
||||
remoteViews), 0, 1000L);
|
||||
} else {
|
||||
decoration = decorations.get(taskId);
|
||||
}
|
||||
|
||||
// transmit
|
||||
Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_DECORATIONS);
|
||||
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, TimerPlugin.IDENTIFIER);
|
||||
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, decoration);
|
||||
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId);
|
||||
context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.todoroo.astrid.timers;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
||||
import com.todoroo.astrid.api.Addon;
|
||||
import com.todoroo.astrid.api.AstridApiConstants;
|
||||
|
||||
public class TimerPlugin extends BroadcastReceiver {
|
||||
|
||||
static final String IDENTIFIER = "timer"; //$NON-NLS-1$
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("nls")
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
Addon plugin = new Addon(IDENTIFIER, "Timer", "Todoroo",
|
||||
"Lets you time how long it takes to complete tasks.");
|
||||
|
||||
Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_ADDONS);
|
||||
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, plugin);
|
||||
context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
|
||||
}
|
||||
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 897 B |
@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- See the file "LICENSE" for the full license governing this code. -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/timers_decoration" />
|
||||
|
||||
<TextView android:id="@+id/timer"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="10sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
Loading…
Reference in New Issue