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

Making the task labels nicer. First step in my attempt to make the images work faster in long lists.

Browse Source
pull/14/head
Tim Su 17 years ago
parent 7171a3870e
commit 68134b94e9
9 changed files with 86 additions and 65 deletions
Show Stats Download Patch File Download Diff File

31
AndroidManifest.xml
Unescape Escape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid"
android:versionCode="64"
android:versionName="2.0.1">
android:versionCode="66"
android:versionName="2.0.3">
<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL"
android:value="http://www.weloveastrid.com" />
@ -29,32 +29,7 @@
android:theme="@android:style/Theme.Dialog"
android:launchMode="singleTask" />
<activity android:name=".activities.TaskEdit">
<intent-filter label="Astrid, Remind Me! 1">
<action android:name="android.intent.action.SEND" />
<data android:name="vnd.android.cursor.dir/*" />
<category android:name="android.intent.category.ALTERNATIVE" />
<category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
</intent-filter>
<intent-filter label="Astrid, Remind Me! 2">
<action android:name="android.intent.action.SEND" />
<data android:name="vnd.android.cursor.item/email" />
<category android:name="android.intent.category.ALTERNATIVE" />
<category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
</intent-filter>
<intent-filter label="Astrid, Remind Me! 3">
<action android:name="android.intent.action.SEND" />
<data android:name="vnd.android.cursor.item/person" />
<category android:name="android.intent.category.ALTERNATIVE" />
<category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
</intent-filter>
<intent-filter label="Astrid, Remind Me! 4">
<action android:name="android.intent.action.SEND" />
<data android:name="item/person" />
<category android:name="android.intent.category.ALTERNATIVE" />
<category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
</intent-filter>
</activity>
<activity android:name=".activities.TaskEdit" />
<activity android:name=".activities.TagList"/>

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

@ -34,7 +34,6 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:scaleType="center"
android:drawingCacheQuality="low"
android:minWidth="41px" />
<ImageView android:id="@+id/imageLeft"
@ -42,7 +41,6 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:scaleType="center"
android:drawingCacheQuality="low"
android:paddingLeft="5dip"/>
<!-- all text -->
@ -58,8 +56,7 @@
android:layout_height="wrap_content"
android:layout_width="fill_parent"
style="@style/TextAppearance.TaskList_Task"
android:gravity="center_vertical"
android:singleLine="true"/>
android:gravity="center_vertical"/>
<!-- absolute / goal deadline -->
<TextView android:id="@+id/text_deadlines"
@ -105,11 +102,40 @@
</LinearLayout>
<ImageView android:id="@+id/imageRight"
<!-- importance -->
<ImageView android:id="@+id/importance_1"
android:gravity="center_vertical"
android:layout_width="24px"
android:layout_height="fill_parent"
android:src="@drawable/bubble_red"
android:visibility="gone"
android:scaleType="center"
android:paddingLeft="6dip"
android:paddingRight="4dip"/>
<ImageView android:id="@+id/importance_2"
android:gravity="center_vertical"
android:layout_width="24px"
android:layout_height="fill_parent"
android:src="@drawable/bubble_yellow"
android:visibility="gone"
android:scaleType="center"
android:paddingLeft="6dip"
android:paddingRight="4dip"/>
<ImageView android:id="@+id/importance_3"
android:gravity="center_vertical"
android:layout_width="24px"
android:layout_height="fill_parent"
android:src="@drawable/bubble_blue"
android:visibility="gone"
android:scaleType="center"
android:paddingLeft="6dip"
android:paddingRight="4dip"/>
<ImageView android:id="@+id/importance_4"
android:gravity="center_vertical"
android:layout_width="24px"
android:layout_height="fill_parent"
android:drawingCacheQuality="low"
android:src="@drawable/bubble_gray"
android:visibility="gone"
android:scaleType="center"
android:paddingLeft="6dip"
android:paddingRight="4dip"/>

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

@ -24,9 +24,9 @@
<color name="task_list_normal">#FFFFFFFF</color>
<color name="task_list_done">#ff777777</color>
<color name="task_list_importance_1">#ffffffff</color>
<color name="task_list_importance_2">#ffc0c4dc</color>
<color name="task_list_importance_3">#ff7381c8</color>
<color name="task_list_importance_4">#ff446592</color>
<color name="task_list_importance_2">#ffcfcfcf</color>
<color name="task_list_importance_3">#ffb8b8b8</color>
<color name="task_list_importance_4">#ffa0a0a0</color>
<color name="taskList_dueDateOverdue">#FFFB6666</color>
<color name="taskList_dueDate">#ffF0E89E</color>

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

