forked from organicmaps/organicmaps
[ios] Fixed status bar for (dark style + routing).
This commit is contained in:
parent
53570c286e
commit
4bb29cc1b0
3 changed files with 13 additions and 6 deletions
|
@ -609,10 +609,9 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView)
|
|||
}
|
||||
else
|
||||
{
|
||||
UIStatusBarStyle style = UIStatusBarStyleDefault;
|
||||
if (self.searchView.state != SearchViewStateHidden || self.controlsManager.menuState == MWMSideMenuStateActive || self.placePageManager.isDirectionViewShown || GetFramework().GetMapStyle() == MapStyleDark)
|
||||
style = UIStatusBarStyleLightContent;
|
||||
return style;
|
||||
if (self.searchView.state != SearchViewStateHidden || self.controlsManager.menuState == MWMSideMenuStateActive || self.placePageManager.isDirectionViewShown || (GetFramework().GetMapStyle() == MapStyleDark && self.routeView.state == RouteViewStateHidden))
|
||||
return UIStatusBarStyleLightContent;
|
||||
return UIStatusBarStyleDefault;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -912,6 +911,11 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView)
|
|||
[self setMapInfoViewFlag:MapInfoViewRoute];
|
||||
}
|
||||
|
||||
- (void)routeViewDidEnterState:(RouteViewState)state
|
||||
{
|
||||
[self updateStatusBarStyle];
|
||||
}
|
||||
|
||||
#pragma mark - SearchViewDelegate
|
||||
|
||||
- (void)searchViewWillEnterState:(SearchViewState)state
|
||||
|
|
|
@ -15,6 +15,7 @@ typedef NS_ENUM(NSUInteger, RouteViewState) {
|
|||
- (void)routeViewDidStartFollowing:(RouteView *)routeView;
|
||||
|
||||
- (void)routeViewWillEnterState:(RouteViewState)state;
|
||||
- (void)routeViewDidEnterState:(RouteViewState)state;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -153,7 +153,6 @@ extern NSString * const kAlohalyticsTapEventKey;
|
|||
- (void)setState:(RouteViewState)state animated:(BOOL)animated
|
||||
{
|
||||
[self.delegate routeViewWillEnterState:state];
|
||||
_state = state;
|
||||
|
||||
[UIView animateWithDuration:(animated ? 0.5 : 0) delay:0 damping:0.83 initialVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^ {
|
||||
self.phoneTurnInstructions.userInteractionEnabled = NO;
|
||||
|
@ -186,7 +185,10 @@ extern NSString * const kAlohalyticsTapEventKey;
|
|||
default:
|
||||
break;
|
||||
}
|
||||
} completion:nil];
|
||||
}
|
||||
completion:nil];
|
||||
_state = state;
|
||||
[self.delegate routeViewDidEnterState:state];
|
||||
}
|
||||
|
||||
- (UIView *)phoneIdiomView
|
||||
|
|
Loading…
Add table
Reference in a new issue