diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 885ffd3ce..f28f5466d 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -1,7 +1,7 @@ diff --git a/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java index b4eba3a56..2e1e4162a 100644 --- a/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java +++ b/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java @@ -163,9 +163,22 @@ public class DateUtilities { @SuppressWarnings("nls") public static SimpleDateFormat getDateFormatWithWeekday(Context context) { try { - return new SimpleDateFormat("EEE, " + getDateFormatString(context)); + return new SimpleDateFormat("EEEE, " + getDateFormatString(context)); } catch (Exception e) { - return new SimpleDateFormat("EEE, d MMM yyyy"); + return new SimpleDateFormat("EEEE, d MMM yyyy"); + } + } + + /** + * @return date format as getDateFormat with weekday + */ + @SuppressWarnings("nls") + public static SimpleDateFormat getDateWithTimeAndWeekday(Context context) { + try { + return new SimpleDateFormat("EEEE, " + getDateFormatString(context) + + " " + getTimeFormatString(context)); + } catch (Exception e) { + return new SimpleDateFormat("EEEE, d MMM yyyy H:mm"); } } diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 936a9c579..2542eac1c 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -279,14 +279,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable { String dateValue; Date dueDateAsDate = DateUtilities.unixtimeToDate(dueDate); if (task.hasDueTime()) { - dateValue = DateUtilities.getDateWithTimeFormat(activity).format(dueDateAsDate); + dateValue = DateUtilities.getDateWithTimeAndWeekday(activity).format(dueDateAsDate); } else { - dateValue = DateUtilities.getDateFormat(activity).format(dueDateAsDate); + dateValue = DateUtilities.getDateFormatWithWeekday(activity).format(dueDateAsDate); } dueDateView.setText(dateValue); setVisibility(dueDateView); } else if(task.isCompleted()) { - String dateValue = DateUtilities.getDateFormat(activity).format(task.getValue(Task.COMPLETION_DATE)); + String dateValue = DateUtilities.getDateFormatWithWeekday(activity).format(task.getValue(Task.COMPLETION_DATE)); dueDateView.setText(r.getString(R.string.TAd_completed, dateValue)); dueDateView.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDetails); setVisibility(dueDateView); diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 7254864d2..3884be158 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -56,14 +56,17 @@ public final class UpgradeService { "If you liked the old version, you can also go back by " + "clicking here", }); - else if(from <= 144) + if(from > 135 && from <= 144) newVersionString(changeLog, "3.0.6 (8/4/10)", new String[] { "This update contains for free all of the " + "powerpack's features for evaluation purposes", "Fixed widget not updating when tasks are edited", - "Added a setting for displaying task notes", - "If you liked the old version, you can also go back by " + - "clicking here", + "Added a setting for displaying task notes in the list", + }); + if(from > 135 && from <= 145) + newVersionString(changeLog, "3.0.7 (8/5/10)", new String[] { + "Linkify phone numbers, e-mails, and web pages", + "Made the 'Astrid Notifications' setting in the menu work", }); if(changeLog.length() == 0)