--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2009/09/23 12:51:49 336 +++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2010/05/19 16:27:41 742 @@ -3,7 +3,6 @@ import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import android.app.AlertDialog; import android.app.Dialog; @@ -11,8 +10,6 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; -import android.location.Address; -import android.location.Geocoder; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; @@ -23,11 +20,12 @@ import dk.thoerup.traininfo.provider.DepartureProvider; import dk.thoerup.traininfo.provider.ProviderFactory; import dk.thoerup.traininfo.util.MessageBox; +import static dk.thoerup.traininfo.R.string.*; public class DepartureList extends ListActivity { public static final int DLG_PROGRESS = 1; - public static final int DLG_DETAILS = 2; + DepartureListAdapter adapter; DepartureProvider provider; @@ -37,11 +35,10 @@ //DepartureBean currentDeparture; ProgressDialog pgDialog; - Dialog detailsDialog; - DepartureFetcher fetcher; - int stationId; - double latitude,longitude; + DepartureFetcher fetcher; + + StationBean station; @SuppressWarnings("unchecked") @Override @@ -53,38 +50,43 @@ setListAdapter(adapter); Intent launchedBy = getIntent(); + + station = (StationBean) launchedBy.getSerializableExtra("stationbean"); - latitude = launchedBy.getDoubleExtra("latitude", 0.0); - longitude = launchedBy.getDoubleExtra("longitude", 0.0); - - String name = launchedBy.getStringExtra("name"); - ((TextView) findViewById(R.id.stationName)).setText( name ); + ((TextView) findViewById(R.id.stationName)).setText( station.getName() ); + - String address = launchedBy.getStringExtra("address"); - ((TextView) findViewById(R.id.stationAddr)).setText( address ); + ((TextView) findViewById(R.id.stationAddr)).setText( station.getAddress() ); - stationId = launchedBy.getIntExtra("stationid", -1); findViewById(R.id.header).setOnClickListener( mapLauncher ); - NumberFormat format = NumberFormat.getNumberInstance(); - format.setMaximumFractionDigits(1); - format.setMinimumFractionDigits(1); - int distance = launchedBy.getIntExtra("distance", 0); - ((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." ); - + int distance = station.getDistance(); + if (distance != 0) { + NumberFormat format = NumberFormat.getNumberInstance(); + format.setMaximumFractionDigits(1); + format.setMinimumFractionDigits(1); - provider = ProviderFactory.getDepartureProvider(); + ((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." ); + } else { + ((TextView) findViewById(R.id.stationDistance)).setVisibility(View.GONE); + } - if (savedInstanceState == null) { - startDepartureFetcher(); + + if (station.isRegional() == false && station.isSTrain() == false) { + getListView().setVisibility( View.GONE ); + findViewById(R.id.metroonly).setVisibility( View.VISIBLE ); + } else { - departures = (List) savedInstanceState.getSerializable("departures"); - adapter.setDepartures(departures); - selectedItemId = savedInstanceState.getInt("selectedItemId"); - boolean detailsShowing = savedInstanceState.getBoolean("detailsShowing"); - if (detailsShowing) - showDialog(DLG_DETAILS); + provider = ProviderFactory.getDepartureProvider(); + + if (savedInstanceState == null) { + startDepartureFetcher(); + } else { + departures = (List) savedInstanceState.getSerializable("departures"); + adapter.setDepartures(departures); + selectedItemId = savedInstanceState.getInt("selectedItemId"); + } } } @@ -93,11 +95,7 @@ { if (pgDialog != null && pgDialog.isShowing()) dismissDialog(DLG_PROGRESS); - boolean detailsShowing = (detailsDialog != null && detailsDialog.isShowing()); - if (detailsShowing) { - dismissDialog(DLG_DETAILS); - } - outState.putBoolean("detailsShowing", detailsShowing); + outState.putInt("selectedItemId", selectedItemId); outState.putSerializable("departures", (ArrayList) departures); @@ -106,9 +104,16 @@ @Override protected void onListItemClick(ListView l, View v, int position, long id) { super.onListItemClick(l, v, position, id); + + selectedItemId = position; + + DepartureBean dep = departures.get(selectedItemId); - selectedItemId = position; - showDialog(DLG_DETAILS); + Intent intent = new Intent(this, TimetableList.class); + intent.putExtra("departure", dep); + + startActivity(intent); + } @@ -117,18 +122,6 @@ super.onPrepareDialog(id, dialog); switch (id) { - case DLG_DETAILS: - DepartureBean currentDeparture = departures.get(selectedItemId); - ((TextView)dialog.findViewById(R.id.Time)).setText(currentDeparture.getTime()); - ((TextView)dialog.findViewById(R.id.Train)).setText(currentDeparture.getTrainNumber()); - ((TextView)dialog.findViewById(R.id.Destination)).setText( currentDeparture.getDestination()); - ((TextView)dialog.findViewById(R.id.Origin)).setText(currentDeparture.getOrigin()); - ((TextView)dialog.findViewById(R.id.Location)).setText(currentDeparture.getLocation()); - ((TextView)dialog.findViewById(R.id.Updated)).setText(currentDeparture.getLastUpdateString()); - ((TextView)dialog.findViewById(R.id.Status)).setText(currentDeparture.getStatus()); - ((TextView)dialog.findViewById(R.id.Note)).setText(currentDeparture.getNote()); - detailsDialog = dialog; - break; case DLG_PROGRESS: pgDialog = (ProgressDialog) dialog; break; @@ -140,20 +133,9 @@ switch (id) { case DLG_PROGRESS: ProgressDialog dlg = new ProgressDialog(this); - dlg.setMessage("Fetch departure data"); + dlg.setMessage( getString(departurelist_fetchdata) ); dlg.setCancelable(true); - return dlg; - case DLG_DETAILS: - //Context mContext = getApplicationContext(); - Dialog dialog = new Dialog(this); - dialog.setCancelable(true); - - dialog.setContentView(R.layout.departuredetails); - dialog.setTitle("Departure details"); - - View root = dialog.findViewById(R.id.layout_root); - root.setOnClickListener( new DialogDismisser(dialog) ); - return dialog; + return dlg; default: return super.onCreateDialog(id); } @@ -162,7 +144,7 @@ void startDepartureFetcher() { showDialog(DLG_PROGRESS); fetcher = new DepartureFetcher(); - fetcher.execute(stationId); + fetcher.execute(station.getId()); } class DialogDismisser implements View.OnClickListener { @@ -176,15 +158,13 @@ public void onClick(View v) { if (dlg.isShowing()) dlg.dismiss(); - } - - -} + } + } View.OnClickListener mapLauncher = new View.OnClickListener() { @Override - public void onClick(View v) { - Uri uri = Uri.parse("geo:" + latitude + "," + longitude); + public void onClick(View v) { + Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude()); startActivity( new Intent(Intent.ACTION_VIEW, uri)); } }; @@ -194,7 +174,7 @@ class DepartureFetcher extends AsyncTask { boolean success; - String addr; + @Override protected void onPostExecute(Void result) { super.onPostExecute(result); @@ -211,19 +191,24 @@ AlertDialog.Builder builder = new AlertDialog.Builder(DepartureList.this); builder.setMessage("Error finding departures"); 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(); startDepartureFetcher(); } }); - 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(); + }); + + try { + builder.show(); + } catch (android.view.WindowManager.BadTokenException e) { + Log.i("DepartureList", "BadTokenException"); // this can happen if the user switched away from this activity, while doInBackground was running + } } }