From 4b73212c6ef626f62f1f7ae091dae47afdf31b5a Mon Sep 17 00:00:00 2001 From: Andy Doan Date: Tue, 25 Oct 2011 12:23:54 -0500 Subject: provide a better time format for schedule items --- src/org/linaro/connect/ScheduleActivity.java | 2 +- src/org/linaro/connect/sched/ScheduleItem.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/org/linaro/connect/ScheduleActivity.java b/src/org/linaro/connect/ScheduleActivity.java index 0e13f3c..bf3d624 100644 --- a/src/org/linaro/connect/ScheduleActivity.java +++ b/src/org/linaro/connect/ScheduleActivity.java @@ -116,7 +116,7 @@ public class ScheduleActivity extends Activity { public View getView(int position, View convertView, ViewGroup parent) { View v = super.getView(position, convertView, parent); ScheduleItem si = getItem(position); - setTextView(v, R.id.schedule_time, si.getStartTime()); + setTextView(v, R.id.schedule_time, si.getStartTime(mFilter)); return v; } diff --git a/src/org/linaro/connect/sched/ScheduleItem.java b/src/org/linaro/connect/sched/ScheduleItem.java index debf206..b9cf2cc 100644 --- a/src/org/linaro/connect/sched/ScheduleItem.java +++ b/src/org/linaro/connect/sched/ScheduleItem.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Serializable; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -62,8 +63,19 @@ public class ScheduleItem implements Serializable { return new Date(t.toMillis(false)); } - public String getStartTime() { - return getDate("DTSTART").toLocaleString(); + /** + * If a filter is provided and the dayofweek != -1, it will only display + * the time and not the date + */ + public String getStartTime(Filter f) { + String fmt = "E HH:mm"; + Date d = getDate("DTSTART"); + + if(f != null && f.dayOfWeek != -1) + fmt = "HH:mm"; + + SimpleDateFormat sdf = new SimpleDateFormat(fmt); + return sdf.format(d); } @Override -- cgit v1.2.3