Fix the bus stop movement, havent fully tested this yet as the live bus data is not working...

3 files changed, 23 insertions, 30 deletions

diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java
index f7f3034..b56502e 100644
--- a/gen/net/cbaines/suma/R.java
+++ b/gen/net/cbaines/suma/R.java
@@ -73,11 +73,11 @@ public final class R {
         public static final int busStopID=0x7f0a001c;
         public static final int busStopListItems=0x7f0a0023;
         public static final int busStopLoadBar=0x7f0a0021;
-        public static final int busStopMessage=0x7f0a001e;
+        public static final int busStopMessage=0x7f0a0020;
         public static final int busStopName=0x7f0a0014;
-        public static final int busStopTimes=0x7f0a001f;
+        public static final int busStopTimes=0x7f0a001e;
         public static final int busTimeContentLayout=0x7f0a001d;
-        public static final int centerLoadBar=0x7f0a0020;
+        public static final int centerLoadBar=0x7f0a001f;
         public static final int check1=0x7f0a0032;
         public static final int childname=0x7f0a0031;
         public static final int donateBitcoinAddress=0x7f0a0029;
diff --git a/res/layout/bus_stop_activity.xml b/res/layout/bus_stop_activity.xml
index 3f4dc98..7875852 100644
--- a/res/layout/bus_stop_activity.xml
+++ b/res/layout/bus_stop_activity.xml
@@ -107,13 +107,6 @@
         android:gravity="center"
         android:orientation="vertical" >
 
-        <TextView
-            android:id="@+id/busStopMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
         <ListView
             android:id="@+id/busStopTimes"
             android:layout_width="fill_parent"
@@ -128,6 +121,13 @@
             android:gravity="center"
             android:orientation="vertical" >
 
+            <TextView
+                android:id="@+id/busStopMessage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
             <ProgressBar
                 android:id="@+id/busStopLoadBar"
                 style="?android:attr/progressBarStyleLarge"
diff --git a/src/net/cbaines/suma/BusStopActivity.java b/src/net/cbaines/suma/BusStopActivity.java
index bfcc13a..d1f725e 100644
--- a/src/net/cbaines/suma/BusStopActivity.java
+++ b/src/net/cbaines/suma/BusStopActivity.java
@@ -93,7 +93,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 	private CheckBox U9RouteRadioButton;
 
 	private static final int POI_DIALOG_ID = 0;
-	private POIDialog busDialog;
+	private POIDialog busStopDialog;
 
 	private HashSet<BusRoute> routes = new HashSet<BusRoute>();
 
@@ -397,15 +397,9 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 
 			if (busStops.size() == 1) {
 
-				BusStop stop = (BusStop) busStops.iterator().next();
-				if (stop == null) {
-					Log.e(TAG, "stop == null");
-				}
-				if (stop.id == null) {
-					Log.e(TAG, "stop.id == null");
-				}
+				BusStop nextBusStop = (BusStop) busStops.iterator().next();
 
-				Uri uri = Uri.parse("http://id.southampton.ac.uk/bus-stop/" + busStop.id);
+				Uri uri = Uri.parse("http://id.southampton.ac.uk/bus-stop/" + nextBusStop.id);
 
 				Log.i(TAG, "Starting a activity for " + uri + " path " + uri.getPath());
 
@@ -414,14 +408,14 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 
 			} else {
 				showDialog(POI_DIALOG_ID);
-				if (busDialog == null) {
+				if (busStopDialog == null) {
 					Log.e(TAG, "Very wierd, just tried to launch the favourite's dialog, but its null?");
 					return false;
 				}
 
-				busDialog.setMessage("");
-				busDialog.setItems(busStops);
-				busDialog.setTitle("Choose Bus Stop");
+				busStopDialog.setMessage("");
+				busStopDialog.setItems(busStops);
+				busStopDialog.setTitle("Choose Bus Stop");
 
 				Log.i(TAG, "Showing dialog");
 			}
@@ -504,9 +498,9 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 	protected Dialog onCreateDialog(int id) {
 		switch (id) {
 		case POI_DIALOG_ID:
-			busDialog = new POIDialog(instance);
-			busDialog.setOnItemClickListener(this);
-			return busDialog;
+			busStopDialog = new POIDialog(instance);
+			busStopDialog.setOnItemClickListener(this);
+			return busStopDialog;
 		}
 		return null;
 	}
@@ -514,16 +508,15 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 		Log.i(TAG, "OnItemClick pos " + position + " id " + id);
 
-		String busId = busDialog.adapter.getItemStringId(position);
+		String busStopID = busStopDialog.adapter.getItemStringId(position);
 
-		Log.i(TAG, "Bus " + busId + " selected");
+		Log.i(TAG, "Bus " + busStopID + " selected");
 
-		Uri uri = Uri.parse("http://id.southampton.ac.uk/bus/" + busId);
+		Uri uri = Uri.parse("http://id.southampton.ac.uk/bus-stop/" + busStopID);
 
 		Log.i(TAG, "Starting a activity for " + uri + " path " + uri.getPath());
 
 		Intent busStopIntent = new Intent(Intent.ACTION_VIEW, uri);
-		busStopIntent.putExtra("busStopID", busStop.id);
 		startActivity(busStopIntent);
 	}