aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/building_activity.xml42
-rw-r--r--res/layout/bus_activity.xml55
-rw-r--r--res/layout/bus_route_activity.xml6
-rw-r--r--res/layout/bus_stop_activity.xml3
-rw-r--r--res/layout/find_activity.xml (renamed from res/layout/find.xml)0
-rw-r--r--res/layout/map_activity.xml (renamed from res/layout/main.xml)0
-rw-r--r--res/values/strings.xml2
7 files changed, 32 insertions, 76 deletions
diff --git a/res/layout/building_activity.xml b/res/layout/building_activity.xml
index 6ed937f..777ad0a 100644
--- a/res/layout/building_activity.xml
+++ b/res/layout/building_activity.xml
@@ -10,31 +10,39 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" />
+ <CheckBox
+ android:id="@+id/buildingActivityFavouriteCheckBox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/bustimes_favourite_checkbox_label" />
+
+ <ImageButton
+ android:id="@+id/buildingActivityImage"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@null"
+ android:contentDescription="@string/buildingImageDescription" />
+
<LinearLayout
- android:id="@+id/linearLayout1"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/buildingActivityLoadBarLayout"
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="fill_parent"
+ android:gravity="center"
+ android:orientation="vertical" >
- <CheckBox
- android:id="@+id/buildingActivityFavouriteCheckBox"
+ <ProgressBar
+ android:id="@+id/buildingActivityLoadBar"
+ style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/bustimes_favourite_checkbox_label" />
+ android:layout_height="wrap_content" />
<TextView
- android:id="@+id/buildingActivityID"
+ android:id="@+id/buildingActivityMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="5dp"
- android:paddingRight="5dp"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:text=""
+ android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout>
- <ImageButton
- android:id="@+id/buildingActivityImage"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@null"
- android:contentDescription="@string/buildingImageDescription" />
-
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/bus_activity.xml b/res/layout/bus_activity.xml
index 3037916..f8bbe59 100644
--- a/res/layout/bus_activity.xml
+++ b/res/layout/bus_activity.xml
@@ -17,61 +17,6 @@
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
diff --git a/res/layout/bus_route_activity.xml b/res/layout/bus_route_activity.xml
index 94a0d07..48cdadc 100644
--- a/res/layout/bus_route_activity.xml
+++ b/res/layout/bus_route_activity.xml
@@ -8,7 +8,7 @@
<TextView
android:id="@+id/busRouteActivityCode"
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -22,13 +22,15 @@
android:id="@+id/busRouteActivityLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/busRouteActivityID"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:visibility="gone" />
</LinearLayout>
<ListView
diff --git a/res/layout/bus_stop_activity.xml b/res/layout/bus_stop_activity.xml
index fcfe6da..3f4dc98 100644
--- a/res/layout/bus_stop_activity.xml
+++ b/res/layout/bus_stop_activity.xml
@@ -95,7 +95,8 @@
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="5dp"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:visibility="gone" />
</LinearLayout>
<LinearLayout
diff --git a/res/layout/find.xml b/res/layout/find_activity.xml
index 6b19c67..6b19c67 100644
--- a/res/layout/find.xml
+++ b/res/layout/find_activity.xml
diff --git a/res/layout/main.xml b/res/layout/map_activity.xml
index dff45bd..dff45bd 100644
--- a/res/layout/main.xml
+++ b/res/layout/map_activity.xml
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e0f62e0..f3850a3 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.4 (alpha)</string>
+ <string name="about_version_summary">0.5 (alpha)</string>
<string name="about_copyright">Copyright</string>
<string name="about_copyright_summary">© 2012, Christopher Baines</string>
<string name="about_license">License</string>
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-22 08:27:46 +0000