--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2011/05/03 12:35:34 1432 +++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2011/05/03 20:30:12 1441 @@ -11,6 +11,7 @@ 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.graphics.Typeface; @@ -27,6 +28,7 @@ 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; @@ -42,7 +44,8 @@ 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_METROMAP = 102; + static final int MENU_TOGGLEDETAILS= 103; DepartureListAdapter adapter; @@ -64,7 +67,7 @@ String trainType = "REGIONAL"; - boolean arrival = false; + boolean arrival = false; int commFailCounter = 0; @@ -74,7 +77,7 @@ setContentView(R.layout.departurelist); adapter = new DepartureListAdapter(this); - setListAdapter(adapter); + setListAdapter(adapter); Intent launchedBy = getIntent(); @@ -335,12 +338,14 @@ - - @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); @@ -353,36 +358,37 @@ 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: - try { - Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude() + "?z=16"); + 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(); } - res = true; + 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); - res = true; + startActivity(metroMap); break; + case MENU_TOGGLEDETAILS: + adapter.toggleShowDetails(); + break; default: res = super.onOptionsItemSelected(item); } @@ -441,9 +447,9 @@ DepartureList.this.getListView().setVisibility(View.VISIBLE); - // handle notification icon. - if ( hasNotifications() ) { - View notifIcon = findViewById(R.id.notifIcon); + // handle notification icon. + View notifIcon = findViewById(R.id.notifIcon); + if ( hasNotifications() ) { notifIcon.setVisibility(View.VISIBLE); notifIcon.setClickable(true); notifIcon.setOnClickListener( new View.OnClickListener() { @@ -454,7 +460,9 @@ startActivity(i); } }); - } + } else { + notifIcon.setVisibility(View.INVISIBLE); + } if (departures.entries.size() == 0) { int msgId = (arrival==false) ? R.string.departurelist_nodepartures : R.string.departurelist_noarrivals;