From 0fec35ae05948a4396bb9527a08e4dd230ecd68c Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sun, 22 May 2022 00:15:16 +0200 Subject: [PATCH] [ios] Minor refactoring Signed-off-by: Alexander Borsuk --- iphone/Maps/Classes/MapViewController.mm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 8c3abaa9e6..59cefc3d80 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -154,23 +154,26 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; - (void)onMapObjectDeselected:(bool)switchFullScreenMode { [self hidePlacePage]; - BOOL const isSearchResult = [MWMSearchManager manager].state == MWMSearchManagerStateResult; + MWMSearchManager * searchManager = MWMSearchManager.manager; + BOOL const isSearchResult = searchManager.state == MWMSearchManagerStateResult; BOOL const isNavigationDashboardHidden = [MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden; if (isSearchResult) { if (isNavigationDashboardHidden) { - [MWMSearchManager manager].state = MWMSearchManagerStateMapSearch; + searchManager.state = MWMSearchManagerStateMapSearch; } else { - [MWMSearchManager manager].state = MWMSearchManagerStateHidden; + searchManager.state = MWMSearchManagerStateHidden; } } if (!switchFullScreenMode) return; + // TODO(AB): Switch to full screen mode directly from the tap, in one place, instead of + // every call to onMapObjectDeselected. if (DeepLinkHandler.shared.isLaunchedByDeeplink) return; - BOOL const isSearchHidden = [MWMSearchManager manager].state == MWMSearchManagerStateHidden; + BOOL const isSearchHidden = searchManager.state == MWMSearchManagerStateHidden; if (isSearchHidden && isNavigationDashboardHidden) { self.controlsManager.hidden = !self.controlsManager.hidden; }