X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=dd2b3bacd16a38d3dd328015009ad5af9ebaa782;hb=93afae01c0ef25230caa144d35e49a9ae29fa62d;hp=0bff03217f7a9a15003b59b921548608e960063c;hpb=539deec9aa94ea7b7736b7597d9470a18204d7f8;p=unical.git

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 0bff032..dd2b3ba 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -1,5 +1,6 @@
 package ro.ieval.unical;
 
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -14,10 +15,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.TextView;
+import android.widget.*;
 
 public class DisplayEventActivity extends Activity {
 	private final class DeleteListener implements View.OnClickListener {
@@ -43,9 +41,9 @@ public class DisplayEventActivity extends Activity {
 					final LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 					final View rowView = inflater.inflate(R.layout.alarm_row_layout, parent, false);
 					final TextView date = (TextView) rowView.findViewById(R.id.alarm_datetime);
-					final Button delete = (Button) rowView.findViewById(R.id.alarm_delete);
+					final ImageButton delete = (ImageButton) rowView.findViewById(R.id.alarm_delete);
 					delete.setOnClickListener(new DeleteListener(getItem(position)));
-					date.setText(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.UK).format(getItem(position)));
+					date.setText(DateFormat.getDateTimeInstance().format(getItem(position)));
 
 					return rowView;
 				}
@@ -75,18 +73,21 @@ public class DisplayEventActivity extends Activity {
 
 		final Date start=new Date(event.dtstart);
 		final Date end=new Date(event.dtend);
-		final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.UK);
-		final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.UK);
-		final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
+		final DateFormat dateFormat = DateFormat.getDateInstance();
+		final DateFormat timeFormat = DateFormat.getTimeInstance();
+		final DateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
 
 		startDay.setText(dayOfWeekFormat.format(start));
+		startDate.setText(dateFormat.format(start));
 		if(!dateFormat.format(start).equals(dateFormat.format(end))) {
 			endDay.setText(dayOfWeekFormat.format(end));
 			endDate.setText(dateFormat.format(end));
 		}
-		startDate.setText(dateFormat.format(start));
+
 		startTime.setText(timeFormat.format(start));
-		endTime.setText(timeFormat.format(end));
+		if(!start.equals(end))
+			endTime.setText(timeFormat.format(end));
+
 		description.setText(event.description);
 		setAdapter();
 	}
@@ -108,18 +109,12 @@ public class DisplayEventActivity extends Activity {
             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(this, event);
 			return true;
 		case R.id.add_alarm:
-			final Intent intent = new Intent(this, AddAlarmActivity.class);
-			intent.putExtra(AddAlarmActivity.EXTRA_EVENT, event._id);
-            startActivity(intent);
+			AddAlarmActivity.addAlarm(this,event);
 			return true;
 		default:
 			return false;