Hide until control set reads setting from preferences for newly created tasks

pull/14/head
Sam Bosley 13 years ago
parent 7c4250036a
commit 8ff97152a6

@ -377,7 +377,8 @@ public final class TaskEditActivity extends TabActivity {
R.id.reminder_due, R.id.reminder_overdue, R.id.reminder_alarm)); R.id.reminder_due, R.id.reminder_overdue, R.id.reminder_alarm));
controls.add(new RandomReminderControlSet(TaskEditActivity.this, controls.add(new RandomReminderControlSet(TaskEditActivity.this,
R.id.reminder_random, R.id.reminder_random_interval)); R.id.reminder_random, R.id.reminder_random_interval));
controls.add(new HideUntilControlSet(TaskEditActivity.this, R.id.hideUntil)); HideUntilControlSet hideUntilControls = new HideUntilControlSet(TaskEditActivity.this, R.id.hideUntil);
controls.add(hideUntilControls);
controls.add(peopleControlSet = new EditPeopleControlSet( controls.add(peopleControlSet = new EditPeopleControlSet(
TaskEditActivity.this, REQUEST_LOG_IN)); TaskEditActivity.this, REQUEST_LOG_IN));
@ -385,6 +386,9 @@ public final class TaskEditActivity extends TabActivity {
synchronized(controls) { synchronized(controls) {
for(TaskEditControlSet controlSet : controls) for(TaskEditControlSet controlSet : controls)
controlSet.readFromTask(model); controlSet.readFromTask(model);
if (isNewTask) {
hideUntilControls.setDefaults();
}
} }
} }

@ -15,6 +15,7 @@ import android.widget.TimePicker;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet; import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.ui.DeadlineTimePickerDialog.OnDeadlineTimeSetListener; import com.todoroo.astrid.ui.DeadlineTimePickerDialog.OnDeadlineTimeSetListener;
@ -203,6 +204,12 @@ public class HideUntilControlSet implements TaskEditControlSet,
// --- setting up values // --- setting up values
public void setDefaults() {
int setting = Preferences.getIntegerFromString(R.string.p_default_hideUntil_key,
Task.HIDE_UNTIL_NONE);
spinner.setSelection(setting);
}
@Override @Override
public void readFromTask(Task task) { public void readFromTask(Task task) {
long date = task.getValue(Task.HIDE_UNTIL); long date = task.getValue(Task.HIDE_UNTIL);

Loading…
Cancel
Save