From b2a178fd5097a57f226f2ba5bc3e009f3e06ae52 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 15 Dec 2021 17:34:42 +0300
Subject: [PATCH] [android] Break long routing time/distance string into 2
 lines

Used non-breakable spaces to control where the string breaks.
Ellipsize the string from the end in case 2 lines are not enough still.

Needed-for: #1528

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 android/res/layout-land/routing_details.xml               | 4 ++--
 android/res/layout-w1020dp-land/routing_details.xml       | 4 ++--
 android/res/layout/routing_details.xml                    | 8 +++++---
 .../maps/routing/RoutingBottomMenuController.java         | 4 ++--
 .../com/mapswithme/maps/routing/RoutingController.java    | 2 +-
 android/src/com/mapswithme/util/Utils.java                | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/android/res/layout-land/routing_details.xml b/android/res/layout-land/routing_details.xml
index 020bc4e4d1..b98fde3487 100644
--- a/android/res/layout-land/routing_details.xml
+++ b/android/res/layout-land/routing_details.xml
@@ -9,10 +9,10 @@
   <TextView
     android:id="@+id/time"
     android:singleLine="true"
-    android:ellipsize="middle"
+    android:ellipsize="end"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    tools:text="33 min"/>
+    tools:text="5 h 55 min • 1555km"/>
   <TextView
     android:id="@+id/altitude_difference"
     android:layout_width="wrap_content"
diff --git a/android/res/layout-w1020dp-land/routing_details.xml b/android/res/layout-w1020dp-land/routing_details.xml
index f0b132825b..b9eaf89a0c 100644
--- a/android/res/layout-w1020dp-land/routing_details.xml
+++ b/android/res/layout-w1020dp-land/routing_details.xml
@@ -10,9 +10,9 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:singleLine="true"
-    android:ellipsize="middle"
+    android:ellipsize="end"
     android:layout_marginBottom="4dp"
-    tools:text="33 min"/>
+    tools:text="5 h 55 min • 1555km"/>
   <TextView
     android:id="@+id/arrival"
     android:layout_width="match_parent"
diff --git a/android/res/layout/routing_details.xml b/android/res/layout/routing_details.xml
index 9a763d5308..239204e317 100644
--- a/android/res/layout/routing_details.xml
+++ b/android/res/layout/routing_details.xml
@@ -22,10 +22,12 @@
   <TextView
     android:id="@+id/time"
     android:layout_width="wrap_content"
-    android:singleLine="true"
-    android:ellipsize="middle"
+    android:maxLines="2"
+    android:ellipsize="end"
     android:layout_alignParentStart="true"
     android:orientation="horizontal"
     android:layout_toStartOf="@id/altitude_difference"
-    android:layout_height="wrap_content"/>
+    android:layout_height="wrap_content"
+    tools:text="5 h 55 min • 1555km"
+    tools:visibility="visible" />
 </RelativeLayout>
diff --git a/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java b/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java
index cc4b26b8cb..a4d99cb141 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java
@@ -311,10 +311,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
     SpannableStringBuilder builder = new SpannableStringBuilder();
     initTimeBuilderSequence(context, time, builder);
 
-    String dot = " • ";
+    String dot = "\u00A0• ";
     initDotBuilderSequence(context, dot, builder);
 
-    String dist = routingInfo.distToTarget + " " + routingInfo.targetUnits;
+    String dist = routingInfo.distToTarget + "\u00A0" + routingInfo.targetUnits;
     initDistanceBuilderSequence(context, dist, builder);
 
     return builder;
diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 81113a60c2..21676383fc 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -1042,7 +1042,7 @@ public class RoutingController implements Initializable<Void>
                                                               String.valueOf(hours), hour);
     SpannableStringBuilder displayedM = Utils.formatUnitsText(context, textSize, unitsSize,
                                                               String.valueOf(minutes), min);
-    return hours == 0 ? displayedM : TextUtils.concat(displayedH + " ", displayedM);
+    return hours == 0 ? displayedM : TextUtils.concat(displayedH + "\u00A0", displayedM);
   }
 
   static String formatArrivalTime(int seconds)
diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java
index 88678b0d5f..2706c90693 100644
--- a/android/src/com/mapswithme/util/Utils.java
+++ b/android/src/com/mapswithme/util/Utils.java
@@ -355,7 +355,7 @@ public class Utils
 
   public static SpannableStringBuilder formatUnitsText(Context context, @DimenRes int size, @DimenRes int units, String dimension, String unitText)
   {
-    final SpannableStringBuilder res = new SpannableStringBuilder(dimension).append(" ").append(unitText);
+    final SpannableStringBuilder res = new SpannableStringBuilder(dimension).append("\u00A0").append(unitText);
     res.setSpan(new AbsoluteSizeSpan(UiUtils.dimen(context, size), false), 0, dimension.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
     res.setSpan(new AbsoluteSizeSpan(UiUtils.dimen(context, units), false), dimension.length(), res.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
     return res;