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

More cosmetic changes: added option to colorize task list, bigger bubbles, and some changes to the label titles.

Browse Source
pull/14/head
Tim Su 16 years ago
parent b6f44dd53a
commit 6293161863
11 changed files with 104 additions and 48 deletions
Show Stats Download Patch File Download Diff File

6
AndroidManifest.xml
Unescape Escape View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid"
android:versionCode="44"
android:versionName="1.11.0">
android:versionCode="45"
android:versionName="1.11.1">
<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL"
android:value="http://www.weloveastrid.com" />
<meta-data android:name="com.a0soft.gphone.aTrackDog.testVersion"
android:value="44" />
android:value="45" />
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.INTERNET"/>

2
res/layout/task_list_row.xml
Unescape Escape View File

@ -85,6 +85,6 @@
android:gravity="center_vertical"
android:layout_width="26px"
android:layout_height="fill_parent"
android:paddingLeft="6dip"/>
android:paddingLeft="12dip"/>
</LinearLayout>

4
res/values/colors.xml
Unescape Escape View File

@ -23,6 +23,10 @@
<color name="task_list_overdue">#FFFB6666</color>
<color name="task_list_normal">#FFFFFFFF</color>
<color name="task_list_done">#ff777777</color>
<color name="task_list_importance_1">#ffFF8281</color>
<color name="task_list_importance_2">#ffF7F1BD</color>
<color name="task_list_importance_3">#ff597AFF</color>
<color name="task_list_importance_4">#ffB4B4B4</color>
<color name="taskList_dueDateOverdue">#FFFB6666</color>
<color name="taskList_dueDate">#ffF0E89E</color>

12
res/values/strings.xml
Unescape Escape View File

@ -226,7 +226,9 @@ If you don\'t want to see the new task right after you complete the old one, you
<string name="key_notification_ringtone">notification_ringtone</string>
<string name="p_fontSize">font_size</string>
<string name="p_deadlineTime">deadline_time</string>
<string name="p_colorize">colorize</string>
<string name="prefs_category_alerts">Notifications</string>
<string name="prefs_quietStart_title">Quiet Hours Start</string>
<string name="prefs_quietStart_desc">Starting hour when Astrid should be quiet (e.g. 22)</string>
<string name="prefs_quietEnd_title">Quiet Hours End</string>
@ -235,8 +237,14 @@ If you don\'t want to see the new task right after you complete the old one, you
<string name="prefs_annoy_desc">If checked, Astrid will try a bit harder to get your attention</string>
<string name="prefs_notification_title">Notification Ringtone</string>
<string name="prefs_notification_desc">Choose how Astrid alerts you!</string>
<string name="prefs_category_appearance">Appearance</string>
<string name="prefs_fontSize_title">Task List Font</string>
<string name="prefs_fontSize_desc">Font on the main listing page (i.e. 22)</string>
<string name="prefs_deadlineTime_title">Default Deadline Time</string>
<string name="prefs_deadlineTime_desc"># of days from now to set new deadlines (i.e. 7)</string>
<string name="prefs_colorize_title">Colorize Task List</string>
<string name="prefs_colorize_desc">Different colors for different priorities</string>
<string name="prefs_category_other">Other</string>
<string name="prefs_deadlineTime_title">Default Deadlines</string>
<string name="prefs_deadlineTime_desc"># of days from now to set new deadlines</string>
</resources>

72
res/xml/preferences.xml
Unescape Escape View File

@ -1,32 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<EditTextPreference
android:key="@string/p_notif_quietStart"
android:title="@string/prefs_quietStart_title"
android:summary="@string/prefs_quietStart_desc" />
<EditTextPreference
android:key="@string/p_notif_quietEnd"
android:title="@string/prefs_quietEnd_title"
android:summary="@string/prefs_quietEnd_desc" />
<CheckBoxPreference
android:key="@string/p_notif_annoy"
android:title="@string/prefs_annoy_title"
android:summary="@string/prefs_annoy_desc" />
<RingtonePreference
android:key="@string/key_notification_ringtone"
android:title="@string/prefs_notification_title"
android:summary="@string/prefs_notification_desc"
android:ringtoneType="notification"
android:showDefault="true"
android:showSilent="true"
/>
<EditTextPreference
android:key="@string/p_fontSize"
android:title="@string/prefs_fontSize_title"
android:summary="@string/prefs_fontSize_desc" />
<EditTextPreference
android:key="@string/p_deadlineTime"
android:title="@string/prefs_deadlineTime_title"
android:summary="@string/prefs_deadlineTime_desc" />
<PreferenceCategory
android:title="@string/prefs_category_alerts">
<EditTextPreference
android:key="@string/p_notif_quietStart"
android:title="@string/prefs_quietStart_title"
android:summary="@string/prefs_quietStart_desc" />
<EditTextPreference
android:key="@string/p_notif_quietEnd"
android:title="@string/prefs_quietEnd_title"
android:summary="@string/prefs_quietEnd_desc" />
<CheckBoxPreference
android:key="@string/p_notif_annoy"
android:title="@string/prefs_annoy_title"
android:summary="@string/prefs_annoy_desc" />
<RingtonePreference
android:key="@string/key_notification_ringtone"
android:title="@string/prefs_notification_title"
android:summary="@string/prefs_notification_desc"
android:ringtoneType="notification"
android:showDefault="true"
android:showSilent="true"
/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/prefs_category_appearance">
<CheckBoxPreference
android:key="@string/p_colorize"
android:title="@string/prefs_colorize_title"
android:summary="@string/prefs_colorize_desc" />
<EditTextPreference
android:key="@string/p_fontSize"
android:title="@string/prefs_fontSize_title"
android:summary="@string/prefs_fontSize_desc" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/prefs_category_other">
<EditTextPreference
android:key="@string/p_deadlineTime"
android:title="@string/prefs_deadlineTime_title"
android:summary="@string/prefs_deadlineTime_desc" />
</PreferenceCategory>
</PreferenceScreen>

