--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2010/10/01 17:57:02 1152 +++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2011/05/03 20:36:16 1442 @@ -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,11 +28,12 @@ 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.StationBean.StationEntry; +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; @@ -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; @@ -62,7 +65,9 @@ StationEntry station; - boolean arrival = false; + String trainType = "REGIONAL"; + + boolean arrival = false; int commFailCounter = 0; @@ -72,7 +77,7 @@ setContentView(R.layout.departurelist); adapter = new DepartureListAdapter(this); - setListAdapter(adapter); + setListAdapter(adapter); Intent launchedBy = getIntent(); @@ -86,6 +91,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); @@ -116,13 +123,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(); @@ -155,13 +201,39 @@ metro = ProviderFactory.getMetroProvider(); + 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"; + + } + + 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(); @@ -266,12 +338,25 @@ - + @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); @@ -284,32 +369,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: Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude() + "?z=16"); - startActivity( new Intent(Intent.ACTION_VIEW, uri)); - res = true; + + 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); - res = true; + startActivity(metroMap); break; + case MENU_TOGGLEDETAILS: + adapter.toggleShowDetails(); + break; default: res = super.onOptionsItemSelected(item); } @@ -360,26 +450,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) { @@ -396,7 +507,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 @@ -406,7 +517,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; } @@ -502,11 +613,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