From b652b491bdcf511e1947297118c2bc098e8c20ae Mon Sep 17 00:00:00 2001
From: Doug Keen <dougkeen@gmail.com>
Date: Mon, 25 Mar 2013 12:48:46 -0700
Subject: [PATCH] Departure listing adapts to screen size

---
 res/drawable/basic_rectangle.xml              |  6 +-
 res/layout-h480dp/departure_listing.xml       | 76 +++++++++++++++
 res/layout/departure_listing.xml              |  2 +-
 res/layout/your_train.xml                     |  2 +-
 .../bart/data/DepartureArrayAdapter.java      | 93 ++++++++++++-------
 5 files changed, 139 insertions(+), 40 deletions(-)
 create mode 100644 res/layout-h480dp/departure_listing.xml

diff --git a/res/drawable/basic_rectangle.xml b/res/drawable/basic_rectangle.xml
index abb8504..57c7709 100644
--- a/res/drawable/basic_rectangle.xml
+++ b/res/drawable/basic_rectangle.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<size android:height="45dp" android:width="15dp" />
+    android:shape="rectangle" >
+
+    <size android:width="15dp" />
+
 </shape>
\ No newline at end of file
diff --git a/res/layout-h480dp/departure_listing.xml b/res/layout-h480dp/departure_listing.xml
new file mode 100644
index 0000000..1d2a2e9
--- /dev/null
+++ b/res/layout-h480dp/departure_listing.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bart="http://schemas.android.com/apk/res/com.dougkeen.bart"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <ImageView
+        android:id="@+id/destinationColorBar"
+        android:layout_width="wrap_content"
+        android:layout_height="64dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:src="@drawable/basic_rectangle" />
+
+    <LinearLayout
+        android:id="@+id/topRow"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@id/destinationColorBar" >
+
+        <TextView
+            android:id="@+id/destinationText"
+            style="@style/DepartureDestinationText"
+            android:layout_weight="1"
+            android:ellipsize="marquee"
+            android:singleLine="true" />
+
+        <ImageView
+            android:id="@+id/bikeIcon"
+            style="@style/BikeIcon" />
+
+        <com.dougkeen.bart.controls.CountdownTextView
+            android:id="@+id/countdown"
+            style="@style/DepartureCountdownText"
+            android:gravity="right"
+            android:width="90dp"
+            bart:tickInterval="1" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/xferIcon"
+        style="@style/XferIcon"
+        android:layout_alignParentRight="true"
+        android:layout_below="@id/topRow"
+        android:src="@drawable/xfer" />
+
+    <TextView
+        android:id="@+id/trainLengthText"
+        style="@style/DepartureUncertaintyText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/topRow"
+        android:layout_toRightOf="@id/destinationColorBar" />
+
+    <TextView
+        android:id="@+id/uncertainty"
+        style="@style/DepartureUncertaintyText"
+        android:layout_alignParentRight="true"
+        android:layout_below="@id/topRow" />
+
+    <TextView
+        android:id="@+id/estimatedArrival"
+        style="@style/DepartureUncertaintyText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/trainLengthText"
+        android:layout_toRightOf="@id/destinationColorBar" />
+
+    <TextView
+        android:id="@+id/departureTime"
+        style="@style/DepartureUncertaintyText"
+        android:layout_alignParentRight="true"
+        android:layout_below="@id/uncertainty" />
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/departure_listing.xml b/res/layout/departure_listing.xml
index 4c5f95b..0b08e13 100644
--- a/res/layout/departure_listing.xml
+++ b/res/layout/departure_listing.xml
@@ -7,7 +7,7 @@
     <ImageView
         android:id="@+id/destinationColorBar"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="45dp"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:src="@drawable/basic_rectangle" />
diff --git a/res/layout/your_train.xml b/res/layout/your_train.xml
index bf1873e..a22ed75 100644
--- a/res/layout/your_train.xml
+++ b/res/layout/your_train.xml
@@ -28,7 +28,7 @@
     <ImageView
         android:id="@+id/yourTrainDestinationColorBar"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="45dp"
         android:layout_alignParentLeft="true"
         android:layout_below="@id/yourTrainHeader"
         android:src="@drawable/basic_rectangle" />