2
src/com/timsu/astrid/activities/TaskListAdapter.java
Unescape Escape View File

@ -280,7 +280,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
progress.setButtonDrawable(R.drawable.btn_check0);
} else {
name.setBackgroundDrawable(null);
name.setTextColor(r.getColor(task.getTaskColorResource()));
name.setTextColor(r.getColor(task.getTaskColorResource(getContext())));
if(task.getProgressPercentage() >= 75)
progress.setButtonDrawable(R.drawable.btn_check75);

28
src/com/timsu/astrid/data/enums/Importance.java
Unescape Escape View File

@ -24,22 +24,36 @@ import com.timsu.astrid.R;
public enum Importance {
// MOST IMPORTANT
LEVEL_1(R.string.importance_1, R.color.importance_1, R.drawable.bullet_red),
LEVEL_2(R.string.importance_2, R.color.importance_2, R.drawable.bullet_orange),
LEVEL_3(R.string.importance_3, R.color.importance_3, R.drawable.bullet_blue),
LEVEL_4(R.string.importance_4, R.color.importance_4, R.drawable.bullet_white),
LEVEL_1(R.string.importance_1,
R.color.importance_1,
R.color.task_list_importance_1,
R.drawable.bubble_red),
LEVEL_2(R.string.importance_2,
R.color.importance_2,
R.color.task_list_importance_2,
R.drawable.bubble_yellow),
LEVEL_3(R.string.importance_3,
R.color.importance_3,
R.color.task_list_importance_3,
R.drawable.bubble_blue),
LEVEL_4(R.string.importance_4,
R.color.importance_4,
R.color.task_list_importance_4,
R.drawable.bubble_gray),
// LEAST IMPORTANT
;
int label;
int color;
int taskListColor;
int icon;
public static final Importance DEFAULT = LEVEL_3;
private Importance(int label, int color, int icon) {
private Importance(int label, int color, int taskListColor, int icon) {
this.label = label;
this.color = color;
this.taskListColor = taskListColor;
this.icon = icon;
}
@ -51,6 +65,10 @@ public enum Importance {
return color;
}
public int getTaskListColor() {
return taskListColor;
}
public int getIconResource() {
return icon;
}

5
src/com/timsu/astrid/data/task/AbstractTaskModel.java
Unescape Escape View File

@ -33,6 +33,7 @@ import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.AbstractModel;
import com.timsu.astrid.data.enums.Importance;
import com.timsu.astrid.data.enums.RepeatInterval;
import com.timsu.astrid.utilities.Preferences;
/** Abstract model of a task. Subclasses implement the getters and setters
@ -187,10 +188,12 @@ public abstract class AbstractTaskModel extends AbstractModel {
// --- utility methods
/** Gets task color. Requires definiteDueDate and importance */
protected int getTaskColorResource() {
protected int getTaskColorResource(Context context) {
if(getDefiniteDueDate() != null && getDefiniteDueDate().getTime() <
System.currentTimeMillis()) {
return R.color.task_list_overdue;
} else if(Preferences.isColorize(context)) {
return getImportance().getTaskListColor();
} else {
return R.color.task_list_normal;
}

5
src/com/timsu/astrid/data/task/TaskModelForList.java
Unescape Escape View File

@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import android.content.Context;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
@ -140,8 +141,8 @@ public class TaskModelForList extends AbstractTaskModel {
}
@Override
public int getTaskColorResource() {
return super.getTaskColorResource();
public int getTaskColorResource(Context context) {
return super.getTaskColorResource(context);
}
@Override

5
src/com/timsu/astrid/data/task/TaskModelForView.java
Unescape Escape View File

@ -64,11 +64,6 @@ public class TaskModelForView extends AbstractTaskModel {
return super.isTaskCompleted();
}
@Override
public int getTaskColorResource() {
return super.getTaskColorResource();
}
@Override
public int getProgressPercentage() {
return super.getProgressPercentage();

11
src/com/timsu/astrid/utilities/Preferences.java
Unescape Escape View File

@ -17,6 +17,7 @@ public class Preferences {
// default values
private static final boolean DEFAULT_PERSISTENCE_MODE = true;
private static final boolean DEFAULT_COLORIZE = false;
/** Set preference defaults, if unset. called at startup */
public static void setPreferenceDefaults(Context context) {
@ -34,6 +35,9 @@ public class Preferences {
if(!prefs.contains(r.getString(R.string.p_deadlineTime))) {
editor.putString(r.getString(R.string.p_deadlineTime), "7");
}
if(!prefs.contains(r.getString(R.string.p_colorize))) {
editor.putBoolean(r.getString(R.string.p_colorize), DEFAULT_COLORIZE);
}
editor.commit();
}
@ -101,6 +105,13 @@ public class Preferences {
return getIntegerValue(context, R.string.p_deadlineTime);
}
/** Get perstence mode setting */
public static boolean isColorize(Context context) {
Resources r = context.getResources();
return getPrefs(context).getBoolean(r.getString(
R.string.p_colorize), DEFAULT_COLORIZE);
}
// --- helper methods
private static SharedPreferences getPrefs(Context context) {

Write Preview
Loading…
Cancel
Save