Better toasts in the BusStopActivity, many other improvements.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/net/cbaines/suma/BusStopActivity.java b/src/net/cbaines/suma/BusStopActivity.java
index 81dbcc1..9f422af 100644
--- a/src/net/cbaines/suma/BusStopActivity.java
+++ b/src/net/cbaines/suma/BusStopActivity.java
@@ -54,15 +54,13 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.j256.ormlite.android.apptools.OrmLiteBaseActivity;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.stmt.PreparedQuery;
 import com.j256.ormlite.stmt.QueryBuilder;
 
-public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> implements OnCheckedChangeListener, Preferences,
-		OnItemClickListener, OnLongClickListener {
+public class BusStopActivity extends ToastHelperActivity implements OnCheckedChangeListener, Preferences, OnItemClickListener,
+		OnLongClickListener {
 
 	final static String TAG = "BusTimeActivity";
 
@@ -97,8 +95,6 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 
 	private HashSet<BusRoute> routes = new HashSet<BusRoute>();
 
-	Toast activityToast;
-
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.bus_stop_activity);
@@ -214,14 +210,18 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 
 		busName = (TextView) findViewById(R.id.busStopName);
 
+		busID = (TextView) findViewById(R.id.busStopID);
 		if (prefs.getBoolean(SHOW_IDENTIFIERS, SHOW_IDENTIFIERS_ENABLED_BY_DEFAULT)) {
-			busID = (TextView) findViewById(R.id.busStopID);
 			busID.setText(busStopID);
 			busID.setVisibility(View.VISIBLE);
+		} else {
+			busID.setVisibility(View.GONE);
 		}
 
 		busStopMessage = (TextView) findViewById(R.id.busStopMessage);
+		busStopMessage.setVisibility(View.GONE);
 		progBar = (ProgressBar) findViewById(R.id.busStopLoadBar);
+		progBar.setVisibility(View.GONE);
 		busTimeList = (ListView) findViewById(R.id.busStopTimes);
 		busTimeContentLayout = (LinearLayout) findViewById(R.id.busTimeContentLayout);
 
@@ -353,6 +353,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 				busStopMessage.setVisibility(View.VISIBLE);
 			} else {
 				progBar.setVisibility(View.GONE);
+				busStopMessage.setVisibility(View.GONE);
 				timetable = newTimetable;
 				displayTimetable(timetable);
 			}