From 7fd8bac5cd30a8499e79623d56abbed33a73f6cd Mon Sep 17 00:00:00 2001 From: gaodeng Date: Wed, 11 Sep 2019 05:10:06 -0700 Subject: [PATCH] iOS13 status bar has now 3 styles (#26294) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: iOS13 status bar has now 3 styles UIStatusBarStyleDefault, UIStatusBarStyleLightContent, UIStatusBarStyleDarkContent UIStatusBarStyleDefault now acts as an automatic style which will set it’s value dynamically based on the the userinterfacestyle(One of the traits) of the viewcontroller that controls the status bar appearance. ## Changelog [iOS] [Fixed] - iOS13 new status bar style UIStatusBarStyleDarkContent Pull Request resolved: https://github.com/facebook/react-native/pull/26294 Differential Revision: D17314054 Pulled By: cpojer fbshipit-source-id: ea109e729bb551dff314bc00a056860a8febb0e9 --- React/Modules/RCTStatusBarManager.m | 99 +++++++++++++++++++---------- 1 file changed, 64 insertions(+), 35 deletions(-) diff --git a/React/Modules/RCTStatusBarManager.m b/React/Modules/RCTStatusBarManager.m index 9b6f9d6698c..d15fd73cce9 100644 --- a/React/Modules/RCTStatusBarManager.m +++ b/React/Modules/RCTStatusBarManager.m @@ -14,17 +14,44 @@ #if !TARGET_OS_TV @implementation RCTConvert (UIStatusBar) -RCT_ENUM_CONVERTER(UIStatusBarStyle, (@{ - @"default": @(UIStatusBarStyleDefault), - @"light-content": @(UIStatusBarStyleLightContent), - @"dark-content": @(UIStatusBarStyleDefault), -}), UIStatusBarStyleDefault, integerValue); ++ (UIStatusBarStyle)UIStatusBarStyle:(id)json RCT_DYNAMIC +{ + static NSDictionary *mapping; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + if (@available(iOS 13.0, *)) { + mapping = @{ + @"default" : @(UIStatusBarStyleDefault), + @"light-content" : @(UIStatusBarStyleLightContent), +#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \ + __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 + @"dark-content" : @(UIStatusBarStyleDarkContent) +#else + @"dark-content": @(UIStatusBarStyleDefault) +#endif + }; -RCT_ENUM_CONVERTER(UIStatusBarAnimation, (@{ - @"none": @(UIStatusBarAnimationNone), - @"fade": @(UIStatusBarAnimationFade), - @"slide": @(UIStatusBarAnimationSlide), -}), UIStatusBarAnimationNone, integerValue); + } else { + mapping = @{ + @"default" : @(UIStatusBarStyleDefault), + @"light-content" : @(UIStatusBarStyleLightContent), + @"dark-content" : @(UIStatusBarStyleDefault) + }; + } + }); + return _RCT_CAST( + type, [RCTConvertEnumValue("UIStatusBarStyle", mapping, @(UIStatusBarStyleDefault), json) integerValue]); +} + +RCT_ENUM_CONVERTER( + UIStatusBarAnimation, + (@{ + @"none" : @(UIStatusBarAnimationNone), + @"fade" : @(UIStatusBarAnimationFade), + @"slide" : @(UIStatusBarAnimationSlide), + }), + UIStatusBarAnimationNone, + integerValue); @end #endif @@ -36,8 +63,9 @@ static BOOL RCTViewControllerBasedStatusBarAppearance() static BOOL value; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - value = [[[NSBundle mainBundle] objectForInfoDictionaryKey: - @"UIViewControllerBasedStatusBarAppearance"] ?: @YES boolValue]; + value = + [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIViewControllerBasedStatusBarAppearance"] + ?: @YES boolValue]; }); return value; @@ -47,8 +75,7 @@ RCT_EXPORT_MODULE() - (NSArray *)supportedEvents { - return @[@"statusBarFrameDidChange", - @"statusBarFrameWillChange"]; + return @[ @"statusBarFrameDidChange", @"statusBarFrameWillChange" ]; } #if !TARGET_OS_TV @@ -56,8 +83,14 @@ RCT_EXPORT_MODULE() - (void)startObserving { NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; - [nc addObserver:self selector:@selector(applicationDidChangeStatusBarFrame:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil]; - [nc addObserver:self selector:@selector(applicationWillChangeStatusBarFrame:) name:UIApplicationWillChangeStatusBarFrameNotification object:nil]; + [nc addObserver:self + selector:@selector(applicationDidChangeStatusBarFrame:) + name:UIApplicationDidChangeStatusBarFrameNotification + object:nil]; + [nc addObserver:self + selector:@selector(applicationWillChangeStatusBarFrame:) + name:UIApplicationWillChangeStatusBarFrameNotification + object:nil]; } - (void)stopObserving @@ -74,11 +107,11 @@ RCT_EXPORT_MODULE() { CGRect frame = [notification.userInfo[UIApplicationStatusBarFrameUserInfoKey] CGRectValue]; NSDictionary *event = @{ - @"frame": @{ - @"x": @(frame.origin.x), - @"y": @(frame.origin.y), - @"width": @(frame.size.width), - @"height": @(frame.size.height), + @"frame" : @{ + @"x" : @(frame.origin.x), + @"y" : @(frame.origin.y), + @"width" : @(frame.size.width), + @"height" : @(frame.size.height), }, }; [self sendEventWithName:eventName body:event]; @@ -94,15 +127,14 @@ RCT_EXPORT_MODULE() [self emitEvent:@"statusBarFrameWillChange" forNotification:notification]; } -RCT_EXPORT_METHOD(getHeight:(RCTResponseSenderBlock)callback) +RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback) { - callback(@[@{ - @"height": @(RCTSharedApplication().statusBarFrame.size.height), - }]); + callback(@[ @{ + @"height" : @(RCTSharedApplication().statusBarFrame.size.height), + } ]); } -RCT_EXPORT_METHOD(setStyle:(UIStatusBarStyle)statusBarStyle - animated:(BOOL)animated) +RCT_EXPORT_METHOD(setStyle : (UIStatusBarStyle)statusBarStyle animated : (BOOL)animated) { if (RCTViewControllerBasedStatusBarAppearance()) { RCTLogError(@"RCTStatusBarManager module requires that the \ @@ -110,14 +142,12 @@ RCT_EXPORT_METHOD(setStyle:(UIStatusBarStyle)statusBarStyle } else { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - [RCTSharedApplication() setStatusBarStyle:statusBarStyle - animated:animated]; + [RCTSharedApplication() setStatusBarStyle:statusBarStyle animated:animated]; } #pragma clang diagnostic pop } -RCT_EXPORT_METHOD(setHidden:(BOOL)hidden - withAnimation:(UIStatusBarAnimation)animation) +RCT_EXPORT_METHOD(setHidden : (BOOL)hidden withAnimation : (UIStatusBarAnimation)animation) { if (RCTViewControllerBasedStatusBarAppearance()) { RCTLogError(@"RCTStatusBarManager module requires that the \ @@ -125,17 +155,16 @@ RCT_EXPORT_METHOD(setHidden:(BOOL)hidden } else { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - [RCTSharedApplication() setStatusBarHidden:hidden - withAnimation:animation]; + [RCTSharedApplication() setStatusBarHidden:hidden withAnimation:animation]; #pragma clang diagnostic pop } } -RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible:(BOOL)visible) +RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible) { RCTSharedApplication().networkActivityIndicatorVisible = visible; } -#endif //TARGET_OS_TV +#endif // TARGET_OS_TV @end