From: Marius Gavrilescu Date: Wed, 21 Aug 2013 12:42:06 +0000 (+0300) Subject: Better DisplayEventActivity X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=00b0fd8e83bd390790342ebc41148f4a760d9fb4;p=unical.git Better DisplayEventActivity --- diff --git a/res/layout/event_view.xml b/res/layout/event_view.xml index 6fd935f..e4dfa8f 100644 --- a/res/layout/event_view.xml +++ b/res/layout/event_view.xml @@ -71,16 +71,33 @@ - + + + + + + 148275978690487 Title Description - Description: Log In Location Username @@ -50,6 +49,7 @@ Edit Event Add alarm Delete + Alarms Day diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java index 4f16069..18f6ef9 100644 --- a/src/ro/ieval/unical/DisplayEventActivity.java +++ b/src/ro/ieval/unical/DisplayEventActivity.java @@ -81,13 +81,16 @@ public class DisplayEventActivity extends Activity { 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(); }