From 2c763b3677dc3fe42b975c73238707a6707e4c56 Mon Sep 17 00:00:00 2001
From: "dkeen@dkeen-laptop" <dkeen@dkeen-laptop>
Date: Sun, 19 Feb 2012 17:46:11 -0800
Subject: [PATCH] Added bug reporting link to departures page

---
 .hgignore                                     |  1 +
 res/layout/departure_listing.xml              | 79 +++++++++++++------
 res/layout/main.xml                           | 45 ++++++++---
 res/values/strings.xml                        |  1 +
 res/values/styles.xml                         |  7 ++
 .../dougkeen/bart/ViewDeparturesActivity.java |  4 +
 6 files changed, 102 insertions(+), 35 deletions(-)

diff --git a/.hgignore b/.hgignore
index a5af426..0f92d67 100644
--- a/.hgignore
+++ b/.hgignore
@@ -2,6 +2,7 @@ syntax: glob
 bin/*
 .settings/org.eclipse.jdt.core.prefs
 project.properties
+dist/*
 syntax: regexp
 ^app_icon\.psd$
 ^bart-train\.jpg$
diff --git a/res/layout/departure_listing.xml b/res/layout/departure_listing.xml
index 44edec9..9727b8a 100644
--- a/res/layout/departure_listing.xml
+++ b/res/layout/departure_listing.xml
@@ -1,27 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent">
-	<ImageView android:id="@+id/destinationColorBar" android:src="@drawable/basic_rectangle"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:layout_alignParentLeft="true" android:layout_centerVertical="true" />
-	<LinearLayout android:id="@+id/topRow"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:layout_toRightOf="@id/destinationColorBar"
-		android:layout_alignParentTop="true">
-		<TextView android:id="@+id/destinationText" style="@style/DepartureDestinationText"
-			android:layout_weight="1" android:singleLine="true"
-			android:ellipsize="marquee" />
-		<ImageView android:id="@+id/bikeIcon" android:src="@drawable/bike"
-			style="@style/BikeIcon" />
-		<TextView android:id="@+id/countdown" style="@style/DepartureCountdownText"
-			android:gravity="right" />
-	</LinearLayout>
-	<ImageView android:id="@+id/xferIcon" android:src="@drawable/xfer"
-		android:layout_below="@id/topRow" android:layout_alignParentRight="true"
-		style="@style/XferIcon" />
-	<TextView android:id="@+id/trainLengthText" style="@style/DepartureTrainLengthText"
-		android:layout_toRightOf="@id/destinationColorBar"
-		android:layout_below="@id/topRow" />
-	<TextView android:layout_alignParentRight="true" android:id="@+id/uncertainty"
-		android:layout_below="@id/topRow" style="@style/DepartureUncertaintyText" />
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <ImageView
+        android:id="@+id/destinationColorBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        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"
+            android:src="@drawable/bike" />
+
+        <TextView
+            android:id="@+id/countdown"
+            style="@style/DepartureCountdownText"
+            android:gravity="right" />
+    </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/DepartureTrainLengthText"
+        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" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 9acda97..91e7e0e 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,14 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	<TextView android:id="@+id/listTitle" android:layout_width="fill_parent"
-		android:textSize="24dp" android:textStyle="bold"
-		android:layout_height="wrap_content" android:paddingLeft="5dp"
-		android:paddingRight="5dp" android:paddingBottom="10dp" />
-	<ListView android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:layout_weight="1"
-		android:id="@android:id/list" />
-	<TextView android:id="@android:id/empty" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:layout_weight="1" />
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/listTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:textSize="24dp"
+        android:textStyle="bold" />
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <TextView
+        android:id="@+id/missingDepartureText"
+        style="@style/MissingDepartureText"
+        android:autoLink="email"
+        android:singleLine="false"
+        android:text="@string/missing_departure"
+        android:visibility="gone" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7f1f30f..bcda25f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,6 +20,7 @@
 		http://m.bart.gov/schedules/advisories/</string>
 	<string name="view">View</string>
 	<string name="view_departures">View departures</string>
+	<string name="missing_departure">Missing departure? Inaccurate time? Please report to bartrunner@dougkeen.com</string>
 	<string name="delete">Delete</string>
 	<string name="yes">Yes</string>
 	<string name="cancel">Cancel</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2a323ed..65aa43f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -56,6 +56,13 @@
 		<item name="android:textSize">16dp</item>
 		<item name="android:singleLine">true</item>
 	</style>
+	<style name="MissingDepartureText">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:textSize">12dp</item>
+		<item name="android:singleLine">true</item>
+		<item name="android:gravity">center</item>
+	</style>
 	<style name="BikeIcon">
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
diff --git a/src/com/dougkeen/bart/ViewDeparturesActivity.java b/src/com/dougkeen/bart/ViewDeparturesActivity.java
index f448c07..07196e7 100644
--- a/src/com/dougkeen/bart/ViewDeparturesActivity.java
+++ b/src/com/dougkeen/bart/ViewDeparturesActivity.java
@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.opengl.Visibility;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Parcelable;
@@ -17,6 +18,7 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -94,6 +96,8 @@ public class ViewDeparturesActivity extends ListActivity {
 			}
 		}
 		setListAdapter(mDeparturesAdapter);
+
+		findViewById(R.id.missingDepartureText).setVisibility(View.VISIBLE);
 	}
 
 	@Override