--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2009/10/11 07:18:56 440 +++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2009/10/29 14:20:16 489 @@ -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; + @@ -65,7 +63,7 @@ String dialogMessage = ""; ProgressDialog dialog; - LocationLookup locator = null; + LocationLookup locationLookup = null; FindStationsTask findStationsTask; StationsFetchedHandler stationsFetched = new StationsFetchedHandler(); @@ -80,9 +78,8 @@ FavoritesMenu contextMenu = new FavoritesMenu(); IntSet favorites = new IntSet(); - - + WelcomeScreen.ListType listType; SharedPreferences prefs; /////////////////////////////////////////////////////////////////////////////////////////// @@ -92,7 +89,7 @@ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main); + setContentView(R.layout.stationlist); adapter = new StationListAdapter(this); @@ -101,7 +98,7 @@ ListView lv = getListView(); lv.setOnCreateContextMenuListener(contextMenu); - locator = new LocationLookup(this, stationsFetched); + locationLookup = new LocationLookup(this, stationsFetched); prefs = getSharedPreferences("TrainStation", 0); @@ -110,14 +107,53 @@ favorites.fromString(favoriteString); } + listType = (WelcomeScreen.ListType) getIntent().getSerializableExtra("type"); + setTitle(); + if (savedInstanceState == null) { - startLookup(); + + + switch (listType) { + case ListNearest: + startLookup(); + break; + case ListSearch: + this.showDialog(DLG_STATIONNAME); + break; + case ListFavorites: + startFavoriteLookup(); + break; + default: + // Not possible !?! + } + } else { stations = (ArrayList) savedInstanceState.getSerializable("stations"); adapter.setStations(stations); location = (GeoPair) savedInstanceState.getSerializable("location"); } + } + protected void setTitle() { + String dialogTitle = getResources().getString(R.string.app_name); + switch (listType) { + case ListNearest: + dialogTitle += " - Nearby stations"; + break; + case ListSearch: + dialogTitle += " - Search"; + break; + case ListFavorites: + dialogTitle += " - Favorites"; + break; + default: + dialogTitle = "";//not possible + } + + setTitle(dialogTitle); + } + + @Override @@ -127,6 +163,7 @@ dialog.dismiss(); outState.putSerializable("stations", (ArrayList) stations); outState.putSerializable("location", location); + } @@ -134,21 +171,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,21 +185,11 @@ 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); - intent.putExtra("userlocation", location ); ArrayList stationPoints = new ArrayList(); for (StationBean st : stations ) { @@ -181,14 +200,9 @@ startActivity(intent); break; - case OPTIONS_ABOUT: - String ver = this.getResources().getString(R.string.app_version); - - Location loc = locator.getLocation(); + case OPTIONS_GPSINFO: + Location loc = locationLookup.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"); @@ -301,7 +315,7 @@ dialogMessage = "Wait for location fix"; showDialog(DLG_PROGRESS); - locator.locateStations(); + locationLookup.locateStations(); stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, 20000); } @@ -310,7 +324,7 @@ showDialog(DLG_PROGRESS); findStationsTask = new FindStationsTask(); - findStationsTask.searchByName(name, locator.getLocation()); + findStationsTask.searchByName(name, locationLookup.getLocation()); findStationsTask.execute(); } @@ -322,7 +336,7 @@ showDialog(DLG_PROGRESS); findStationsTask = new FindStationsTask(); - findStationsTask.searchByIds(favorites.toString(), locator.getLocation()); + findStationsTask.searchByIds(favorites.toString(), locationLookup.getLocation()); findStationsTask.execute(); } else { MessageBox.showMessage(this, "Favorite list is empty"); @@ -337,7 +351,7 @@ showDialog(DLG_PROGRESS); findStationsTask = new FindStationsTask(); - findStationsTask.searchByLocation( locator.getLocation() ); + findStationsTask.searchByLocation( locationLookup.getLocation() ); findStationsTask.execute(); } @@ -381,7 +395,7 @@ dismissDialog(DLG_PROGRESS); startLocatorTask(); - location = GeoPair.fromLocation( locator.getLocation() ); + location = GeoPair.fromLocation( locationLookup.getLocation() ); break; @@ -391,8 +405,8 @@ break; case LOCATIONFIXTIMEOUT: if (isRunning) { - locator.stopSearch(); - if (locator.hasLocation()) { + locationLookup.stopSearch(); + if (locationLookup.hasLocation()) { stationsFetched.sendEmptyMessage( GOTLOCATION ); } else { dismissDialog(DLG_PROGRESS); @@ -460,15 +474,21 @@ @Override protected Void doInBackground(Void... params) { - - if (method.equals(LookupMethod.ByLocation)) + + switch (method) { + case ByLocation: success = stationProvider.lookupStations(loc); - - if (method.equals(LookupMethod.ByName)) + break; + case ByName: success = stationProvider.lookupStationsByName(name); - - if (method.equals(LookupMethod.ByList)) + break; + case ByList: success = stationProvider.lookupStationsByIds(ids); + break; + default: + success = false; // not possible + } + Location dummy = new Location("gps"); List stations = stationProvider.getStations(); @@ -477,11 +497,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; @@ -492,6 +518,7 @@ super.onPostExecute(result); dialog.dismiss(); + if (success) { if (stationProvider.getStations().size() == 0) MessageBox.showMessage(StationList.this, "No stations found!"); // this should not be possible !?! @@ -539,7 +566,7 @@ selectedPosition = info.position; int stationID = stations.get(selectedPosition).getId(); - if (!favorites.hasInt(stationID)) { + if (!favorites.contains(stationID)) { menu.add(0, FAVORITES_ADD, 0, "Add to favorites"); } else { menu.add(0, FAVORITES_REMOVE, 0, "Remove from favorites"); @@ -555,8 +582,15 @@ favorites.add(stationID); Toast.makeText(StationList.this, "Station added", Toast.LENGTH_SHORT).show(); } else { + favorites.remove(stationID); Toast.makeText(StationList.this, "Station removed", Toast.LENGTH_SHORT).show(); + + + if (listType.equals( WelcomeScreen.ListType.ListFavorites) ) { + stations.remove(selectedPosition); + adapter.notifyDataSetChanged(); + } } Editor ed = prefs.edit(); ed.putString("favorites", favorites.toString());