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

[ios] Added skip place page dismiss on opening time editing.

Browse source
This commit is contained in:
Илья Гречухин 2015-12-28 17:34:01 +03:00 • committed by Sergey Yershov
parent d3d8a2f71f
commit 7a335d0fb5
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iphone/Maps/Classes/MapViewController.mm
View file

@ -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);