Make pickers start at the displayed value

[unical.git] / src / ro / ieval / unical / AddEventActivity.java

diff --git a/src/ro/ieval/unical/AddEventActivity.java b/src/ro/ieval/unical/AddEventActivity.java
index 8b806565d85f04b367209867f6edc43640f9ded1..512b6895e786523fc597a19e88c6f6ddfc1cdc94 100644 (file)
--- a/src/ro/ieval/unical/AddEventActivity.java
+++ b/src/ro/ieval/unical/AddEventActivity.java
@@ -93,10 +93,24 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
 
     public void showDateTimePickerDialog(final View v) {
                dateTimeTextView=(TextView) v;
-               if(v.getId()==R.id.date_start || v.getId()==R.id.date_end || v.getId() == R.id.repeat_until)
-                       new DatePickerFragment().show(getFragmentManager(), "datePicker");
-               else
-                       new TimePickerFragment().show(getFragmentManager(), "timePicker");
+               if(v.getId()==R.id.date_start || v.getId()==R.id.date_end || v.getId() == R.id.repeat_until){
+                       final String[] parts = dateTimeTextView.getText().toString().split("-");
+                       final DatePickerFragment fragment = new DatePickerFragment();
+                       final Bundle args = new Bundle();
+                       args.putInt(DatePickerFragment.ARGUMENT_YEAR, Integer.parseInt(parts[0]));
+                       args.putInt(DatePickerFragment.ARGUMENT_MONTH, Integer.parseInt(parts[1]));
+                       args.putInt(DatePickerFragment.ARGUMENT_DAY, Integer.parseInt(parts[2]));
+                       fragment.setArguments(args);
+                       fragment.show(getFragmentManager(), "datePicker");
+               } else {
+                       final String[] parts = dateTimeTextView.getText().toString().split(":");
+                       final TimePickerFragment fragment = new TimePickerFragment();
+                       final Bundle args = new Bundle();
+                       args.putInt(TimePickerFragment.ARGUMENT_HOUR, Integer.parseInt(parts[0]));
+                       args.putInt(TimePickerFragment.ARGUMENT_MINUTE, Integer.parseInt(parts[1]));
+                       fragment.setArguments(args);
+                       fragment.show(getFragmentManager(), "timePicker");
+               }
        }
 
        @Override