diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ae66f9404..fd7a2e5e5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="46" + android:versionName="1.11.2"> diff --git a/res/layout/task_list_row.xml b/res/layout/task_list_row.xml index e642a639c..2cce1354a 100644 --- a/res/layout/task_list_row.xml +++ b/res/layout/task_list_row.xml @@ -83,8 +83,9 @@ + android:paddingLeft="6dip" + android:paddingRight="4dip"/> \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 646685d50..d61ccb8e1 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,10 +23,10 @@ #FFFB6666 #FFFFFFFF #ff777777 - #ffFF8281 - #ffF7F1BD - #ff597AFF - #ffB4B4B4 + #ffffffff + #ffc0c4dc + #ff7381c8 + #ff446592 #FFFB6666 #ffF0E89E diff --git a/res/values/strings.xml b/res/values/strings.xml index 26719ddb2..6227f532d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -223,6 +223,7 @@ If you don\'t want to see the new task right after you complete the old one, you notif_qstart notif_qend notif_annoy + notif_default_reminder notification_ringtone font_size deadline_time @@ -233,8 +234,10 @@ If you don\'t want to see the new task right after you complete the old one, you Starting hour when Astrid should be quiet (e.g. 22) Quiet Hours End Ending hour when Astrid should be quiet (e.g. 08) - Persistence Mode - If checked, Astrid will try a bit harder to get your attention + Default Reminders + For new tasks, in days (i.e. 7). Blank to disable + Persistent Mode + If checked, you must view reminders before clearing them Notification Ringtone Choose how Astrid alerts you! diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 092749769..da2ab695d 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -16,6 +16,10 @@ android:key="@string/p_notif_annoy" android:title="@string/prefs_annoy_title" android:summary="@string/prefs_annoy_desc" /> + { TabWidget tabWidget = tabHost.getTabWidget(); for(int i = 0; i < tabWidget.getChildCount(); i++) { RelativeLayout tab = (RelativeLayout)tabWidget.getChildAt(i); - tab.getLayoutParams().height = 44; + tab.getLayoutParams().height = 46; } setUpUIComponents(); @@ -191,6 +191,11 @@ public class TaskEdit extends TaskModificationTabbedActivity { notification.setTimeDuration(model.getNotificationIntervalSeconds()); flags.setValue(model.getNotificationFlags()); notes.setText(model.getNotes()); + if(model.getTaskIdentifier() == null) { + Integer reminder = Preferences.getDefaultReminder(this); + if(reminder != null) + notification.setTimeDuration(24*3600*reminder); + } // tags tags = tagController.getAllTags(this); diff --git a/src/com/timsu/astrid/utilities/Preferences.java b/src/com/timsu/astrid/utilities/Preferences.java index 4b34b0a2b..10ee5ae9f 100644 --- a/src/com/timsu/astrid/utilities/Preferences.java +++ b/src/com/timsu/astrid/utilities/Preferences.java @@ -112,6 +112,11 @@ public class Preferences { R.string.p_colorize), DEFAULT_COLORIZE); } + /** Return # of days to remind by default */ + public static Integer getDefaultReminder(Context context) { + return getIntegerValue(context, R.string.p_notif_defaultRemind); + } + // --- helper methods private static SharedPreferences getPrefs(Context context) {