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

[MAPSME-3676] [ios] Fixed traffic button hidden state changes.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-01-31 13:46:19 +03:00 • committed by Sergey Yershov
parent 1029dd2e11
commit 252de5916e
1 changed files with 4 additions and 2 deletions

6
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -372,7 +372,6 @@ extern NSString * const kAlohalyticsTapEventKey;
if (_disableStandbyOnRouteFollowing == disableStandbyOnRouteFollowing)
return;
_disableStandbyOnRouteFollowing = disableStandbyOnRouteFollowing;
self.trafficButtonHidden = disableStandbyOnRouteFollowing;
if (disableStandbyOnRouteFollowing)
[[MapsAppDelegate theApp] disableStandby];
else
@ -426,6 +425,7 @@ extern NSString * const kAlohalyticsTapEventKey;
self.sideButtons.zoomHidden = self.zoomHidden;
self.sideButtonsHidden = NO;
self.disableStandbyOnRouteFollowing = YES;
self.trafficButtonHidden = YES;
self.navigationManager.state = MWMNavigationDashboardStateNavigation;
}
@ -434,6 +434,7 @@ extern NSString * const kAlohalyticsTapEventKey;
self.sideButtons.zoomHidden = self.zoomHidden;
self.navigationManager.state = MWMNavigationDashboardStateHidden;
self.disableStandbyOnRouteFollowing = NO;
self.trafficButtonHidden = NO;
self.menuState = MWMBottomMenuStateInactive;
[self navigationDashBoardDidUpdate];
}
@ -517,7 +518,8 @@ extern NSString * const kAlohalyticsTapEventKey;
- (void)setTrafficButtonHidden:(BOOL)trafficButtonHidden
{
_trafficButtonHidden = self.disableStandbyOnRouteFollowing || trafficButtonHidden;
BOOL const isNavigation = self.navigationManager.state == MWMNavigationDashboardStateNavigation;
_trafficButtonHidden = isNavigation || trafficButtonHidden;
self.trafficButton.hidden = self.hidden || _trafficButtonHidden;
}