iamthefij/BartRunnerAndroid
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added departure clock time

Browse Source
This commit is contained in:
Doug Keen 2013-01-26 13:01:44 -08:00 committed by Doug Keen
parent 7411c0ea12
commit 357fd69506
5 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/departure_listing.xml
View File

@ -54,10 +54,11 @@
android:layout_toRightOf="@id/destinationColorBar"
bart:tickInterval="1" />
<TextView
<com.dougkeen.bart.controls.TimedTextSwitcher
android:id="@+id/uncertainty"
style="@style/DepartureUncertaintyText"
android:layout_alignParentRight="true"
android:layout_below="@id/topRow" />
android:layout_below="@id/topRow"
bart:tickInterval="1" />
</merge>

3
res/values/styles.xml
View File

@ -82,10 +82,11 @@
</style>
<style name="DepartureUncertaintyText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_width">80dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">16dp</item>
<item name="android:singleLine">true</item>
<item name="android:gravity">right</item>
</style>
<style name="MissingDepartureText">

26
src/com/dougkeen/bart/data/DepartureArrayAdapter.java
View File

@ -75,7 +75,7 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
TimedTextSwitcher textSwitcher = (TimedTextSwitcher) view
.findViewById(R.id.trainLengthText);
initTextSwitcher(textSwitcher);
initTextSwitcher(textSwitcher, R.layout.train_length_arrival_textview);
final String arrivesAtDestinationPrefix = getContext().getString(
R.string.arrives_at_destination);
@ -118,8 +118,23 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
return departure.getCountdownText();
}
});
((TextView) view.findViewById(R.id.uncertainty)).setText(departure
.getUncertaintyText());
TimedTextSwitcher uncertaintySwitcher = (TimedTextSwitcher) view
.findViewById(R.id.uncertainty);
initTextSwitcher(uncertaintySwitcher, R.layout.uncertainty_textview);
uncertaintySwitcher.setTextProvider(new TextProvider() {
@Override
public String getText(long tickNumber) {
if (tickNumber % 4 == 0) {
return departure.getUncertaintyText();
} else {
return departure
.getEstimatedDepartureTimeText(getContext());
}
}
});
if (departure.isBikeAllowed()) {
((ImageView) view.findViewById(R.id.bikeIcon))
.setVisibility(View.VISIBLE);
@ -138,12 +153,13 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
return view;
}
private void initTextSwitcher(TextSwitcher textSwitcher) {
private void initTextSwitcher(TextSwitcher textSwitcher,
final int layoutView) {
if (textSwitcher.getInAnimation() == null) {
textSwitcher.setFactory(new ViewFactory() {
public View makeView() {
return LayoutInflater.from(getContext()).inflate(
R.layout.train_length_arrival_textview, null);
layoutView, null);
}
});

5
src/com/dougkeen/bart/data/FavoritesArrayAdapter.java
View File

@ -196,8 +196,11 @@ public class FavoritesArrayAdapter extends ArrayAdapter<StationPair> {
uncertaintyTextSwitcher.setTextProvider(new TextProvider() {
@Override
public String getText(long tickNumber) {
if (tickNumber % 4 <= 1) {
if (tickNumber % 6 <= 1) {
return pair.getFare();
} else if (tickNumber % 6 <= 3) {
return etdListener.getFirstDeparture()
.getEstimatedDepartureTimeText(getContext());
} else {
return etdListener.getFirstDeparture()
.getUncertaintyText();

9
src/com/dougkeen/bart/model/Departure.java
View File

@ -315,6 +315,15 @@ public class Departure implements Parcelable, Comparable<Departure> {
}
}
public String getEstimatedDepartureTimeText(Context context) {
if (getMeanEstimate() > 0) {
return DateFormat.getTimeFormat(context).format(
new Date(getMeanEstimate()));
} else {
return "";
}
}
public boolean hasDeparted() {
return getMeanSecondsLeft() <= 0;
}