--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2009/10/29 08:56:17 481 +++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2010/01/28 09:10:44 563 @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import java.util.Locale; + import android.app.AlertDialog; import android.app.Dialog; @@ -12,14 +12,12 @@ 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; 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; @@ -38,6 +36,8 @@ 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; @@ -63,7 +63,7 @@ String dialogMessage = ""; ProgressDialog dialog; - LocationLookup locator = null; + LocationLookup locationLookup = null; FindStationsTask findStationsTask; StationsFetchedHandler stationsFetched = new StationsFetchedHandler(); @@ -80,7 +80,6 @@ IntSet favorites = new IntSet(); WelcomeScreen.ListType listType; - String dialogTitle; SharedPreferences prefs; /////////////////////////////////////////////////////////////////////////////////////////// @@ -99,7 +98,7 @@ ListView lv = getListView(); lv.setOnCreateContextMenuListener(contextMenu); - locator = new LocationLookup(this, stationsFetched); + locationLookup = new LocationLookup(this, stationsFetched); prefs = getSharedPreferences("TrainStation", 0); @@ -108,8 +107,12 @@ favorites.fromString(favoriteString); } + listType = (WelcomeScreen.ListType) getIntent().getSerializableExtra("type"); + setTitle(); + if (savedInstanceState == null) { - listType = (WelcomeScreen.ListType) getIntent().getSerializableExtra("type"); + + switch (listType) { case ListNearest: startLookup(); @@ -128,10 +131,29 @@ stations = (ArrayList) savedInstanceState.getSerializable("stations"); adapter.setStations(stations); location = (GeoPair) savedInstanceState.getSerializable("location"); - dialogTitle = savedInstanceState.getString("title"); - setTitle(dialogTitle); } + + } + 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 @@ -141,7 +163,7 @@ dialog.dismiss(); outState.putSerializable("stations", (ArrayList) stations); outState.putSerializable("location", location); - outState.putString("title", dialogTitle); + } @@ -149,11 +171,11 @@ @Override public boolean onCreateOptionsMenu(Menu menu) { MenuItem item; - - item = menu.add(0, OPTIONS_MAP, 0, "Station map"); + + 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, "GPS Info"); + item = menu.add(0, OPTIONS_GPSINFO, 0, getString(stationlist_gpsinfo)); item.setIcon(android.R.drawable.ic_menu_mapmode); return true; @@ -168,7 +190,6 @@ case OPTIONS_MAP: Intent intent = new Intent(this,StationMapView.class); - intent.putExtra("userlocation", location ); ArrayList stationPoints = new ArrayList(); for (StationBean st : stations ) { @@ -180,12 +201,18 @@ startActivity(intent); break; case OPTIONS_GPSINFO: - Location loc = locator.getLocation(); + Location loc = locationLookup.getLocation(); StringBuffer message = new StringBuffer(); - 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"); - + 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: @@ -204,6 +231,19 @@ } + + 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(); + } @@ -213,7 +253,7 @@ 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: @@ -223,23 +263,24 @@ 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()); } 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(); @@ -270,19 +311,9 @@ super.onListItemClick(l, v, position, id); StationBean station = stations.get(position); - - double latitude = station.getLatitude(); - double longitude = station.getLongitude(); - - 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()); + intent.putExtra("stationbean", station); startActivity(intent); } @@ -290,20 +321,20 @@ // public void startLookup() { - isRunning = true; - dialogMessage = "Wait for location fix"; + isRunning = true; + dialogMessage = getString( stationlist_waitforlocation ); showDialog(DLG_PROGRESS); - locator.locateStations(); + locationLookup.locateStations(); stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, 20000); } void startNameSearch(String name) { - dialogMessage = "Finding stations by name"; + dialogMessage = getString( stationlist_findbyname ); showDialog(DLG_PROGRESS); findStationsTask = new FindStationsTask(); - findStationsTask.searchByName(name, locator.getLocation()); + findStationsTask.searchByName(name, locationLookup.getLocation()); findStationsTask.execute(); } @@ -311,14 +342,14 @@ public void startFavoriteLookup() { if (favorites.size() > 0) { - dialogMessage = "Loading favorites"; + dialogMessage = getString( stationlist_loadfavorites ); 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"); + showMessageAndClose( getString( stationlist_nofavorites ) ); } } @@ -326,15 +357,16 @@ void startLocatorTask() { - dialogMessage = "Finding nearby stations"; + dialogMessage = getString( stationlist_findingnearby ); showDialog(DLG_PROGRESS); findStationsTask = new FindStationsTask(); - findStationsTask.searchByLocation( locator.getLocation() ); + 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")); @@ -359,7 +391,7 @@ } return sb.toString(); - } + }*/ //////////////////////////////////////////////////////////////////////////// @@ -374,33 +406,33 @@ 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) ); 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("Location 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(); } @@ -473,10 +505,7 @@ List stations = stationProvider.getStations(); for (StationBean station : stations) { - String addr = lookupAddress(station.getLatitude(), station.getLongitude()); - station.setAddress(addr); - - + 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()); @@ -497,35 +526,18 @@ super.onPostExecute(result); dialog.dismiss(); - //set title - switch (method) { - case ByLocation: - dialogTitle = "Traininfo DK - Nearby stations"; - break; - case ByName: - dialogTitle = "Traininfo DK - Search"; - break; - case ByList: - dialogTitle = "Traininfo DK - Favorites"; - break; - default: - dialogTitle = "";//not possible - } - - StationList.this.setTitle(dialogTitle); - //set title end 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(); @@ -537,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(); } @@ -563,9 +575,9 @@ int stationID = stations.get(selectedPosition).getId(); if (!favorites.contains(stationID)) { - menu.add(0, FAVORITES_ADD, 0, "Add to favorites"); + menu.add(0, FAVORITES_ADD, 0, getString(stationlist_addfavorite) ); } else { - menu.add(0, FAVORITES_REMOVE, 0, "Remove from favorites"); + menu.add(0, FAVORITES_REMOVE, 0, getString(stationlist_removefavorite) ); } } @@ -576,11 +588,11 @@ int stationID = sb.getId(); if (item.getItemId() == FAVORITES_ADD) { favorites.add(stationID); - Toast.makeText(StationList.this, "Station added", Toast.LENGTH_SHORT).show(); + Toast.makeText(StationList.this, getString(stationlist_stationadded), Toast.LENGTH_SHORT).show(); } else { favorites.remove(stationID); - Toast.makeText(StationList.this, "Station removed", Toast.LENGTH_SHORT).show(); + Toast.makeText(StationList.this, getString(stationlist_stationremoved), Toast.LENGTH_SHORT).show(); if (listType.equals( WelcomeScreen.ListType.ListFavorites) ) {