X-Git-Url: http://git.ieval.ro/?p=unical.git;a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;fp=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=18f6ef9556b16ec1caabd0fff78d4abcec40ffd6;hp=4f160696bd6f3cc5aee6a0496ba3d8bb60c37174;hb=00b0fd8e83bd390790342ebc41148f4a760d9fb4;hpb=b0b2a265c93527d163e4752934961b40e34bce84 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(); }