Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix status bar appearance and title view layouting on iOS 13 #5604

Merged
merged 3 commits into from
Oct 23, 2019
Merged

Fix status bar appearance and title view layouting on iOS 13 #5604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7750843
Sets the window background color to the system's one for dark mode su…
yogevbd Oct 23, 2019
9c50c9d
Fix title layouting on iOS 13
yogevbd Oct 23, 2019
1046700
Merge branch 'master' into fixStatusBarAppearance
yogevbd Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions lib/ios/RNNTitleViewHelper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@

@implementation RNNTitleView

- (void)layoutSubviews {
CGFloat heightSum = _titleLabel.frame.size.height + _subtitleLabel.frame.size.height;
CGFloat yOffset = (self.frame.size.height - heightSum) / 2;

[_titleLabel setFrame:CGRectMake(0, yOffset, self.frame.size.width, _titleLabel.frame.size.height)];
[_subtitleLabel setFrame:CGRectMake(0, yOffset+_titleLabel.frame.size.height, self.frame.size
.width, _subtitleLabel.frame.size.height)];
}

@end

Expand Down Expand Up @@ -54,7 +62,7 @@ -(void)setup {

self.titleView = [[RNNTitleView alloc] initWithFrame:navigationBarBounds];
self.titleView.backgroundColor = [UIColor clearColor];
self.titleView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
self.titleView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleHeight;
self.titleView.clipsToBounds = YES;

if (self.subtitle) {
Expand Down Expand Up @@ -94,7 +102,7 @@ -(UILabel*)setupSubtitle {
UILabel *subtitleLabel = [[UILabel alloc] initWithFrame:subtitleFrame];
subtitleLabel.textAlignment = NSTextAlignmentCenter;
subtitleLabel.backgroundColor = [UIColor clearColor];
subtitleLabel.autoresizingMask = self.titleView.autoresizingMask;
subtitleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;

NSDictionary* fontAttributes = [RNNFontAttributesCreator createWithFontFamily:[_subtitleOptions.fontFamily getWithDefaultValue:nil] fontSize:[_subtitleOptions.fontSize getWithDefaultValue:nil] fontWeight:[_subtitleOptions.fontWeight getWithDefaultValue:nil] color:[_subtitleOptions.color getWithDefaultValue:nil]];
[subtitleLabel setAttributedText:[[NSAttributedString alloc] initWithString:self.subtitle attributes:fontAttributes]];
Expand Down Expand Up @@ -126,7 +134,7 @@ -(UILabel*)setupTitle {
titleLabel.textAlignment = NSTextAlignmentCenter;
titleLabel.backgroundColor = [UIColor clearColor];

titleLabel.autoresizingMask = self.titleView.autoresizingMask;
titleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;

NSDictionary* fontAttributes = [RNNFontAttributesCreator createWithFontFamily:[_titleOptions.fontFamily getWithDefaultValue:nil] fontSize:[_titleOptions.fontSize getWithDefaultValue:nil] fontWeight:[_titleOptions.fontWeight getWithDefaultValue:nil] color:[_subtitleOptions.color getWithDefaultValue:nil]];
[titleLabel setAttributedText:[[NSAttributedString alloc] initWithString:self.title attributes:fontAttributes]];
Expand Down
6 changes: 5 additions & 1 deletion lib/ios/ReactNativeNavigation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ -(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOpt

- (UIWindow *)initializeKeyWindow {
UIWindow* keyWindow = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
keyWindow.backgroundColor = [UIColor whiteColor];
if (@available(iOS 13.0, *)) {
keyWindow.backgroundColor = [UIColor systemBackgroundColor];
} else {
keyWindow.backgroundColor = [UIColor whiteColor];
}
UIApplication.sharedApplication.delegate.window = keyWindow;

return keyWindow;
Expand Down