From 0b5aefbe0ff01638dd264222c5368ad02a0fe1ee Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Tue, 28 Feb 2012 19:09:23 +0000
Subject: Fixed two bugs relating to the query on the database not being
 ordered?, and implemented a new preference option.

---
 res/layout/bus_route_activity.xml | 16 ++++++++--------
 res/layout/bus_stop_activity.xml  | 13 +++++++------
 res/values/strings.xml            |  4 ++++
 res/xml/preferences.xml           |  9 +++++++++
 4 files changed, 28 insertions(+), 14 deletions(-)

(limited to 'res')

diff --git a/res/layout/bus_route_activity.xml b/res/layout/bus_route_activity.xml
index fde127c..94a0d07 100644
--- a/res/layout/bus_route_activity.xml
+++ b/res/layout/bus_route_activity.xml
@@ -6,6 +6,12 @@
     android:orientation="vertical"
     android:theme="@android:style/Theme.NoTitleBar" >
 
+    <TextView
+        android:id="@+id/busRouteActivityCode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
     <LinearLayout
         android:id="@+id/busRouteActivityHeaderLayout"
         android:layout_width="fill_parent"
@@ -16,19 +22,13 @@
             android:id="@+id/busRouteActivityLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <TextView
-            android:id="@+id/busRouteActivityCode"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
             android:id="@+id/busRouteActivityID"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
 
     <ListView
diff --git a/res/layout/bus_stop_activity.xml b/res/layout/bus_stop_activity.xml
index 24200c6..fcfe6da 100644
--- a/res/layout/bus_stop_activity.xml
+++ b/res/layout/bus_stop_activity.xml
@@ -27,7 +27,7 @@
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
 
         <CheckBox
@@ -40,7 +40,7 @@
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U1N"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
 
         <CheckBox
@@ -53,7 +53,7 @@
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U2"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
 
         <CheckBox
@@ -66,7 +66,7 @@
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U6"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
 
         <CheckBox
@@ -79,14 +79,15 @@
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U9"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="#FFFFFF" />
 
         <CheckBox
             android:id="@+id/favouriteCheckBox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/bustimes_favourite_checkbox_label" />
+            android:text="@string/bustimes_favourite_checkbox_label"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
             android:id="@+id/busStopID"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6333664..e0f62e0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -74,6 +74,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     </string-array>
 
     <!-- Preferences Messages -->
+    <string name="preferences_catagory_appearance">Appearance</string>
+    <string name="preferences_show_identifiers">Show Identifiers</string>
+    <string name="preferences_show_identifiers_enabled">Showing Identifiers</string>
+    <string name="preferences_show_identifiers_disabled">Hiding Identifiers</string>
     <string name="preferences_catagory_positioning">Positioning</string>
     <string name="preferences_gps">GPS</string>
     <string name="preferences_gps_enabled">GPS Enabled</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 4a12e1c..9de3a61 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <PreferenceCategory
+        android:orderingFromXml="true"
+        android:title="@string/preferences_catagory_appearance" >
+        <CheckBoxPreference
+            android:key="showIdentifiers"
+            android:summaryOff="@string/preferences_show_identifiers_disabled"
+            android:summaryOn="@string/preferences_show_identifiers_enabled"
+            android:title="@string/preferences_show_identifiers" />
+    </PreferenceCategory>
     <PreferenceCategory
         android:orderingFromXml="true"
         android:title="@string/preferences_catagory_positioning" >
-- 
cgit v1.2.3