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

Merge remote-tracking branch 'stingerAJ/2011-08-26-patches'

Browse Source 
Conflicts:
	astrid/res/xml/preferences_defaults.xml
pull/14/head
Tim Su 13 years ago
parent d45d844b77 b620c0d260
commit 9b16149c8a
9 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File

7
api/src/com/todoroo/andlib/data/AbstractModel.java
Unescape Escape View File

@ -336,9 +336,10 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
}
/**
* Gets the state of the given flag on the given property
* @param property
* @param flag
* Returns the set state of the given flag on the given property
* @param property the property to get the set state of the flag
* @param flag the flag-descriptor (e.g. <code>Task.FLAG_REPEAT_AFTER_COMPLETION</code>)
* @return true if the flag is set
*/
public boolean getFlag(IntegerProperty property, int flag) {
return (getValue(property) & flag) > 0;

11
api/src/com/todoroo/astrid/data/Task.java
Unescape Escape View File

@ -304,17 +304,6 @@ public final class Task extends RemoteModel {
return getValue(DUE_DATE) > 0;
}
/**
* Returns the set state of the given flag on the given property
* @param property
* @param flag
* @return
*/
@Override
public boolean getFlag(IntegerProperty property, int flag) {
return (getValue(property) & flag) > 0;
}
// --- due and hide until date management
/** urgency array index -> significance */

3
astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
Unescape Escape View File

@ -46,6 +46,9 @@ public class DefaultsPreferences extends TodorooPreferenceActivity {
} else if(r.getString(R.string.p_default_reminders_key).equals(preference.getKey())) {
updateTaskListPreference(preference, value, r, R.array.EPr_default_reminders,
R.array.EPr_default_reminders_values, R.string.EPr_default_reminders_desc);
} else if(r.getString(R.string.p_default_reminders_mode_key).equals(preference.getKey())) {
updateTaskListPreference(preference, value, r, R.array.EPr_default_reminders_mode,
R.array.EPr_default_reminders_mode_values, R.string.EPr_default_reminders_mode_desc);
} else if(r.getString(R.string.p_rmd_default_random_hours).equals(preference.getKey())) {
int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_reminder_random_hours), (String)value);
if(index <= 0)

9
astrid/res/values-de/strings.xml
Unescape Escape View File

@ -696,6 +696,11 @@
<!-- Preference: Default Reminders Description (%s => setting) -->
<string name="EPr_default_reminders_desc">Momentan: %s</string>
<!-- Preference: Default Reminders Mode Title -->
<string name="EPr_default_reminders_mode_title">Standard Klingeln/Vibrieren Typ</string>
<!-- Preference: Default Reminders Mode Description (%s => setting) -->
<string name="EPr_default_reminders_mode_desc">Momentan: %s</string>
<!-- Preference: Default Add To Calendar Title -->
<string name="EPr_default_addtocalendar_title">Standard Kalendereintrag</string>
@ -1450,10 +1455,10 @@ Achtung: diese Aufgaben sind unwiederbringlich verloren, wenn Sie kein Backup ge
<string name="TEA_reminder_mode_once">Einmal klingeln</string>
<!-- Task Edit: Reminder mode: ring five times -->
<string name="TEA_reminder_mode_five">Ring Five Times</string>
<string name="TEA_reminder_mode_five">Fünfmal klingeln</string>
<!-- Task Edit: Reminder mode: ring nonstop -->
<string name="TEA_reminder_mode_nonstop">Klingeln, bis ich den Arlarm abschalte</string>
<string name="TEA_reminder_mode_nonstop">Klingeln, bis ich den Alarm abschalte</string>
<string-array name="TEA_reminder_random">
<!-- random reminder choices for task edit page. -->

10
astrid/res/values/keys.xml
Unescape Escape View File

