Beginings of management of non Uni-Link data.

4 files changed, 80 insertions, 54 deletions

diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java
index 8b15d5f..2945b23 100644
--- a/gen/net/cbaines/suma/R.java
+++ b/gen/net/cbaines/suma/R.java
@@ -129,44 +129,46 @@ public final class R {
         public static final int U9=0x7f07000d;
         /**  About Strings 
          */
-        public static final int about=0x7f07002c;
-        public static final int about_android_market=0x7f070039;
-        public static final int about_android_market_summary=0x7f07003a;
-        public static final int about_copyright=0x7f07002f;
-        public static final int about_copyright_summary=0x7f070030;
-        public static final int about_data=0x7f070037;
-        public static final int about_data_summary=0x7f070038;
-        public static final int about_database=0x7f070043;
-        public static final int about_database_summary=0x7f070044;
-        public static final int about_developer=0x7f070035;
-        public static final int about_developer_summary=0x7f070036;
-        public static final int about_donate=0x7f070045;
-        public static final int about_donate_summary=0x7f070046;
+        public static final int about=0x7f070033;
+        public static final int about_android_market=0x7f070040;
+        public static final int about_android_market_summary=0x7f070041;
+        public static final int about_copyright=0x7f070036;
+        public static final int about_copyright_summary=0x7f070037;
+        public static final int about_data=0x7f07003e;
+        public static final int about_data_summary=0x7f07003f;
+        public static final int about_database=0x7f07004a;
+        public static final int about_database_summary=0x7f07004b;
+        public static final int about_developer=0x7f07003c;
+        public static final int about_developer_summary=0x7f07003d;
+        public static final int about_donate=0x7f07004c;
+        public static final int about_donate_summary=0x7f07004d;
         public static final int about_help_message=0x7f070015;
-        public static final int about_license=0x7f070031;
-        public static final int about_license_summary=0x7f070032;
-        public static final int about_map_data=0x7f07003b;
-        public static final int about_map_data_summary=0x7f07003c;
-        public static final int about_map_icons=0x7f07003d;
-        public static final int about_map_icons_summary=0x7f07003e;
-        public static final int about_map_tiles=0x7f070041;
-        public static final int about_map_tiles_summary=0x7f070042;
-        public static final int about_menu_instruction_text=0x7f070025;
-        public static final int about_osm_map=0x7f07003f;
-        public static final int about_osm_map_summary=0x7f070040;
-        public static final int about_project=0x7f070033;
-        public static final int about_project_summary=0x7f070034;
-        public static final int about_version=0x7f07002d;
-        public static final int about_version_summary=0x7f07002e;
+        public static final int about_license=0x7f070038;
+        public static final int about_license_summary=0x7f070039;
+        public static final int about_map_data=0x7f070042;
+        public static final int about_map_data_summary=0x7f070043;
+        public static final int about_map_icons=0x7f070044;
+        public static final int about_map_icons_summary=0x7f070045;
+        public static final int about_map_tiles=0x7f070048;
+        public static final int about_map_tiles_summary=0x7f070049;
+        /**  About Messages 
+         */
+        public static final int about_menu_instruction_text=0x7f07002c;
+        public static final int about_osm_map=0x7f070046;
+        public static final int about_osm_map_summary=0x7f070047;
+        public static final int about_project=0x7f07003a;
+        public static final int about_project_summary=0x7f07003b;
+        public static final int about_version=0x7f070034;
+        public static final int about_version_summary=0x7f070035;
         public static final int app_name=0x7f070004;
         public static final int bitcoin_error_message=0x7f07001a;
         public static final int building_non_residential=0x7f070007;
         public static final int building_residential=0x7f070006;
-        public static final int bustimes_favourite_checkbox_label=0x7f070026;
+        public static final int bustimes_favourite_checkbox_label=0x7f07002d;
         public static final int credits_help_message=0x7f070018;
         public static final int donate_button=0x7f070019;
-        public static final int donate_dialog_error_title=0x7f070028;
-        public static final int donate_dialog_message=0x7f070027;
+        public static final int donate_dialog_error_title=0x7f07002f;
+        public static final int donate_dialog_message=0x7f07002e;
         public static final int favourites_dialog_message=0x7f07001c;
         public static final int favourites_help_message=0x7f070016;
         public static final int find_help_message=0x7f070011;
@@ -180,14 +182,15 @@ public final class R {
         public static final int menu_favourites=0x7f07000f;
         public static final int menu_find=0x7f070000;
         public static final int menu_find_my_location=0x7f070003;
-        public static final int menu_next_stop=0x7f07002a;
+        public static final int menu_next_stop=0x7f070031;
         public static final int menu_preferences=0x7f070001;
-        public static final int menu_previous_stop=0x7f070029;
-        public static final int menu_refresh_stop=0x7f07002b;
+        public static final int menu_previous_stop=0x7f070030;
+        public static final int menu_refresh_stop=0x7f070032;
         public static final int menu_view=0x7f070002;
         public static final int pref_bus_stop=0x7f070008;
         public static final int preferences=0x7f07001b;
-        public static final int preferences_catagory_bus_times=0x7f070021;
+        public static final int preferences_catagory_data=0x7f070028;
+        public static final int preferences_catagory_live_bus_times=0x7f070021;
         /**  Preferences Messages 
          */
         public static final int preferences_catagory_positioning=0x7f07001d;
@@ -195,9 +198,15 @@ public final class R {
         public static final int preferences_gps_disabled=0x7f070020;
         public static final int preferences_gps_enabled=0x7f07001f;
         public static final int preferences_help_message=0x7f070012;
-        public static final int preferences_live_bus_times=0x7f070022;
-        public static final int preferences_live_bus_times_disabled=0x7f070024;
-        public static final int preferences_live_bus_times_enabled=0x7f070023;
+        public static final int preferences_non_uni_link=0x7f070029;
+        public static final int preferences_non_uni_link_disabled=0x7f07002b;
+        public static final int preferences_non_uni_link_enabled=0x7f07002a;
+        public static final int preferences_non_uni_link_live_bus_times=0x7f070025;
+        public static final int preferences_non_uni_link_live_bus_times_disabled=0x7f070027;
+        public static final int preferences_non_uni_link_live_bus_times_enabled=0x7f070026;
+        public static final int preferences_uni_link_live_bus_times=0x7f070022;
+        public static final int preferences_uni_link_live_bus_times_disabled=0x7f070024;
+        public static final int preferences_uni_link_live_bus_times_enabled=0x7f070023;
         public static final int view_help_message=0x7f070014;
     }
     public static final class xml {
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 842e597..69d6861 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,8 +97,8 @@ 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.2 (alpha)</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
diff --git a/src/net/cbaines/suma/PreferencesActivity.java b/src/net/cbaines/suma/PreferencesActivity.java
index b7c1d89..d5df6a1 100644
--- a/src/net/cbaines/suma/PreferencesActivity.java
+++ b/src/net/cbaines/suma/PreferencesActivity.java
@@ -23,12 +23,6 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 
 public class PreferencesActivity extends PreferenceActivity {
-    boolean CheckboxPreference;
-    String ListPreference;
-    String editTextPreference;
-    String ringtonePreference;
-    String secondEditTextPreference;
-    String customPref;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {