kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[iOS] Disabled location related dialogs for the welcome screen

Browse source
This commit is contained in:
Zoia Pribytkova 2019-07-31 14:16:51 +03:00 • committed by Aleksey Belousov
parent d70e71b780
commit 73d7e35f7e
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -280,9 +280,9 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
[MWMRouter restoreRouteIfNeeded];
self.view.clipsToBounds = YES;
[self processMyPositionStateModeEvent:MWMMyPositionModePendingPosition];
[MWMKeyboard addObserver:self];
self.welcomePageController = [MWMWelcomePageController controllerWithParent:self];
[self processMyPositionStateModeEvent:MWMMyPositionModePendingPosition];
if ([MWMNavigationDashboardManager manager].state == MWMNavigationDashboardStateHidden)
self.controlsManager.menuState = self.controlsManager.menuRestoreState;
@ -579,7 +579,10 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
switch (mode)
{
case MWMMyPositionModeNotFollowNoPosition: break;
case MWMMyPositionModePendingPosition: [MWMLocationManager start]; break;
case MWMMyPositionModePendingPosition:
if (self.welcomePageController && [Alohalytics isFirstSession]) { break; }
[MWMLocationManager start];
break;
case MWMMyPositionModeNotFollow: break;
case MWMMyPositionModeFollow:
case MWMMyPositionModeFollowAndRotate: self.disableStandbyOnLocationStateMode = YES; break;
@ -595,9 +598,13 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
BOOL const isMapVisible = (self.navigationController.visibleViewController == self);
if (isMapVisible && ![MWMLocationManager isLocationProhibited])
{
[self.alertController presentLocationNotFoundAlertWithOkBlock:^{
if (self.welcomePageController) {
GetFramework().SwitchMyPositionNextMode();
}];
} else {
[self.alertController presentLocationNotFoundAlertWithOkBlock:^{
GetFramework().SwitchMyPositionNextMode();
}];
}
}
}