From 75db5f323b757ff2bda917401ac0ef1ef1a6989e Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Tue, 20 Aug 2019 14:54:09 +0300
Subject: [PATCH] [android] Modified the layouts according to previous
 behavior, removed the useless views

---
 android/res/layout-land/routing_details.xml   | 28 +++----------
 .../layout-w1020dp-land/routing_details.xml   | 20 +---------
 android/res/layout/routing_details.xml        | 39 ++++---------------
 .../routing/RoutingBottomMenuController.java  | 30 ++++++++------
 4 files changed, 32 insertions(+), 85 deletions(-)

diff --git a/android/res/layout-land/routing_details.xml b/android/res/layout-land/routing_details.xml
index b560db4894..370d5ac9a1 100644
--- a/android/res/layout-land/routing_details.xml
+++ b/android/res/layout-land/routing_details.xml
@@ -6,31 +6,13 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
-  <LinearLayout
+  <TextView
+    android:id="@+id/time"
+    android:singleLine="true"
+    android:ellipsize="middle"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
-    <TextView
-      android:id="@+id/time"
-      android:singleLine="true"
-      android:ellipsize="middle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      tools:text="33 min"/>
-    <TextView
-      style="@style/MwmWidget.TextView.PlanDetail.Number.Secondary"
-      android:layout_marginLeft="6dp"
-      android:layout_marginRight="6dp"
-      android:layout_marginTop="2dp"
-      android:visibility="gone"
-      android:text="•"
-      tools:ignore="HardcodedText"/>
-    <TextView
-      android:id="@+id/distance"
-      android:visibility="gone"
-      style="@style/MwmWidget.TextView.PlanDetail.Number"
-      tools:text="1024 km"/>
-  </LinearLayout>
+    tools:text="33 min"/>
   <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 8fb304acae..977d4c9cce 100644
--- a/android/res/layout-w1020dp-land/routing_details.xml
+++ b/android/res/layout-w1020dp-land/routing_details.xml
@@ -13,24 +13,6 @@
     android:ellipsize="middle"
     android:layout_marginBottom="4dp"
     tools:text="33 min"/>
-  <TextView
-    style="@style/MwmWidget.TextView.PlanDetail.Number.Secondary"
-    android:id="@+id/dot"
-    android:layout_marginLeft="6dp"
-    android:layout_marginRight="6dp"
-    android:layout_marginTop="2dp"
-    android:layout_toRightOf="@id/time"
-    android:layout_toEndOf="@id/time"
-    android:visibility="gone"
-    android:text="•"
-    tools:ignore="HardcodedText"/>
-  <TextView
-    android:id="@+id/distance"
-    style="@style/MwmWidget.TextView.PlanDetail.Number"
-    android:layout_toEndOf="@id/dot"
-    android:layout_toRightOf="@id/dot"
-    android:visibility="gone"
-    tools:text="1024 km 324"/>
   <TextView
     android:id="@+id/arrival"
     android:layout_width="match_parent"
@@ -39,8 +21,8 @@
     android:layout_alignLeft="@id/time"
     android:layout_alignStart="@id/time"
     android:layout_marginBottom="10dp"
-    android:visibility="gone"
     tools:text="Arrival 13:03"
+    style="@style/MwmWidget.TextView.PlanDetail.Number.Secondary"
     android:textSize="@dimen/text_size_routing_plan_detail_arrival"/>
   <TextView
     android:id="@+id/altitude_difference"
diff --git a/android/res/layout/routing_details.xml b/android/res/layout/routing_details.xml
index ceb791faa1..fd0452f37b 100644
--- a/android/res/layout/routing_details.xml
+++ b/android/res/layout/routing_details.xml
@@ -4,7 +4,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/numbers"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content">
+  android:layout_height="wrap_content"
+  android:layout_marginBottom="@dimen/altitude_chart_time_distance_margin_bottom">
   <TextView
     android:id="@+id/altitude_difference"
     android:layout_width="wrap_content"
@@ -20,39 +21,15 @@
     tools:text="43 m"
     tools:targetApi="jelly_bean"
     tools:visibility="visible"/>
-  <LinearLayout
+  <TextView
+    android:id="@+id/time"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:singleLine="true"
+    android:ellipsize="middle"
     android:layout_alignParentStart="true"
     android:layout_alignParentLeft="true"
     android:orientation="horizontal"
     android:layout_toLeftOf="@id/altitude_difference"
