--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2009/09/23 12:51:49 336 +++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2010/01/28 08:55:19 561 @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import java.util.Locale; + import android.app.AlertDialog; import android.app.Dialog; @@ -10,81 +10,281 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; -import android.location.Address; -import android.location.Geocoder; +import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; import android.location.Location; import android.os.AsyncTask; import android.os.Bundle; 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; +import static dk.thoerup.traininfo.R.string.*; + public class StationList extends ListActivity { public static final int GOTLOCATION = 1001; public static final int GOTSTATIONLIST = 1002; public static final int NOPROVIDER = 1003; public static final int LOCATIONFIXTIMEOUT = 1004; + + public static final int OPTIONS_MAP = 2003; + public static final int OPTIONS_GPSINFO = 2004; - public static final int DLG_PROGRESS = 1001; + + + public static final int DLG_PROGRESS = 3001; + public static final int DLG_STATIONNAME = 3002; + + static enum LookupMethod { + ByLocation, + ByName, + ByList, + MethodNone + } + - /** Called when the activity is first created. */ String dialogMessage = ""; ProgressDialog dialog; - LocationLookup locator = null; - LocatorTask locatorTask; + LocationLookup locationLookup = null; + FindStationsTask findStationsTask; + StationsFetchedHandler stationsFetched = new StationsFetchedHandler(); + + GeoPair location = new GeoPair(); boolean isRunning = false; List stations = new ArrayList(); StationProvider stationProvider = ProviderFactory.getStationProvider(); + + StationListAdapter adapter = null; + FavoritesMenu contextMenu = new FavoritesMenu(); + IntSet favorites = new IntSet(); + + WelcomeScreen.ListType listType; + SharedPreferences prefs; + + /////////////////////////////////////////////////////////////////////////////////////////// + //Activity call backs - StationListAdapter adapter = null; @SuppressWarnings("unchecked") @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main); + setContentView(R.layout.stationlist); - LocationLookup.removeMockLocation(this); - //LocationLookup.injectMockLocation(this); adapter = new StationListAdapter(this); setListAdapter(adapter); - locator = new LocationLookup(this, stationsFetched); + ListView lv = getListView(); + lv.setOnCreateContextMenuListener(contextMenu); + + locationLookup = new LocationLookup(this, stationsFetched); + + + prefs = getSharedPreferences("TrainStation", 0); + String favoriteString = prefs.getString("favorites", ""); + if (! favoriteString.equals("") ) { + 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(app_name); + switch (listType) { + case ListNearest: + dialogTitle += " - " + getString(stationlist_nearbystations); + break; + case ListSearch: + dialogTitle += " - " + getString(stationlist_search); + break; + case ListFavorites: + dialogTitle += " - " + getString(stationlist_favorites); + break; + default: + dialogTitle = "";//not possible } + + setTitle(dialogTitle); } + + + @Override public void onSaveInstanceState(Bundle outState) { if (dialog != null && dialog.isShowing()) dialog.dismiss(); outState.putSerializable("stations", (ArrayList) stations); + outState.putSerializable("location", location); + } @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuItem item; + + item = menu.add(0, OPTIONS_MAP, 0, getString(stationlist_stationmap)); + item.setIcon(android.R.drawable.ic_menu_mapmode); + + item = menu.add(0, OPTIONS_GPSINFO, 0, getString(stationlist_gpsinfo)); + item.setIcon(android.R.drawable.ic_menu_mapmode); + + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + boolean retval = true; + + //TODO: Cleanup + switch (item.getItemId()) { + case OPTIONS_MAP: + + Intent intent = new Intent(this,StationMapView.class); + + ArrayList stationPoints = new ArrayList(); + for (StationBean st : stations ) { + stationPoints.add( new GeoPair(st.getLatitude(), st.getLongitude(), st.getName()) ); + } + + intent.putExtra("stations", stationPoints); + + startActivity(intent); + break; + case OPTIONS_GPSINFO: + Location loc = locationLookup.getLocation(); + StringBuffer message = new StringBuffer(); + message.append( getString(stationlist_locationinfo) ).append(":\n"); + if (loc != null) { + message.append( getString(stationlist_obtainedby) ).append( loc.getProvider() ).append("\n"); + message.append( getString(stationlist_accuracy) ).append( (int)loc.getAccuracy()).append("m\n"); + message.append( getString(stationlist_latitude) ).append( loc.getLatitude()).append("\n"); + message.append( getString(stationlist_longitude) ).append( loc.getLongitude() ).append("\n"); + } else { + message.append( getString(stationlist_nolocation) ); + } + + MessageBox.showMessage(this, message.toString()); + break; + default: + retval = super.onOptionsItemSelected(item); + } + + return retval; + } + + + + @Override + public boolean onContextItemSelected(MenuItem item) { + contextMenu.onContextItemSelected(item); + return true; + + + } + + public void showMessageAndClose(String message) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setMessage(message) + .setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + StationList.this.finish(); + } + }) + .show(); + } + + + + + @Override protected Dialog onCreateDialog(int id) { switch (id) { case DLG_PROGRESS: ProgressDialog dlg = new ProgressDialog(this); - dlg.setMessage("Wait for location fix"); + dlg.setMessage( getString(stationlist_waitforlocation) ); dlg.setCancelable(false); return dlg; + case DLG_STATIONNAME: + LayoutInflater factory = LayoutInflater.from(this); + final View rootView = factory.inflate(R.layout.textinput, null); + + + AlertDialog.Builder builder = new AlertDialog.Builder(this); + + builder.setTitle( getString(stationlist_stationsearch) ); + builder.setView(rootView); + builder.setCancelable(true); + builder.setPositiveButton( getString(generic_search), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + EditText et = (EditText) rootView.findViewById(R.id.EditText); + dialog.dismiss(); + if (et.getText().toString().length() >= 2) { + startNameSearch(et.getText().toString()); + } else { + showMessageAndClose( getString(stationlist_twocharmin) ); + } + } + }); + builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + StationList.this.finish(); // Close this Activity + } + }); + return builder.create(); + default: return super.onCreateDialog(id); } @@ -92,7 +292,6 @@ } - @Override protected void onPrepareDialog(int id, Dialog dialog) { super.onPrepareDialog(id, dialog); @@ -106,17 +305,99 @@ break; } } + + @Override + protected void onListItemClick(ListView l, View v, int position, long id) { + super.onListItemClick(l, v, position, id); + + StationBean station = stations.get(position); + + Intent intent = new Intent(this, DepartureList.class); + intent.putExtra("stationbean", station); + startActivity(intent); + } + + ///////////////////////////////////////////////////////////// + // public void startLookup() { - isRunning = true; + isRunning = true; + dialogMessage = getString( stationlist_waitforlocation ); showDialog(DLG_PROGRESS); - locator.locateStations(); + locationLookup.locateStations(); stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, 20000); } + + void startNameSearch(String name) { + dialogMessage = getString( stationlist_findbyname ); + showDialog(DLG_PROGRESS); + + findStationsTask = new FindStationsTask(); + findStationsTask.searchByName(name, locationLookup.getLocation()); + findStationsTask.execute(); + + } + + public void startFavoriteLookup() { + + if (favorites.size() > 0) { + dialogMessage = getString( stationlist_loadfavorites ); + showDialog(DLG_PROGRESS); + + findStationsTask = new FindStationsTask(); + findStationsTask.searchByIds(favorites.toString(), locationLookup.getLocation()); + findStationsTask.execute(); + } else { + showMessageAndClose( getString( stationlist_nofavorites ) ); + } + } + + + + void startLocatorTask() + { + dialogMessage = getString( stationlist_findingnearby ); + showDialog(DLG_PROGRESS); + + findStationsTask = new FindStationsTask(); + findStationsTask.searchByLocation( locationLookup.getLocation() ); + findStationsTask.execute(); + } + + /* TODO: Remove this no longer needed function + String lookupAddress(double latitude, double longitude) { + + Geocoder coder = new Geocoder(this, new Locale("da")); + StringBuilder sb = new StringBuilder(); + Log.i("lookupaddr", "" + latitude + "/" + longitude); + try { + List
addressList = coder.getFromLocation(latitude, longitude, 1); + Address addr = addressList.get(0); + + + int max = addr.getMaxAddressLineIndex(); + for (int i=0; i0) + sb.append(", "); + + sb.append(addr.getAddressLine(i)); + } + + + } catch (Exception e) { + Log.e("DepartureList", "geocoder failed", e); + } + + return sb.toString(); + }*/ + + + //////////////////////////////////////////////////////////////////////////// + // Inner classes - Handler stationsFetched = new Handler() { + class StationsFetchedHandler extends Handler { @Override public void handleMessage(Message msg) { @@ -125,32 +406,33 @@ dismissDialog(DLG_PROGRESS); startLocatorTask(); + location = GeoPair.fromLocation( locationLookup.getLocation() ); break; case NOPROVIDER: dismissDialog(DLG_PROGRESS); - MessageBox.showMessage(StationList.this,"No location provider enabled. Plase enable gps."); + MessageBox.showMessage(StationList.this, getString(stationlist_nolocationprovider) ); break; case LOCATIONFIXTIMEOUT: if (isRunning) { - locator.stopSearch(); - if (locator.hasLocation()) { + locationLookup.stopSearch(); + if (locationLookup.hasLocation()) { stationsFetched.sendEmptyMessage( GOTLOCATION ); } else { dismissDialog(DLG_PROGRESS); AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this); - builder.setMessage("GPS fix timed out"); + builder.setMessage( getString( stationlist_gpstimeout) ); builder.setCancelable(true); - builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { + builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); startLookup(); } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + builder.setNegativeButton( getString(generic_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); } @@ -164,82 +446,77 @@ isRunning = false; } }; - - void startLocatorTask() - { - dialogMessage = "Finding nearby stations"; - showDialog(DLG_PROGRESS); - - locatorTask = new LocatorTask(); - locatorTask.execute(); - } - - @Override - protected void onListItemClick(ListView l, View v, int position, long id) { - super.onListItemClick(l, v, position, id); - - StationBean station = stations.get(position); - - double latitude = station.getLatitude(); - double longitude = station.getLongitude(); - + + class FindStationsTask extends AsyncTask { - Intent intent = new Intent(this, DepartureList.class); - intent.putExtra("name", station.getName()); - intent.putExtra("distance", station.getDistance()); - intent.putExtra("latitude", latitude); - intent.putExtra("longitude", longitude); - intent.putExtra("stationid", station.getId()); - intent.putExtra("address", station.getAddress()); - startActivity(intent); - } - - String lookupAddress(double latitude, double longitude) { + LookupMethod method = LookupMethod.MethodNone; + boolean success; + String name; + Location loc; + String ids; - Geocoder coder = new Geocoder(this, new Locale("da")); - StringBuilder sb = new StringBuilder(); - Log.i("lookupaddr", "" + latitude + "/" + longitude); - try { - List
addressList = coder.getFromLocation(latitude, longitude, 1); - Address addr = addressList.get(0); - - - int max = addr.getMaxAddressLineIndex(); - for (int i=0; i0) - sb.append(", "); - - sb.append(addr.getAddressLine(i)); - } + public void searchByName(String n, Location l) { + method = LookupMethod.ByName; + loc = l; + name = n; + } + + public void searchByLocation(Location l) { + method = LookupMethod.ByLocation; + loc = l; + } + + public void searchByIds(String id, Location l) { - } catch (Exception e) { - Log.e("DepartureList", "geocoder failed", e); + method = LookupMethod.ByList; + loc = l; + ids = id; } - return sb.toString(); - } - - class LocatorTask extends AsyncTask { - boolean success; @Override protected void onPreExecute() { + if (method.equals(LookupMethod.MethodNone)) + throw new RuntimeException("Method not set"); super.onPreExecute(); } @Override protected Void doInBackground(Void... params) { - Location loc = locator.getLocation(); - success = stationProvider.lookupStations(loc); + + switch (method) { + case ByLocation: + success = stationProvider.lookupStations(loc); + break; + case ByName: + success = stationProvider.lookupStationsByName(name); + break; + case ByList: + success = stationProvider.lookupStationsByIds(ids); + break; + default: + success = false; // not possible + } + Location dummy = new Location("gps"); List stations = stationProvider.getStations(); - for (StationBean station : stations) { - String addr = lookupAddress(station.getLatitude(), station.getLongitude()); - station.setAddress(addr); - } + + for (StationBean station : stations) { + + if (method.equals(LookupMethod.ByName) || method.equals(LookupMethod.ByList)) { + 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; } @@ -249,17 +526,18 @@ super.onPostExecute(result); dialog.dismiss(); + if (success) { if (stationProvider.getStations().size() == 0) - MessageBox.showMessage(StationList.this, "No stations found!"); // this should not be possible !?! + MessageBox.showMessage(StationList.this, getString(stationlist_nostations) ); // this should not be possible !?! stations = stationProvider.getStations(); adapter.setStations( stations ); } else { //communication or parse errors AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this); - builder.setMessage("Error on finding nearby stations"); + builder.setMessage(getString(stationlist_nearbyerror)); builder.setCancelable(true); - builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { + builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); @@ -271,7 +549,7 @@ }); } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); } @@ -280,4 +558,51 @@ } } } + + + 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, getString(stationlist_addfavorite) ); + } else { + menu.add(0, FAVORITES_REMOVE, 0, getString(stationlist_addfavorite) ); + } + + } + + 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, getString(stationlist_stationadded), Toast.LENGTH_SHORT).show(); + } else { + + favorites.remove(stationID); + Toast.makeText(StationList.this, getString(stationlist_stationremoved), Toast.LENGTH_SHORT).show(); + + + if (listType.equals( WelcomeScreen.ListType.ListFavorites) ) { + stations.remove(selectedPosition); + adapter.notifyDataSetChanged(); + } + } + Editor ed = prefs.edit(); + ed.putString("favorites", favorites.toString()); + ed.commit(); + } + } } \ No newline at end of file