1 files changed, 13 insertions, 24 deletions

diff --git a/src/net/cbaines/suma/BuildingNumOverlay.java b/src/net/cbaines/suma/BuildingNumOverlay.java
index a4cf556..c2a9d7c 100644
--- a/src/net/cbaines/suma/BuildingNumOverlay.java
+++ b/src/net/cbaines/suma/BuildingNumOverlay.java
@@ -40,6 +40,7 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.widget.Toast;
@@ -65,6 +66,8 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 
 	private float userScale = 1f;
 
+	private boolean showIdentifiers;
+
 	public BuildingNumOverlay(MapActivity context, List<Building> buildings) throws SQLException {
 		super(context);
 
@@ -76,6 +79,9 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 		final SharedPreferences favouritesPrefs = context.getSharedPreferences(FAVOURITES_PREFERENCES, 0);
 		favouritesPrefs.registerOnSharedPreferenceChangeListener(this);
 
+		showIdentifiers = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SHOW_IDENTIFIERS,
+				SHOW_IDENTIFIERS_ENABLED_BY_DEFAULT);
+
 		paint = new Paint();
 		paint.setColor(Color.BLACK);
 		paint.setAntiAlias(true);
@@ -209,14 +215,12 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 		} else {
 			Log.v(TAG, "building Pressed " + building.id);
 
-			if (context.activityToast == null) {
-				context.activityToast = Toast.makeText(context, building.name + " (" + building.id + ")",
-						Toast.LENGTH_SHORT);
-			} else {
-				context.activityToast.setDuration(Toast.LENGTH_SHORT);
-				context.activityToast.setText(building.name + " (" + building.id + ")");
+			String str = building.name;
+			if (showIdentifiers) {
+				str += " (" + building.id + ")";
 			}
-			context.activityToast.show();
+			context.makeToast(str, context.getResources().getString(R.string.map_activity_toast_help_message),
+					Toast.LENGTH_SHORT);
 
 			return true;
 		}
@@ -262,24 +266,9 @@ public class BuildingNumOverlay extends Overlay implements Preferences, OnShared
 			if (favouritesPrefs.getBoolean(building.id, false)) {
 				favouritesPrefs.edit().remove(building.id).commit();
 
-				if (context.activityToast == null) {
-					context.activityToast = Toast.makeText(context, building.id + " removed from favourites",
-							Toast.LENGTH_SHORT);
-				} else {
-					context.activityToast.setDuration(Toast.LENGTH_SHORT);
-					context.activityToast.setText(building.id + " removed from favourites");
-				}
-				context.activityToast.show();
-
+				context.makeToast(building.id + " removed from favourites", Toast.LENGTH_SHORT);
 			} else {
-				if (context.activityToast == null) {
-					context.activityToast = Toast.makeText(context, building.id + " made a favourite",
-							Toast.LENGTH_SHORT);
-				} else {
-					context.activityToast.setDuration(Toast.LENGTH_SHORT);
-					context.activityToast.setText(building.id + " made a favourite");
-				}
-				context.activityToast.show();
+				context.makeToast(building.id + " made a favourite", Toast.LENGTH_SHORT);
 
 				favouritesPrefs.edit().putBoolean(building.id, true).commit();
 			}