From ac9a84e8bb5dc43a5d72840eaa325c5e99ac610a Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Thu, 8 Mar 2012 22:03:48 +0000
Subject: Beginings of a welcome dialog, and overlay improvements.

---
 gen/net/cbaines/suma/R.java                  | Bin 15051 -> 15604 bytes
 res/layout/welcome_dialog.xml                |  52 +++++++++++++++++++
 res/values/strings.xml                       |  72 +++++++++++++++++----------
 src/net/cbaines/suma/BuildingNumOverlay.java |  58 ++++++++++-----------
 src/net/cbaines/suma/BusStopOverlay.java     |  33 ++++++------
 src/net/cbaines/suma/MapActivity.java        |   7 +++
 src/net/cbaines/suma/WelcomeDialog.java      |  48 ++++++++++++++++++
 7 files changed, 200 insertions(+), 70 deletions(-)
 create mode 100644 res/layout/welcome_dialog.xml
 create mode 100644 src/net/cbaines/suma/WelcomeDialog.java

diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java
index 7ff7855..67c7f33 100644
Binary files a/gen/net/cbaines/suma/R.java and b/gen/net/cbaines/suma/R.java differ
diff --git a/res/layout/welcome_dialog.xml b/res/layout/welcome_dialog.xml
new file mode 100644
index 0000000..49b7c27
--- /dev/null
+++ b/res/layout/welcome_dialog.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_root"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="2dp" >
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:gravity="center"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/welcomeDialogButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/welcome_dialog_button_text" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/textView4"
+        android:text="@string/welcome_dialog_version"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/textView4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:text="@string/welcome_dialog_copyright"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="match_parent"
+        android:layout_height="305dp"
+        android:layout_above="@+id/linearLayout1"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/textView3"
+        android:scrollbars="vertical"
+        android:text="@string/welcome_dialog_install_message" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9932e9..b61609b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,23 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="menu_find">Find</string>
-    <string name="menu_preferences">Preferences</string>
-    <string name="menu_view">View</string>
-    <string name="menu_find_my_location">Find my Location</string>
     <string name="app_name">Southampton University Map</string>
-    <string name="legal_message">Southampton University Map comes with ABSOLUTELY NO WARRANTY; do not rely on the data or functionality provided by this application. This is free software, and you are welcome to redistribute it under certain conditions; expand the Licence item above for more details.</string>
-    <string name="building_residential">Residential Building</string>
-    <string name="building_non_residential">Non-Residential Building</string>
-    <string name="pref_bus_stop">Bus Stops</string>
+
+    <!-- General -->
     <string name="U1">U1</string>
     <string name="U1N">U1N</string>
     <string name="U2">U2</string>
     <string name="U6">U6</string>
     <string name="U9">U9</string>
+
+    <!-- Map Activity -->
+    <string name="menu_find">Find</string>
+    <string name="menu_preferences">Preferences</string>
+    <string name="menu_view">View</string>
+    <string name="menu_find_my_location">Find my Location</string>
+    <string name="pref_bus_stop">Bus Stops</string>
     <string name="menu_about">About</string>
     <string name="menu_favourites">Favourites</string>
-    <string name="favourites_dialog_title">Favourites</string>
+
+    <!-- Welcome Dialog -->
+    <string name="welcome_dialog_title">Southampton University Map App</string>
+    <string name="welcome_dialog_version">Version 0.7 (alpha)</string>
+    <string name="welcome_dialog_copyright">© 2011 Christopher Baines</string>
+        <string name="welcome_dialog_upgrade_message">
+Thanks for upgrading this app, and it\'s hoped that its better for you than the previous version. Noteable changes include\:\n
+ &#8226; New Search\n
+ &#8226; Other\n
+
+\nThis program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.\n
+
+\nThis program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.</string>
+    <string name="welcome_dialog_install_message">
+Welcome to the Southampton University Map App. Noteable features include\:\n
+ &#8226; Search for Buildings\n
+ &#8226; Get Live Bus Times\n
+
+\nThis program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.\n
+
+\nThis program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.</string>
 
     <!-- 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>
@@ -27,28 +60,13 @@
     <string name="view_help_message">Use the options in the View dialog to enable and disable the map elements.</string>
     <string name="about_help_message">The About screen displays the help messages and also the contact details of the developer. You also have the option of making a Bitcoin donation using the Donate button at the bottom. WARNING, the donation address is not private as it is hardcoded in to the app.</string>
     <string name="favourites_help_message">The favourites dialog includes a list of buildings or bus stops marked as favourites, this is meant to allow for easier access to frequently used locations.</string>
