diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b9c9b017d..aed713f04 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="34" + android:versionName="1.9.8"> diff --git a/res/values/colors.xml b/res/values/colors.xml index b22f8813d..7d8111b2f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,7 +20,7 @@ --> - #F09EA6 + #FF340A #ff777777 #ffFFBF9E @@ -32,9 +32,9 @@ #ffbbbbbb #ffff0000 - #ffcff09e - #ffa8dba8 - #ff79bd9a - #ff439898 + #fffff75c + #ffa1b4ff + #ff5274ff + #ff0033ff diff --git a/res/values/strings.xml b/res/values/strings.xml index b6e56bb0f..44cb8645c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -200,10 +200,17 @@ - notif_qstart - notif_qend - notification_ringtone + notif_qstart + notif_qend + notif_annoy + notification_ringtone + Quiet Hours Start + 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 harder to get your attention. Notification Ringtone Choose how Astrid alerts you! diff --git a/res/values/styles.xml b/res/values/styles.xml index b4b284c6b..57082c346 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -29,7 +29,7 @@ diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 86b140476..f406b889d 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -3,12 +3,16 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + android:title="@string/prefs_quietStart_title" + android:summary="@string/prefs_quietStart_desc" /> + android:title="@string/prefs_quietEnd_title" + android:summary="@string/prefs_quietEnd_desc" /> +