-    android:layout_toStartOf="@id/altitude_difference">
-    <TextView
-      android:id="@+id/time"
-      android:layout_width="0dp"
-      android:layout_weight="1"
-      android:singleLine="true"
-      android:ellipsize="middle"
-      tools:text="33 min"
-      android:layout_height="wrap_content"/>
-    <TextView
-      style="@style/MwmWidget.TextView.PlanDetail.Number.Secondary"
-      android:layout_marginLeft="6dp"
-      android:layout_width="0dp"
-      android:layout_weight="1"
-      android:layout_marginRight="6dp"
-      android:layout_marginTop="2dp"
-      android:visibility="gone"
-      android:text="•"
-      tools:ignore="HardcodedText"/>
-    <TextView
-      android:id="@+id/distance"
-      android:layout_width="0dp"
-      android:layout_weight="1"
-      android:visibility="gone"
-      style="@style/MwmWidget.TextView.PlanDetail.Number"
-      tools:text="1024 km"/>
-  </LinearLayout>
-
+    android:layout_toStartOf="@id/altitude_difference"
+    android:layout_height="wrap_content"/>
 </RelativeLayout>
diff --git a/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java b/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java
index f51d5ccb55..8198b6a5b7 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java
@@ -370,7 +370,14 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
     Spanned spanned = makeSpannedRoutingDetails(mContext, rinfo);
     TextView numbersTime = (TextView) mNumbersFrame.findViewById(R.id.time);
-    numbersTime.setText(spanned, TextView.BufferType.SPANNABLE);
+    numbersTime.setText(spanned);
+
+    TextView numbersArrival = (TextView) mNumbersFrame.findViewById(R.id.arrival);
+    if (numbersArrival != null)
+    {
+      String arrivalTime = RoutingController.formatArrivalTime(rinfo.totalTimeInSeconds);
+      numbersArrival.setText(arrivalTime);
+    }
   }
 
   @NonNull
@@ -388,11 +395,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
     initDotBuilderSequence(context, dot, builder);
 
     String dist = routingInfo.distToTarget + " " + routingInfo.targetUnits;
-    dist = "asdasdasdasdasdasdasdasdasdadqweqweqweqweqweqweqweqweqweqwe";
-    initTailBuilderSequence(context, dist, builder, android.R.attr.textColorPrimary);
-
-    String arrivalTime = RoutingController.formatArrivalTime(routingInfo.totalTimeInSeconds);
-    initTailBuilderSequence(context, arrivalTime, builder.append(" "), R.attr.secondary);
+    initDistanceBuilderSequence(context, dist, builder);
 
     return builder;
   }
@@ -406,7 +409,8 @@ final class RoutingBottomMenuController implements View.OnClickListener
                     0,
                     builder.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-    builder.setSpan(new AbsoluteSizeSpan(context.getResources().getDimensionPixelSize(R.dimen.text_size_routing_number)),
+    builder.setSpan(new AbsoluteSizeSpan(context.getResources()
+                                                .getDimensionPixelSize(R.dimen.text_size_routing_number)),
                     0,
                     builder.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -414,7 +418,8 @@ final class RoutingBottomMenuController implements View.OnClickListener
                     0,
                     builder.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-    builder.setSpan(new ForegroundColorSpan(ThemeUtils.getColor(context, android.R.attr.textColorPrimary)),
+    builder.setSpan(new ForegroundColorSpan(ThemeUtils.getColor(context,
+                                                                android.R.attr.textColorPrimary)),
                     0,
                     builder.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -427,7 +432,8 @@ final class RoutingBottomMenuController implements View.OnClickListener
                     builder.length() - dot.length(),
                     builder.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-    builder.setSpan(new AbsoluteSizeSpan(context.getResources().getDimensionPixelSize(R.dimen.text_size_routing_number)),
+    builder.setSpan(new AbsoluteSizeSpan(context.getResources()
+                                                .getDimensionPixelSize(R.dimen.text_size_routing_number)),
                     builder.length() - dot.length(),
                     builder.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -437,8 +443,8 @@ final class RoutingBottomMenuController implements View.OnClickListener
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
   }
 
-  private static void initTailBuilderSequence(@NonNull Context context, @NonNull String arrivalTime,
-                                              @NonNull SpannableStringBuilder builder, int textColor)
+  private static void initDistanceBuilderSequence(@NonNull Context context, @NonNull String arrivalTime,
+                                                  @NonNull SpannableStringBuilder builder)
   {
     builder.append(arrivalTime);
     builder.setSpan(new TypefaceSpan(context.getResources().getString(R.string.robotoMedium)),
@@ -454,7 +460,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
                     builder.length() - arrivalTime.length(),
                     builder.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-    builder.setSpan(new ForegroundColorSpan(ThemeUtils.getColor(context, textColor)),
+    builder.setSpan(new ForegroundColorSpan(ThemeUtils.getColor(context, android.R.attr.textColorPrimary)),
                     builder.length() - arrivalTime.length(),
                     builder.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);