From 4cd6321fa3314de67986602992fe939ff5ae2943 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 5 Dec 2011 21:14:18 -0800 Subject: [PATCH] More progress on calendar picker New and awesome date and time picker for deadlines, alarms, etc. --- .../com/todoroo/andlib/data/DatabaseDao.java | 3 +- .../astrid/alarms/AlarmControlSet.java | 54 +++- .../color/task_edit_toggle_button_text.xml | 7 + astrid/res/drawable/date_shortcut_bottom.xml | 26 ++ .../res/drawable/date_shortcut_bottom_off.xml | 10 + .../res/drawable/date_shortcut_bottom_on.xml | 12 + astrid/res/drawable/date_shortcut_middle.xml | 26 ++ .../res/drawable/date_shortcut_middle_off.xml | 7 + .../res/drawable/date_shortcut_middle_on.xml | 9 + .../res/drawable/date_shortcut_standalone.xml | 26 ++ .../drawable/date_shortcut_standalone_off.xml | 12 + .../drawable/date_shortcut_standalone_on.xml | 14 ++ astrid/res/drawable/date_shortcut_top.xml | 26 ++ astrid/res/drawable/date_shortcut_top_off.xml | 10 + astrid/res/drawable/date_shortcut_top_on.xml | 12 + .../deadline_timepicker_button_bl.xml | 24 ++ .../deadline_timepicker_button_bl_off.xml | 9 + .../deadline_timepicker_button_bl_on.xml | 11 + .../deadline_timepicker_button_br.xml | 24 ++ .../deadline_timepicker_button_br_off.xml | 9 + .../deadline_timepicker_button_br_on.xml | 11 + .../deadline_timepicker_button_tl.xml | 24 ++ .../deadline_timepicker_button_tl_off.xml | 9 + .../deadline_timepicker_button_tl_on.xml | 11 + .../deadline_timepicker_button_tr.xml | 24 ++ .../deadline_timepicker_button_tr_off.xml | 9 + .../deadline_timepicker_button_tr_on.xml | 11 + astrid/res/drawable/icn_arrow_down.png | Bin 0 -> 1575 bytes astrid/res/drawable/icn_arrow_left.png | Bin 0 -> 930 bytes .../{icn_arrow.png => icn_arrow_right.png} | Bin astrid/res/drawable/icn_arrow_up.png | Bin 0 -> 1555 bytes astrid/res/drawable/members_arrow_white.xml | 2 +- .../drawable/task_edit_dialog_background.xml | 14 ++ astrid/res/drawable/timepicker_am_btn.xml | 24 ++ astrid/res/drawable/timepicker_am_btn_off.xml | 10 + astrid/res/drawable/timepicker_am_btn_on.xml | 12 + astrid/res/drawable/timepicker_pm_btn.xml | 24 ++ astrid/res/drawable/timepicker_pm_btn_off.xml | 10 + astrid/res/drawable/timepicker_pm_btn_on.xml | 12 + astrid/res/layout-land/date_time_picker.xml | 48 ++++ astrid/res/layout/alarm_edit_row.xml | 53 ++-- astrid/res/layout/astrid_time_picker.xml | 71 ++++++ .../res/layout/beast_mode_pref_activity.xml | 2 +- astrid/res/layout/control_set_alarms.xml | 3 +- astrid/res/layout/control_set_deadline.xml | 8 + .../layout/control_set_deadline_display.xml | 39 +++ astrid/res/layout/control_set_importance.xml | 1 + astrid/res/layout/date_time_dialog.xml | 36 +++ astrid/res/layout/date_time_picker.xml | 45 ++++ astrid/res/layout/deadline_number_picker.xml | 66 +++++ .../res/layout/preference_draggable_row.xml | 29 ++- astrid/res/layout/task_edit_activity_new.xml | 27 +- astrid/res/layout/task_edit_arrow.xml | 2 +- astrid/res/layout/task_edit_when_controls.xml | 18 +- astrid/res/layout/time_picker_new.xml | 35 +++ astrid/res/values/colors.xml | 4 +- astrid/res/values/strings-core.xml | 9 +- astrid/res/values/styles.xml | 19 ++ .../astrid/activity/TaskEditActivity.java | 18 +- .../todoroo/astrid/ui/AstridTimePicker.java | 199 +++++++++++++++ .../com/todoroo/astrid/ui/CalendarView.java | 174 ++++++++----- .../todoroo/astrid/ui/DateAndTimeDialog.java | 101 ++++++++ .../todoroo/astrid/ui/DateAndTimePicker.java | 233 ++++++++++++++++++ .../todoroo/astrid/ui/DeadlineControlSet.java | 69 ++++++ .../astrid/ui/DeadlineNumberPicker.java | 27 ++ .../astrid/ui/HideUntilControlSet.java | 76 ++---- .../astrid/ui/ImportanceControlSet.java | 24 +- .../com/todoroo/astrid/ui/NumberPicker.java | 16 +- .../todoroo/astrid/ui/PopupControlSet.java | 9 +- 69 files changed, 1795 insertions(+), 204 deletions(-) create mode 100644 astrid/res/color/task_edit_toggle_button_text.xml create mode 100644 astrid/res/drawable/date_shortcut_bottom.xml create mode 100644 astrid/res/drawable/date_shortcut_bottom_off.xml create mode 100644 astrid/res/drawable/date_shortcut_bottom_on.xml create mode 100644 astrid/res/drawable/date_shortcut_middle.xml create mode 100644 astrid/res/drawable/date_shortcut_middle_off.xml create mode 100644 astrid/res/drawable/date_shortcut_middle_on.xml create mode 100644 astrid/res/drawable/date_shortcut_standalone.xml create mode 100644 astrid/res/drawable/date_shortcut_standalone_off.xml create mode 100644 astrid/res/drawable/date_shortcut_standalone_on.xml create mode 100644 astrid/res/drawable/date_shortcut_top.xml create mode 100644 astrid/res/drawable/date_shortcut_top_off.xml create mode 100644 astrid/res/drawable/date_shortcut_top_on.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_bl.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_bl_off.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_bl_on.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_br.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_br_off.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_br_on.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_tl.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_tl_off.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_tl_on.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_tr.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_tr_off.xml create mode 100644 astrid/res/drawable/deadline_timepicker_button_tr_on.xml create mode 100644 astrid/res/drawable/icn_arrow_down.png create mode 100644 astrid/res/drawable/icn_arrow_left.png rename astrid/res/drawable/{icn_arrow.png => icn_arrow_right.png} (100%) create mode 100644 astrid/res/drawable/icn_arrow_up.png create mode 100644 astrid/res/drawable/task_edit_dialog_background.xml create mode 100644 astrid/res/drawable/timepicker_am_btn.xml create mode 100644 astrid/res/drawable/timepicker_am_btn_off.xml create mode 100644 astrid/res/drawable/timepicker_am_btn_on.xml create mode 100644 astrid/res/drawable/timepicker_pm_btn.xml create mode 100644 astrid/res/drawable/timepicker_pm_btn_off.xml create mode 100644 astrid/res/drawable/timepicker_pm_btn_on.xml create mode 100644 astrid/res/layout-land/date_time_picker.xml create mode 100644 astrid/res/layout/astrid_time_picker.xml create mode 100644 astrid/res/layout/control_set_deadline.xml create mode 100644 astrid/res/layout/control_set_deadline_display.xml create mode 100644 astrid/res/layout/date_time_dialog.xml create mode 100644 astrid/res/layout/date_time_picker.xml create mode 100644 astrid/res/layout/deadline_number_picker.xml create mode 100644 astrid/res/layout/time_picker_new.xml create mode 100644 astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java create mode 100644 astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java create mode 100644 astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java create mode 100644 astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java create mode 100644 astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java diff --git a/api/src/com/todoroo/andlib/data/DatabaseDao.java b/api/src/com/todoroo/andlib/data/DatabaseDao.java index 8ee776d7f..12aba2a95 100644 --- a/api/src/com/todoroo/andlib/data/DatabaseDao.java +++ b/api/src/com/todoroo/andlib/data/DatabaseDao.java @@ -83,8 +83,9 @@ public class DatabaseDao { } protected void onModelUpdated(TYPE model) { + TYPE modelCopy = (TYPE) model.clone(); for(ModelUpdateListener listener : listeners) { - listener.onModelUpdated(model); + listener.onModelUpdated(modelCopy); } } diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java index f1a8d9fcd..448d202d7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java @@ -6,17 +6,19 @@ import java.util.LinkedHashSet; import android.app.Activity; import android.view.LayoutInflater; import android.view.View; -import android.widget.Button; +import android.view.View.OnClickListener; import android.widget.ImageButton; import android.widget.LinearLayout; +import android.widget.TextView; import com.timsu.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.andlib.widget.DateControlSet; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.TaskEditControlSet; +import com.todoroo.astrid.ui.DateAndTimeDialog; +import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener; /** * Control set to manage adding and removing tags @@ -30,6 +32,7 @@ public final class AlarmControlSet extends TaskEditControlSet { private final LinearLayout alertsContainer; private final Activity activity; + private final DateAndTimeDialog pickerDialog; public AlarmControlSet(Activity activity, int layout) { //View v = LayoutInflater.from(activity).inflate(R.layout.alarm_control, parent, true); @@ -42,6 +45,8 @@ public final class AlarmControlSet extends TaskEditControlSet { addAlarm(new Date()); } }); + + pickerDialog = new DateAndTimeDialog(activity, 0); } @Override @@ -60,12 +65,10 @@ public final class AlarmControlSet extends TaskEditControlSet { public String writeToModel(Task task) { LinkedHashSet alarms = new LinkedHashSet(); for(int i = 0; i < alertsContainer.getChildCount(); i++) { - DateControlSet set = (DateControlSet) alertsContainer.getChildAt(i).getTag(); - if(set == null) + Long dateValue = (Long) alertsContainer.getChildAt(i).getTag(); + if(dateValue == null) continue; - Date date = set.getDate(); - if(date != null) - alarms.add(set.getDate().getTime()); + alarms.add(dateValue); } if(AlarmService.getInstance().synchronizeAlarms(task.getId(), alarms)) @@ -78,10 +81,39 @@ public final class AlarmControlSet extends TaskEditControlSet { final View alertItem = LayoutInflater.from(activity).inflate(R.layout.alarm_edit_row, null); alertsContainer.addView(alertItem); - DateControlSet dcs = new DateControlSet(activity, (Button)alertItem.findViewById(R.id.date), - (Button)alertItem.findViewById(R.id.time)); - dcs.setDate(alert); - alertItem.setTag(dcs); + alertItem.setOnClickListener(new OnClickListener() { + @Override + public void onClick(final View v) { + pickerDialog.setSelectedDateAndTime((Long) alertItem.getTag()); + pickerDialog.setDateAndTimeDialogListener(new DateAndTimeDialogListener() { + @Override + public void onDateAndTimeSelected(long date) { + if (date > 0) { + if (!pickerDialog.hasTime()) { + Date d = new Date(date); + d.setHours(18); + d.setMinutes(0); + d.setSeconds(0); + date = d.getTime(); + } + v.setTag(date); + TextView label = (TextView) v.findViewById(R.id.alarm_string); + label.setText(pickerDialog.getDisplayString(activity, date)); + } + } + + @Override + public void onDateAndTimeCancelled() { + // Do nothing + } + }); + pickerDialog.show(); + } + }); + + alertItem.setTag(alert.getTime()); + TextView display = (TextView) alertItem.findViewById(R.id.alarm_string); + display.setText(pickerDialog.getDisplayString(activity, alert.getTime())); ImageButton reminderRemoveButton; reminderRemoveButton = (ImageButton)alertItem.findViewById(R.id.button1); diff --git a/astrid/res/color/task_edit_toggle_button_text.xml b/astrid/res/color/task_edit_toggle_button_text.xml new file mode 100644 index 000000000..b0b7280af --- /dev/null +++ b/astrid/res/color/task_edit_toggle_button_text.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_bottom.xml b/astrid/res/drawable/date_shortcut_bottom.xml new file mode 100644 index 000000000..aba6749ee --- /dev/null +++ b/astrid/res/drawable/date_shortcut_bottom.xml @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/astrid/res/drawable/date_shortcut_bottom_off.xml b/astrid/res/drawable/date_shortcut_bottom_off.xml new file mode 100644 index 000000000..bb7c79961 --- /dev/null +++ b/astrid/res/drawable/date_shortcut_bottom_off.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_bottom_on.xml b/astrid/res/drawable/date_shortcut_bottom_on.xml new file mode 100644 index 000000000..1c96f52de --- /dev/null +++ b/astrid/res/drawable/date_shortcut_bottom_on.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_middle.xml b/astrid/res/drawable/date_shortcut_middle.xml new file mode 100644 index 000000000..33c5f98ba --- /dev/null +++ b/astrid/res/drawable/date_shortcut_middle.xml @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/astrid/res/drawable/date_shortcut_middle_off.xml b/astrid/res/drawable/date_shortcut_middle_off.xml new file mode 100644 index 000000000..8a8c5d485 --- /dev/null +++ b/astrid/res/drawable/date_shortcut_middle_off.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_middle_on.xml b/astrid/res/drawable/date_shortcut_middle_on.xml new file mode 100644 index 000000000..65556cfc9 --- /dev/null +++ b/astrid/res/drawable/date_shortcut_middle_on.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_standalone.xml b/astrid/res/drawable/date_shortcut_standalone.xml new file mode 100644 index 000000000..412447409 --- /dev/null +++ b/astrid/res/drawable/date_shortcut_standalone.xml @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/astrid/res/drawable/date_shortcut_standalone_off.xml b/astrid/res/drawable/date_shortcut_standalone_off.xml new file mode 100644 index 000000000..6e0794a2f --- /dev/null +++ b/astrid/res/drawable/date_shortcut_standalone_off.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_standalone_on.xml b/astrid/res/drawable/date_shortcut_standalone_on.xml new file mode 100644 index 000000000..9c264a623 --- /dev/null +++ b/astrid/res/drawable/date_shortcut_standalone_on.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_top.xml b/astrid/res/drawable/date_shortcut_top.xml new file mode 100644 index 000000000..e0b4cb721 --- /dev/null +++ b/astrid/res/drawable/date_shortcut_top.xml @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/astrid/res/drawable/date_shortcut_top_off.xml b/astrid/res/drawable/date_shortcut_top_off.xml new file mode 100644 index 000000000..c07951b08 --- /dev/null +++ b/astrid/res/drawable/date_shortcut_top_off.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_top_on.xml b/astrid/res/drawable/date_shortcut_top_on.xml new file mode 100644 index 000000000..605440c02 --- /dev/null +++ b/astrid/res/drawable/date_shortcut_top_on.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_bl.xml b/astrid/res/drawable/deadline_timepicker_button_bl.xml new file mode 100644 index 000000000..d477daf4b --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_bl.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/astrid/res/drawable/deadline_timepicker_button_bl_off.xml b/astrid/res/drawable/deadline_timepicker_button_bl_off.xml new file mode 100644 index 000000000..b742333c3 --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_bl_off.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_bl_on.xml b/astrid/res/drawable/deadline_timepicker_button_bl_on.xml new file mode 100644 index 000000000..9f8a08644 --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_bl_on.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_br.xml b/astrid/res/drawable/deadline_timepicker_button_br.xml new file mode 100644 index 000000000..3d7b3ec91 --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_br.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/astrid/res/drawable/deadline_timepicker_button_br_off.xml b/astrid/res/drawable/deadline_timepicker_button_br_off.xml new file mode 100644 index 000000000..7936a0e2c --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_br_off.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_br_on.xml b/astrid/res/drawable/deadline_timepicker_button_br_on.xml new file mode 100644 index 000000000..81bbc26f7 --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_br_on.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_tl.xml b/astrid/res/drawable/deadline_timepicker_button_tl.xml new file mode 100644 index 000000000..47390f5ae --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_tl.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/astrid/res/drawable/deadline_timepicker_button_tl_off.xml b/astrid/res/drawable/deadline_timepicker_button_tl_off.xml new file mode 100644 index 000000000..c99cd5a77 --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_tl_off.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_tl_on.xml b/astrid/res/drawable/deadline_timepicker_button_tl_on.xml new file mode 100644 index 000000000..264876304 --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_tl_on.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_tr.xml b/astrid/res/drawable/deadline_timepicker_button_tr.xml new file mode 100644 index 000000000..4e1df4b2f --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_tr.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/astrid/res/drawable/deadline_timepicker_button_tr_off.xml b/astrid/res/drawable/deadline_timepicker_button_tr_off.xml new file mode 100644 index 000000000..bf230d1d3 --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_tr_off.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_tr_on.xml b/astrid/res/drawable/deadline_timepicker_button_tr_on.xml new file mode 100644 index 000000000..7fb8fe038 --- /dev/null +++ b/astrid/res/drawable/deadline_timepicker_button_tr_on.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/icn_arrow_down.png b/astrid/res/drawable/icn_arrow_down.png new file mode 100644 index 0000000000000000000000000000000000000000..3ffbaac88efaa8fea191e77b4682126b9e86855a GIT binary patch literal 1575 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 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/members_arrow_white.xml b/astrid/res/drawable/members_arrow_white.xml index 254a95923..7be341d28 100644 --- a/astrid/res/drawable/members_arrow_white.xml +++ b/astrid/res/drawable/members_arrow_white.xml @@ -17,7 +17,7 @@ + android:state_focused="false" android:drawable="@drawable/icn_arrow_right" /> + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/timepicker_am_btn.xml b/astrid/res/drawable/timepicker_am_btn.xml new file mode 100644 index 000000000..8caf019f1 --- /dev/null +++ b/astrid/res/drawable/timepicker_am_btn.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/astrid/res/drawable/timepicker_am_btn_off.xml b/astrid/res/drawable/timepicker_am_btn_off.xml new file mode 100644 index 000000000..ec0fb1656 --- /dev/null +++ b/astrid/res/drawable/timepicker_am_btn_off.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/timepicker_am_btn_on.xml b/astrid/res/drawable/timepicker_am_btn_on.xml new file mode 100644 index 000000000..a995c53bf --- /dev/null +++ b/astrid/res/drawable/timepicker_am_btn_on.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/timepicker_pm_btn.xml b/astrid/res/drawable/timepicker_pm_btn.xml new file mode 100644 index 000000000..b49dbdee3 --- /dev/null +++ b/astrid/res/drawable/timepicker_pm_btn.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/astrid/res/drawable/timepicker_pm_btn_off.xml b/astrid/res/drawable/timepicker_pm_btn_off.xml new file mode 100644 index 000000000..5eb343d93 --- /dev/null +++ b/astrid/res/drawable/timepicker_pm_btn_off.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/timepicker_pm_btn_on.xml b/astrid/res/drawable/timepicker_pm_btn_on.xml new file mode 100644 index 000000000..281a42b9e --- /dev/null +++ b/astrid/res/drawable/timepicker_pm_btn_on.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/layout-land/date_time_picker.xml b/astrid/res/layout-land/date_time_picker.xml new file mode 100644 index 000000000..0645a0023 --- /dev/null +++ b/astrid/res/layout-land/date_time_picker.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/astrid/res/layout/alarm_edit_row.xml b/astrid/res/layout/alarm_edit_row.xml index 7b51c4911..44f5fe563 100644 --- a/astrid/res/layout/alarm_edit_row.xml +++ b/astrid/res/layout/alarm_edit_row.xml @@ -15,25 +15,38 @@ --> - -