--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2011/07/06 21:20:49 1546 +++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2011/07/07 19:07:55 1547 @@ -3,24 +3,17 @@ 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_satellitecount; @@ -28,8 +21,6 @@ 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; @@ -44,21 +35,21 @@ 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.text.Editable; +import android.text.TextWatcher; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; -import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.View.OnCreateContextMenuListener; import android.widget.AdapterView; -import android.widget.EditText; import android.widget.ListView; +import android.widget.TextView; import android.widget.Toast; import dk.thoerup.android.traininfo.common.StationBean; import dk.thoerup.android.traininfo.common.StationEntry; @@ -77,7 +68,6 @@ public static final int OPTIONS_GPSINFO = 104; public static final int DLG_PROGRESS = 3001; - public static final int DLG_STATIONNAME = 3002; public static final int GPS_TIMEOUT_MS = 15000; //how long are we willing to wait for gps fix -in milliseconds @@ -94,7 +84,6 @@ String dialogMessage = ""; ProgressDialog dialog; LocationLookup locationLookup = null; - FindStationsTask findStationsTask; StationsFetchedHandler stationsFetched = new StationsFetchedHandler(); //GeoPair location = new GeoPair(); @@ -153,7 +142,7 @@ startNearestLookup(); break; case ListSearch: - showDialog(DLG_STATIONNAME); + enableNamesearchField(); break; case ListFavorites: startFavoriteLookup(); @@ -184,9 +173,7 @@ if (locationLookup != null) { locationLookup.stopSearch(); } - if (findStationsTask != null) { - findStationsTask.cancel(true); - } + } @@ -210,6 +197,35 @@ } + + public void enableNamesearchField() { + final TextView stationSearch = (TextView) findViewById(R.id.stationsearch); + stationSearch.setVisibility( View.VISIBLE ); + stationSearch.addTextChangedListener( new TextWatcher() { + + @Override + public void afterTextChanged(Editable s) { + if (s.length() > 0) { + startNameLookup( s.toString() ); + } else { + stations = new StationBean(); + getListView().invalidateViews(); + adapter.setStations( stations ); + } + } + + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + } + + }); + + + } @Override @@ -319,35 +335,6 @@ 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(); - String search = et.getText().toString().trim(); - if (search.length() >= 2) { - startNameLookup(search); - } 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); @@ -400,24 +387,21 @@ } void startNameLookup(String name) { - dialogMessage = getString( stationlist_findbyname ); - showDialog(DLG_PROGRESS); - - findStationsTask = new FindStationsTask(); - findStationsTask.searchByName(name); - findStationsTask.execute(); + stations = stationProvider.lookupStationsByName(name); + getListView().invalidateViews(); + adapter.setStations( stations ); } public void startFavoriteLookup() { if (favorites.size() > 0) { - dialogMessage = getString( stationlist_loadfavorites ); - showDialog(DLG_PROGRESS); - - findStationsTask = new FindStationsTask(); - findStationsTask.searchByIds( favorites.toString() ); - findStationsTask.execute(); + + stations = stationProvider.lookupStationsByIds( favorites.toString() ); + getListView().invalidateViews(); + adapter.setStations( stations ); + + } else { showMessageAndClose( getString( stationlist_nofavorites ) ); } @@ -425,14 +409,11 @@ - void startLocatorTask() - { - dialogMessage = getString( stationlist_findingnearby ); - showDialog(DLG_PROGRESS); - - findStationsTask = new FindStationsTask(); - findStationsTask.searchByLocation( locationLookup.getLocation() ); - findStationsTask.execute(); + void startNearestLookupPhase2() + { + stations = stationProvider.lookupStationsByLocation( locationLookup.getLocation() ); + getListView().invalidateViews(); + adapter.setStations( stations ); } @@ -450,7 +431,7 @@ case GOTLOCATION: dismissDialog(DLG_PROGRESS); - startLocatorTask(); + startNearestLookupPhase2(); return; @@ -475,7 +456,7 @@ locationLookup.stopSearch(); if (locationLookup.hasLocation()) { - startLocatorTask(); + startNearestLookupPhase2(); } else { AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this); builder.setMessage( getString( stationlist_gpstimeout) ); @@ -511,126 +492,6 @@ - class FindStationsTask extends AsyncTask { - - LookupMethod method = LookupMethod.MethodNone; - String name; - Location loc; - String ids; - - public void searchByName(String n) { - - method = LookupMethod.ByName; - name = n; - } - - public void searchByLocation(Location l) { - method = LookupMethod.ByLocation; - loc = l; - } - - public void searchByIds(String id) { - - method = LookupMethod.ByList; - ids = id; - } - - @Override - protected void onPreExecute() { - - if (method.equals(LookupMethod.MethodNone)) - throw new RuntimeException("Method not set"); - super.onPreExecute(); - } - - @Override - protected Void doInBackground(Void... params) { - - switch (method) { - case ByLocation: - stations = stationProvider.lookupStationsByLocation(loc); - break; - case ByName: - stations = stationProvider.lookupStationsByName(name); - break; - case ByList: - stations = stationProvider.lookupStationsByIds(ids); - break; - default: - stations = null; // not possible - } - - - return null; - } - - @Override - protected void onPostExecute(Void result) { - super.onPostExecute(result); - dialog.dismiss(); - - - 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(getString(stationlist_fetcherror)); - builder.setCancelable(true); - builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - - 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() { - startNameLookup( FindStationsTask.this.name ); - } - }; - break; - case ByList: - runner = new Runnable() { - @Override - public void run() { - startFavoriteLookup(); - } - }; - break; - } - - stationsFetched.post( runner ); - } - }); - builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - StationList.this.finish(); - } - }); - - builder.show(); - } - } - } - - class FavoritesMenu implements OnCreateContextMenuListener { private final static int FAVORITES_ADD = 9001; private final static int FAVORITES_REMOVE = 9002;