From 39b2c9ea4537236419d33e3e3700ab75f7e1059e Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Sun, 20 Dec 2020 14:58:06 +0300
Subject: [PATCH] [iOS] Removed references to Guides. Signed-off-by: Viktar
 Havaka viktor.govako@gmail.com

---
 .../Maps/Bookmarks/BookmarksCoordinator.swift |  6 ++++--
 .../MWMTrafficButtonViewController.mm         | 20 -------------------
 .../BottomMenu/Menu/BottomMenuPresenter.swift | 10 +++++-----
 .../UI/Welcome/WelcomePageController.swift    |  7 ++++---
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/iphone/Maps/Bookmarks/BookmarksCoordinator.swift b/iphone/Maps/Bookmarks/BookmarksCoordinator.swift
index aedab8c274..891fd5c20e 100644
--- a/iphone/Maps/Bookmarks/BookmarksCoordinator.swift
+++ b/iphone/Maps/Bookmarks/BookmarksCoordinator.swift
@@ -45,8 +45,10 @@ import UIKit
     switch state {
     case .opened:
       guard let bookmarksControllers = bookmarksControllers else {
-        navigationController.pushViewController(BookmarksTabViewController(coordinator: self),
-                                                animated: true)
+        // Instead of BookmarksTabViewController
+        let bookmarks = BMCViewController(coordinator: self)
+        bookmarks.title = L("bookmarks")
+        navigationController.pushViewController(bookmarks, animated: true)
         return
       }
       var controllers = navigationController.viewControllers
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
index e2a1d1a306..31ad96a1ff 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
@@ -128,26 +128,6 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
 }
 
 - (void)handleGuidesState:(MWMMapOverlayGuidesState)state {
-  switch (state) {
-    case MWMMapOverlayGuidesStateDisabled:
-    case MWMMapOverlayGuidesStateEnabled:
-      break;
-    case MWMMapOverlayGuidesStateHasData:
-      performOnce(^{
-        [[MWMToast toastWithText:L(@"routes_layer_is_on_toast")] showWithAlignment:MWMToastAlignmentTop];
-      }, @"routes_layer_is_on_toast");
-      break;
-    case MWMMapOverlayGuidesStateNetworkError:
-      [[MWMToast toastWithText:L(@"connection_error_toast_guides")] show];
-      break;
-    case MWMMapOverlayGuidesStateFatalNetworkError:
-      [MWMMapOverlayManager setGuidesEnabled:NO];
-      [[MWMAlertViewController activeAlertController] presentNoConnectionAlert];
-      break;
-    case MWMMapOverlayGuidesStateNoData:
-      [[MWMToast toastWithText:L(@"no_routes_in_the_area_toast")] show];
-      break;
-  }
 }
 
 - (void)handleIsolinesState:(MWMMapOverlayIsolinesState)state {
diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift
index 76c6ebcb41..c6153b5912 100644
--- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift
+++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift
@@ -5,7 +5,7 @@ protocol BottomMenuPresenterProtocol: UITableViewDelegate, UITableViewDataSource
 class BottomMenuPresenter: NSObject {
   enum CellType: Int, CaseIterable {
     case addPlace
-    case downloadRoutes
+    //case downloadRoutes
     case downloadMaps
     case settings
     case share
@@ -64,8 +64,8 @@ extension BottomMenuPresenter {
                        title: L("placepage_add_place_button"),
                        badgeCount: 0,
                        enabled: enabled)
-      case .downloadRoutes:
-        cell.configure(imageName: "ic_menu_routes", title: L("download_guides"))
+//      case .downloadRoutes:
+//        cell.configure(imageName: "ic_menu_routes", title: L("download_guides"))
       case .downloadMaps:
         cell.configure(imageName: "ic_menu_download",
                        title: L("download_maps"),
@@ -113,8 +113,8 @@ extension BottomMenuPresenter {
     switch CellType(rawValue: indexPath.row)! {
     case .addPlace:
       interactor.addPlace()
-    case .downloadRoutes:
-      interactor.downloadRoutes()
+//    case .downloadRoutes:
+//      interactor.downloadRoutes()
     case .downloadMaps:
       interactor.downloadMaps()
     case .settings:
diff --git a/iphone/Maps/UI/Welcome/WelcomePageController.swift b/iphone/Maps/UI/Welcome/WelcomePageController.swift
index a027f1f03f..1ca09c38b1 100644
--- a/iphone/Maps/UI/Welcome/WelcomePageController.swift
+++ b/iphone/Maps/UI/Welcome/WelcomePageController.swift
@@ -31,9 +31,10 @@ final class WelcomePageController: UIPageViewController {
   }
 
   static func shouldShowWelcome() -> Bool {
-    return WelcomeStorage.shouldShowTerms ||
-      Alohalytics.isFirstSession() ||
-      (WelcomeStorage.shouldShowWhatsNew && !DeepLinkHandler.shared.isLaunchedByDeeplink)
+//    return WelcomeStorage.shouldShowTerms ||
+//      Alohalytics.isFirstSession() ||
+//      (WelcomeStorage.shouldShowWhatsNew && !DeepLinkHandler.shared.isLaunchedByDeeplink)
+    return false
   }
 
   @objc static func controller(parent: WelcomePageControllerProtocol) -> WelcomePageController? {