show station positions also in textual trip output

proposed by @pbeccard
grote · Aug 14, 2014 · 9203f4d · 9203f4d
1 parent c12a6bf
commit 9203f4d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -48,6 +48,8 @@
     <string name="time">Time</string>
     <string name="date">Date</string>
     <string name="min"> min</string>
+    <string name="walk">Walk</string>
+    <string name="position">Position</string>
     <string name="destination">Destination</string>
     <string name="detail_duration">Duration:</string>
     <string name="detail_date">Date:</string>

diff --git a/src/de/grobox/liberario/LiberarioUtils.java b/src/de/grobox/liberario/LiberarioUtils.java
@@ -96,7 +96,7 @@ static public void addWalkingBox(Context context, ViewGroup lineLayout) {
 	}
 
 	static public View getDivider(Context context) {
-		return (View) LayoutInflater.from(context).inflate(R.layout.divider_horizontal, null);
+		return LayoutInflater.from(context).inflate(R.layout.divider_horizontal, null);
 	}
 
 
@@ -147,8 +147,11 @@ static public String tripToString(Context context, Trip trip) {
 		String str = "";
 
 		for(Leg leg : trip.legs) {
+			String apos = "";
+
 			str += DateUtils.getTime(context, leg.departureTime) + " ";
 			str += leg.departure.name;
+
 			if(leg instanceof Trip.Public) {
 				Trip.Public pub = (Trip.Public) leg;
 				if(pub.line != null && pub.line.label != null) {
@@ -157,16 +160,26 @@ static public String tripToString(Context context, Trip trip) {
 					if(pub.destination  != null) str += " → " + pub.destination.uniqueShortName();
 					str += ")";
 				}
+				// show departure position if existing
+				if(pub.getDeparturePosition() != null) {
+					str += " - " + context.getString(R.string.position) + ": " + pub.getDeparturePosition().name;
+				}
+				// remember arrival position if existing
+				if(pub.getArrivalPosition() != null) {
+					apos += " - " + context.getString(R.string.position) + ": " + pub.getArrivalPosition().name;
+				}
 			} else if(leg instanceof Trip.Individual) {
 				Trip.Individual ind = (Trip.Individual) leg;
-				str += " (Walk ";
+				str += " (" + context.getString(R.string.walk) + " ";
 				if(ind.distance > 0) str += ind.distance + context.getResources().getString(R.string.meter) + " ";
 				if(ind.min > 0) str += ind.min + context.getResources().getString(R.string.min);
 				str += ")";
 			}
+
 			str += "\n";
 			str += DateUtils.getTime(context, leg.arrivalTime) + " ";
 			str += leg.arrival.name;
+			str += apos;
 			str += "\n";
 			str += "\n";
 		}