Removes repeat layout. Format date now works correctly

[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 373c4f9088053009a087e8e11c544785d212428d..b86dd77c30e6dc4e73a7403c6f3c801a4ed1c764 100644 (file)
--- a/src/ro/ieval/unical/AddEventActivity.java
+++ b/src/ro/ieval/unical/AddEventActivity.java
@@ -26,55 +26,6 @@ import android.widget.*;
 
 public final class AddEventActivity extends Activity implements OnDateSetListener, OnTimeSetListener{
 
-    private class OnCheckedChangeListener implements android.widget.CompoundButton.OnCheckedChangeListener{
-        private final LinearLayout layout;
-        public OnCheckedChangeListener(final LinearLayout layout){
-            this.layout=layout;
-        }
-
-        private class OnItemSelectedListener implements android.widget.AdapterView.OnItemSelectedListener{
-            private final View repeatCount;
-            private final View repeatUntil;
-
-            public OnItemSelectedListener(final View repeatCount, final View repeatUntil) {
-                this.repeatCount=repeatCount;
-                this.repeatUntil=repeatUntil;
-            }
-
-            @Override
-            public void onItemSelected(final AdapterView<?> whatever, final View ignored, final int pos, final long id) {
-                switch(pos){
-                    case 0:
-                        repeatCount.setVisibility(View.GONE);
-                        repeatUntil.setVisibility(View.GONE);
-                        break;
-                    case 1:
-                        repeatCount.setVisibility(View.GONE);
-                        repeatUntil.setVisibility(View.VISIBLE);
-                        break;
-                    case 2:
-                        repeatCount.setVisibility(View.VISIBLE);
-                        repeatUntil.setVisibility(View.GONE);
-                        break;
-                    default:
-                }
-            }
-
-            @Override public void onNothingSelected(final AdapterView<?> arg0) { /* do nothing */      }
-        }
-
-        @Override
-        public void onCheckedChanged(final CompoundButton buttonView, final boolean isChecked) {
-            if(isChecked) {
-                Utils.setEnabledRecursively(layout, true);
-                final Spinner repeatType = (Spinner) findViewById(R.id.repeat_type);
-                repeatType.setOnItemSelectedListener(new OnItemSelectedListener(findViewById(R.id.repeat_count),findViewById(R.id.repeat_until)));
-            }else {
-                Utils.setEnabledRecursively(layout, false);
-            }
-        }
-    }
-
        private TextView dateTimeTextView;
     public static final String EXTRA_EVENT = "event";
     private static Event event=new Event();
@@ -95,13 +46,8 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
                final ActionBar actionBar = getActionBar();
                setContentView(R.layout.add_event);
 
-               final LinearLayout layout = (LinearLayout) findViewById(R.id.repeat_layout);
-               final Switch repeatSwitch = (Switch) findViewById(R.id.repeat_switch);
-               Utils.setEnabledRecursively(layout, false);
-
-               repeatSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener(layout));
-
                final EditText title = (EditText) findViewById(R.id.eventtitle);
+        title.requestFocus();
                title.setText(event.title);
 
                final TextView tstart = (TextView) findViewById(R.id.time_start);
@@ -163,8 +109,8 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
                                finish();
                                return true;
             case R.id.save:
-
-                if(event.title!=null) event.delete(this);
+                boolean edit=false;
+                if(event.title!=null) edit=true;
                 event.title=((EditText)findViewById(R.id.eventtitle)).getText().toString();
                 String start=((TextView)findViewById(R.id.date_start)).getText().toString()+ " " +((TextView)findViewById(R.id.time_start)).getText().toString();
                 String end=((TextView)findViewById(R.id.date_end)).getText().toString()+ " "+((TextView)findViewById(R.id.time_end)).getText().toString();
@@ -173,7 +119,7 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
                     Date s=new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(start);
                     Date e=new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(end);
                     event.dtstart=s.getTime();
-                    event.dtend=s.getTime();
+                    event.dtend=e.getTime();
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -181,8 +127,13 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
                 event.description=((EditText) findViewById(R.id.description)).getText().toString();
 
                 if(!Event.calendarCreated)createCalendar();
+                if(event.calendarID!=Event.getUnicalId(this)) {
+                    edit=false;
+                    event.delete(this);
+                }
                 event.calendarID=Event.getUnicalId(this);
-                event.insert(this);
+                if(!edit) event.insert(this);
+                else event.edit(this);
 
                 Toast toast = Toast.makeText(getApplicationContext(),"Event saved!",Toast.LENGTH_LONG);
                 toast.show();
@@ -195,7 +146,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 || v.getId() == R.id.repeat_until){
+               if(v.getId()==R.id.date_start || v.getId()==R.id.date_end ){
                        final String[] parts = dateTimeTextView.getText().toString().split("-");
                        final DatePickerFragment fragment = new DatePickerFragment();
                        final Bundle args = new Bundle();
@@ -219,7 +170,7 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
        public void onTimeSet(final TimePicker picker, final int hour, final int 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));
+                       ((TextView)findViewById(R.id.time_end)).setText(String.format("%02d:%02d",hour,minute));
        }
 
        @Override