--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2010/09/14 16:30:16 1055 +++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2012/03/06 11:02:04 1709 @@ -11,12 +11,15 @@ import android.app.Dialog; import android.app.ListActivity; import android.app.ProgressDialog; +import android.content.ActivityNotFoundException; import android.content.DialogInterface; import android.content.Intent; +import android.content.SharedPreferences; import android.graphics.Typeface; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; +import android.preference.PreferenceManager; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -27,18 +30,30 @@ import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; +import android.widget.Toast; +import dk.thoerup.android.traininfo.common.DepartureBean; +import dk.thoerup.android.traininfo.common.DepartureEntry; +import dk.thoerup.android.traininfo.common.MetroBean; +import dk.thoerup.android.traininfo.common.MetroBean.MetroEntry; +import dk.thoerup.android.traininfo.common.StationEntry; import dk.thoerup.traininfo.provider.DepartureProvider; import dk.thoerup.traininfo.provider.MetroProvider; import dk.thoerup.traininfo.provider.ProviderFactory; -import dk.thoerup.traininfo.provider.MetroProvider.MetroBean; -import dk.thoerup.traininfo.provider.MetroProvider.MetroEntry; + +import dk.thoerup.traininfo.util.FavoritesHelper; import dk.thoerup.traininfo.util.MessageBox; +import dk.thoerup.traininfo.util.StationEntryCsv; public class DepartureList extends ListActivity { public static final int DLG_PROGRESS = 1; static final int MENU_MAP = 100; static final int MENU_NOTIFICATIONS = 101; + static final int MENU_METROMAP = 102; + static final int MENU_TOGGLEDETAILS= 103; + + static final int MENU_FAVORITES_ADD = 104; + static final int MENU_FAVORITES_REMOVE = 105; DepartureListAdapter adapter; @@ -49,6 +64,9 @@ MetroProvider metro; int selectedItemId; + + FavoritesHelper favorites; + //DepartureBean currentDeparture; ProgressDialog pgDialog; @@ -56,9 +74,11 @@ DepartureFetcher fetcher; MetroFetcher metroFetcher; - StationBean station; + StationEntry station; + + String trainType = "REGIONAL"; - boolean arrival = false; + boolean arrival = false; int commFailCounter = 0; @@ -66,13 +86,15 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.departurelist); - + + favorites = new FavoritesHelper(this); + adapter = new DepartureListAdapter(this); setListAdapter(adapter); - + Intent launchedBy = getIntent(); - station = (StationBean) launchedBy.getSerializableExtra("stationbean"); + station = (StationEntry) launchedBy.getSerializableExtra("stationbean"); ((TextView) findViewById(R.id.stationName)).setText( station.getName() ); @@ -82,6 +104,8 @@ final Button departureBtn = (Button) findViewById(R.id.departurebtn); final Button arrivalBtn = (Button) findViewById(R.id.arrivalbtn); final Button metroBtn = (Button) findViewById(R.id.metrobtn); + final Button regionalBtn = (Button) findViewById(R.id.regionalbtn); + final Button stogBtn = (Button) findViewById(R.id.stogbtn); final View metroView = findViewById(R.id.metroonly); @@ -112,13 +136,52 @@ } }); + regionalBtn.setOnClickListener( new OnClickListener() { + @Override + public void onClick(View arg0) { + regionalBtn.setBackgroundResource(R.drawable.custom_button_hilight); + stogBtn.setBackgroundResource(R.drawable.custom_button); + metroBtn.setBackgroundResource(R.drawable.custom_button); + + departureBtn.setVisibility( View.VISIBLE ); + arrivalBtn.setVisibility( View.VISIBLE ); + + getListView().setVisibility( View.VISIBLE ); + metroView.setVisibility( View.GONE ); + trainType = "REGIONAL"; + startDepartureFetcher(); + } + }); + stogBtn.setOnClickListener( new OnClickListener() { + @Override + public void onClick(View arg0) { + regionalBtn.setBackgroundResource(R.drawable.custom_button); + stogBtn.setBackgroundResource(R.drawable.custom_button_hilight); + metroBtn.setBackgroundResource(R.drawable.custom_button); + + + departureBtn.setVisibility( View.VISIBLE ); + arrivalBtn.setVisibility( View.VISIBLE ); + + getListView().setVisibility( View.VISIBLE ); + metroView.setVisibility( View.GONE ); + trainType = "STOG"; + startDepartureFetcher(); + } + }); + + + metroBtn.setOnClickListener( new OnClickListener() { @Override public void onClick(View v) { - arrivalBtn.setBackgroundResource(R.drawable.custom_button); - departureBtn.setBackgroundResource(R.drawable.custom_button); + regionalBtn.setBackgroundResource(R.drawable.custom_button); + stogBtn.setBackgroundResource(R.drawable.custom_button); metroBtn.setBackgroundResource(R.drawable.custom_button_hilight); + departureBtn.setVisibility( View.GONE ); + arrivalBtn.setVisibility( View.GONE ); + getListView().setVisibility( View.GONE ); metroView.setVisibility( View.VISIBLE ); startMetroFetcher(); @@ -130,7 +193,7 @@ // findViewById(R.id.header).setOnClickListener( mapLauncher ); - int distance = station.getDistance(); + int distance = station.getCalcdist(); if (distance != 0) { NumberFormat format = NumberFormat.getNumberInstance(); format.setMaximumFractionDigits(1); @@ -143,7 +206,9 @@ ProviderFactory.purgeOldEntries(); //cleanup before fetching more data - Log.e("Station", station.toCSV() ); + Log.e("Station", StationEntryCsv.toCSV(station) ); + + if (station.isMetro() == false) { metroBtn.setVisibility( View.GONE ); @@ -151,13 +216,49 @@ metro = ProviderFactory.getMetroProvider(); - if (station.isRegional() == false && station.isSTrain() == false) { + if (station.isRegional() == false ) { + regionalBtn.setVisibility(View.GONE); + } + + if (station.isStrain() == false ) { + stogBtn.setVisibility(View.GONE); + } + + if (station.isRegional() == true && station.isStrain() == false ) { + if ( station.isMetro() == false ) + regionalBtn.setVisibility(View.GONE); + trainType = "REGIONAL"; + } + + if (station.isRegional() == false && station.isStrain() == true) { + if (station.isMetro() == false) + stogBtn.setVisibility(View.GONE); + + stogBtn.setBackgroundResource(R.drawable.custom_button_hilight); + trainType = "STOG"; + + } + //Both enabled - use preferred from preferences + if (station.isRegional() == true && station.isStrain() == true ) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + trainType = prefs.getString("traintype", "REGIONAL"); //default value is gps + + if (trainType.equals("STOG") ) { + stogBtn.setBackgroundResource(R.drawable.custom_button_hilight); + regionalBtn.setBackgroundResource(R.drawable.custom_button); + } + } + + + if (station.isRegional() == false && station.isStrain() == false) { getListView().setVisibility( View.GONE ); metroView.setVisibility( View.VISIBLE ); departureBtn.setVisibility( View.GONE ); arrivalBtn.setVisibility(View.GONE); - metroBtn.setVisibility( View.GONE ); + metroBtn.setVisibility( View.GONE ); + + if (savedInstanceState == null) { startMetroFetcher(); @@ -187,6 +288,8 @@ } } + + boolean hasNotifications() { return (departures != null && departures.notifications.size() > 0); } @@ -222,6 +325,12 @@ protected void onListItemClick(ListView l, View v, int position, long id) { super.onListItemClick(l, v, position, id); + //how can this happen ?? + if (departures == null || departures.entries == null || departures.entries.size() == 0) { + Toast.makeText(this, "No departures in list ?!?", Toast.LENGTH_LONG).show(); //TODO: translate + return; + } + selectedItemId = position; DepartureEntry dep = departures.entries.get(selectedItemId); @@ -262,40 +371,90 @@ + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + + /////////////////////// + + MenuItem item = menu.findItem( MENU_NOTIFICATIONS ); + boolean notifEnabled = hasNotifications(); + item.setEnabled(notifEnabled); + + ////////////////////////// + + + return true; + } + @Override public boolean onCreateOptionsMenu(Menu menu) { MenuItem item; + + item = menu.add(0, MENU_TOGGLEDETAILS, 0, getString(R.string.departurelist_toggledetails)); + item.setIcon(android.R.drawable.ic_menu_view); + item = menu.add(0, MENU_MAP, 0, getString(R.string.departurelist_showonmap) ); item.setIcon(android.R.drawable.ic_menu_mapmode); item = menu.add(0, MENU_NOTIFICATIONS, 0, getString(R.string.departurelist_notifications) ); - item.setIcon(android.R.drawable.ic_menu_info_details); - + item.setIcon(android.R.drawable.ic_menu_info_details); boolean notifEnabled = hasNotifications(); item.setEnabled(notifEnabled); + + /////////////////////////////////////// + if ( ! favorites.hasFavorite( this.station.getId() ) ) { + item = menu.add(0, MENU_FAVORITES_ADD, 0, getString(dk.thoerup.traininfo.R.string.stationlist_addfavorite) ); + } else { + item = menu.add(0, MENU_FAVORITES_REMOVE, 0, getString(dk.thoerup.traininfo.R.string.stationlist_removefavorite) ); + } + ///////////////////////////// + if (station.isMetro()) { + item = menu.add(0, MENU_METROMAP, 0, "Metro" ); //TODO:translate!?! + item.setIcon(android.R.drawable.ic_menu_mapmode); + } return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { - boolean res; + boolean res = true; switch(item.getItemId()) { case MENU_MAP: - Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude()); - startActivity( new Intent(Intent.ACTION_VIEW, uri)); - res = true; + Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude() + "?z=16"); + + try { + startActivity( new Intent(Intent.ACTION_VIEW, uri)); + } catch (ActivityNotFoundException anfe) { + Toast.makeText(this, "Could not launch google maps", Toast.LENGTH_LONG).show(); + } + break; case MENU_NOTIFICATIONS: Intent i = new Intent(this,dk.thoerup.traininfo.NotificationList.class); i.putExtra(NotificationList.EXTRA_NOTIFICATIONS, departures.notifications); - startActivity(i); - res = true; + startActivity(i); + break; + case MENU_METROMAP: + Intent metroMap = new Intent(this,dk.thoerup.traininfo.MetroMap.class); + startActivity(metroMap); + break; + case MENU_TOGGLEDETAILS: + adapter.toggleShowDetails(); + break; + case MENU_FAVORITES_ADD: + favorites.addFavorite( this.station.getId() ); + Toast.makeText(this, getString(dk.thoerup.traininfo.R.string.stationlist_stationadded), Toast.LENGTH_SHORT).show(); + break; + case MENU_FAVORITES_REMOVE: + favorites.removeFavorite( station.getId() ); + Toast.makeText(this, getString(dk.thoerup.traininfo.R.string.stationlist_stationremoved), Toast.LENGTH_SHORT).show(); break; default: res = super.onOptionsItemSelected(item); @@ -347,26 +506,47 @@ pgDialog.dismiss(); - - if (departures != null) { + + if (departures != null && departures.errorCode == null) { commFailCounter = 0; DepartureList.this.getListView().setVisibility(View.GONE); //Experimental, inspired by http://osdir.com/ml/Android-Developers/2010-04/msg01198.html adapter.setDepartures(departures.entries); DepartureList.this.getListView().setVisibility(View.VISIBLE); - if ( hasNotifications() ) { - findViewById(R.id.notifIcon).setVisibility(View.VISIBLE); + // handle notification icon. + View notifIcon = findViewById(R.id.notifIcon); + if ( hasNotifications() ) { + notifIcon.setVisibility(View.VISIBLE); + notifIcon.setClickable(true); + notifIcon.setOnClickListener( new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(DepartureList.this, dk.thoerup.traininfo.NotificationList.class); + i.putExtra(NotificationList.EXTRA_NOTIFICATIONS, departures.notifications); + startActivity(i); + } + }); + } else { + notifIcon.setVisibility(View.INVISIBLE); } if (departures.entries.size() == 0) { - MessageBox.showMessage(DepartureList.this, "No departures found", true); + int msgId = (arrival==false) ? R.string.departurelist_nodepartures : R.string.departurelist_noarrivals; + MessageBox.showMessage(DepartureList.this, getString(msgId), false); } } else { // communication or parse error commFailCounter++; - AlertDialog.Builder builder = new AlertDialog.Builder(DepartureList.this); - builder.setMessage("Error finding departures"); + AlertDialog.Builder builder = new AlertDialog.Builder(DepartureList.this); + + if (departures != null && departures.errorCode != null ) { //got an error xml back + commFailCounter = 10; + builder.setMessage( getString(R.string.no_backend) ); + } else { + builder.setMessage( getString(R.string.departurelist_fetcherror) ); + } builder.setCancelable(true); + if (commFailCounter < 3) { builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -383,7 +563,7 @@ } }); - try { + try { //TODO: is this still necessary after the 0.9.4.1 fix ? 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 @@ -393,7 +573,7 @@ @Override protected Void doInBackground(Integer... params) { - departures = provider.lookupDepartures(params[0], DepartureList.this.arrival); + departures = provider.lookupDepartures(params[0], DepartureList.this.arrival, trainType); return null; } @@ -411,6 +591,7 @@ TextView h1 = new TextView(this); h1.setText("Metro"); + h1.setTextSize(16); h1.setTypeface( Typeface.defaultFromStyle(Typeface.BOLD)); @@ -421,9 +602,12 @@ TextView h2 = new TextView(this); + h2.setTextSize(16); h2.setTypeface( Typeface.defaultFromStyle(Typeface.BOLD)); h2.setText("Om minutter"); + params = new TableRow.LayoutParams(); + params.weight = 2; head.addView(h2,params); @@ -436,14 +620,17 @@ Log.e("Test", "" + entry.destination); TextView v1 = new TextView(this); - v1.setText( entry.metro ); + v1.setTextSize(16); + v1.setText( entry.metro ); row.addView(v1); TextView v2 = new TextView(this); + v2.setTextSize(16); v2.setText( entry.destination ); row.addView(v2); TextView v3 = new TextView(this); + v3.setTextSize(16); v3.setText( entry.minutes ); row.addView(v3); @@ -482,11 +669,11 @@ builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); - DepartureList.this.finish(); + DepartureList.this.finish(); //TODO: should we really close the activity ?? } }); - try { + try { //TODO: is this still necessary after the 0.9.4.1 fix ? 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