From 357fd6950669a52d8093100c8d1b31f4770c6087 Mon Sep 17 00:00:00 2001
From: Doug Keen <dougkeen@gmail.com>
Date: Sat, 26 Jan 2013 13:01:44 -0800
Subject: [PATCH] Added departure clock time

---
 res/layout/departure_listing.xml              |  5 ++--
 res/values/styles.xml                         |  3 ++-
 .../bart/data/DepartureArrayAdapter.java      | 26 +++++++++++++++----
 .../bart/data/FavoritesArrayAdapter.java      |  5 +++-
 src/com/dougkeen/bart/model/Departure.java    |  9 +++++++
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/res/layout/departure_listing.xml b/res/layout/departure_listing.xml
index 850129d..c4f3028 100644
--- a/res/layout/departure_listing.xml
+++ b/res/layout/departure_listing.xml
@@ -54,10 +54,11 @@
         android:layout_toRightOf="@id/destinationColorBar"
         bart:tickInterval="1" />
 
-    <TextView
+    <com.dougkeen.bart.controls.TimedTextSwitcher
         android:id="@+id/uncertainty"
         style="@style/DepartureUncertaintyText"
         android:layout_alignParentRight="true"
-        android:layout_below="@id/topRow" />
+        android:layout_below="@id/topRow"
+        bart:tickInterval="1" />
 
 </merge>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 650bdaf..f322d55 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -82,10 +82,11 @@
     </style>
 
     <style name="DepartureUncertaintyText">
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">80dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">16dp</item>
         <item name="android:singleLine">true</item>
+        <item name="android:gravity">right</item>
     </style>
 
     <style name="MissingDepartureText">
diff --git a/src/com/dougkeen/bart/data/DepartureArrayAdapter.java b/src/com/dougkeen/bart/data/DepartureArrayAdapter.java
index ff4a0bc..0317fd8 100644
--- a/src/com/dougkeen/bart/data/DepartureArrayAdapter.java
+++ b/src/com/dougkeen/bart/data/DepartureArrayAdapter.java
@@ -75,7 +75,7 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
 
 		TimedTextSwitcher textSwitcher = (TimedTextSwitcher) view
 				.findViewById(R.id.trainLengthText);
-		initTextSwitcher(textSwitcher);
+		initTextSwitcher(textSwitcher, R.layout.train_length_arrival_textview);
 
 		final String arrivesAtDestinationPrefix = getContext().getString(
 				R.string.arrives_at_destination);
@@ -118,8 +118,23 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
 				return departure.getCountdownText();
 			}
 		});
-		((TextView) view.findViewById(R.id.uncertainty)).setText(departure
-				.getUncertaintyText());
+
+		TimedTextSwitcher uncertaintySwitcher = (TimedTextSwitcher) view
+				.findViewById(R.id.uncertainty);
+		initTextSwitcher(uncertaintySwitcher, R.layout.uncertainty_textview);
+
+		uncertaintySwitcher.setTextProvider(new TextProvider() {
+			@Override
+			public String getText(long tickNumber) {
+				if (tickNumber % 4 == 0) {
+					return departure.getUncertaintyText();
+				} else {
+					return departure
+							.getEstimatedDepartureTimeText(getContext());
+				}
+			}
+		});
+
 		if (departure.isBikeAllowed()) {
 			((ImageView) view.findViewById(R.id.bikeIcon))
 					.setVisibility(View.VISIBLE);
@@ -138,12 +153,13 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
 		return view;
 	}
 
-	private void initTextSwitcher(TextSwitcher textSwitcher) {
+	private void initTextSwitcher(TextSwitcher textSwitcher,
+			final int layoutView) {
 		if (textSwitcher.getInAnimation() == null) {
 			textSwitcher.setFactory(new ViewFactory() {
 				public View makeView() {
 					return LayoutInflater.from(getContext()).inflate(
-							R.layout.train_length_arrival_textview, null);
+							layoutView, null);
 				}
 			});
 
diff --git a/src/com/dougkeen/bart/data/FavoritesArrayAdapter.java b/src/com/dougkeen/bart/data/FavoritesArrayAdapter.java
index 4212470..700a3bd 100644
--- a/src/com/dougkeen/bart/data/FavoritesArrayAdapter.java
+++ b/src/com/dougkeen/bart/data/FavoritesArrayAdapter.java
@@ -196,8 +196,11 @@ public class FavoritesArrayAdapter extends ArrayAdapter<StationPair> {
 			uncertaintyTextSwitcher.setTextProvider(new TextProvider() {
 				@Override
 				public String getText(long tickNumber) {
-					if (tickNumber % 4 <= 1) {
+					if (tickNumber % 6 <= 1) {
 						return pair.getFare();
+					} else if (tickNumber % 6 <= 3) {
+						return etdListener.getFirstDeparture()
+								.getEstimatedDepartureTimeText(getContext());
 					} else {
 						return etdListener.getFirstDeparture()
 								.getUncertaintyText();
diff --git a/src/com/dougkeen/bart/model/Departure.java b/src/com/dougkeen/bart/model/Departure.java
index 5b7b3cf..c40582f 100644
--- a/src/com/dougkeen/bart/model/Departure.java
+++ b/src/com/dougkeen/bart/model/Departure.java
@@ -315,6 +315,15 @@ public class Departure implements Parcelable, Comparable<Departure> {
 		}
 	}
 
+	public String getEstimatedDepartureTimeText(Context context) {
+		if (getMeanEstimate() > 0) {
+			return DateFormat.getTimeFormat(context).format(
+					new Date(getMeanEstimate()));
+		} else {
+			return "";
+		}
+	}
+
 	public boolean hasDeparted() {
 		return getMeanSecondsLeft() <= 0;
 	}