From cea8f6a2a8d2a88c7a3036f85dbc4d80c4c45694 Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Wed, 22 May 2024 13:47:28 +0400 Subject: [PATCH] [ios] fix: do not hide the side buttons during the new place adding Signed-off-by: Kiryl Kaveryn --- .../MapViewControls/MWMMapViewControlsManager.mm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 817b811dd0..cb5147d275 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -40,6 +40,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; @property(weak, nonatomic) MapViewController *ownerController; @property(nonatomic) BOOL disableStandbyOnRouteFollowing; +@property(nonatomic) BOOL isAddingPlace; @end @@ -61,6 +62,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; self.isDirectionViewHidden = YES; self.menuState = MWMBottomMenuStateInactive; self.menuRestoreState = MWMBottomMenuStateInactive; + self.isAddingPlace = NO; return self; } @@ -122,6 +124,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; } - (void)didFinishAddingPlace { + self.isAddingPlace = NO; self.trafficButtonHidden = NO; self.menuState = MWMBottomMenuStateInactive; } @@ -132,12 +135,14 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; - (void)addPlace:(BOOL)isBusiness hasPoint:(BOOL)hasPoint point:(m2::PointD const &)point { MapViewController *ownerController = self.ownerController; - [ownerController dismissPlacePage]; + self.isAddingPlace = YES; self.searchManager.state = MWMSearchManagerStateHidden; self.menuState = MWMBottomMenuStateHidden; self.trafficButtonHidden = YES; + [ownerController dismissPlacePage]; + [MWMAddPlaceNavigationBar showInSuperview:ownerController.view isBusiness:isBusiness applyPosition:hasPoint @@ -285,7 +290,9 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; - (void)setHidden:(BOOL)hidden { if (_hidden == hidden) return; - _hidden = hidden; + // Do not hide the controls view during the place adding process. + if (!_isAddingPlace) + _hidden = hidden; self.sideButtonsHidden = _sideButtonsHidden; self.trafficButtonHidden = _trafficButtonHidden; self.menuState = hidden ? MWMBottomMenuStateHidden : MWMBottomMenuStateInactive;