-    <string name="licence_help_message">Southampton University Map App Copyright © 2011 Christopher Baines\n
-\n
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.\n
-\n
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.\n
-\n
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.</string>
     <string name="credits_help_message">Data:  Map Icons: From the "Map Icons Collection" (http://mapicons.nicolasmollet.com). Map Tiles: From the Mapnik project, through the OSMDroid libary. Database: Using the ORMLite libary.</string>
     <string name="donate_button">Donate</string>
     <string name="bitcoin_error_message">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.</string>
     <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 -->
+    <!-- View Dialog -->
     <string-array name="uniLinkBusRoutes">
         <item>U1</item>
         <item>U1N</item>
@@ -147,4 +165,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <string name="bus_activity_destination_label">Destination:\u0020</string>
     <string name="bus_activity_no_destination_message">No given destination</string>
 
+    <!-- Favourites Dialog -->
+    <string name="favourites_dialog_title">Favourites</string>
+    <string name="welcome_dialog_button_text">Continue</string>
+
 </resources>
\ No newline at end of file
diff --git a/src/net/cbaines/suma/BuildingNumOverlay.java b/src/net/cbaines/suma/BuildingNumOverlay.java
index f11a166..b541aa1 100644
--- a/src/net/cbaines/suma/BuildingNumOverlay.java
+++ b/src/net/cbaines/suma/BuildingNumOverlay.java
@@ -94,33 +94,24 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 	}
 
 	/**
-	 * Draw a marker on each of our items. populate() must have been called
-	 * first.<br/>
+	 * Draw a marker on each of our items. populate() must have been called first.<br/>
 	 * <br/>
-	 * The marker will be drawn twice for each Item in the Overlay--once in the
-	 * shadow phase, skewed and darkened, then again in the non-shadow phase.
-	 * The bottom-center of the marker will be aligned with the geographical
-	 * coordinates of the Item.<br/>
+	 * The marker will be drawn twice for each Item in the Overlay--once in the shadow phase, skewed and darkened, then again in
+	 * the non-shadow phase. The bottom-center of the marker will be aligned with the geographical coordinates of the Item.<br/>
 	 * <br/>
-	 * The order of drawing may be changed by overriding the getIndexToDraw(int)
-	 * method. An item may provide an alternate marker via its
-	 * OverlayItem.getMarker(int) method. If that method returns null, the
-	 * default marker is used.<br/>
+	 * The order of drawing may be changed by overriding the getIndexToDraw(int) method. An item may provide an alternate marker
+	 * via its OverlayItem.getMarker(int) method. If that method returns null, the default marker is used.<br/>
 	 * <br/>
-	 * The focused item is always drawn last, which puts it visually on top of
-	 * the other items.<br/>
+	 * The focused item is always drawn last, which puts it visually on top of the other items.<br/>
 	 * 
 	 * @param canvas
-	 *            the Canvas upon which to draw. Note that this may already have
-	 *            a transformation applied, so be sure to leave it the way you
-	 *            found it
+	 *            the Canvas upon which to draw. Note that this may already have a transformation applied, so be sure to leave it
+	 *            the way you found it
 	 * @param mapView
-	 *            the MapView that requested the draw. Use
-	 *            MapView.getProjection() to convert between on-screen pixels
-	 *            and latitude/longitude pairs
+	 *            the MapView that requested the draw. Use MapView.getProjection() to convert between on-screen pixels and
+	 *            latitude/longitude pairs
 	 * @param shadow
-	 *            if true, draw the shadow layer. If false, draw the overlay
-	 *            contents.
+	 *            if true, draw the shadow layer. If false, draw the overlay contents.
 	 */
 	@Override
 	public void draw(final Canvas canvas, final MapView mapView, final boolean shadow) {
@@ -144,8 +135,7 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 		final SharedPreferences favouritesPrefs = context.getSharedPreferences(FAVOURITES_PREFERENCES, 0);
 
 		/*
-		 * Draw in backward cycle, so the items with the least index are on the
-		 * front.
+		 * Draw in backward cycle, so the items with the least index are on the front.
 		 */
 		for (Iterator<Building> buildingIter = buildings.iterator(); buildingIter.hasNext();) {
 			final Building building = buildingIter.next();
@@ -219,8 +209,7 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 			if (showIdentifiers) {
 				str += " (" + building.id + ")";
 			}
-			context.makeToast(str, context.getResources().getString(R.string.map_activity_toast_help_message),
-					Toast.LENGTH_SHORT);
+			context.makeToast(str, context.getResources().getString(R.string.map_activity_toast_help_message), Toast.LENGTH_SHORT);
 
 			return true;
 		}
@@ -230,7 +219,7 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 	public boolean onDoubleTap(final MotionEvent event, final MapView mapView) {
 		if (!this.isEnabled())
 			return false;
-		
+
 		Building building = getSelectedItem(event, mapView);
 
 		if (building == null) {
@@ -265,19 +254,27 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 			Log.v(TAG, "building Pressed " + building.id);
 
 			final SharedPreferences favouritesPrefs = context.getSharedPreferences(FAVOURITES_PREFERENCES, 0);
+			final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
 
 			if (favouritesPrefs.getBoolean(building.id, false)) {
 				favouritesPrefs.edit().remove(building.id).commit();
 
-				context.makeToast(building.id + " removed from favourites", Toast.LENGTH_SHORT);
+				// if (sharedPrefs.getBoolean(SHOW_IDENTIFIERS, SHOW_IDENTIFIERS_ENABLED_BY_DEFAULT)) {
+				context.makeToast(building.name + " removed from favourites", "(" + building.id + ")", Toast.LENGTH_SHORT);
+				// } else {
+				// context.makeToast(building.name + " removed from favourites", Toast.LENGTH_SHORT);
+				// }
 			} else {
-				context.makeToast(building.id + " made a favourite", Toast.LENGTH_SHORT);
+				// if (sharedPrefs.getBoolean(SHOW_IDENTIFIERS, SHOW_IDENTIFIERS_ENABLED_BY_DEFAULT)) {
+				context.makeToast(building.name + " added to favourites", "(" + building.id + ")", Toast.LENGTH_SHORT);
+				// } else {
+				// context.makeToast(building.name + " added to favourites", Toast.LENGTH_SHORT);
+				// }
 
 				favouritesPrefs.edit().putBoolean(building.id, true).commit();
 			}
 
-			Collections.sort(buildings,
-					new POIFavouriteComparator(context.getSharedPreferences(FAVOURITES_PREFERENCES, 0)));
+			Collections.sort(buildings, new POIFavouriteComparator(context.getSharedPreferences(FAVOURITES_PREFERENCES, 0)));
 
 			mapView.invalidate();
 
@@ -310,8 +307,7 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
 		Log.i(TAG, "Got a favourites change in the BuildingNumOverlay for key " + key);
 
-		Collections
-				.sort(buildings, new POIFavouriteComparator(context.getSharedPreferences(FAVOURITES_PREFERENCES, 0)));
+		Collections.sort(buildings, new POIFavouriteComparator(context.getSharedPreferences(FAVOURITES_PREFERENCES, 0)));
 	}
 
 }
diff --git a/src/net/cbaines/suma/BusStopOverlay.java b/src/net/cbaines/suma/BusStopOverlay.java
index 778b306..b8377cf 100644
--- a/src/net/cbaines/suma/BusStopOverlay.java
+++ b/src/net/cbaines/suma/BusStopOverlay.java
@@ -110,8 +110,7 @@ public class BusStopOverlay extends Overlay implements RouteColorConstants, Pref
 		final SharedPreferences favouritesPreferences = context.getSharedPreferences(FAVOURITES_PREFERENCES, 0);
 
 		/*
-		 * Draw in backward cycle, so the items with the least index are on the
-		 * front.
+		 * Draw in backward cycle, so the items with the least index are on the front.
 		 */
 
 		for (int stopNum = 0; stopNum < busStops.size(); stopNum++) {
@@ -184,9 +183,9 @@ public class BusStopOverlay extends Overlay implements RouteColorConstants, Pref
 							Log.e(TAG, "Unknown route code");
 						}
 
-						canvas.drawRect(rectLeft, mCurScreenCoords.y
-								+ ((yOfsetPerMarker * makersPlaced) - (45 * scale)), rectRight, mCurScreenCoords.y
-								+ (yOfsetPerMarker * makersPlaced) - ((45 * scale) - markerYSize), paint);
+						canvas.drawRect(rectLeft, mCurScreenCoords.y + ((yOfsetPerMarker * makersPlaced) - (45 * scale)),
+								rectRight, mCurScreenCoords.y + (yOfsetPerMarker * makersPlaced) - ((45 * scale) - markerYSize),
+								paint);
 
 						makersPlaced++;
 					}
