From 66222e46ef9dc9899cee72b78ebef06424a79bfb Mon Sep 17 00:00:00 2001 From: Zoia Pribytkova Date: Mon, 5 Aug 2019 11:05:04 +0300 Subject: [PATCH] [iOS] Exclude bookmarks screen from the hierarchy when we are opening catalogs from the URL --- iphone/Maps/UI/Discovery/MWMDiscoveryController.mm | 4 +--- iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm index 60c877793b..6e4aca6acc 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm @@ -342,12 +342,10 @@ struct Callback } - (void)openCatalogForURL:(NSURL *)url { - auto bookmarks = [[MWMBookmarksTabViewController alloc] init]; - bookmarks.activeTab = ActiveTabCatalog; // NOTE: UTM is already into URL, core part does it for Discovery page. MWMCatalogWebViewController *catalog = [MWMCatalogWebViewController catalogFromAbsoluteUrl:url utm:MWMUTMNone]; NSMutableArray * controllers = [self.navigationController.viewControllers mutableCopy]; - [controllers addObjectsFromArray:@[bookmarks, catalog]]; + [controllers addObjectsFromArray:@[catalog]]; [self.navigationController setViewControllers:controllers animated:YES]; } diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm index 75249bf624..d245d7d118 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm @@ -793,12 +793,10 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page: #pragma mark - MWMPlacePagePromoProtocol - (void)openCatalogForURL:(NSURL *)url { - auto bookmarks = [[MWMBookmarksTabViewController alloc] init]; - bookmarks.activeTab = ActiveTabCatalog; // NOTE: UTM is already into URL, core part does it for Placepage Gallery. MWMCatalogWebViewController *catalog = [MWMCatalogWebViewController catalogFromAbsoluteUrl:url utm:MWMUTMNone]; NSMutableArray * controllers = [self.ownerViewController.navigationController.viewControllers mutableCopy]; - [controllers addObjectsFromArray:@[bookmarks, catalog]]; + [controllers addObjectsFromArray:@[catalog]]; [self.ownerViewController.navigationController setViewControllers:controllers animated:YES]; }