AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] Removed references to Guides.

Browse source 
Signed-off-by: Viktar Havaka viktor.govako@gmail.com
This commit is contained in:
vng 2020-12-20 14:58:06 +03:00 • committed by Roman Tsisyk
parent 029a19914e
commit 39b2c9ea45
4 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Bookmarks/BookmarksCoordinator.swift
View file

@ -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

20
iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
View file

@ -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 {

10
iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift
View file

@ -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:

7
iphone/Maps/UI/Welcome/WelcomePageController.swift
View file

@ -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? {