X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=798adc68a53d5e0608397b89e46df7e2b4754302;hb=070d3ab2d6f382ab74988df71eba137424df525f;hp=df885caa7c7afd8885df32589f0a0e03062cd5fd;hpb=8a08d036704efadbfcd4f7c4be1721f915d929c9;p=unical.git diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java index df885ca..798adc6 100644 --- a/src/ro/ieval/unical/DisplayEventActivity.java +++ b/src/ro/ieval/unical/DisplayEventActivity.java @@ -28,37 +28,37 @@ public class DisplayEventActivity extends Activity { final Event e=getIntent().getParcelableExtra(EXTRA_EVENT); setContentView(R.layout.event_view); 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("E", Locale.UK); - + final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK); + startDay.setText(dayOfWeekFormat.format(start)); - if(dayOfWeekFormat.format(start)!=dayOfWeekFormat.format(end)) + if(dateFormat.format(start)!=dateFormat.format(end)) { endDay.setText(dayOfWeekFormat.format(end)); - startDate.setText(dateFormat.format(start)); - if(dateFormat.format(start)!=dateFormat.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); return true; } - + @Override public boolean onOptionsItemSelected(final MenuItem item) { // Handle item selection