--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2009/10/02 10:49:00 382 +++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2010/09/16 15:32:42 1066 @@ -1,33 +1,71 @@ package dk.thoerup.traininfo; +import static dk.thoerup.traininfo.R.string.app_name; +import static dk.thoerup.traininfo.R.string.generic_cancel; +import static dk.thoerup.traininfo.R.string.generic_retry; +import static dk.thoerup.traininfo.R.string.generic_search; +import static dk.thoerup.traininfo.R.string.stationlist_accuracy; +import static dk.thoerup.traininfo.R.string.stationlist_addfavorite; +import static dk.thoerup.traininfo.R.string.stationlist_favorites; +import static dk.thoerup.traininfo.R.string.stationlist_fetcherror; +import static dk.thoerup.traininfo.R.string.stationlist_findbyname; +import static dk.thoerup.traininfo.R.string.stationlist_findingnearby; +import static dk.thoerup.traininfo.R.string.stationlist_gpsinfo; +import static dk.thoerup.traininfo.R.string.stationlist_gpstimeout; +import static dk.thoerup.traininfo.R.string.stationlist_latitude; +import static dk.thoerup.traininfo.R.string.stationlist_loadfavorites; +import static dk.thoerup.traininfo.R.string.stationlist_locationinfo; +import static dk.thoerup.traininfo.R.string.stationlist_longitude; +import static dk.thoerup.traininfo.R.string.stationlist_nearbystations; +import static dk.thoerup.traininfo.R.string.stationlist_nofavorites; +import static dk.thoerup.traininfo.R.string.stationlist_nolocation; +import static dk.thoerup.traininfo.R.string.stationlist_nolocationprovider; +import static dk.thoerup.traininfo.R.string.stationlist_nostations; +import static dk.thoerup.traininfo.R.string.stationlist_obtainedby; +import static dk.thoerup.traininfo.R.string.stationlist_removefavorite; +import static dk.thoerup.traininfo.R.string.stationlist_search; +import static dk.thoerup.traininfo.R.string.stationlist_stationadded; +import static dk.thoerup.traininfo.R.string.stationlist_stationmap; +import static dk.thoerup.traininfo.R.string.stationlist_stationremoved; +import static dk.thoerup.traininfo.R.string.stationlist_stationsearch; +import static dk.thoerup.traininfo.R.string.stationlist_twocharmin; +import static dk.thoerup.traininfo.R.string.stationlist_waitforlocation; + import java.util.ArrayList; import java.util.List; -import java.util.Locale; +import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.ListActivity; 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.android.traininfo.common.StationBean; +import dk.thoerup.android.traininfo.common.StationBean.StationEntry; 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 { @@ -36,36 +74,45 @@ 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_GPSINFO = 2004; public static final int DLG_PROGRESS = 3001; public static final int DLG_STATIONNAME = 3002; - /** Called when the activity is first created. */ + + public static final int GPS_TIMEOUT_MS = 15000; //how long are we willing to wait for gps fix -in milliseconds + + + static enum LookupMethod { + ByLocation, + ByName, + ByList, + MethodNone + } + + String dialogMessage = ""; ProgressDialog dialog; - LocationLookup locator = null; - LocatorTask locatorTask; + LocationLookup locationLookup = null; + FindStationsTask findStationsTask; StationsFetchedHandler stationsFetched = new StationsFetchedHandler(); GeoPair location = new GeoPair(); - + + boolean isLaunchedforShortcut; boolean isRunning = false; - List stations = new ArrayList(); + StationBean stations = new StationBean(); StationProvider stationProvider = ProviderFactory.getStationProvider(); StationListAdapter adapter = null; - static enum LookupMethod { - ByLocation, - ByName, - MethodNone - } + FavoritesMenu contextMenu = new FavoritesMenu(); + IntSet favorites = new IntSet(); + + WelcomeScreen.ListType listType; + SharedPreferences prefs; /////////////////////////////////////////////////////////////////////////////////////////// //Activity call backs @@ -74,40 +121,120 @@ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main); + setContentView(R.layout.stationlist); 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(); + + isLaunchedforShortcut = getIntent().getBooleanExtra("shortcut", false); + + ProviderFactory.purgeOldEntries(); //cleanup before fetching more data + if (savedInstanceState == null) { - startLookup(); + + + switch (listType) { + case ListNearest: + startLookup(); + break; + case ListSearch: + showDialog(DLG_STATIONNAME); + break; + case ListFavorites: + startFavoriteLookup(); + break; + default: + // Not possible !?! + } + } else { - stations = (ArrayList) savedInstanceState.getSerializable("stations"); + stations = (StationBean) savedInstanceState.getSerializable("stations"); adapter.setStations(stations); location = (GeoPair) savedInstanceState.getSerializable("location"); } + + } + + + + + + + @Override + protected void onDestroy() { + super.onDestroy(); + + isRunning = false; + + if (locationLookup != null) { + locationLookup.stopSearch(); + } + if (findStationsTask != null) { + findStationsTask.cancel(true); + } } + + 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("stations", (StationBean) stations); outState.putSerializable("location", location); + } @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_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; } @@ -115,21 +242,14 @@ 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_MAP: Intent intent = new Intent(this,StationMapView.class); - intent.putExtra("userlocation", location ); ArrayList stationPoints = new ArrayList(); - for (StationBean st : stations ) { + for (StationEntry st : stations.entries ) { stationPoints.add( new GeoPair(st.getLatitude(), st.getLongitude(), st.getName()) ); } @@ -137,14 +257,20 @@ startActivity(intent); break; - case OPTIONS_ABOUT: - String ver = this.getResources().getString(R.string.app_version); - + 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"); - - MessageBox.showMessage(this, message.toString()); + 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( (float)loc.getLatitude()).append("\n"); + message.append( getString(stationlist_longitude) ).append( (float)loc.getLongitude() ).append("\n"); + } else { + message.append( getString(stationlist_nolocation) ); + } + + MessageBox.showMessage(this, message.toString(), false); break; default: retval = super.onOptionsItemSelected(item); @@ -152,13 +278,39 @@ 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: @@ -168,23 +320,25 @@ AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Station search"); + builder.setTitle( getString(stationlist_stationsearch) ); builder.setView(rootView); builder.setCancelable(true); - builder.setPositiveButton("Search", new DialogInterface.OnClickListener() { + 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()); + String search = et.getText().toString().trim(); + if (search.length() >= 2) { + startNameSearch(search); } else { - MessageBox.showMessage(StationList.this, "Two characters minimum" ); + showMessageAndClose( getString(stationlist_twocharmin) ); } } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + 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(); @@ -214,84 +368,68 @@ 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(); - - + StationEntry station = stations.entries.get(position); - 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); + if (isLaunchedforShortcut == true) { + Intent i = new Intent(); + i.putExtra("station", station); + setResult(Activity.RESULT_OK, i); + finish(); + } else { + Intent intent = new Intent(this, DepartureList.class); + intent.putExtra("stationbean", station); + startActivity(intent); + } } ///////////////////////////////////////////////////////////// // public void startLookup() { - isRunning = true; - dialogMessage = "Wait for location fix"; + isRunning = true; + dialogMessage = getString( stationlist_waitforlocation ); showDialog(DLG_PROGRESS); - locator.locateStations(); - stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, 20000); + locationLookup.locateStations(); + stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, GPS_TIMEOUT_MS); } void startNameSearch(String name) { - dialogMessage = "Finding stations by name"; + dialogMessage = getString( stationlist_findbyname ); showDialog(DLG_PROGRESS); - locatorTask = new LocatorTask(); - locatorTask.searchByName(name, locator.getLocation()); - locatorTask.execute(); + findStationsTask = new FindStationsTask(); + findStationsTask.searchByName(name); + findStationsTask.execute(); } + + public void startFavoriteLookup() { + + if (favorites.size() > 0) { + dialogMessage = getString( stationlist_loadfavorites ); + showDialog(DLG_PROGRESS); + + findStationsTask = new FindStationsTask(); + findStationsTask.searchByIds( favorites.toString() ); + findStationsTask.execute(); + } else { + showMessageAndClose( getString( stationlist_nofavorites ) ); + } + } void startLocatorTask() { - dialogMessage = "Finding nearby stations"; + dialogMessage = getString( stationlist_findingnearby ); showDialog(DLG_PROGRESS); - locatorTask = new LocatorTask(); - locatorTask.searchByLocation( locator.getLocation() ); - locatorTask.execute(); + findStationsTask = new FindStationsTask(); + findStationsTask.searchByLocation( locationLookup.getLocation() ); + findStationsTask.execute(); } - - - 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 @@ -305,38 +443,39 @@ dismissDialog(DLG_PROGRESS); startLocatorTask(); - location = GeoPair.fromLocation( locator.getLocation() ); + 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), true ); + //StationList.this.finish(); 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(); } - }); - builder.show(); + }); + builder.show(); } } @@ -347,17 +486,16 @@ }; - 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) { + public void searchByName(String n) { method = LookupMethod.ByName; - loc = l; name = n; } @@ -366,6 +504,12 @@ loc = l; } + public void searchByIds(String id) { + + method = LookupMethod.ByList; + ids = id; + } + @Override protected void onPreExecute() { @@ -376,26 +520,21 @@ @Override protected Void doInBackground(Void... params) { - - if (method.equals(LookupMethod.ByLocation)) - success = stationProvider.lookupStations(loc); - - if (method.equals(LookupMethod.ByName)) - success = stationProvider.lookupStations(name); - - Location dummy = new Location("gps"); - List stations = stationProvider.getStations(); + + switch (method) { + case ByLocation: + stations = stationProvider.lookupStations(loc); + break; + case ByName: + stations = stationProvider.lookupStationsByName(name); + break; + case ByList: + stations = stationProvider.lookupStationsByIds(ids); + break; + default: + stations = null; // not possible + } - for (StationBean station : stations) { - String addr = lookupAddress(station.getLatitude(), station.getLongitude()); - station.setAddress(addr); - - if (method.equals(LookupMethod.ByName) ) { - dummy.setLatitude(station.getLatitude()); - dummy.setLongitude(station.getLongitude()); - station.setDistance( (int)loc.distanceTo(dummy) ); - } - } return null; } @@ -405,35 +544,111 @@ super.onPostExecute(result); dialog.dismiss(); - if (success) { - if (stationProvider.getStations().size() == 0) - MessageBox.showMessage(StationList.this, "No stations found!"); // this should not be possible !?! - stations = stationProvider.getStations(); + + if (stations != null) { + if (stations.entries.size() == 0) { + showMessageAndClose(getString(stationlist_nostations)); + } + + StationList.this.getListView().invalidateViews(); 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_fetcherror)); 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(); - stationsFetched.post( new Runnable() { - @Override - public void run() { - startLocatorTask(); - } - }); + Runnable runner = null; + switch (method) { + case ByLocation: + runner = new Runnable() { + @Override + public void run() { + startLocatorTask(); + } + }; + break; + case ByName: + runner = new Runnable() { + @Override + public void run() { + startNameSearch( FindStationsTask.this.name ); + } + }; + break; + case ByList: + runner = new Runnable() { + @Override + public void run() { + startFavoriteLookup(); + } + }; + break; + } + + stationsFetched.post( runner ); } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); + StationList.this.finish(); } - }); - builder.show(); + }); + + builder.show(); + } + } + } + + + 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.entries.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_removefavorite) ); + } + + } + + public void onContextItemSelected(MenuItem item) { + StationEntry sb = stations.entries.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.entries.remove(selectedPosition); + adapter.notifyDataSetChanged(); + } } + Editor ed = prefs.edit(); + ed.putString("favorites", favorites.toString()); + ed.commit(); } } } \ No newline at end of file