From 6f18d4877affbbc9c2f59b1711ea34f553f51e76 Mon Sep 17 00:00:00 2001 From: Doug Keen Date: Sun, 28 Jul 2013 17:47:57 -0700 Subject: [PATCH] Add platform info to departures listing --- .../dougkeen/bart/activities/ViewDeparturesActivity.java | 2 +- src/com/dougkeen/bart/controls/YourTrainLayout.java | 2 +- src/com/dougkeen/bart/data/DepartureArrayAdapter.java | 6 +++--- src/com/dougkeen/bart/model/Departure.java | 6 +++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java b/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java index 276668d..6b9bdc4 100644 --- a/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java +++ b/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java @@ -471,7 +471,7 @@ public class ViewDeparturesActivity extends Activity implements if (mActionMode == null) mActionMode = startActionMode(new DepartureActionMode()); mActionMode.setTitle(mSelectedDeparture.getTrainDestinationName()); - mActionMode.setSubtitle(mSelectedDeparture.getTrainLengthText()); + mActionMode.setSubtitle(mSelectedDeparture.getTrainLengthAndPlatform()); } private class DepartureActionMode implements ActionMode.Callback { diff --git a/src/com/dougkeen/bart/controls/YourTrainLayout.java b/src/com/dougkeen/bart/controls/YourTrainLayout.java index ea68539..a06bc39 100644 --- a/src/com/dougkeen/bart/controls/YourTrainLayout.java +++ b/src/com/dougkeen/bart/controls/YourTrainLayout.java @@ -114,7 +114,7 @@ public class YourTrainLayout extends RelativeLayout implements Checkable { .setText(boardedDeparture.getTrainDestination().toString()); ((TextView) findViewById(R.id.yourTrainTrainLengthText)) - .setText(boardedDeparture.getTrainLengthText()); + .setText(boardedDeparture.getTrainLengthAndPlatform()); ImageView colorBar = (ImageView) findViewById(R.id.yourTrainDestinationColorBar); ((GradientDrawable) colorBar.getDrawable()).setColor(Color diff --git a/src/com/dougkeen/bart/data/DepartureArrayAdapter.java b/src/com/dougkeen/bart/data/DepartureArrayAdapter.java index 5468b9c..3aaa05d 100644 --- a/src/com/dougkeen/bart/data/DepartureArrayAdapter.java +++ b/src/com/dougkeen/bart/data/DepartureArrayAdapter.java @@ -98,7 +98,7 @@ public class DepartureArrayAdapter extends ArrayAdapter { .findViewById(R.id.estimatedArrival); if (estimatedArrival != null) { ((TextView) view.findViewById(R.id.trainLengthText)) - .setText(departure.getTrainLengthText()); + .setText(departure.getTrainLengthAndPlatform()); estimatedArrival.setText(arrivesAtDestinationPrefix + estimatedArrivalTimeText); } else { @@ -111,13 +111,13 @@ public class DepartureArrayAdapter extends ArrayAdapter { textSwitcher.setCurrentText(arrivesAtDestinationPrefix + estimatedArrivalTimeText); } else { - textSwitcher.setCurrentText(departure.getTrainLengthText()); + textSwitcher.setCurrentText(departure.getTrainLengthAndPlatform()); } textSwitcher.setTextProvider(new TextProvider() { @Override public String getText(long tickNumber) { if (tickNumber % 4 == 0) { - return departure.getTrainLengthText(); + return departure.getTrainLengthAndPlatform(); } else { final String estimatedArrivalTimeText = departure .getEstimatedArrivalTimeText(getContext()); diff --git a/src/com/dougkeen/bart/model/Departure.java b/src/com/dougkeen/bart/model/Departure.java index 7698aad..804e3e0 100644 --- a/src/com/dougkeen/bart/model/Departure.java +++ b/src/com/dougkeen/bart/model/Departure.java @@ -172,7 +172,11 @@ public class Departure implements Parcelable, Comparable { } public String getTrainLengthText() { - return trainLength + " car train"; + return trainLength + " cars"; + } + + public String getTrainLengthAndPlatform() { + return trainLength + " cars, platform " + getPlatform(); } public boolean getRequiresTransfer() {