@ -235,6 +235,13 @@
<item>6</item>
</string-array>
<string-array name="EPr_default_reminders_mode_values">
<!-- reminders: values that map EPr_default_reminders items to reminder flags. -->
<item>0</item>
<item>16</item>
<item>8</item>
</string-array>
<!-- default importance setting (corresponds to task setting) -->
<string name="p_default_importance_key">p_def_imp</string>
@ -247,6 +254,9 @@
<!-- default Add To Calendar setting (corresponds to entry in gcal_TEA_addToCalendar) -->
<string name="p_default_addtocalendar_key">p_def_addtocalendar</string>
<!-- default reminder mode setting (corresponds to entry in TEA_reminder_mode_once, TEA_reminder_mode_five, TEA_reminder_mode_nonstop) -->
<string name="p_default_reminders_mode_key">rmd_default_reminder_mode</string>
<!-- ============================================================ SYNC == -->
<string-array name="sync_SPr_interval_values">

12
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -414,6 +414,11 @@
<!-- Preference: Default Reminders Description (%s => setting) -->
<string name="EPr_default_reminders_desc">Currently: %s</string>
<!-- Reminder Mode Preference: Default Reminders Duration -->
<string name="EPr_default_reminders_mode_title">Default Ring/Vibrate type</string>
<!-- Preference: Default Reminders Description (%s => setting) -->
<string name="EPr_default_reminders_mode_desc">Currently: %s</string>
<!-- Preference: Default Add To Calendar Title -->
<string name="EPr_default_addtocalendar_title">Default Add To Calendar</string>
@ -450,6 +455,13 @@
<item>At deadline or overdue</item>
</string-array>
<string-array name="EPr_default_reminders_mode">
<!-- reminders duration: labels for "Task Defaults" preference item. -->
<item>@string/TEA_reminder_mode_once</item>
<item>@string/TEA_reminder_mode_five</item>
<item>@string/TEA_reminder_mode_nonstop</item>
</string-array>
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day</item>

9
astrid/res/xml/preferences_defaults.xml
Unescape Escape View File

@ -27,4 +27,13 @@
android:title="@string/rmd_EPr_defaultRemind_title"
android:entries="@array/EPr_reminder_random"
android:entryValues="@array/EPr_reminder_random_hours" />
<ListPreference
android:key="@string/p_default_reminders_mode_key"
android:title="@string/EPr_default_reminders_mode_title"
android:entries="@array/EPr_default_reminders_mode"
android:entryValues="@array/EPr_default_reminders_mode_values" />
<CheckBoxPreference
android:title="@string/EPr_default_addtocalendar_title"
android:key="@string/p_default_addtocalendar_key"
android:defaultValue="false"/>
</PreferenceScreen>

7
astrid/src/com/todoroo/astrid/dao/TaskDao.java
Unescape Escape View File

@ -225,9 +225,10 @@ public class TaskDao extends DatabaseDao<Task> {
0));
}
if(!item.containsValue(Task.REMINDER_FLAGS)) {
item.setValue(Task.REMINDER_FLAGS,
Preferences.getIntegerFromString(R.string.p_default_reminders_key,
Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE));
int reminder_flags = Preferences.getIntegerFromString(R.string.p_default_reminders_key,
Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE) |
Preferences.getIntegerFromString(R.string.p_default_reminders_mode_key, 0);
item.setValue(Task.REMINDER_FLAGS, reminder_flags);
}
}

3
astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.timsu.astrid.R;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.data.Task;
public class AstridPreferences {
@ -28,7 +29,7 @@ public class AstridPreferences {
Preferences.setIfUnset(prefs, editor, r, R.string.p_default_urgency_key, 0);
Preferences.setIfUnset(prefs, editor, r, R.string.p_default_importance_key, 2);
Preferences.setIfUnset(prefs, editor, r, R.string.p_default_hideUntil_key, 0);
Preferences.setIfUnset(prefs, editor, r, R.string.p_default_reminders_key, 6);
Preferences.setIfUnset(prefs, editor, r, R.string.p_default_reminders_key, Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE);
Preferences.setIfUnset(prefs, editor, r, R.string.p_rmd_default_random_hours, 0);
Preferences.setIfUnset(prefs, editor, r, R.string.p_fontSize, 20);
Preferences.setIfUnset(prefs, editor, r, R.string.p_showNotes, true);

Write Preview
Loading…
Cancel
Save