Remove trailing whitespace

[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 8b8a767afdb805c586d7bac200378fa9e14c7b5e..798adc68a53d5e0608397b89e46df7e2b4754302 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -1,6 +1,8 @@
 package ro.ieval.unical;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 import android.app.Activity;
 import android.content.Context;
@@ -15,7 +17,6 @@ public class DisplayEventActivity extends Activity {
        public static final String EXTRA_EVENT = "event";
 
        public static void displayEvent(final Context context, final Event event){
-               System.out.println("Muie");
                final Intent i=new Intent(context,DisplayEventActivity.class);
                i.putExtra(DisplayEventActivity.EXTRA_EVENT, event);
                context.startActivity(i);
@@ -26,43 +27,56 @@ public class DisplayEventActivity extends Activity {
                super.onCreate(savedInstanceState);
                final Event e=getIntent().getParcelableExtra(EXTRA_EVENT);
                setContentView(R.layout.event_view);
-               
-           final TextView eventTitle= (TextView) findViewById(R.id.eventTitle);
-               final TextView date=(TextView) findViewById(R.id.date);
-               final TextView description=(TextView) findViewById(R.id.description);
-               final TextView location= (TextView) findViewById(R.id.location);
-               
-               eventTitle.setText(e.title);
-               date.setText(new Date(e.dtstart).toString());
-               description.setText(e.description);
-               location.setText(e.eventLocation);
+               setTitle(e.title);
+
+               final TextView startDay= (TextView) findViewById(R.id.startday);
+               final TextView endDay= (TextView) findViewById(R.id.endday);
+               final TextView startDate= (TextView) findViewById(R.id.startdate);
+               final TextView endDate= (TextView) findViewById(R.id.enddate);
+               final TextView startTime= (TextView) findViewById(R.id.starttime);
+               final TextView endTime= (TextView) findViewById(R.id.endtime);
+
+               final Date start=new Date(e.dtstart);
+               final Date end=new Date(e.dtend);
+               final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy", Locale.UK);
+               final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.UK);
+               final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
+
+               startDay.setText(dayOfWeekFormat.format(start));
+               if(dateFormat.format(start)!=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));
        }
-       
+
        @Override
        public boolean onCreateOptionsMenu(final Menu menu) {
                final MenuInflater inflater = getMenuInflater();
-           inflater.inflate(R.menu.event, menu);
+               inflater.inflate(R.menu.event, menu);
                return true;
        }
-       
+
        @Override
        public boolean onOptionsItemSelected(final MenuItem item) {
-           // Handle item selection
-           switch (item. getItemId()) {
-               case R.id.NewEvent:
-                       final Intent i=new Intent(this,AddEventActivity.class);
+               // 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();
-                       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;
-           }
+                               return true;
+                       case R.id.deleteevent:
+                               final DeleteEventDialog d=new DeleteEventDialog();
+                               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;
+               }
        }
 }