From d675d9a282a1bcbd2c83a6d0205706e1aa0686a6 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Mon, 14 Jan 2019 19:28:22 +0100
Subject: [PATCH] TripDetailsActivity: Relayout fare list to properly show
 fare/ticket names.

---
 .../directions_trip_details_content.xml       | 20 ++++---------------
 .../directions_trip_details_fares_row.xml     | 12 ++++++++---
 oeffi/res/values-de/strings.xml               |  1 -
 oeffi/res/values/strings.xml                  |  1 -
 .../oeffi/directions/TripDetailsActivity.java |  4 ++--
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/oeffi/res/layout/directions_trip_details_content.xml b/oeffi/res/layout/directions_trip_details_content.xml
index 42cee15..cdbf12c 100644
--- a/oeffi/res/layout/directions_trip_details_content.xml
+++ b/oeffi/res/layout/directions_trip_details_content.xml
@@ -71,22 +71,10 @@
                             android:background="?android:attr/listDivider"
                             android:baselineAligned="true"
                             android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-                            android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                            android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-                            android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
-
-                            <TableRow>
-
-                                <TextView
-                                    android:id="@+id/directions_trip_details_fare_entry_network"
-                                    android:textSize="@dimen/font_size_large" />
-
-                                <TextView
-                                    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                                    android:text="@string/directions_trip_details_fare_entry_ticket"
-                                    android:textSize="@dimen/font_size_large" />
-                            </TableRow>
-                        </TableLayout>
+                            android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
+                            android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:paddingTop="@dimen/list_entry_padding_vertical_lax"
+                            android:stretchColumns="2" />
 
                         <TextView
                             android:id="@+id/directions_trip_details_footer"
diff --git a/oeffi/res/layout/directions_trip_details_fares_row.xml b/oeffi/res/layout/directions_trip_details_fares_row.xml
index f685886..d173f4b 100644
--- a/oeffi/res/layout/directions_trip_details_fares_row.xml
+++ b/oeffi/res/layout/directions_trip_details_fares_row.xml
@@ -3,18 +3,24 @@
 
     <TextView
         android:id="@+id/directions_trip_details_fare_entry_row_type"
-        android:textSize="@dimen/font_size_large" />
+        android:textSize="@dimen/font_size_normal"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/directions_trip_details_fare_entry_row_name"
+        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:textSize="@dimen/font_size_normal" />
 
     <TextView
         android:id="@+id/directions_trip_details_fare_entry_row_fare"
         android:gravity="right"
         android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:textSize="@dimen/font_size_large"
+        android:textSize="@dimen/font_size_normal"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/directions_trip_details_fare_entry_row_unit"
         android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:textSize="@dimen/font_size_large" />
+        android:textSize="@dimen/font_size_normal" />
 
 </TableRow>
diff --git a/oeffi/res/values-de/strings.xml b/oeffi/res/values-de/strings.xml
index 01fb75a..97e4145 100644
--- a/oeffi/res/values-de/strings.xml
+++ b/oeffi/res/values-de/strings.xml
@@ -242,7 +242,6 @@
     <!-- directions trip details -->
     <string name="directions_trip_details_duraton">Dauer %s</string>
     <string name="directions_trip_details_num_changes">%d Umst.</string>
-    <string name="directions_trip_details_fare_entry_ticket">Einzelfahrt</string>
     <string name="directions_trip_details_walk">&lt;b>%1$d Minuten&lt;/b> %2$sFußweg nach&lt;br/>%3$s</string>
     <string name="directions_trip_details_bike">&lt;b>%1$d Minuten&lt;/b> %2$sFahrt mit dem Fahrrad nach&lt;br/>%3$s</string>
     <string name="directions_trip_details_car">&lt;b>%1$d Minuten&lt;/b> %2$sFahrt mit dem Auto nach&lt;br/>%3$s</string>
diff --git a/oeffi/res/values/strings.xml b/oeffi/res/values/strings.xml
index 6752d73..1a02dd8 100644
--- a/oeffi/res/values/strings.xml
+++ b/oeffi/res/values/strings.xml
@@ -243,7 +243,6 @@
     <!-- directions trip details -->
     <string name="directions_trip_details_duraton">Duration %s</string>
     <string name="directions_trip_details_num_changes">%d ch.</string>
-    <string name="directions_trip_details_fare_entry_ticket">Single ticket</string>
     <string name="directions_trip_details_walk">walk &lt;b>%1$d minutes&lt;/b> %2$sto&lt;br/>%3$s</string>
     <string name="directions_trip_details_bike">bike &lt;b>%1$d minutes&lt;/b> %2$sto&lt;br/>%3$s</string>
     <string name="directions_trip_details_car">drive &lt;b>%1$d minutes&lt;/b> %2$sto&lt;br/>%3$s</string>
diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
index 2816c08..7b191a4 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
@@ -557,14 +557,14 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
         if (trip.fares != null && !trip.fares.isEmpty()) {
             faresTable.setVisibility(View.VISIBLE);
 
-            ((TextView) findViewById(R.id.directions_trip_details_fare_entry_network)).setText(fares.get(0).network);
             final String[] fareTypes = res.getStringArray(R.array.fare_types);
 
-            int i = 1;
+            int i = 0;
             for (final Fare fare : fares) {
                 final View fareRow = inflater.inflate(R.layout.directions_trip_details_fares_row, null);
                 ((TextView) fareRow.findViewById(R.id.directions_trip_details_fare_entry_row_type))
                         .setText(fareTypes[fare.type.ordinal()]);
+                ((TextView) fareRow.findViewById(R.id.directions_trip_details_fare_entry_row_name)).setText(fare.name);
                 ((TextView) fareRow.findViewById(R.id.directions_trip_details_fare_entry_row_fare))
                         .setText(String.format("%s%.2f", fare.currency.getSymbol(), fare.fare));
                 final TextView unitView = (TextView) fareRow