Do some voodoo to fix crash

[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 606685fbd2eae228b715e1b3ac54b6ca8c113a9d..3526d653a2a56d0640bbfc5b1b02841c974f0dd9 100644 (file)
--- a/src/ro/ieval/unical/AddEventActivity.java
+++ b/src/ro/ieval/unical/AddEventActivity.java
@@ -6,18 +6,13 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.Fragment;
-import android.app.FragmentManager;
 import android.app.TimePickerDialog.OnTimeSetListener;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.DatePicker;
-import android.widget.Spinner;
-import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.TimePicker;
 
@@ -28,7 +23,7 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
        protected void onCreate(final Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
                setContentView(R.layout.add_event);
-               setTitle(R.string.addeventtitle);
+               setTitle(R.string.add_event_title);
                final ActionBar actionBar = getActionBar();
                actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
                final ActionBar.Tab t1 = actionBar.newTab().setText(this.getString(R.string.addevtab1));
@@ -57,25 +52,6 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
                actionBar.addTab(t1);
                actionBar.addTab(t2);
                actionBar.addTab(t3);
-
-               handleViews(f1,f2,f3);
-
-       }
-
-       private void handleViews(Fragment f1,Fragment f2,Fragment f3) {
-               Switch repeatSwitch = (Switch) this.getFragmentManager().findFragmentById(f1.getId()).getView().findViewById(R.id.repeat_switch);
-               final Spinner repeatSpinner = (Spinner) this.getFragmentManager().findFragmentById(f1.getId()).getView().findViewById(R.id.repeat_spinner);
-               repeatSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-
-                       @Override
-                       public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                               if(isChecked) {
-                                       repeatSpinner.setEnabled(true);
-                               }else {
-                                       repeatSpinner.setEnabled(false);
-                               }
-                       }
-               });
        }
 
        @Override
@@ -98,7 +74,7 @@ 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)
+               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");
@@ -106,7 +82,7 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
 
        @Override
        public void onTimeSet(final TimePicker picker, final int hour, final int minute) {
-               dateTimeTextView.setText(String.format("%2d:%2d",hour,minute));
+               dateTimeTextView.setText(String.format("%02d:%02d",hour,minute));
                if(dateTimeTextView.getId() == R.id.time_start)
                        ((TextView)findViewById(R.id.time_end)).setText(String.format("%2d:%2d",hour,minute));
        }
@@ -114,9 +90,9 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
        @Override
        public void onDateSet(final DatePicker picker, final int year, final int monthOfYear, final int dayOfMonth) {
                final Calendar calendar=new GregorianCalendar(year, monthOfYear, dayOfMonth);
-               dateTimeTextView.setText(String.format("%4d-%2d-%2d", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)));
+               dateTimeTextView.setText(Utils.formatDate(year, monthOfYear, dayOfMonth));
                calendar.add(Calendar.DAY_OF_MONTH, 1);
                if(dateTimeTextView.getId() == R.id.date_start)
-                       ((TextView)findViewById(R.id.date_end)).setText(String.format("%4d-%2d-%2d", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)));
+                       ((TextView)findViewById(R.id.date_end)).setText(Utils.formatDate(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)));
        }
 }