@@ -210,8 +209,7 @@ public class BusStopOverlay extends Overlay implements RouteColorConstants, Pref
 			if (showIdentifiers) {
 				str += " (" + busStop.id + ")";
 			}
-			context.makeToast(str, context.getResources().getString(R.string.map_activity_toast_help_message),
-					Toast.LENGTH_SHORT);
+			context.makeToast(str, context.getResources().getString(R.string.map_activity_toast_help_message), Toast.LENGTH_SHORT);
 
 			return true;
 		}
@@ -250,21 +248,28 @@ public class BusStopOverlay extends Overlay implements RouteColorConstants, Pref
 		} else {
 			Log.i(TAG, "Pressed " + busStop.id);
 
-			SharedPreferences favouritesPreferences = context.getSharedPreferences(FAVOURITES_PREFERENCES, 0);
+			final SharedPreferences favouritesPreferences = context.getSharedPreferences(FAVOURITES_PREFERENCES, 0);
+			final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
 
 			if (favouritesPreferences.getBoolean(busStop.id, false)) {
 				favouritesPreferences.edit().remove(busStop.id).commit();
 
-				context.makeToast(busStop.id + " removed from favourites", Toast.LENGTH_SHORT);
-
+				if (sharedPrefs.getBoolean(SHOW_IDENTIFIERS, SHOW_IDENTIFIERS_ENABLED_BY_DEFAULT)) {
+					context.makeToast(busStop.description + " removed from favourites", "(" + busStop.id + ")",
+							Toast.LENGTH_SHORT);
+				} else {
+					context.makeToast(busStop.description + " removed from favourites", Toast.LENGTH_SHORT);
+				}
 			} else {
-				context.makeToast(busStop.id + " made a favourite", Toast.LENGTH_SHORT);
-
+				if (sharedPrefs.getBoolean(SHOW_IDENTIFIERS, SHOW_IDENTIFIERS_ENABLED_BY_DEFAULT)) {
+					context.makeToast(busStop.description + " added to favourites", "(" + busStop.id + ")", Toast.LENGTH_SHORT);
+				} else {
+					context.makeToast(busStop.description + " added to favourites", Toast.LENGTH_SHORT);
+				}
 				favouritesPreferences.edit().putBoolean(busStop.id, true).commit();
 			}
 
-			Collections.sort(busStops,
-					new POIFavouriteComparator(context.getSharedPreferences(FAVOURITES_PREFERENCES, 0)));
+			Collections.sort(busStops, new POIFavouriteComparator(context.getSharedPreferences(FAVOURITES_PREFERENCES, 0)));
 
 			mapView.invalidate();
 
diff --git a/src/net/cbaines/suma/MapActivity.java b/src/net/cbaines/suma/MapActivity.java
index 6eab356..413ec48 100644
--- a/src/net/cbaines/suma/MapActivity.java
+++ b/src/net/cbaines/suma/MapActivity.java
@@ -86,6 +86,8 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants
 
 	static final int VIEW_DIALOG_ID = 0;
 	static final int FAVOURITE_DIALOG_ID = 1;
+	static final int WELCOME_DIALOG_ID = 2;
+
 	private POIDialog favDialog;
 
 	private HashMap<String, Overlay> overlays = new HashMap<String, Overlay>();
@@ -271,6 +273,8 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants
 
 		mapController.setCenter(userLocation);
 
+		showDialog(WELCOME_DIALOG_ID);
+
 		Log.i(TAG, "Finished onCreate " + (System.currentTimeMillis() - startTime));
 	}
 
