From 82cb2df13546a1275df21e261e02adca9304a621 Mon Sep 17 00:00:00 2001
From: "S. Kozyr" <s.trump@gmail.com>
Date: Sun, 27 Aug 2023 13:16:12 +0300
Subject: [PATCH] [iOS] Added "Distance: " prefix to ruler route lower panel

Signed-off-by: S. Kozyr <s.trump@gmail.com>
---
 .../MWMNavigationDashboardManager+Entity.mm   | 19 ++++++++++---------
 .../MWMNavigationDashboardManager.mm          | 12 +++++++-----
 .../TransportRoutePreviewStatus.swift         | 11 +++++++++--
 .../TransportTransitStepsCollectionView.swift |  2 +-
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
index 2305c41e5f..19c58e5584 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
@@ -6,7 +6,7 @@
 #import "SwiftBridge.h"
 
 #import <AudioToolbox/AudioServices.h>
-#include <CoreApi/Framework.h>
+#import <CoreApi/Framework.h>
 
 #include "routing/following_info.hpp"
 #include "routing/turns.hpp"
@@ -101,25 +101,26 @@ NSAttributedString *estimate(NSTimeInterval time, NSString *distance, NSString *
 }
 
 NSArray<MWMRouterTransitStepInfo *> *buildRouteTransitSteps(NSArray<MWMRoutePoint *> *points) {
-  NSMutableArray<MWMRouterTransitStepInfo *> *steps = [NSMutableArray arrayWithCapacity:[points count]*2-1];
+  // Generate step info in format: (Segment 1 distance) (1) (Segment 2 distance) (2) ... (n-1) (Segment N distance).
+  NSMutableArray<MWMRouterTransitStepInfo *> *steps = [NSMutableArray arrayWithCapacity:[points count] * 2 - 1];
   auto const numPoints = [points count];
-  for (int i = 0; i < numPoints-1; i++) {
+  for (int i = 0; i < numPoints - 1; i++) {
     MWMRoutePoint* segmentStart = points[i];
-    MWMRoutePoint* segmentEnd = points[i+1];
+    MWMRoutePoint* segmentEnd = points[i + 1];
     auto const distance = platform::Distance::CreateFormatted(
-      ms::DistanceOnEarth(segmentStart.latitude, segmentStart.longitude, segmentEnd.latitude, segmentEnd.longitude));
+        ms::DistanceOnEarth(segmentStart.latitude, segmentStart.longitude, segmentEnd.latitude, segmentEnd.longitude));
 
     MWMRouterTransitStepInfo* segmentInfo = [[MWMRouterTransitStepInfo alloc] init];
     segmentInfo.type = MWMRouterTransitTypeRuler;
     segmentInfo.distance = @(distance.GetDistanceString().c_str());
     segmentInfo.distanceUnits = @(distance.GetUnitsString().c_str());
-    steps[i*2] = segmentInfo;
+    steps[i * 2] = segmentInfo;
 
-    if (i < numPoints-2) {
+    if (i < numPoints - 2) {
       MWMRouterTransitStepInfo* stopInfo = [[MWMRouterTransitStepInfo alloc] init];
       stopInfo.type = MWMRouterTransitTypeIntermediatePoint;
       stopInfo.intermediateIndex = i;
-      steps[i*2+1] = stopInfo;
+      steps[i * 2 + 1] = stopInfo;
     }
   }
 
@@ -193,7 +194,7 @@ NSArray<MWMRouterTransitStepInfo *> *buildRouteTransitSteps(NSArray<MWMRoutePoin
   }
 
   if (auto entity = self.entity) {
-    BOOL showEta = (type != MWMRouterTypeRuler);
+    BOOL const showEta = (type != MWMRouterTypeRuler);
     
     entity.isValid = YES;
     entity.timeToTarget = info.m_time;
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index ce4485b091..95b56068bd 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -82,8 +82,10 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
   if (!entity.isValid)
     return;
   [_navigationInfoView onNavigationInfoUpdated:entity];
-  if ([MWMRouter type] == MWMRouterTypePublicTransport || [MWMRouter type] == MWMRouterTypeRuler)
-    [_transportRoutePreviewStatus onNavigationInfoUpdated:entity];
+  bool const isPublicTransport = [MWMRouter type] == MWMRouterTypePublicTransport;
+  bool const isRuler = [MWMRouter type] == MWMRouterTypeRuler;
+  if (isPublicTransport || isRuler)
+    [_transportRoutePreviewStatus onNavigationInfoUpdated:entity prependDistance:isRuler];
   else
     [_baseRoutePreviewStatus onNavigationInfoUpdated:entity];
   [_navigationControlView onNavigationInfoUpdated:entity];
@@ -176,13 +178,13 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
   NSAssert(_state == MWMNavigationDashboardStatePlanning || _state == MWMNavigationDashboardStateReady, @"Invalid state change (ready)");
   [self setRouteBuilderProgress:100.];
   [self updateGoButtonTitle];
-  auto const isTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
-  auto const isRuler = ([MWMRouter type] == MWMRouterTypeRuler);
+  bool const isTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
+  bool const isRuler = ([MWMRouter type] == MWMRouterTypeRuler);
   if (isTransport || isRuler)
     [self.transportRoutePreviewStatus showReady];
   else
     [self.baseRoutePreviewStatus showReady];
-  self.goButtonsContainer.hidden = (isTransport || isRuler);
+  self.goButtonsContainer.hidden = isTransport || isRuler;
   for (MWMRouteStartButton *button in self.goButtons)
   {
     if (isRuler)
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift
index 327186cc1a..93430fd233 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift
@@ -38,9 +38,16 @@ final class TransportRoutePreviewStatus: SolidTouchView {
     updateHeight()
   }
 
-  @objc func onNavigationInfoUpdated(_ info: MWMNavigationDashboardEntity) {
+  @objc func onNavigationInfoUpdated(_ info: MWMNavigationDashboardEntity, prependDistance: Bool) {
     navigationInfo = info
-    etaLabel.attributedText = info.estimate
+    if (prependDistance) {
+      let labelText = NSMutableAttributedString(string: NSLocalizedString("placepage_distance", comment: "") + ": ")
+      labelText.append(info.estimate)
+      etaLabel.attributedText = labelText
+    }
+    else {
+      etaLabel.attributedText = info.estimate
+    }
     stepsCollectionView.steps = info.transitSteps
 
     // TODO: even when stepsCollectionView is hidden it still takes space in layout
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitStepsCollectionView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitStepsCollectionView.swift
index bf761eb6a7..8d1549ccad 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitStepsCollectionView.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitStepsCollectionView.swift
@@ -21,7 +21,7 @@ final class TransportTransitStepsCollectionView: UICollectionView {
     super.awakeFromNib()
     dataSource = self
     [TransportTransitIntermediatePoint.self, TransportTransitPedestrian.self,
-     TransportTransitTrain.self, TransportRuler.self].forEach {
+        TransportTransitTrain.self, TransportRuler.self].forEach {
       register(cellClass: $0)
     }
   }