--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/10/27 13:39:28	473
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/10/29 08:56:17	481
@@ -44,11 +44,9 @@
 	public static final int NOPROVIDER = 1003;
 	public static final int LOCATIONFIXTIMEOUT = 1004;
 	
-	public static final int OPTIONS_RESCAN = 2001;
-	public static final int OPTIONS_NAMESEARCH = 2002;
 	public static final int OPTIONS_MAP = 2003;
-	public static final int OPTIONS_ABOUT = 2004;
-	public static final int OPTIONS_FAVORITES = 2005;
+	public static final int OPTIONS_GPSINFO = 2004;
+
 	
 
 	
@@ -80,9 +78,9 @@
 	
 	FavoritesMenu contextMenu = new FavoritesMenu();
 	IntSet favorites = new IntSet();
-	
-	boolean showingFavorites = false;
-	
+
+	WelcomeScreen.ListType listType;
+	String dialogTitle;
 	SharedPreferences prefs;
 	
 	///////////////////////////////////////////////////////////////////////////////////////////
@@ -92,7 +90,7 @@
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.main);
+		setContentView(R.layout.stationlist);
 		
 		
 		adapter = new StationListAdapter(this);
@@ -111,11 +109,27 @@
 		}
 		
 		if (savedInstanceState == null) {
-			startLookup();
+			listType = (WelcomeScreen.ListType) getIntent().getSerializableExtra("type");
+			switch (listType) {
+			case ListNearest:
+				startLookup();
+				break;
+			case ListSearch:
+				this.showDialog(DLG_STATIONNAME);
+				break;
+			case ListFavorites:
+				startFavoriteLookup();
+				break;
+			default:
+				// Not possible !?!
+			}
+			
 		} else {
 			stations = (ArrayList<StationBean>) savedInstanceState.getSerializable("stations");
 			adapter.setStations(stations);
 			location = (GeoPair) savedInstanceState.getSerializable("location");
+			dialogTitle = savedInstanceState.getString("title");
+			setTitle(dialogTitle);
 		}
 	}
 
@@ -127,6 +141,7 @@
     		dialog.dismiss();
     	outState.putSerializable("stations", (ArrayList<StationBean>) stations);
     	outState.putSerializable("location", location);
+    	outState.putString("title", dialogTitle);
     }
 	
 	
@@ -134,21 +149,13 @@
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuItem item;
-		
-		item = menu.add(0, OPTIONS_RESCAN, 0, "Nearest stations");
-		item.setIcon(android.R.drawable.ic_menu_mylocation);
-		
-		item = menu.add(0, OPTIONS_NAMESEARCH, 0, "Search for station");
-		item.setIcon(android.R.drawable.ic_menu_search);
-		
-		item = menu.add(0, OPTIONS_FAVORITES, 0, "Favorites");
-		item.setIcon(android.R.drawable.ic_menu_agenda);
-		
+				
 		item = menu.add(0, OPTIONS_MAP, 0, "Station map");
 		item.setIcon(android.R.drawable.ic_menu_mapmode);
 		
-		item = menu.add(0, OPTIONS_ABOUT, 0, "About");
-		item.setIcon(android.R.drawable.ic_menu_info_details);
+		item = menu.add(0, OPTIONS_GPSINFO, 0, "GPS Info");
+		item.setIcon(android.R.drawable.ic_menu_mapmode);		
+		
 		return true;
 	}
 
@@ -156,17 +163,8 @@
 	public boolean onOptionsItemSelected(MenuItem item) {
 		boolean retval = true;
 
-		
+		//TODO: Cleanup
 		switch (item.getItemId()) {
-		case OPTIONS_RESCAN:
-			startLookup();
-			break;
-		case OPTIONS_NAMESEARCH:
-			showDialog(DLG_STATIONNAME);
-			break;
-		case OPTIONS_FAVORITES:
-			startFavoriteLookup();
-			break;
 		case OPTIONS_MAP:
 			
 			Intent intent = new Intent(this,StationMapView.class);
@@ -181,14 +179,9 @@
 			
 			startActivity(intent);
 			break;
-		case OPTIONS_ABOUT:
-			String ver = this.getResources().getString(R.string.app_version);
-			
+		case OPTIONS_GPSINFO:
 			Location loc = locator.getLocation();
 			StringBuffer message = new StringBuffer();
-			message.append("TrainInfo DK v").append(ver).append("\n");
-			message.append("By Torben Nielsen\n");
-			message.append("\n");
 			message.append("Location info:\n");
 			message.append("-Obtained by: ").append(loc != null ? loc.getProvider() : "-").append("\n");
 			message.append("-Accuracy: ").append(loc != null ? (int)loc.getAccuracy() : "-").append("m\n");
@@ -483,11 +476,17 @@
 				String addr = lookupAddress(station.getLatitude(), station.getLongitude());
 				station.setAddress(addr);
 				
+				
 				if (method.equals(LookupMethod.ByName) || method.equals(LookupMethod.ByList)) {
-					dummy.setLatitude(station.getLatitude());
-					dummy.setLongitude(station.getLongitude());
-					station.setDistance( (int)loc.distanceTo(dummy) );
+					if (loc != null) { //only do the distance calc if we have a location
+						dummy.setLatitude(station.getLatitude());
+						dummy.setLongitude(station.getLongitude());
+						station.setDistance( (int)loc.distanceTo(dummy) );
+					} else {
+						station.setDistance(0);
+					}
 				}
+
 			}						
 			
 			return null;
@@ -499,31 +498,28 @@
 			dialog.dismiss();
 			
 			//set title
-			String title;
 			switch (method) {
 			case ByLocation:
-				title = "Traininfo DK - Nearby stations";
+				dialogTitle = "Traininfo DK - Nearby stations";
 				break;
 			case ByName:
-				title = "Traininfo DK - Search";
+				dialogTitle = "Traininfo DK - Search";
 				break;
 			case ByList:
-				title = "Traininfo DK - Favorites";
+				dialogTitle = "Traininfo DK - Favorites";
 				break;
 			default:
-				title = "";//not possible					
+				dialogTitle = "";//not possible					
 			}				
 			
-			StationList.this.setTitle(title);
+			StationList.this.setTitle(dialogTitle);
 			//set title end
 			
 			if (success) {				
 				if (stationProvider.getStations().size() == 0)
 					MessageBox.showMessage(StationList.this, "No stations found!"); // this should not be possible !?!
 				stations = stationProvider.getStations();
-				adapter.setStations( stations );
-				
-				showingFavorites = method.equals(LookupMethod.ByList);				
+				adapter.setStations( stations );				
 				
 			} else { //communication or parse errors
 				AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this);						
@@ -586,7 +582,8 @@
 				favorites.remove(stationID);
 				Toast.makeText(StationList.this, "Station removed", Toast.LENGTH_SHORT).show();
 				
-				if (showingFavorites) {
+				
+				if (listType.equals( WelcomeScreen.ListType.ListFavorites) ) {
 					stations.remove(selectedPosition);
 					adapter.notifyDataSetChanged();
 				}