From fd0d18d599edfce5d41de79ba14590fdf080a9c3 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 20 Nov 2020 23:49:39 +0100
Subject: [PATCH] NearestFavoriteStationWidgetService: Rather than a mysterious
 app-widget number reveal the station distance.

---
 oeffi/res/layout/station_widget_content.xml          |  3 ++-
 .../NearestFavoriteStationWidgetService.java         | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/oeffi/res/layout/station_widget_content.xml b/oeffi/res/layout/station_widget_content.xml
index 5dcf4cc..47b5948 100644
--- a/oeffi/res/layout/station_widget_content.xml
+++ b/oeffi/res/layout/station_widget_content.xml
@@ -15,7 +15,7 @@
         android:paddingRight="@dimen/list_entry_padding_horizontal" >
 
         <TextView
-            android:id="@+id/station_widget_number"
+            android:id="@+id/station_widget_distance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
@@ -30,6 +30,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="2dp"
             android:layout_weight="1"
+            android:gravity="center_horizontal"
             android:ellipsize="middle"
             android:singleLine="true"
             android:textColor="#fff"
diff --git a/oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java b/oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java
index 0c2c634..ea3b64d 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java
@@ -38,6 +38,7 @@ import com.google.common.util.concurrent.SettableFuture;
 import de.schildbach.oeffi.Constants;
 import de.schildbach.oeffi.R;
 import de.schildbach.oeffi.network.NetworkProviderFactory;
+import de.schildbach.oeffi.util.Formats;
 import de.schildbach.oeffi.util.Objects;
 import de.schildbach.pte.NetworkId;
 import de.schildbach.pte.NetworkProvider;
@@ -265,16 +266,15 @@ public class NearestFavoriteStationWidgetService extends JobIntentService {
                 views.setViewVisibility(R.id.station_widget_message, View.GONE);
 
                 if (numFavorites > 0) {
-                    views.setTextViewText(R.id.station_widget_number, (i + 1) + "/" + appWidgetIds.length);
-                    views.setViewVisibility(R.id.station_widget_number,
-                            appWidgetIds.length != 1 ? View.VISIBLE : View.GONE);
+                    final Favorite favorite = favorites.get(i % numFavorites);
+                    log.debug("Favorite: {}", favorite);
+
+                    views.setTextViewText(R.id.station_widget_distance, Formats.formatDistance(favorite.distance));
+                    views.setViewVisibility(R.id.station_widget_distance, View.VISIBLE);
 
                     setHeader(appWidgetId, getString(R.string.nearest_favorite_station_widget_loading));
                     appWidgetManager.updateAppWidget(appWidgetId, views);
 
-                    final Favorite favorite = favorites.get(i % numFavorites);
-                    log.debug("Favorite: {}", favorite);
-
                     final NetworkProvider networkProvider = NetworkProviderFactory.provider(favorite.networkId);
                     final String stationId = favorite.id;