@@ -1079,6 +1083,9 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants
 			favDialog.setOnItemLongClickListener(this);
 			favDialog.setTitle(R.string.favourites_dialog_title);
 			return favDialog;
+		case WELCOME_DIALOG_ID:
+			WelcomeDialog welcomeDialog = new WelcomeDialog(instance);
+			return welcomeDialog;
 		}
 		return null;
 	}
diff --git a/src/net/cbaines/suma/WelcomeDialog.java b/src/net/cbaines/suma/WelcomeDialog.java
new file mode 100644
index 0000000..d0d6fd0
--- /dev/null
+++ b/src/net/cbaines/suma/WelcomeDialog.java
@@ -0,0 +1,48 @@
+/*
+ * Southampton University Map App
+ * Copyright (C) 2011  Christopher Baines
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package net.cbaines.suma;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+
+public class WelcomeDialog extends Dialog implements android.view.View.OnClickListener {
+
+	// private static final String TAG = "WelcomeDialog";
+
+	private Button continueButton;
+
+	public WelcomeDialog(Context context) {
+		super(context);
+
+		this.setTitle(R.string.welcome_dialog_title);
+
+		setContentView(R.layout.welcome_dialog);
+		
+		continueButton = (Button) findViewById(R.id.welcomeDialogButton);
+		continueButton.setOnClickListener(this);
+	}
+
+	public void onClick(View arg0) {
+		this.dismiss();
+	}
+
+}
-- 
cgit v1.2.3