--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2009/10/02 10:49:00 382 +++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2009/10/11 07:23:35 441 @@ -10,6 +10,8 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; +import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; import android.location.Address; import android.location.Geocoder; import android.location.Location; @@ -18,16 +20,22 @@ import android.os.Handler; import android.os.Message; import android.util.Log; +import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.ContextMenu.ContextMenuInfo; +import android.view.View.OnCreateContextMenuListener; +import android.widget.AdapterView; import android.widget.EditText; import android.widget.ListView; +import android.widget.Toast; import dk.thoerup.traininfo.provider.ProviderFactory; import dk.thoerup.traininfo.provider.StationProvider; import dk.thoerup.traininfo.stationmap.GeoPair; import dk.thoerup.traininfo.stationmap.StationMapView; +import dk.thoerup.traininfo.util.IntSet; import dk.thoerup.traininfo.util.MessageBox; public class StationList extends ListActivity { @@ -40,16 +48,25 @@ 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 DLG_PROGRESS = 3001; public static final int DLG_STATIONNAME = 3002; - /** Called when the activity is first created. */ + static enum LookupMethod { + ByLocation, + ByName, + ByList, + MethodNone + } + + String dialogMessage = ""; ProgressDialog dialog; LocationLookup locator = null; - LocatorTask locatorTask; + FindStationsTask findStationsTask; StationsFetchedHandler stationsFetched = new StationsFetchedHandler(); GeoPair location = new GeoPair(); @@ -61,11 +78,12 @@ StationListAdapter adapter = null; - static enum LookupMethod { - ByLocation, - ByName, - MethodNone - } + FavoritesMenu contextMenu = new FavoritesMenu(); + IntSet favorites = new IntSet(); + + + + SharedPreferences prefs; /////////////////////////////////////////////////////////////////////////////////////////// //Activity call backs @@ -80,7 +98,18 @@ adapter = new StationListAdapter(this); setListAdapter(adapter); + ListView lv = getListView(); + lv.setOnCreateContextMenuListener(contextMenu); + locator = new LocationLookup(this, stationsFetched); + + + prefs = getSharedPreferences("TrainStation", 0); + String favoriteString = prefs.getString("favorites", ""); + if (! favoriteString.equals("") ) { + favorites.fromString(favoriteString); + } + if (savedInstanceState == null) { startLookup(); } else { @@ -104,10 +133,22 @@ @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(0, OPTIONS_RESCAN, 0, "Find nearest stations"); - menu.add(0, OPTIONS_NAMESEARCH, 0, "Search for station"); - menu.add(0, OPTIONS_MAP, 0, "Show station map"); - menu.add(0, OPTIONS_ABOUT, 0, "About"); + 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); return true; } @@ -123,6 +164,9 @@ case OPTIONS_NAMESEARCH: showDialog(DLG_STATIONNAME); break; + case OPTIONS_FAVORITES: + startFavoriteLookup(); + break; case OPTIONS_MAP: Intent intent = new Intent(this,StationMapView.class); @@ -140,9 +184,14 @@ case OPTIONS_ABOUT: String ver = this.getResources().getString(R.string.app_version); + 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"); MessageBox.showMessage(this, message.toString()); break; @@ -152,6 +201,19 @@ return retval; } + + + + @Override + public boolean onContextItemSelected(MenuItem item) { + contextMenu.onContextItemSelected(item); + return true; + + + } + + + @Override protected Dialog onCreateDialog(int id) { @@ -247,10 +309,24 @@ dialogMessage = "Finding stations by name"; showDialog(DLG_PROGRESS); - locatorTask = new LocatorTask(); - locatorTask.searchByName(name, locator.getLocation()); - locatorTask.execute(); + findStationsTask = new FindStationsTask(); + findStationsTask.searchByName(name, locator.getLocation()); + findStationsTask.execute(); + + } + + public void startFavoriteLookup() { + if (favorites.size() > 0) { + dialogMessage = "Loading favorites"; + showDialog(DLG_PROGRESS); + + findStationsTask = new FindStationsTask(); + findStationsTask.searchByIds(favorites.toString(), locator.getLocation()); + findStationsTask.execute(); + } else { + MessageBox.showMessage(this, "Favorite list is empty"); + } } @@ -260,9 +336,9 @@ dialogMessage = "Finding nearby stations"; showDialog(DLG_PROGRESS); - locatorTask = new LocatorTask(); - locatorTask.searchByLocation( locator.getLocation() ); - locatorTask.execute(); + findStationsTask = new FindStationsTask(); + findStationsTask.searchByLocation( locator.getLocation() ); + findStationsTask.execute(); } @@ -322,7 +398,7 @@ dismissDialog(DLG_PROGRESS); AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this); - builder.setMessage("GPS fix timed out"); + builder.setMessage("Location fix timed out"); builder.setCancelable(true); builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -347,12 +423,13 @@ }; - class LocatorTask extends AsyncTask { + class FindStationsTask extends AsyncTask { LookupMethod method = LookupMethod.MethodNone; boolean success; String name; Location loc; + String ids; public void searchByName(String n, Location l) { @@ -366,6 +443,13 @@ loc = l; } + public void searchByIds(String id, Location l) { + + method = LookupMethod.ByList; + loc = l; + ids = id; + } + @Override protected void onPreExecute() { @@ -381,7 +465,10 @@ success = stationProvider.lookupStations(loc); if (method.equals(LookupMethod.ByName)) - success = stationProvider.lookupStations(name); + success = stationProvider.lookupStationsByName(name); + + if (method.equals(LookupMethod.ByList)) + success = stationProvider.lookupStationsByIds(ids); Location dummy = new Location("gps"); List stations = stationProvider.getStations(); @@ -390,7 +477,7 @@ String addr = lookupAddress(station.getLatitude(), station.getLongitude()); station.setAddress(addr); - if (method.equals(LookupMethod.ByName) ) { + if (method.equals(LookupMethod.ByName) || method.equals(LookupMethod.ByList)) { dummy.setLatitude(station.getLatitude()); dummy.setLongitude(station.getLongitude()); station.setDistance( (int)loc.distanceTo(dummy) ); @@ -436,4 +523,44 @@ } } } + + + class FavoritesMenu implements OnCreateContextMenuListener { + private final static int FAVORITES_ADD = 9001; + private final static int FAVORITES_REMOVE = 9002; + + private int selectedPosition; + + + @Override + public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { + + AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo; + selectedPosition = info.position; + int stationID = stations.get(selectedPosition).getId(); + + if (!favorites.contains(stationID)) { + menu.add(0, FAVORITES_ADD, 0, "Add to favorites"); + } else { + menu.add(0, FAVORITES_REMOVE, 0, "Remove from favorites"); + } + + } + + public void onContextItemSelected(MenuItem item) { + StationBean sb = stations.get(selectedPosition); + + int stationID = sb.getId(); + if (item.getItemId() == FAVORITES_ADD) { + 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(); + } + Editor ed = prefs.edit(); + ed.putString("favorites", favorites.toString()); + ed.commit(); + } + } } \ No newline at end of file