1 files changed, 11 insertions, 30 deletions

diff --git a/src/net/cbaines/suma/StopView.java b/src/net/cbaines/suma/StopView.java
index afe8664..fa76131 100644
--- a/src/net/cbaines/suma/StopView.java
+++ b/src/net/cbaines/suma/StopView.java
@@ -23,6 +23,7 @@ import java.sql.SQLException;
 import java.text.DateFormat;
 
 import android.content.Intent;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.util.Log;
 import android.view.Gravity;
@@ -49,6 +50,9 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli
 
 	private Stop stop;
 
+	private String onClickHelpMessage;
+	private String onClickUnidentifiedMessage;
+
 	public StopView(BusStopActivity context, Stop stop) {
 		super(context);
 
@@ -63,6 +67,10 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli
 		time.setTextSize(22f);
 		time.setGravity(Gravity.RIGHT);
 
+		Resources resources = context.getResources();
+		onClickHelpMessage = resources.getString(R.string.stop_view_on_click_toast_help_message);
+		onClickUnidentifiedMessage = resources.getString(R.string.stop_view_on_click_toast_unidentified_message);
+
 		setStop(stop);
 
 		addView(name, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
@@ -111,14 +119,7 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli
 	}
 
 	public void onClick(View v) {
-		if (context.activityToast == null) {
-			context.activityToast = Toast.makeText(context, onClickMessage, Toast.LENGTH_SHORT);
-		} else {
-			context.activityToast.setText(onClickMessage);
-			context.activityToast.setDuration(Toast.LENGTH_SHORT);
-		}
-		context.activityToast.show();
-
+		context.makeToast(onClickMessage, onClickHelpMessage, Toast.LENGTH_SHORT);
 	}
 
 	public boolean onLongClick(View v) {
@@ -131,8 +132,7 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli
 			busDao.refresh(stop.bus);
 			busRouteDao.refresh(stop.bus.route);
 
-			Log.i("StopView", "Bus route " + stop.bus.route + " Uni-Link " + stop.bus.route.uniLink + " Bus ID "
-					+ stop.bus.id);
+			Log.i("StopView", "Bus route " + stop.bus.route + " Uni-Link " + stop.bus.route.uniLink + " Bus ID " + stop.bus.id);
 
 			if (stop.bus.id != null && stop.bus.route.uniLink) {
 				Uri uri = Uri.parse("http://id.southampton.ac.uk/bus/" + stop.bus.id);
@@ -141,27 +141,8 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli
 				busStopIntent.putExtra("busStopID", stop.busStop.id);
 				context.startActivity(busStopIntent);
 			} else {
-				if (!stop.bus.route.uniLink) {
-					if (context.activityToast == null) {
-						context.activityToast = Toast.makeText(context,
-								"Bus schedules only avalible for Uni-Link buses", Toast.LENGTH_SHORT);
-					} else {
-						context.activityToast.setText("Bus schedules only avalible for Uni-Link buses");
-						context.activityToast.setDuration(Toast.LENGTH_SHORT);
-					}
-					context.activityToast.show();
-				} else {
-					if (context.activityToast == null) {
-						context.activityToast = Toast.makeText(context,
-								"Bus schedules not avalible for unidentified buses", Toast.LENGTH_SHORT);
-					} else {
-						context.activityToast.setText("Bus schedules not avalible for unidentified buses");
-						context.activityToast.setDuration(Toast.LENGTH_SHORT);
-					}
-					context.activityToast.show();
-				}
+				context.makeToast(onClickUnidentifiedMessage, Toast.LENGTH_SHORT);
 			}
-
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}