Work on delete event to finish activity

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

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 275b2dcaf93c01f64deeb98235a5b3eeaafb1b28..906ed5cddf77e7118f4f851469fefdbfdda71078 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -16,6 +16,7 @@ import android.widget.TextView;
 public class DisplayEventActivity extends Activity {
        public static final String EXTRA_EVENT = "event";
        private Event event;
+    private final DeleteEventDialog d=new DeleteEventDialog();
 
        public static void displayEvent(final Context context, final Event event){
                final Intent i=new Intent(context,DisplayEventActivity.class);
@@ -55,6 +56,13 @@ public class DisplayEventActivity extends Activity {
                description.setText(event.description);
        }
 
+    @Override
+    protected void onResume () {
+        super.onResume();
+        if(d.deleted)
+            finish();
+    }
+
        @Override
        public boolean onCreateOptionsMenu(final Menu menu) {
                final MenuInflater inflater = getMenuInflater();
@@ -66,23 +74,25 @@ public class DisplayEventActivity extends Activity {
        public boolean onOptionsItemSelected(final MenuItem item) {
                // Handle item selection
                switch (item. getItemId()) {
-                       case R.id.NewEvent:
-                               final Intent i=new Intent(this,AddEventActivity.class);
-                               startActivity(i);
-                               return true;
-                       case R.id.deleteevent:
-                               final DeleteEventDialog d=new DeleteEventDialog(event,this);
-                               d.show(getFragmentManager(), "Delete");
-                               return true;
-                       case R.id.eventlist:
-                               final Intent it=new Intent(this,EventListActivity.class);
-                               startActivity(it);
-                               return true;
-            case R.id.edit_event:
-                AddEventActivity.editEvent(DisplayEventActivity.this,event);
-                return true;
-                       default:
-                               return true;
+               case R.id.deleteevent:
+            final Bundle b=new Bundle();
+            b.putParcelable("Event",event);
+            d.setArguments(b);
+                       d.show(getFragmentManager(), "Delete");
+
+                       return true;
+               case R.id.eventlist:
+                       final Intent it=new Intent(this,EventListActivity.class);
+                       startActivity(it);
+                       return true;
+               case R.id.edit_event:
+                       AddEventActivity.editEvent(DisplayEventActivity.this,event);
+                       return true;
+               case R.id.add_alarm:
+
+                       return true;
+               default:
+                       return true;
                }
        }
 }