Merge branch 'dev'

Conflicts:
	gen/net/cbaines/suma/R.java
	src/net/cbaines/suma/BusSpecificStopView.java
	src/net/cbaines/suma/BusStopSpecificStopView.java
	src/net/cbaines/suma/MapActivity.java

4 files changed, 62 insertions, 14 deletions

diff --git a/res/layout/bus_activity.xml b/res/layout/bus_activity.xml
index f8bbe59..d8b26f6 100644
--- a/res/layout/bus_activity.xml
+++ b/res/layout/bus_activity.xml
@@ -14,11 +14,17 @@
 
         <TextView
             android:id="@+id/busActivityBusID"
-            android:layout_width="wrap_content"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge" />
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/busActivityBusDestination"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/busActivityContentLayout"
diff --git a/res/layout/bus_stop_activity.xml b/res/layout/bus_stop_activity.xml
index 7875852..66da2f6 100644
--- a/res/layout/bus_stop_activity.xml
+++ b/res/layout/bus_stop_activity.xml
@@ -21,11 +21,12 @@
             android:id="@+id/radio_u1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="2dp"
             android:background="@drawable/u1_radio_button"
             android:button="@drawable/empty"
             android:checked="true"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:text="@string/U1"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
@@ -34,11 +35,12 @@
             android:id="@+id/radio_u1n"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="2dp"
             android:background="@drawable/u1n_radio_button"
             android:button="@drawable/empty"
             android:checked="true"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:text="@string/U1N"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
@@ -47,11 +49,12 @@
             android:id="@+id/radio_u2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="2dp"
             android:background="@drawable/u2_radio_button"
             android:button="@drawable/empty"
             android:checked="true"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:text="@string/U2"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
@@ -60,11 +63,12 @@
             android:id="@+id/radio_u6"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="2dp"
             android:background="@drawable/u6_radio_button"
             android:button="@drawable/empty"
             android:checked="true"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:text="@string/U6"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
@@ -73,11 +77,12 @@
             android:id="@+id/radio_u9"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="2dp"
             android:background="@drawable/u9_radio_button"
             android:button="@drawable/empty"
             android:checked="true"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:text="@string/U9"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
@@ -86,6 +91,7 @@
             android:id="@+id/favouriteCheckBox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="2dp"
             android:text="@string/bustimes_favourite_checkbox_label"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -93,8 +99,6 @@
             android:id="@+id/busStopID"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:visibility="gone" />
     </LinearLayout>
diff --git a/res/layout/toast_view.xml b/res/layout/toast_view.xml
new file mode 100644
index 0000000..51d7561
--- /dev/null
+++ b/res/layout/toast_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toastViewLinearLayout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="#F01D1D1D"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:padding="10dp" >
+
+    <TextView
+        android:id="@+id/toastViewText"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical|center_horizontal"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/toastViewSubMessage"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical|center_horizontal"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f3850a3..05ed277 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -106,7 +106,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <!-- About Strings -->
     <string name="about">About</string>
     <string name="about_version">Version</string>
-    <string name="about_version_summary">0.5 (alpha)</string>
+    <string name="about_version_summary">0.6 (alpha)</string>
     <string name="about_copyright">Copyright</string>
     <string name="about_copyright_summary">© 2012, Christopher Baines</string>
     <string name="about_license">License</string>
@@ -132,5 +132,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <string name="about_donate">Donate</string>
     <string name="about_donate_summary">Make a personal donation to the developer through Bitcoin.</string>
     <string name="buildingImageDescription">Image of the Building</string>
+    <string name="map_activity_toast_help_message">Double tap for more info</string>
+
+    <!-- Bus Stop Specific Stop View Strings -->
+    <string name="bus_stop_stop_view_on_click_toast_help_message">Hold to view the bus schedule</string>
+    <string name="bus_stop_stop_view_on_click_toast_unidentified_message">Bus schedules not available for unidentified buses</string>
+
+    <!-- Bus Specific Stop View Strings -->
+    <string name="bus_stop_view_on_click_toast_help_message">Hold to view the bus stop</string>
+    <string name="bus_stop_view_on_click_toast_unidentified_message">Arrival prediction not available for timetabled buses</string>
+
+    <!-- Bus Activity -->
+    <string name="bus_activity_destination_label">Destination:\u0020</string>
+    <string name="bus_activity_no_destination_message">No given destination</string>
 
 </resources>
\ No newline at end of file