@ -47,7 +47,8 @@
<item quantity="other">%d / %d Active</item>
</plurals>
<plurals name="Nalarms">
<item quantity="one">%d Alarm</item>
<item quantity="one">One Alarm</item>
<item quantity="two">Two Alarms</item>
<item quantity="other">%d Alarms</item>
</plurals>
<plurals name="Ntags">
@ -87,9 +88,9 @@
<string name="taskList_overdueBy">Overdue by</string>
<string name="taskList_completedPrefix">Finished</string>
<string name="taskList_estimatedTimePrefix">Estimated:</string>
<string name="taskList_elapsedTimePrefix">Elapsed:</string>
<string name="taskList_elapsedTimePrefix">Spent:</string>
<string name="taskList_periodicReminderPrefix">Reminder Every</string>
<string name="taskList_repeatPrefix">Repeat Every</string>
<string name="taskList_repeatPrefix">Repeats Every</string>
<string name="taskList_alarmSuffix">Set</string>
<string name="taskList_tagsPrefix">Tags:</string>
<string name="taskList_notesPrefix">Notes:</string>
@ -267,34 +268,42 @@ Wish me luck!\n
<!-- Preference Keys -->
<skip />
<string name="p_notif_quietStart">notif_qstart</string>
<string name="p_notif_quietEnd">notif_qend</string>
<string name="p_notif_annoy">notif_annoy</string>
<string name="p_notif_defaultRemind">notif_default_reminder</string>
<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="p_notif_quietStart">notif_qstart</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="p_notif_quietEnd">notif_qend</string>
<string name="prefs_quietEnd_title">Quiet Hours End</string>
<string name="prefs_quietEnd_desc">Ending hour when Astrid should be quiet (e.g. 08)</string>
<string name="prefs_quietEnd_desc">Ending hour when Astrid should be quiet (e.g. 08)</string>
<string name="p_notif_defaultRemind">notif_default_reminder</string>
<string name="prefs_defaultRemind_title">Default Reminders</string>
<string name="prefs_defaultRemind_desc">For new tasks, in days (i.e. 7). Blank to disable</string>
<string name="p_notif_annoy">notif_annoy</string>
<string name="prefs_annoy_title">Persistent Mode</string>
<string name="prefs_annoy_desc">If checked, you must view reminders before clearing them</string>
<string name="p_notification_ringtone">notification_ringtone</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="p_colorize">colorize</string>
<string name="prefs_colorize_title">Colorize Task List</string>
<string name="prefs_colorize_desc">Different colors for different priorities</string>
<string name="p_fontSize">font_size</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_category_other">Other</string>
<string name="p_deadlineTime">deadline_time</string>
<string name="prefs_deadlineTime_title">Default Deadlines</string>
<string name="prefs_deadlineTime_desc"># of days from now to set new deadlines</string>

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

@ -21,7 +21,7 @@
android:title="@string/prefs_defaultRemind_title"
android:summary="@string/prefs_defaultRemind_desc" />
<RingtonePreference
android:key="@string/key_notification_ringtone"
android:key="@string/p_notification_ringtone"
android:title="@string/prefs_notification_title"
android:summary="@string/prefs_notification_desc"
android:ringtoneType="notification"

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

@ -157,11 +157,20 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
// importance
final ImageView importance = ((ImageView)view.findViewById(R.id.imageRight));
if(visibleFields.IMPORTANCE)
importance.setImageDrawable(r.getDrawable(task.getImportance().getIconResource()));
else
importance.setVisibility(View.GONE);
if(visibleFields.IMPORTANCE) {
switch(task.getImportance()) {
case LEVEL_1:
view.findViewById(R.id.importance_1).setVisibility(View.VISIBLE);
break;
case LEVEL_2:
view.findViewById(R.id.importance_2).setVisibility(View.VISIBLE);
break;
case LEVEL_3:
view.findViewById(R.id.importance_3).setVisibility(View.VISIBLE); break;
case LEVEL_4:
view.findViewById(R.id.importance_4).setVisibility(View.VISIBLE);
}
}
// due date / completion date
final TextView deadlines = ((TextView)view.findViewById(R.id.text_deadlines));
@ -177,21 +186,23 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
append(" " + r.getString(R.string.ago_suffix));
}
} else {
boolean taskOverdue = false;
if(task.getDefiniteDueDate() != null) {
long timeLeft = task.getDefiniteDueDate().getTime() -
System.currentTimeMillis();
if(timeLeft > 0){
label.append(r.getString(R.string.taskList_dueIn)).append(" ");
} else {
taskOverdue = true;
label.append(r.getString(R.string.taskList_overdueBy)).append(" ");
deadlines.setTextColor(r.getColor(R.color.taskList_dueDateOverdue));
}
label.append(DateUtilities.getDurationString(r,
(int)Math.abs(timeLeft/1000), 1));
if(task.getPreferredDueDate() != null)
label.append(" / ");
}
if(task.getPreferredDueDate() != null) {
if(!taskOverdue && task.getPreferredDueDate() != null) {
if(task.getDefiniteDueDate() != null)
label.append(" / ");
long timeLeft = task.getPreferredDueDate().getTime() -
System.currentTimeMillis();
label.append(r.getString(R.string.taskList_goalPrefix)).append(" ");

2
src/com/timsu/astrid/utilities/DateUtilities.java
Unescape Escape View File

@ -72,7 +72,7 @@ public class DateUtilities {
seconds)).append(" ");
}
return result.toString();
return result.toString().trim();
}
/**

4
src/com/timsu/astrid/utilities/Notifications.java
Unescape Escape View File

@ -33,9 +33,9 @@ public class Notifications extends BroadcastReceiver {
// stuff for scheduling
/** minimum # of seconds before a deadline to notify */
private static final int DEADLINE_NOTIFY_SECS = 10; //60 * 60;
private static final int DEADLINE_NOTIFY_SECS = 60 * 60;
/** # of seconds after deadline to repeat reminder*/
private static final int DEADLINE_REPEAT = 20; //10 * 60;
private static final int DEADLINE_REPEAT = 10 * 60;
// flags
public static final int FLAG_DEFINITE_DEADLINE = 1 << 0;

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

@ -122,7 +122,7 @@ public class Preferences {
public static Uri getNotificationRingtone(Context context) {
Resources r = context.getResources();
String value = getPrefs(context).getString(r.getString(
R.string.key_notification_ringtone), "");
R.string.p_notification_ringtone), "");
try {
return Uri.parse(value);

Write Preview
Loading…
Cancel
Save