X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=906ed5cddf77e7118f4f851469fefdbfdda71078;hb=dc52b2617d80acc8b1c82a96f2fcb4fb8de7885c;hp=bb819b9eb51558facca7f6844b3da8c5fd48b4fe;hpb=650b76aaadffdbf0481faa97340a8b500c7d8469;p=unical.git

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index bb819b9..906ed5c 100644
--- 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);
@@ -45,7 +46,7 @@ public class DisplayEventActivity extends Activity {
 		final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
 
 		startDay.setText(dayOfWeekFormat.format(start));
-		if(dateFormat.format(start)!=dateFormat.format(end)) {
+		if(!dateFormat.format(start).equals(dateFormat.format(end))) {
 			endDay.setText(dayOfWeekFormat.format(end));
 			endDate.setText(dateFormat.format(end));
 		}
@@ -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,20 +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;
-			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;
 		}
 	}
 }