From 66efa018683c1f3723a955463db87bb403e92334 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 22 Jul 2016 12:54:35 +0300 Subject: [PATCH 1/2] [ios] Fixed status bar style. --- .../MapViewControls/MWMMapViewControlsManager.h | 2 ++ .../MapViewControls/MWMMapViewControlsManager.mm | 16 ++++++++++++++++ .../MWMNavigationDashboardManager.mm | 1 + iphone/Maps/Classes/MapViewController.mm | 10 +--------- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index 5fda194301..9814a20e27 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -25,6 +25,8 @@ - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentController:(MapViewController *)controller; +- (UIStatusBarStyle)preferredStatusBarStyle; + #pragma mark - Layout - (void)refreshLayout; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 4c669ced94..f14dcea28b 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -19,6 +19,7 @@ #import "MapViewController.h" #import "MapsAppDelegate.h" #import "Statistics.h" +#import "UIColor+MapsMeColor.h" #import "3party/Alohalytics/src/alohalytics_objc.h" @@ -70,6 +71,21 @@ extern NSString * const kAlohalyticsTapEventKey; return self; } +- (UIStatusBarStyle)preferredStatusBarStyle +{ + BOOL const isNightMode = [UIColor isNightMode]; + BOOL const isLight = (self.searchManager.state == MWMSearchManagerStateMapSearch && + self.navigationState != MWMNavigationDashboardStateNavigation) || + (self.searchManager.state != MWMSearchManagerStateMapSearch && + self.searchManager.state != MWMSearchManagerStateHidden) || + self.navigationState == MWMNavigationDashboardStatePlanning || + self.menuState == MWMBottomMenuStateActive || self.isDirectionViewShown || + (isNightMode && self.navigationState != MWMNavigationDashboardStateHidden) || + MapsAppDelegate.theApp.routingPlaneMode != MWMRoutingPlaneModeNone; + return (isLight || (!isLight && isNightMode)) ? UIStatusBarStyleLightContent + : UIStatusBarStyleDefault; +} + #pragma mark - My Position - (void)processMyPositionStateModeEvent:(location::EMyPositionMode)mode diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index b1aa5c79b3..8ba71172ea 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -107,6 +107,7 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>; self.routePreview = nil; [self.navigationInfoView remove]; self.navigationInfoView = nil; + [MWMMapViewControlsManager manager].searchHidden = YES; } - (void)showStatePrepare diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 7ccbf82bbc..aa94fd49f5 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -371,15 +371,7 @@ BOOL gIsFirstMyPositionMode = YES; - (BOOL)prefersStatusBarHidden { return self.apiBar.isVisible; } - (UIStatusBarStyle)preferredStatusBarStyle { - BOOL const isNightMode = [UIColor isNightMode]; - BOOL const isLight = - !self.controlsManager.searchHidden || - self.controlsManager.menuState == MWMBottomMenuStateActive || - self.controlsManager.isDirectionViewShown || - (isNightMode && self.controlsManager.navigationState != MWMNavigationDashboardStateHidden) || - MapsAppDelegate.theApp.routingPlaneMode != MWMRoutingPlaneModeNone; - return (isLight || (!isLight && isNightMode)) ? UIStatusBarStyleLightContent - : UIStatusBarStyleDefault; + return [self.controlsManager preferredStatusBarStyle]; } - (void)updateStatusBarStyle { [self setNeedsStatusBarAppearanceUpdate]; } From a6ae10eae8e41d8c0080b3e13076f4d6cd5ca78c Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 22 Jul 2016 12:54:45 +0300 Subject: [PATCH 2/2] Clang-format. --- .../MapViewControls/MWMMapViewControlsManager.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index 9814a20e27..95eeb8a1c2 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -14,13 +14,13 @@ + (MWMMapViewControlsManager *)manager; -@property (nonatomic) BOOL hidden; -@property (nonatomic) BOOL zoomHidden; -@property (nonatomic) BOOL sideButtonsHidden; -@property (nonatomic) MWMBottomMenuState menuState; -@property (nonatomic, readonly) MWMNavigationDashboardState navigationState; -@property (nonatomic, readonly) MWMPlacePageEntity * placePageEntity; -@property (nonatomic) BOOL searchHidden; +@property(nonatomic) BOOL hidden; +@property(nonatomic) BOOL zoomHidden; +@property(nonatomic) BOOL sideButtonsHidden; +@property(nonatomic) MWMBottomMenuState menuState; +@property(nonatomic, readonly) MWMNavigationDashboardState navigationState; +@property(nonatomic, readonly) MWMPlacePageEntity * placePageEntity; +@property(nonatomic) BOOL searchHidden; - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentController:(MapViewController *)controller; @@ -39,7 +39,7 @@ #pragma mark - MWMPlacePageViewManager -@property (nonatomic, readonly) BOOL isDirectionViewShown; +@property(nonatomic, readonly) BOOL isDirectionViewShown; - (void)dismissPlacePage; - (void)showPlacePage:(place_page::Info const &)info;