aboutsummaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/bus_activity.xml8
-rw-r--r--res/layout/bus_stop_activity.xml28
-rw-r--r--res/layout/toast_view.xml25
3 files changed, 48 insertions, 13 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