Merge branch 'dev' of github.com:cbaines/SouthamptonUniversityMap into dev

3 files changed, 42 insertions, 20 deletions

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" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a53109b..3bde7e1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -77,10 +77,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <string name="preferences_gps">GPS</string>
     <string name="preferences_gps_enabled">GPS Enabled</string>
     <string name="preferences_gps_disabled">GPS Disabled</string>
-    <string name="preferences_catagory_bus_times">Bus Times</string>
-    <string name="preferences_live_bus_times">Live Bus Times</string>
-    <string name="preferences_live_bus_times_enabled">Live Bus Times Enabled</string>
-    <string name="preferences_live_bus_times_disabled">Live Bus Times Disabled</string>
+    <string name="preferences_catagory_live_bus_times">Live Bus Times</string>
+    <string name="preferences_uni_link_live_bus_times">Uni-Link</string>
+    <string name="preferences_uni_link_live_bus_times_enabled">Uni-Link Enabled</string>
+    <string name="preferences_uni_link_live_bus_times_disabled">Uni-Link Disabled</string>
+    <string name="preferences_non_uni_link_live_bus_times">Non Uni-Link</string>
+    <string name="preferences_non_uni_link_live_bus_times_enabled">Non Uni-Link Enabled</string>
+    <string name="preferences_non_uni_link_live_bus_times_disabled">Non Uni-Link Disabled</string>
+    <string name="preferences_catagory_data">Data</string>
+    <string name="preferences_non_uni_link">Non Uni-Link Bus Stops</string>
+    <string name="preferences_non_uni_link_enabled">Non Uni-Link Bus Stops Enabled</string>
+    <string name="preferences_non_uni_link_disabled">Non Uni-Link Bus Stops Disabled</string>
+
+    <!-- About Messages -->
     <string name="about_menu_instruction_text">Expand the items below to learn more about each feature of the application.</string>
     <string name="bustimes_favourite_checkbox_label">Favourite</string>
     <string name="donate_dialog_message">Loading bitcoin client</string>
@@ -88,11 +97,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <string name="menu_previous_stop">Previous</string>
     <string name="menu_next_stop">Next</string>
     <string name="menu_refresh_stop">Refresh</string>
-    
-     <!-- About Strings -->
+
+    <!-- About Strings -->
     <string name="about">About</string>
     <string name="about_version">Version</string>
-    <string name="about_version_summary">0.2.1 (alpha)</string>
+    <string name="about_version_summary">0.2.2 (alpha)</string>
     <string name="about_copyright">Copyright</string>
     <string name="about_copyright_summary">© 2012, Christopher Baines</string>
     <string name="about_license">License</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 8aec00c..e0609f6 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -12,12 +12,26 @@
     </PreferenceCategory>
     <PreferenceCategory
         android:orderingFromXml="true"
-        android:title="@string/preferences_catagory_bus_times" >
+        android:title="@string/preferences_catagory_live_bus_times" >
         <CheckBoxPreference
             android:key="liveBusTimesEnabled"
-            android:summaryOff="@string/preferences_live_bus_times_disabled"
-            android:summaryOn="@string/preferences_live_bus_times_enabled"
-            android:title="@string/preferences_live_bus_times" />
+            android:summaryOff="@string/preferences_uni_link_live_bus_times_disabled"
+            android:summaryOn="@string/preferences_uni_link_live_bus_times_enabled"
+            android:title="@string/preferences_uni_link_live_bus_times" />
+        <CheckBoxPreference
+            android:key="nonUniLinkLiveBusTimesEnabled"
+            android:summaryOff="@string/preferences_non_uni_link_live_bus_times_disabled"
+            android:summaryOn="@string/preferences_non_uni_link_live_bus_times_enabled"
+            android:title="@string/preferences_non_uni_link_live_bus_times" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:orderingFromXml="true"
+        android:title="@string/preferences_catagory_data" >
+        <CheckBoxPreference
+            android:key="NonUniLinkBusStop"
+            android:summaryOff="@string/preferences_non_uni_link_disabled"
+            android:summaryOn="@string/preferences_non_uni_link_enabled"
+            android:title="@string/preferences_non_uni_link" />
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file