From a429fbe4dfb5d38e66286ff591834fd61aec6d95 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 26 Nov 2020 20:37:00 +0100
Subject: [PATCH] Interval list: RTL and localized formatting (only default
 strings.xml).

---
 .../opentracks/util/StringUtilsTest.java      |  9 +++
 .../adapters/IntervalStatisticsAdapter.java   | 16 ++----
 .../opentracks/util/StringUtils.java          | 28 ++++++++++
 .../res/layout/interval_stats_list_item.xml   | 56 +++++++------------
 src/main/res/values/strings.xml               |  5 ++
 5 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java
index 20be2001c..21a57ca6d 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java
@@ -226,4 +226,13 @@ public class StringUtilsTest {
         assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second);
         assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second);
     }
+
+    @Test
+    public void testFormatSpeed() {
+        assertEquals("4:59 min/km", StringUtils.formatSpeed(context, 3.34, true, false));
+        assertEquals("8:02 min/mi", StringUtils.formatSpeed(context, 3.34, false, false));
+
+        assertEquals("12.02 km/h", StringUtils.formatSpeed(context, 3.34, true, true));
+        assertEquals("7.47 mph", StringUtils.formatSpeed(context, 3.34, false, true));
+    }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java
index 2e718f32b..6b478353b 100644
--- a/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java
@@ -1,7 +1,6 @@
 package de.dennisguse.opentracks.adapters;
 
 import android.content.Context;
-import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,10 +19,10 @@ import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
 
 public class IntervalStatisticsAdapter extends ArrayAdapter<IntervalStatistics.Interval> {
 
-    private StackMode stackMode;
-    private boolean metricUnits;
+    private final StackMode stackMode;
+    private final boolean metricUnits;
     private float sumDistance_m;
-    private String category;
+    private final String category;
 
     public IntervalStatisticsAdapter(Context context, List<IntervalStatistics.Interval> intervalList, String category, StackMode stackMode) {
         super(context, R.layout.interval_stats_list_item, intervalList);
@@ -61,15 +60,12 @@ public class IntervalStatisticsAdapter extends ArrayAdapter<IntervalStatistics.I
         viewHolder.distance.setText(StringUtils.formatDistance(getContext(), sumDistance_m, metricUnits));
 
         if (PreferencesUtils.isReportSpeed(getContext(), category)) {
-            Pair<String, String> speedParts = StringUtils.getSpeedParts(getContext(), interval.getSpeed_ms(), metricUnits, true);
-            viewHolder.rate.setText(speedParts.first + " " + speedParts.second);
+            viewHolder.rate.setText(StringUtils.formatSpeed(getContext(), interval.getSpeed_ms(), metricUnits, true));
         } else {
-            Pair<String, String> paceParts = StringUtils.getSpeedParts(getContext(), interval.getSpeed_ms(), metricUnits, false);
-            viewHolder.rate.setText(paceParts.first + " " + paceParts.second);
+            viewHolder.rate.setText(StringUtils.formatSpeed(getContext(), interval.getSpeed_ms(), metricUnits, false));
         }
 
-        Pair<String, String> gainParts = StringUtils.formatElevation(getContext(), interval.getGain_m(), metricUnits);
-        viewHolder.gain.setText(gainParts.first + " " + gainParts.second);
+        viewHolder.gain.setText(StringUtils.formatDistance(getContext(), interval.getGain_m(), metricUnits));
 
         return intervalView;
     }
diff --git a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java
index 2a7d9db34..94f55ac9e 100644
--- a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java
@@ -118,6 +118,34 @@ public class StringUtils {
         }
     }
 
+    public static String formatSpeed(Context context, double speed_mps, boolean metricUnits, boolean reportSpeed) {
+        if (Double.isNaN(speed_mps) || Double.isInfinite(speed_mps)) {
+            speed_mps = 0;
+        }
+
+        double speed = speed_mps * UnitConversions.M_TO_KM; //KM p sec
+        if (!metricUnits) {
+            speed *= UnitConversions.KM_TO_MI;
+        }
+
+        if (reportSpeed) {
+            if (metricUnits) {
+                return context.getString(R.string.value_float_kilometer_hour, speed * UnitConversions.S_TO_HR);
+            } else {
+                return context.getString(R.string.value_float_mile_hour, speed * UnitConversions.S_TO_HR);
+            }
+        } else {
+            int pace = speed == 0 ? 0 : (int) Math.round(1 / speed); //sec / [KM | MI]
+            int minutes = pace / 60;
+            int seconds = pace % 60;
+            if (metricUnits) {
+                return context.getString(R.string.value_pace_kilometer, minutes, seconds);
+            } else {
+                return context.getString(R.string.value_pace_mile, minutes, seconds);
+            }
+        }
+    }
+
     private static String formatDecimal(double value) {
         return StringUtils.formatDecimal(value, 2);
     }
diff --git a/src/main/res/layout/interval_stats_list_item.xml b/src/main/res/layout/interval_stats_list_item.xml
index 1de6ac727..121dd9db1 100644
--- a/src/main/res/layout/interval_stats_list_item.xml
+++ b/src/main/res/layout/interval_stats_list_item.xml
@@ -1,47 +1,31 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="8dp"
     android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/interval_item_distance"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            style="@style/TextMedium"
-            tools:text="1 km" />
+    <TextView
+        android:id="@+id/interval_item_distance"
+        style="@style/TextMedium"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        tools:text="1 km" />
 
-        <TextView
-            android:id="@+id/interval_item_rate"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            style="@style/TextMedium"
-            tools:text="15 km/h" />
+    <TextView
+        android:id="@+id/interval_item_rate"
+        style="@style/TextMedium"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        tools:text="15 km/h" />
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_arrow_drop_up_24" />
-
-            <TextView
-                android:id="@+id/interval_item_gain"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                style="@style/TextMedium"
-                tools:text="100 m" />
-
-        </LinearLayout>
+    <TextView
+        android:id="@+id/interval_item_gain"
+        style="@style/TextMedium"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        app:drawableStartCompat="@drawable/ic_arrow_drop_up_24"
+        tools:text="100 m" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7736bdbf9..3838e33e6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -508,8 +508,11 @@ limitations under the License.
     <string name="value_always">Always</string>
     <string name="value_float_feet">%1$.2f ft</string>
     <string name="value_float_kilometer">%1$.2f km</string>
+    <string name="value_float_kilometer_hour">%1$.2f km/h</string>
     <string name="value_float_meter">%1$.2f m</string>
     <string name="value_float_mile">%1$.2f mi</string>
+    <string name="value_float_mile_hour">%1$.2f mph</string>
+
     <string name="value_float_mile_poor_gps">%1$.1f mi (poor GPS)</string>
     <string name="value_integer_feet">%1$d ft</string>
     <string name="value_integer_feet_excellent_gps">%1$d ft (excellent GPS)</string>
@@ -525,6 +528,8 @@ limitations under the License.
     <string name="value_integer_minute">%1$d min</string>
     <string name="value_integer_percent">%1$d %%</string>
     <string name="value_integer_second">%1$d s</string>
+    <string name="value_pace_mile">%1$d:%2$02d min/mi</string>
+    <string name="value_pace_kilometer">%1$d:%2$02d min/km</string>
     <string name="value_none">None</string>
     <string name="value_off">Off</string>
     <string name="value_smallest">Smallest</string>