From 3d9e42c3e2d622912b2781b235469186d96559f1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 5 Jan 2012 09:23:03 +0000 Subject: Fixed issue with bitcoin uri. Removed custom menu star, and replaced with android drawable. Moved and changed favourites dialog message text. --- AndroidManifest.xml | 4 +-- CHANGELOG | 14 +++++++++++ gen/net/cbaines/suma/R.java | 32 ++++++++++++------------ res/drawable-hdpi/ic_menu_star.png | Bin 1173 -> 0 bytes res/drawable-ldpi/ic_menu_star.png | Bin 879 -> 0 bytes res/drawable-mdpi/ic_menu_star.png | Bin 1370 -> 0 bytes res/drawable-xhdpi/ic_menu_star.png | Bin 1264 -> 0 bytes res/menu/map_menu.xml | 40 ++++++++++++++++++++---------- res/values/strings.xml | 1 + src/net/cbaines/suma/DonateDialog.java | 2 +- src/net/cbaines/suma/FavouriteDialog.java | 2 +- 11 files changed, 62 insertions(+), 33 deletions(-) create mode 100644 CHANGELOG delete mode 100644 res/drawable-hdpi/ic_menu_star.png delete mode 100644 res/drawable-ldpi/ic_menu_star.png delete mode 100644 res/drawable-mdpi/ic_menu_star.png delete mode 100644 res/drawable-xhdpi/ic_menu_star.png diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6069704..3c874ba 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="2" + android:versionName="0.15 (alpha)" > diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..67d67af --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,14 @@ +SouthamptonUniveristyMap (0.15) + + * Fixed issue with bitcoin uri. + * Removed custom menu star, and replaced with android drawable. + * Moved and changed favourites dialog message text. + + -- Christopher Baines Wed, 04 Jan 2012 22:10:45 +0000 + +SouthamptonUniveristyMap (0.1) + + * Initial release. + + -- Christopher Baines Wed, 04 Jan 2012 22:10:45 +0000 + diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java index cc16eab..cf96e75 100644 --- a/gen/net/cbaines/suma/R.java +++ b/gen/net/cbaines/suma/R.java @@ -21,12 +21,11 @@ public final class R { public static final int building_fav=0x7f020001; public static final int busstop=0x7f020002; public static final int busstop_fav=0x7f020003; - public static final int ic_menu_star=0x7f020004; - public static final int u1_back=0x7f020005; - public static final int u1n_back=0x7f020006; - public static final int u2_back=0x7f020007; - public static final int u6_back=0x7f020008; - public static final int u9_back=0x7f020009; + public static final int u1_back=0x7f020004; + public static final int u1n_back=0x7f020005; + public static final int u2_back=0x7f020006; + public static final int u6_back=0x7f020007; + public static final int u9_back=0x7f020008; } public static final class id { public static final int busStopID=0x7f09000c; @@ -99,16 +98,17 @@ public final class R { public static final int U6=0x7f06000c; public static final int U9=0x7f06000d; public static final int about_help_message=0x7f060015; - public static final int about_menu_instruction_text=0x7f060022; + public static final int about_menu_instruction_text=0x7f060023; public static final int app_name=0x7f060004; public static final int bitcoin_error_message=0x7f06001a; public static final int building_non_residential=0x7f060007; public static final int building_residential=0x7f060006; - public static final int bustimes_favourite_checkbox_label=0x7f060023; + public static final int bustimes_favourite_checkbox_label=0x7f060024; public static final int credits_help_message=0x7f060018; public static final int donate_button=0x7f060019; - public static final int donate_dialog_error_title=0x7f060025; - public static final int donate_dialog_message=0x7f060024; + public static final int donate_dialog_error_title=0x7f060026; + public static final int donate_dialog_message=0x7f060025; + public static final int favourites_dialog_message=0x7f06001c; public static final int favourites_help_message=0x7f060016; public static final int find_help_message=0x7f060011; public static final int findmylocation_help_message=0x7f060013; @@ -125,13 +125,13 @@ public final class R { public static final int menu_view=0x7f060002; public static final int pref_bus_stop=0x7f060008; public static final int preferences=0x7f06001b; - public static final int preferences_catagory_bus_times=0x7f06001f; - public static final int preferences_catagory_positioning=0x7f06001c; - public static final int preferences_gps_disabled=0x7f06001e; - public static final int preferences_gps_enabled=0x7f06001d; + public static final int preferences_catagory_bus_times=0x7f060020; + public static final int preferences_catagory_positioning=0x7f06001d; + public static final int preferences_gps_disabled=0x7f06001f; + public static final int preferences_gps_enabled=0x7f06001e; public static final int preferences_help_message=0x7f060012; - public static final int preferences_live_bus_times_disabled=0x7f060021; - public static final int preferences_live_bus_times_enabled=0x7f060020; + public static final int preferences_live_bus_times_disabled=0x7f060022; + public static final int preferences_live_bus_times_enabled=0x7f060021; public static final int view_help_message=0x7f060014; } public static final class xml { diff --git a/res/drawable-hdpi/ic_menu_star.png b/res/drawable-hdpi/ic_menu_star.png deleted file mode 100644 index 4ab0b29..0000000 Binary files a/res/drawable-hdpi/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_menu_star.png b/res/drawable-ldpi/ic_menu_star.png deleted file mode 100644 index 318c900..0000000 Binary files a/res/drawable-ldpi/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_star.png b/res/drawable-mdpi/ic_menu_star.png deleted file mode 100644 index 8781250..0000000 Binary files a/res/drawable-mdpi/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_star.png b/res/drawable-xhdpi/ic_menu_star.png deleted file mode 100644 index e82948a..0000000 Binary files a/res/drawable-xhdpi/ic_menu_star.png and /dev/null differ diff --git a/res/menu/map_menu.xml b/res/menu/map_menu.xml index 0d61dcd..29f9342 100644 --- a/res/menu/map_menu.xml +++ b/res/menu/map_menu.xml @@ -1,16 +1,30 @@ - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 86f3813..59e4696 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -45,6 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Donate You appear to have no bitcoin client installed, or at least none that listen for bitcoin uri\'s. Either install such a client, or just send coins via any method from any device to the address below. Preferences + No Favourite\'s. To add a building or bus stop to the favourites list, just press and hold it on the map. U1 diff --git a/src/net/cbaines/suma/DonateDialog.java b/src/net/cbaines/suma/DonateDialog.java index 0c0c45f..401433c 100644 --- a/src/net/cbaines/suma/DonateDialog.java +++ b/src/net/cbaines/suma/DonateDialog.java @@ -71,7 +71,7 @@ public class DonateDialog extends Dialog implements Runnable { try { - Intent donateIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("bitcoin:?" + bitcoinAddress + Intent donateIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("bitcoin:" + bitcoinAddress + "&label=Southampton%20Uni%20Map%20App&message=Donation%20for%20the%20Southampton%20University%20Map%20App")); context.startActivity(donateIntent); diff --git a/src/net/cbaines/suma/FavouriteDialog.java b/src/net/cbaines/suma/FavouriteDialog.java index dfd5690..53a9862 100644 --- a/src/net/cbaines/suma/FavouriteDialog.java +++ b/src/net/cbaines/suma/FavouriteDialog.java @@ -81,7 +81,7 @@ public class FavouriteDialog extends Dialog { Log.i(TAG, "Favourite dialog has no favourites, displaying message"); message.post(new Runnable() { public void run() { - message.setText("No Favourite's, to make some buildings or bus stops favourite, just tap and hold them on the map"); + message.setText(R.string.favourites_dialog_message); message.setVisibility(View.VISIBLE); } }); -- cgit v1.2.3