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

[iOS] Exclude bookmarks screen from the hierarchy when we are opening catalogs from the URL

Browse source
This commit is contained in:
Zoia Pribytkova 2019-08-05 11:05:04 +03:00 • committed by Aleksey Belousov
parent cf8ffbb582
commit 66222e46ef
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/UI/Discovery/MWMDiscoveryController.mm
View file

@ -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<UIViewController *> * controllers = [self.navigationController.viewControllers mutableCopy];
[controllers addObjectsFromArray:@[bookmarks, catalog]];
[controllers addObjectsFromArray:@[catalog]];
[self.navigationController setViewControllers:controllers animated:YES];
}

4
iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
View file

@ -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<UIViewController *> * controllers = [self.ownerViewController.navigationController.viewControllers mutableCopy];
[controllers addObjectsFromArray:@[bookmarks, catalog]];
[controllers addObjectsFromArray:@[catalog]];
[self.ownerViewController.navigationController setViewControllers:controllers animated:YES];
}