Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add hostname to loading banner on iOS

Browse Source 
Summary:
This diff adds a hostname to the loading banner on iOS so it's clear which server you're loading from.

Changelog: [Added] [iOS] Added hostname to loading banner.

Reviewed By: PeteTheHeat

Differential Revision: D21280252

fbshipit-source-id: d7733c056f5fb63e32b247a4fa1476ab42c7da17
This commit is contained in:
Rick Hanlon
2020-04-28 23:20:16 -07:00
committed by Facebook GitHub Bot
parent e9f29a3291
commit 96999339b6
1 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
React/CoreModules/RCTDevLoadingView.mm
+39 -7
View File
@@ -29,6 +29,7 @@ using namespace facebook::react;
@implementation RCTDevLoadingView {
UIWindow *_window;
UILabel *_label;
UILabel *_host;
NSDate *_showDate;
}
@@ -64,6 +65,24 @@ RCT_EXPORT_MODULE()
}
}
- (UIColor *)dimColor:(UIColor *)c
{
// Given a color, return a slightly lighter or darker color for dim effect.
CGFloat h, s, b, a;
if ([c getHue:&h saturation:&s brightness:&b alpha:&a])
return [UIColor colorWithHue:h saturation:s brightness:b < 0.5 ? b * 1.25 : b * 0.75 alpha:a];
return nil;
}
- (NSString *)getTextForHost
{
if (self->_bridge.bundleURL == nil || self->_bridge.bundleURL.fileURL) {
return @"React Native";
}
return [NSString stringWithFormat:@"%@:%@", self->_bridge.bundleURL.host, self->_bridge.bundleURL.port];
}
- (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor
{
if (!RCTDevLoadingViewGetEnabled()) {
@@ -78,18 +97,25 @@ RCT_EXPORT_MODULE()
if (@available(iOS 11.0, *)) {
UIWindow *window = RCTSharedApplication().keyWindow;
self->_window =
[[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 30)];
self->_label = [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top, screenSize.width, 30)];
[[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 52)];
self->_label = [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top, screenSize.width, 22)];
self->_host =
[[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top + 20, screenSize.width, 22)];
self->_host.font = [UIFont monospacedDigitSystemFontOfSize:10.0 weight:UIFontWeightRegular];
self->_host.textAlignment = NSTextAlignmentCenter;
[self->_window addSubview:self->_label];
[self->_window addSubview:self->_host];
} else {
self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, 22)];
self->_label = [[UILabel alloc] initWithFrame:self->_window.bounds];
[self->_window addSubview:self->_label];
// TODO: Add host to iOS < 11.0
}
[self->_window addSubview:self->_label];
#if TARGET_OS_TV
self->_window.windowLevel = UIWindowLevelNormal + 1;
#else
self->_window.windowLevel = UIWindowLevelStatusBar + 1;
#endif
// set a root VC so rotation is supported
self->_window.rootViewController = [UIViewController new];
@@ -99,6 +125,12 @@ RCT_EXPORT_MODULE()
self->_label.text = message;
self->_label.textColor = color;
if (self->_host != nil) {
self->_host.text = [self getTextForHost];
self->_host.textColor = [self dimColor:color];
}
self->_window.backgroundColor = backgroundColor;
self->_window.hidden = NO;