diff --git a/src/com/dougkeen/bart/data/DepartureArrayAdapter.java b/src/com/dougkeen/bart/data/DepartureArrayAdapter.java
index b54dc76..5468b9c 100644
--- a/src/com/dougkeen/bart/data/DepartureArrayAdapter.java
+++ b/src/com/dougkeen/bart/data/DepartureArrayAdapter.java
@@ -89,37 +89,48 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
 		((TextView) view.findViewById(R.id.destinationText)).setText(departure
 				.getTrainDestination().toString());
 
-		TimedTextSwitcher textSwitcher = (TimedTextSwitcher) view
-				.findViewById(R.id.trainLengthText);
-		initTextSwitcher(textSwitcher, R.layout.train_length_arrival_textview);
-
 		final String arrivesAtDestinationPrefix = getContext().getString(
 				R.string.arrives_at_destination);
 		final String estimatedArrivalTimeText = departure
 				.getEstimatedArrivalTimeText(getContext());
-		if (!StringUtils.isBlank(estimatedArrivalTimeText)) {
-			textSwitcher.setCurrentText(arrivesAtDestinationPrefix
+
+		TextView estimatedArrival = (TextView) view
+				.findViewById(R.id.estimatedArrival);
+		if (estimatedArrival != null) {
+			((TextView) view.findViewById(R.id.trainLengthText))
+					.setText(departure.getTrainLengthText());
+			estimatedArrival.setText(arrivesAtDestinationPrefix
 					+ estimatedArrivalTimeText);
 		} else {
-			textSwitcher.setCurrentText(departure.getTrainLengthText());
-		}
-		textSwitcher.setTextProvider(new TextProvider() {
-			@Override
-			public String getText(long tickNumber) {
-				if (tickNumber % 4 == 0) {
-					return departure.getTrainLengthText();
-				} else {
-					final String estimatedArrivalTimeText = departure
-							.getEstimatedArrivalTimeText(getContext());
-					if (StringUtils.isBlank(estimatedArrivalTimeText)) {
-						return "";
+			TimedTextSwitcher textSwitcher = (TimedTextSwitcher) view
+					.findViewById(R.id.trainLengthText);
+			initTextSwitcher(textSwitcher,
+					R.layout.train_length_arrival_textview);
+
+			if (!StringUtils.isBlank(estimatedArrivalTimeText)) {
+				textSwitcher.setCurrentText(arrivesAtDestinationPrefix
+						+ estimatedArrivalTimeText);
+			} else {
+				textSwitcher.setCurrentText(departure.getTrainLengthText());
+			}
+			textSwitcher.setTextProvider(new TextProvider() {
+				@Override
+				public String getText(long tickNumber) {
+					if (tickNumber % 4 == 0) {
+						return departure.getTrainLengthText();
 					} else {
-						return arrivesAtDestinationPrefix
-								+ estimatedArrivalTimeText;
+						final String estimatedArrivalTimeText = departure
+								.getEstimatedArrivalTimeText(getContext());
+						if (StringUtils.isBlank(estimatedArrivalTimeText)) {
+							return "";
+						} else {
+							return arrivesAtDestinationPrefix
+									+ estimatedArrivalTimeText;
+						}
 					}
 				}
-			}
-		});
+			});
+		}
 
 		ImageView colorBar = (ImageView) view
 				.findViewById(R.id.destinationColorBar);
@@ -135,22 +146,32 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
 			}
 		});
 
-		TimedTextSwitcher uncertaintySwitcher = (TimedTextSwitcher) view
-				.findViewById(R.id.uncertainty);
-		initTextSwitcher(uncertaintySwitcher, R.layout.uncertainty_textview);
+		TextView departureTime = (TextView) view
+				.findViewById(R.id.departureTime);
 
-		uncertaintySwitcher.setTextProvider(new TextProvider() {
-			@Override
-			public String getText(long tickNumber) {
-				if (tickNumber % 4 == 0) {
-					return departure.getUncertaintyText();
-				} else {
-					return departure
-							.getEstimatedDepartureTimeText(getContext());
+		if (departureTime != null) {
+			((TextView) view.findViewById(R.id.uncertainty)).setText(departure
+					.getUncertaintyText());
+			departureTime.setText(departure
+					.getEstimatedDepartureTimeText(getContext()));
+		} else {
+			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());
+					}
 				}
-			}
-		});
-
+			});
+		}
+		
 		ImageView bikeIcon = (ImageView) view.findViewById(R.id.bikeIcon);
 		if (departure.isBikeAllowed()) {
 			bikeIcon.setImageDrawable(bikeDrawable);