Added a icon for xhdpi, and fixed up some hardcoded strings.

4 files changed, 57 insertions, 43 deletions

diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java
index 6c050e5..8b15d5f 100644
--- a/gen/net/cbaines/suma/R.java
+++ b/gen/net/cbaines/suma/R.java
@@ -14,6 +14,8 @@ public final class R {
     public static final class array {
         public static final int buildingTypes=0x7f080001;
         public static final int preferencesHeadings=0x7f080003;
+        /**  View Strings 
+         */
         public static final int uniLinkBusRoutes=0x7f080000;
         public static final int utilityOverlays=0x7f080002;
     }
@@ -125,71 +127,77 @@ public final class R {
         public static final int U2=0x7f07000b;
         public static final int U6=0x7f07000c;
         public static final int U9=0x7f07000d;
-        public static final int about=0x7f07002a;
-        public static final int about_android_market=0x7f070037;
-        public static final int about_android_market_summary=0x7f070038;
-        public static final int about_copyright=0x7f07002d;
-        public static final int about_copyright_summary=0x7f07002e;
-        public static final int about_data=0x7f070035;
-        public static final int about_data_summary=0x7f070036;
-        public static final int about_database=0x7f070041;
-        public static final int about_database_summary=0x7f070042;
-        public static final int about_developer=0x7f070033;
-        public static final int about_developer_summary=0x7f070034;
-        public static final int about_donate=0x7f070043;
-        public static final int about_donate_summary=0x7f070044;
+        /**  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_help_message=0x7f070015;
-        public static final int about_license=0x7f07002f;
-        public static final int about_license_summary=0x7f070030;
-        public static final int about_map_data=0x7f070039;
-        public static final int about_map_data_summary=0x7f07003a;
-        public static final int about_map_icons=0x7f07003b;
-        public static final int about_map_icons_summary=0x7f07003c;
-        public static final int about_map_tiles=0x7f07003f;
-        public static final int about_map_tiles_summary=0x7f070040;
-        public static final int about_menu_instruction_text=0x7f070023;
-        public static final int about_osm_map=0x7f07003d;
-        public static final int about_osm_map_summary=0x7f07003e;
-        public static final int about_project=0x7f070031;
-        public static final int about_project_summary=0x7f070032;
-        public static final int about_version=0x7f07002b;
-        public static final int about_version_summary=0x7f07002c;
+        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 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=0x7f070024;
+        public static final int bustimes_favourite_checkbox_label=0x7f070026;
         public static final int credits_help_message=0x7f070018;
         public static final int donate_button=0x7f070019;
-        public static final int donate_dialog_error_title=0x7f070026;
-        public static final int donate_dialog_message=0x7f070025;
+        public static final int donate_dialog_error_title=0x7f070028;
+        public static final int donate_dialog_message=0x7f070027;
         public static final int favourites_dialog_message=0x7f07001c;
         public static final int favourites_help_message=0x7f070016;
         public static final int find_help_message=0x7f070011;
         public static final int findmylocation_help_message=0x7f070013;
         public static final int legal_message=0x7f070005;
         public static final int licence_help_message=0x7f070017;
-        /**  Preferences Messages 
+        /**  Help Messages 
          */
         public static final int map_help_message=0x7f070010;
         public static final int menu_about=0x7f07000e;
         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=0x7f070028;
+        public static final int menu_next_stop=0x7f07002a;
         public static final int menu_preferences=0x7f070001;
-        public static final int menu_previous_stop=0x7f070027;
-        public static final int menu_refresh_stop=0x7f070029;
+        public static final int menu_previous_stop=0x7f070029;
+        public static final int menu_refresh_stop=0x7f07002b;
         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=0x7f070020;
+        public static final int preferences_catagory_bus_times=0x7f070021;
+        /**  Preferences Messages 
+         */
         public static final int preferences_catagory_positioning=0x7f07001d;
-        public static final int preferences_gps_disabled=0x7f07001f;
-        public static final int preferences_gps_enabled=0x7f07001e;
+        public static final int preferences_gps=0x7f07001e;
+        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_disabled=0x7f070022;
-        public static final int preferences_live_bus_times_enabled=0x7f070021;
+        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 view_help_message=0x7f070014;
     }
     public static final class xml {
diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png
new file mode 100644
index 0000000..88c4f63
--- /dev/null
+++ b/res/drawable-xhdpi/icon.png
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 033a6a9..948c10e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="menu_about">About</string>
     <string name="menu_favourites">Favourites</string>
 
-    <!-- Preferences Messages -->
+    <!-- Help Messages -->
     <string name="map_help_message">You can drag the map to move it, you can use pinch motions to zoom in and out, this can also be done with the buttons at the bottom of the screen. Taping the building markers will show you there full name, and tapping the bus stop markers will show the live times at that stop. Presing and holding a marker, will add the item to the favourites list.</string>
     <string name="find_help_message">The Find screen allows you to search for buildings, bus stops and sites. You can search by description and id. If your location is known, the results will be sorted by distance from your current location.</string>
     <string name="preferences_help_message">You can disable and enable the apps use of live bus times and gps positioning from the preferences screen.</string>
@@ -47,6 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <string name="preferences">Preferences</string>
     <string name="favourites_dialog_message">No Favourite\'s. To add a building or bus stop to the favourites list, just press and hold it on the map.</string>
 
+    <!-- View Strings -->
     <string-array name="uniLinkBusRoutes">
         <item>U1</item>
         <item>U1N</item>
@@ -71,10 +72,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
         <item>Other</item>
     </string-array>
 
+    <!-- Preferences Messages -->
     <string name="preferences_catagory_positioning">Positioning</string>
+    <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="about_menu_instruction_text">Expand the items below to learn more about each feature of the application.</string>
@@ -84,6 +88,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 -->
     <string name="about">About</string>
     <string name="about_version">Version</string>
     <string name="about_version_summary">0.2.1 (alpha)</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 51f176c..8aec00c 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -8,7 +8,7 @@
             android:key="GPSEnabled"
             android:summaryOff="@string/preferences_gps_disabled"
             android:summaryOn="@string/preferences_gps_enabled"
-            android:title="GPS" />
+            android:title="@string/preferences_gps" />
     </PreferenceCategory>
     <PreferenceCategory
         android:orderingFromXml="true"
@@ -17,7 +17,7 @@
             android:key="liveBusTimesEnabled"
             android:summaryOff="@string/preferences_live_bus_times_disabled"
             android:summaryOn="@string/preferences_live_bus_times_enabled"
-            android:title="Live Bus Times" />
+            android:title="@string/preferences_live_bus_times" />
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file