From 08f3ae85b14a11c3010a94b584fcb6eef9350943 Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Thu, 2 Feb 2012 10:40:47 +0000
Subject: More changes, not sure what.

---
 src/net/cbaines/suma/DataHandler.java                      | 2 +-
 src/net/cbaines/suma/SouthamptonUniversityMapActivity.java | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/net')

diff --git a/src/net/cbaines/suma/DataHandler.java b/src/net/cbaines/suma/DataHandler.java
index f6263da..f564d19 100644
--- a/src/net/cbaines/suma/DataHandler.java
+++ b/src/net/cbaines/suma/DataHandler.java
@@ -81,7 +81,7 @@ public class DataHandler extends DefaultHandler {
     @Override
     public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
 	if (localName.equals("trkpt")) {
-	    Log.v("DataHandler", "Adding point to route overlay " + atts.getValue("lat") + " " + atts.getValue("lon"));
+	    // Log.v("DataHandler", "Adding point to route overlay " + atts.getValue("lat") + " " + atts.getValue("lon"));
 	    _data.addPoint(Util.csLatLongToGeoPoint(atts.getValue("lat"), atts.getValue("lon")));
 	}
     }
diff --git a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
index 927f41e..52b3e1f 100644
--- a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
+++ b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
@@ -138,8 +138,10 @@ public class SouthamptonUniversityMapActivity extends OrmLiteBaseActivity<Databa
 	pastOverlays = (HashMap<String, Overlay>) getLastNonConfigurationInstance();
 
 	// SensorManager mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); This code in the following constructor causes problems in
-	// some emulators, disable there sensors to fix.
+	// some emulators, disable sensors to fix.
+	Log.i(TAG, "Starting creating myLocationOverlay");
 	myLocationOverlay = new MyLocationOverlay(instance, mapView);
+	Log.i(TAG, "Finished creating myLocationOverlay");
 
 	while (databaseThread.isAlive()) {
 	    Thread.yield();
@@ -241,7 +243,7 @@ public class SouthamptonUniversityMapActivity extends OrmLiteBaseActivity<Databa
 		    // of your application so we are gonna be able to overwrite that database with our database.
 		    Log.i(TAG, "GetReadableDatabase");
 		    helper.getWritableDatabase().close();
-		    
+
 		    helper.copyDataBase();
 		    Log.i(TAG, "Out of copy database");
 		} catch (IOException ioe) {
-- 
cgit v1.2.3


From 43dfbdb57dd39f24a824c9c33c8886481ba25cb9 Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Thu, 2 Feb 2012 13:47:55 +0000
Subject: Beginings of management of non Uni-Link data.

---
 gen/net/cbaines/suma/R.java                   | Bin 10843 -> 11479 bytes
 res/values/strings.xml                        |  21 +++++++++++++++------
 res/xml/preferences.xml                       |  22 ++++++++++++++++++----
 src/net/cbaines/suma/PreferencesActivity.java |   6 ------
 4 files changed, 33 insertions(+), 16 deletions(-)

(limited to 'src/net')

diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java
index 8b15d5f..2945b23 100644
Binary files a/gen/net/cbaines/suma/R.java and b/gen/net/cbaines/suma/R.java differ
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) {
-- 
cgit v1.2.3