Merge branch 'dev'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml

4 files changed, 125 insertions, 10 deletions

diff --git a/res/layout/bus_activity.xml b/res/layout/bus_activity.xml
new file mode 100644
index 0000000..3037916
--- /dev/null
+++ b/res/layout/bus_activity.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center|top"
+    android:orientation="vertical"
+    android:theme="@android:style/Theme.NoTitleBar" >
+
+    <LinearLayout
+        android:id="@+id/busActivityHeaderLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/busActivityBusID"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/busActivityU1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/u1_back_selected"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:text="@string/U1"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#FFFFFF" />
+
+        <TextView
+            android:id="@+id/busActivityU1N"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/u1n_back_selected"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:text="@string/U1N"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#FFFFFF" />
+
+        <TextView
+            android:id="@+id/busActivityU2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/u2_back_selected"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:text="@string/U2"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#FFFFFF" />
+
+        <TextView
+            android:id="@+id/busActivityU6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/u6_back_selected"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:text="@string/U6"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#FFFFFF" />
+
+        <TextView
+            android:id="@+id/busActivityU9"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/u9_back_selected"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:text="@string/U9"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#FFFFFF" />
+    </LinearLayout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/busActivityContentLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/busActivityMessage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <ListView
+            android:id="@+id/busActivityTimes"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
+        </ListView>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/bus_stop_dialog.xml b/res/layout/bus_stop_dialog.xml
new file mode 100644
index 0000000..24148c6
--- /dev/null
+++ b/res/layout/bus_stop_dialog.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_root"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal"
+    android:padding="10dp" >
+    
+    <ListView
+        android:id="@+id/busStopListItems"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/favourite_dialog.xml b/res/layout/poi_dialog.xml
index 44cb02a..cf97083 100644
--- a/res/layout/favourite_dialog.xml
+++ b/res/layout/poi_dialog.xml
@@ -4,7 +4,9 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="horizontal"
-    android:padding="10dp" >
+    android:paddingBottom="10dp"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp" >
 
     <TextView
         android:id="@+id/favouriteDialogMessage"
diff --git a/res/layout/view_child_row.xml b/res/layout/view_child_row.xml
index 687cbee..bd4b3d5 100644
--- a/res/layout/view_child_row.xml
+++ b/res/layout/view_child_row.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:gravity="right"
-    android:orientation="horizontal"
-    android:paddingRight="10dp" >
+    android:paddingLeft="50dp" >
 
     <TextView
         android:id="@+id/childname"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_gravity="left"
         android:focusable="false"
-        android:paddingLeft="50dp"
-        android:textSize="17dp" />
+        android:textSize="18dp" />
 
     <CheckBox
         android:id="@+id/check1"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="fill_parent"
         android:layout_gravity="right"
+        android:layout_weight="1"
         android:focusable="false"
         android:gravity="right" />