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

and we compile!

Browse Source
pull/14/head
Tim Su 14 years ago
parent 1c9d4c1696
commit aefbf09ada
10 changed files with 65 additions and 79 deletions
Show Stats Download Patch File Download Diff File

3
astrid/src-legacy/com/timsu/astrid/activities/TaskList.java
Unescape Escape View File

@ -45,7 +45,6 @@ import com.timsu.astrid.data.task.TaskController;
import com.timsu.astrid.sync.Synchronizer; import com.timsu.astrid.sync.Synchronizer;
import com.timsu.astrid.utilities.Constants; import com.timsu.astrid.utilities.Constants;
import com.timsu.astrid.utilities.AstridUtilities.AstridUncaughtExceptionHandler; import com.timsu.astrid.utilities.AstridUtilities.AstridUncaughtExceptionHandler;
import com.todoroo.astrid.reminders.StartupReceiver;
/** /**
* TaskList is the main launched activity for Astrid. It uses a ViewFlipper * TaskList is the main launched activity for Astrid. It uses a ViewFlipper
@ -112,7 +111,7 @@ public class TaskList extends Activity {
Thread.setDefaultUncaughtExceptionHandler(new AstridUncaughtExceptionHandler()); Thread.setDefaultUncaughtExceptionHandler(new AstridUncaughtExceptionHandler());
// open controllers & perform application startup rituals // open controllers & perform application startup rituals
StartupReceiver.onStartupApplication(this); // StartupReceiver.onStartupApplication(this);
shouldCloseInstance = false; shouldCloseInstance = false;
taskController = new TaskController(this); taskController = new TaskController(this);
taskController.open(); taskController.open();

11
astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java
Unescape Escape View File

@ -83,7 +83,6 @@ import com.timsu.astrid.widget.NumberPickerDialog;
import com.timsu.astrid.widget.NNumberPickerDialog.OnNNumberPickedListener; import com.timsu.astrid.widget.NNumberPickerDialog.OnNNumberPickedListener;
import com.timsu.astrid.widget.NumberPickerDialog.OnNumberPickedListener; import com.timsu.astrid.widget.NumberPickerDialog.OnNumberPickedListener;
import com.todoroo.astrid.activity.TaskEditActivity; import com.todoroo.astrid.activity.TaskEditActivity;
import com.todoroo.astrid.reminders.ReminderService;
/** /**
* Primary view for the Astrid Application. Lists all of the tasks in the * Primary view for the Astrid Application. Lists all of the tasks in the
@ -463,8 +462,8 @@ public class TaskListSubActivity extends SubActivity {
Resources r = getResources(); Resources r = getResources();
// clear notifications // clear notifications
ReminderService.clearAllNotifications(getParent(), task // ReminderService.clearAllNotifications(getParent(), task
.getTaskIdentifier()); // .getTaskIdentifier());
String[] strings = new String[] { String[] strings = new String[] {
r.getString(R.string.notify_yes), r.getString(R.string.notify_yes),
@ -541,9 +540,9 @@ public class TaskListSubActivity extends SubActivity {
R.string.notify_snooze_title), new OnNNumberPickedListener() { R.string.notify_snooze_title), new OnNNumberPickedListener() {
public void onNumbersPicked(int[] values) { public void onNumbersPicked(int[] values) {
int snoozeSeconds = values[0] * 3600 + values[1] * 60; int snoozeSeconds = values[0] * 3600 + values[1] * 60;
ReminderService.createSnoozeAlarm(getParent(), task // ReminderService.createSnoozeAlarm(getParent(), task
.getTaskIdentifier(), snoozeSeconds, flags, // .getTaskIdentifier(), snoozeSeconds, flags,
repeatInterval); // repeatInterval);
TaskList.shouldCloseInstance = true; TaskList.shouldCloseInstance = true;
closeActivity(); closeActivity();

3
astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java
Unescape Escape View File

@ -24,12 +24,11 @@ import java.util.Date;
import android.database.Cursor; import android.database.Cursor;
import com.timsu.astrid.data.enums.Importance; import com.timsu.astrid.data.enums.Importance;
import com.todoroo.astrid.reminders.ReminderService.Notifiable;
/** Fields that you would want to edit in the TaskModel */ /** Fields that you would want to edit in the TaskModel */
public class TaskModelForEdit extends AbstractTaskModel implements Notifiable { public class TaskModelForEdit extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] { static String[] FIELD_LIST = new String[] {
NAME, NAME,

6
astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java
Unescape Escape View File

@ -28,14 +28,12 @@ import android.database.Cursor;
import com.timsu.astrid.data.AbstractController; import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.alerts.AlertController; import com.timsu.astrid.data.alerts.AlertController;
import com.todoroo.astrid.reminders.ReminderService;
import com.todoroo.astrid.reminders.ReminderService.Notifiable;
/** Fields that you would want to read or edit in the onTaskSave and onTaskComplete /** Fields that you would want to read or edit in the onTaskSave and onTaskComplete
* event handlers */ * event handlers */
public class TaskModelForHandlers extends AbstractTaskModel implements Notifiable { public class TaskModelForHandlers extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] { static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID, AbstractController.KEY_ROWID,
@ -92,7 +90,7 @@ public class TaskModelForHandlers extends AbstractTaskModel implements Notifiabl
// reset periodic alerts // reset periodic alerts
setLastNotificationTime(null); setLastNotificationTime(null);
ReminderService.updateAlarm(context, taskController, alertController, this); // ReminderService.updateAlarm(context, taskController, alertController, this);
alertController.close(); alertController.close();
} }

3
astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java
Unescape Escape View File

@ -24,12 +24,11 @@ import java.util.Date;
import android.database.Cursor; import android.database.Cursor;
import com.timsu.astrid.data.AbstractController; import com.timsu.astrid.data.AbstractController;
import com.todoroo.astrid.reminders.ReminderService.Notifiable;
/** Fields that you would want to see in the TaskView activity */ /** Fields that you would want to see in the TaskView activity */
public class TaskModelForNotify extends AbstractTaskModel implements Notifiable { public class TaskModelForNotify extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] { static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID, AbstractController.KEY_ROWID,

3
astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java
Unescape Escape View File

@ -25,12 +25,11 @@ import android.database.Cursor;
import com.timsu.astrid.data.AbstractController; import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.enums.Importance; import com.timsu.astrid.data.enums.Importance;
import com.todoroo.astrid.reminders.ReminderService.Notifiable;
/** Fields that you would want to synchronize in the TaskModel */ /** Fields that you would want to synchronize in the TaskModel */
public class TaskModelForSync extends AbstractTaskModel implements Notifiable { public class TaskModelForSync extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] { static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID, AbstractController.KEY_ROWID,

7
astrid/src-legacy/com/timsu/astrid/sync/SynchronizationProvider.java
Unescape Escape View File

@ -48,7 +48,6 @@ import com.timsu.astrid.data.task.TaskModelForSync;
import com.timsu.astrid.utilities.AstridUtilities; import com.timsu.astrid.utilities.AstridUtilities;
import com.timsu.astrid.utilities.DialogUtilities; import com.timsu.astrid.utilities.DialogUtilities;
import com.timsu.astrid.utilities.Preferences; import com.timsu.astrid.utilities.Preferences;
import com.todoroo.astrid.reminders.ReminderService;
/** A service that synchronizes with Astrid /** A service that synchronizes with Astrid
* *
@ -57,7 +56,7 @@ import com.todoroo.astrid.reminders.ReminderService;
*/ */
public abstract class SynchronizationProvider { public abstract class SynchronizationProvider {
private int id; private final int id;
static ProgressDialog progressDialog; static ProgressDialog progressDialog;
private Handler syncHandler; private Handler syncHandler;
protected Synchronizer synchronizer; protected Synchronizer synchronizer;
@ -478,8 +477,8 @@ public abstract class SynchronizationProvider {
stats.localCreatedTasks++; stats.localCreatedTasks++;
} }
ReminderService.updateAlarm(context, taskController, alertController, // ReminderService.updateAlarm(context, taskController, alertController,
task); // task);
postUpdate(new ProgressUpdater(stats.localUpdatedTasks, postUpdate(new ProgressUpdater(stats.localUpdatedTasks,
remoteTasks.size())); remoteTasks.size()));
} }

3
astrid/src-legacy/com/timsu/astrid/utilities/LocaleReceiver.java
Unescape Escape View File

@ -16,7 +16,6 @@ import com.timsu.astrid.data.tag.TagController;
import com.timsu.astrid.data.tag.TagIdentifier; import com.timsu.astrid.data.tag.TagIdentifier;
import com.timsu.astrid.data.task.TaskController; import com.timsu.astrid.data.task.TaskController;
import com.timsu.astrid.data.task.TaskIdentifier; import com.timsu.astrid.data.task.TaskIdentifier;
import com.todoroo.astrid.reminders.ReminderService;
/** /**
* Receiver is activated when Locale conditions are triggered * Receiver is activated when Locale conditions are triggered
@ -64,7 +63,7 @@ public class LocaleReceiver extends BroadcastReceiver {
String reminder = r.getString(R.string.notif_tagNotification). String reminder = r.getString(R.string.notif_tagNotification).
replace("$NUM", r.getQuantityString(R.plurals.Ntasks, count, count)). replace("$NUM", r.getQuantityString(R.plurals.Ntasks, count, count)).
replace("$TAG", tagName); replace("$TAG", tagName);
ReminderService.showTagNotification(context, tagId, reminder); // ReminderService.showTagNotification(context, tagId, reminder);
Preferences.setLocaleLastAlertTime(context, tagId, Preferences.setLocaleLastAlertTime(context, tagId,
System.currentTimeMillis()); System.currentTimeMillis());

87
astrid/src-legacy/com/timsu/astrid/utilities/Preferences.java
Unescape Escape View File

@ -50,12 +50,12 @@ public class Preferences {
if(!prefs.contains(r.getString(R.string.p_fontSize))) { if(!prefs.contains(r.getString(R.string.p_fontSize))) {
editor.putString(r.getString(R.string.p_fontSize), "20"); editor.putString(r.getString(R.string.p_fontSize), "20");
} }
if(!prefs.contains(r.getString(R.string.p_deadlineTime))) { // if(!prefs.contains(r.getString(R.string.p_deadlineTime))) {
editor.putString(r.getString(R.string.p_deadlineTime), "1"); // editor.putString(r.getString(R.string.p_deadlineTime), "1");
} // }
if(!prefs.contains(r.getString(R.string.p_notif_defaultRemind))) { // if(!prefs.contains(r.getString(R.string.p_notif_defaultRemind))) {
editor.putString(r.getString(R.string.p_notif_defaultRemind), "0"); // editor.putString(r.getString(R.string.p_notif_defaultRemind), "0");
} // }
if(!prefs.contains(r.getString(R.string.p_colorize))) { if(!prefs.contains(r.getString(R.string.p_colorize))) {
editor.putBoolean(r.getString(R.string.p_colorize), DEFAULT_COLORIZE); editor.putBoolean(r.getString(R.string.p_colorize), DEFAULT_COLORIZE);
} }
@ -77,38 +77,38 @@ public class Preferences {
} }
private static void setVisibilityPreferences(SharedPreferences p, Editor e, Resources r) { private static void setVisibilityPreferences(SharedPreferences p, Editor e, Resources r) {
if(!p.contains(r.getString(R.string.prefs_titleVisible))) { // if(!p.contains(r.getString(R.string.prefs_titleVisible))) {
e.putBoolean(r.getString(R.string.prefs_titleVisible), // e.putBoolean(r.getString(R.string.prefs_titleVisible),
Boolean.parseBoolean(r.getString(R.string.prefs_titleVisible_default))); // Boolean.parseBoolean(r.getString(R.string.prefs_titleVisible_default)));
} // }
if(!p.contains(r.getString(R.string.prefs_timeVisible))) { // if(!p.contains(r.getString(R.string.prefs_timeVisible))) {
e.putBoolean(r.getString(R.string.prefs_timeVisible), // e.putBoolean(r.getString(R.string.prefs_timeVisible),
Boolean.parseBoolean(r.getString(R.string.prefs_timeVisible_default))); // Boolean.parseBoolean(r.getString(R.string.prefs_timeVisible_default)));
} // }
if(!p.contains(r.getString(R.string.prefs_deadlineVisible))) { // if(!p.contains(r.getString(R.string.prefs_deadlineVisible))) {
e.putBoolean(r.getString(R.string.prefs_deadlineVisible), // e.putBoolean(r.getString(R.string.prefs_deadlineVisible),
Boolean.parseBoolean(r.getString(R.string.prefs_deadlineVisible_default))); // Boolean.parseBoolean(r.getString(R.string.prefs_deadlineVisible_default)));
} // }
if(!p.contains(r.getString(R.string.prefs_importanceVisible))) { // if(!p.contains(r.getString(R.string.prefs_importanceVisible))) {
e.putBoolean(r.getString(R.string.prefs_importanceVisible), // e.putBoolean(r.getString(R.string.prefs_importanceVisible),
Boolean.parseBoolean(r.getString(R.string.prefs_importanceVisible_default))); // Boolean.parseBoolean(r.getString(R.string.prefs_importanceVisible_default)));
} // }
if(!p.contains(r.getString(R.string.prefs_reminderVisible))) { // if(!p.contains(r.getString(R.string.prefs_reminderVisible))) {
e.putBoolean(r.getString(R.string.prefs_reminderVisible), // e.putBoolean(r.getString(R.string.prefs_reminderVisible),
Boolean.parseBoolean(r.getString(R.string.prefs_reminderVisible_default))); // Boolean.parseBoolean(r.getString(R.string.prefs_reminderVisible_default)));
} // }
if(!p.contains(r.getString(R.string.prefs_repeatVisible))) { // if(!p.contains(r.getString(R.string.prefs_repeatVisible))) {
e.putBoolean(r.getString(R.string.prefs_repeatVisible), // e.putBoolean(r.getString(R.string.prefs_repeatVisible),
Boolean.parseBoolean(r.getString(R.string.prefs_repeatVisible_default))); // Boolean.parseBoolean(r.getString(R.string.prefs_repeatVisible_default)));
} // }
if(!p.contains(r.getString(R.string.prefs_tagsVisible))) { // if(!p.contains(r.getString(R.string.prefs_tagsVisible))) {
e.putBoolean(r.getString(R.string.prefs_tagsVisible), // e.putBoolean(r.getString(R.string.prefs_tagsVisible),
Boolean.parseBoolean(r.getString(R.string.prefs_tagsVisible_default))); // Boolean.parseBoolean(r.getString(R.string.prefs_tagsVisible_default)));
} // }
if(!p.contains(r.getString(R.string.prefs_notesVisible))) { // if(!p.contains(r.getString(R.string.prefs_notesVisible))) {
e.putBoolean(r.getString(R.string.prefs_notesVisible), // e.putBoolean(r.getString(R.string.prefs_notesVisible),
Boolean.parseBoolean(r.getString(R.string.prefs_notesVisible_default))); // Boolean.parseBoolean(r.getString(R.string.prefs_notesVisible_default)));
} // }
} }
// --- system preferences // --- system preferences
@ -275,7 +275,8 @@ public class Preferences {
/** Return # of days to remind by default */ /** Return # of days to remind by default */
public static Integer getDefaultReminder(Context context) { public static Integer getDefaultReminder(Context context) {
return getIntegerValue(context, R.string.p_notif_defaultRemind); // return getIntegerValue(context, R.string.p_notif_defaultRemind);
return 0;
} }
// --- postpone count & settings // --- postpone count & settings
@ -295,7 +296,8 @@ public class Preferences {
/** Return # of days from now to set deadlines by default */ /** Return # of days from now to set deadlines by default */
public static Integer getDefaultDeadlineDays(Context context) { public static Integer getDefaultDeadlineDays(Context context) {
return getIntegerValue(context, R.string.p_deadlineTime); // return getIntegerValue(context, R.string.p_deadlineTime);
return 0;
} }
/** Get perstence mode setting */ /** Get perstence mode setting */
@ -421,11 +423,6 @@ public class Preferences {
return time; return time;
} }
/** Reads the old auto */
public static Float getSyncOldAutoSyncFrequency(Context context) {
return getFloatValue(context, R.string.p_sync_every_old);
}
/** Sets the auto-sync frequency to the desired value */ /** Sets the auto-sync frequency to the desired value */
public static void setSyncAutoSyncFrequency(Context context, int value) { public static void setSyncAutoSyncFrequency(Context context, int value) {
Editor editor = getPrefs(context).edit(); Editor editor = getPrefs(context).edit();

18
astrid/src-legacy/com/timsu/astrid/utilities/TaskFieldsVisibility.java
Unescape Escape View File

@ -4,8 +4,6 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Resources; import android.content.res.Resources;
import com.timsu.astrid.R;
/** Helper struct to store preferences for field visibility */ /** Helper struct to store preferences for field visibility */
public class TaskFieldsVisibility { public class TaskFieldsVisibility {
@ -41,14 +39,14 @@ public class TaskFieldsVisibility {
Resources r = context.getResources(); Resources r = context.getResources();
PrefReader pr = new PrefReader(prefs, r); PrefReader pr = new PrefReader(prefs, r);
tf.TITLE = pr.get(R.string.prefs_titleVisible, R.string.prefs_titleVisible_default); tf.TITLE = true;
tf.TIMES = pr.get(R.string.prefs_timeVisible, R.string.prefs_timeVisible_default); tf.TIMES = true;
tf.IMPORTANCE = pr.get(R.string.prefs_importanceVisible, R.string.prefs_importanceVisible_default); tf.IMPORTANCE = true;
tf.DEADLINE = pr.get(R.string.prefs_deadlineVisible, R.string.prefs_deadlineVisible_default); tf.DEADLINE = true;
tf.REMINDERS = pr.get(R.string.prefs_reminderVisible, R.string.prefs_reminderVisible_default); tf.REMINDERS = true;
tf.REPEATS = pr.get(R.string.prefs_repeatVisible, R.string.prefs_repeatVisible_default); tf.REPEATS = true;
tf.TAGS = pr.get(R.string.prefs_tagsVisible, R.string.prefs_tagsVisible_default); tf.TAGS = true;
tf.NOTES = pr.get(R.string.prefs_notesVisible, R.string.prefs_notesVisible_default); tf.NOTES = true;
return tf; return tf;
} }

Write Preview
Loading…
Cancel
Save