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

Updated copy for ReminderControlSet

Browse Source
pull/14/head
Sam Bosley 11 years ago
parent f3d08b19f8
commit 2feaebba6e
2 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File

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

@ -37,11 +37,17 @@
<!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
<string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
<string name="TEA_reminder_due_short">When due</string>
<string name="TEA_reminder_when">when</string>
<string name="TEA_reminder_due_short">due</string>
<string name="TEA_reminder_overdue_short">overdue</string>
<string name="TEA_reminder_overdue_short">When overdue</string>
<string name="TEA_reminder_randomly_short">randomly</string>
<string name="TEA_reminder_randomly_short">Randomly</string>
<string name="TEA_reminder_display_one">Remind me %s</string>
<string name="TEA_reminder_display_multiple">Remind %s</string>
<string-array name="TEA_reminder_random">
<!-- random reminder choices for task edit page. -->

47
astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
Unescape Escape View File

@ -9,7 +9,6 @@ import java.util.ArrayList;
import java.util.List;
import android.app.Activity;
import android.text.TextUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView;
@ -162,30 +161,50 @@ public class ReminderControlSet extends PopupControlSet {
@Override
protected void refreshDisplayView() {
int reminderCount = 0;
StringBuilder reminderString = new StringBuilder();
// Has random reminder?
if ((randomControlSet != null && randomControlSet.hasRandomReminder()) || (randomControlSet == null && model.getValue(Task.REMINDER_PERIOD) > 0)) {
reminderString.append(activity.getString(R.string.TEA_reminder_randomly_short));
reminderCount++;
}
int value;
if (initialized)
value = getValue();
else
value = model.getValue(Task.REMINDER_FLAGS);
StringBuilder sb = new StringBuilder();
if ((value & Task.NOTIFY_AT_DEADLINE) > 0)
sb.append(activity.getString(R.string.TEA_reminder_due_short));
boolean appendedWhen = false;
if ((value & Task.NOTIFY_AT_DEADLINE) > 0) {
if (reminderCount > 0)
reminderString.append(" & "); //$NON-NLS-1$
if ((value & Task.NOTIFY_AFTER_DEADLINE) > 0) {
if (sb.length() > 0)
sb.append(" / "); //$NON-NLS-1$
sb.append(activity.getString(R.string.TEA_reminder_overdue_short));
reminderString.append(activity.getString(R.string.TEA_reminder_when)).append(" "); //$NON-NLS-1$
reminderString.append(activity.getString(R.string.TEA_reminder_due_short));
reminderCount++;
appendedWhen = true;
}
if ((randomControlSet != null && randomControlSet.hasRandomReminder()) || (randomControlSet == null && model.getValue(Task.REMINDER_PERIOD) > 0)) {
if (sb.length() > 0)
sb.append(" / "); //$NON-NLS-1$
sb.append(activity.getString(R.string.TEA_reminder_randomly_short));
if ((value & Task.NOTIFY_AFTER_DEADLINE) > 0 && reminderCount < 2) {
if (reminderCount > 0)
reminderString.append(" & "); //$NON-NLS-1$
if (!appendedWhen)
reminderString.append(activity.getString(R.string.TEA_reminder_when)).append(" "); //$NON-NLS-1$
reminderString.append(activity.getString(R.string.TEA_reminder_overdue_short));
reminderCount++;
}
String toDisplay = sb.toString();
if (!TextUtils.isEmpty(toDisplay)) {
if (reminderCount > 0) {
String toDisplay;
if (reminderCount == 1) {
toDisplay = activity.getString(R.string.TEA_reminder_display_one, reminderString.toString());
} else {
toDisplay = activity.getString(R.string.TEA_reminder_display_multiple, reminderString.toString());
}
label.setText(toDisplay);
label.setTextColor(themeColor);
image.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_reminder, R.drawable.tea_icn_reminder_lightblue));

Write Preview
Loading…
Cancel
Save