From 7a335d0fb5efe366b147ff8ffa0d8d2d5685dca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=93=D1=80=D0=B5=D1=87=D1=83?= =?UTF-8?q?=D1=85=D0=B8=D0=BD?= Date: Mon, 28 Dec 2015 17:34:01 +0300 Subject: [PATCH] [ios] Added skip place page dismiss on opening time editing. --- iphone/Maps/Classes/MapViewController.mm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 751d955bf7..8bd9dabe21 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -101,6 +101,8 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) @property (nonatomic) BOOL skipForceTouch; +@property (nonatomic) BOOL skipDismissOnViewDisappear; + @end @implementation MapViewController @@ -397,6 +399,8 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) return; [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil]; + self.skipDismissOnViewDisappear = NO; + [self.controlsManager reloadPlacePage]; self.controlsManager.menuState = self.menuRestoreState; [self refreshAd]; @@ -449,7 +453,8 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) { [super viewWillDisappear:animated]; self.menuRestoreState = self.controlsManager.menuState; - [self dismissPlacePage]; + if (!self.skipDismissOnViewDisappear) + [self dismissPlacePage]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orientationChanged:) name:UIDeviceOrientationDidChangeNotification object:nil]; } @@ -792,8 +797,9 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - if ([segue.identifier isEqualToString:@"Map2PlacePageEditor"]) + if ([segue.identifier isEqualToString:@"Map2OpeningHoursEditor"]) { + self.skipDismissOnViewDisappear = YES; MWMPlacePageEntity * entity = sender; NSUInteger const timeIndex = [entity.metadataTypes indexOfObject:@(MWMPlacePageMetadataTypeOpenHours)]; BOOL const haveTime = (timeIndex != NSNotFound);