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

[V2][IOS] fixes noBorder issue with largeTitle #4310

Merged
merged 10 commits into from
Feb 4, 2019
Merged

[V2][IOS] fixes noBorder issue with largeTitle #4310

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f71ec7b
fixes noBorder issue with largeTitle
mohammadalijf Nov 12, 2018
e1c56ee
fixes issue that change navigationbar title color to default
mohammadalijf Nov 13, 2018
9afb49e
Merge branch 'master' into master
mohammadalijf Nov 26, 2018
dd394e9
Merge remote-tracking branch 'upstream/master'
mohammadalijf Dec 12, 2018
91fba4c
Merge branch 'master' of https://github.com/mohammadalijf/react-nativ…
mohammadalijf Dec 12, 2018
123b99a
Merge branch 'master' into master
guyca Dec 20, 2018
ac36e03
Merge remote-tracking branch 'upstream/master'
mohammadalijf Dec 20, 2018
ae57165
Merge branch 'master' of https://github.com/mohammadalijf/react-nativ…
mohammadalijf Dec 20, 2018
f6bf4d2
Merge remote-tracking branch 'upstream/master'
mohammadalijf Jan 13, 2019
b106489
Merge branch 'master' into master
yogevbd Feb 4, 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
6 changes: 5 additions & 1 deletion lib/ios/RNNNavigationControllerPresenter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,11 @@ - (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavig
[navigationController rnn_setBackButtonColor:newOptions.topBar.backButton.color.get];
}

[navigationController rnn_setNavigationBarLargeTitleFontFamily:[newOptions.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[newOptions.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[newOptions.topBar.largeTitle.color getWithDefaultValue:nil]];

RNNLargeTitleOptions *largteTitleOptions = newOptions.topBar.largeTitle;
if (largteTitleOptions.color.hasValue || largteTitleOptions.fontSize.hasValue || largteTitleOptions.fontFamily.hasValue) {
[navigationController rnn_setNavigationBarLargeTitleFontFamily:[newOptions.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[newOptions.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[newOptions.topBar.largeTitle.color getWithDefaultValue:nil]];
}

[navigationController rnn_setNavigationBarFontFamily:[newOptions.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[newOptions.topBar.title.fontSize getWithDefaultValue:nil] color:[newOptions.topBar.title.color getWithDefaultValue:nil]];

Expand Down
9 changes: 3 additions & 6 deletions lib/ios/UINavigationController+RNNOptions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,9 @@ - (void)rnn_hideBarsOnScroll:(BOOL)hideOnScroll {

- (void)rnn_setNavigationBarNoBorder:(BOOL)noBorder {
if (noBorder) {
self.navigationBar
.shadowImage = [[UIImage alloc] init];
[self.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
[self.navigationBar setShadowImage:[[UIImage alloc] init]];
} else {
self.navigationBar
.shadowImage = nil;
[self.navigationBar setShadowImage:nil];
}
}

Expand Down Expand Up @@ -114,7 +111,7 @@ - (void)rnn_setBackButtonIcon:(UIImage *)icon withColor:(UIColor *)color title:(

backItem.title = title ? title : lastViewControllerInStack.navigationItem.title;
backItem.tintColor = color;

lastViewControllerInStack.navigationItem.backBarButtonItem = backItem;
}

Expand Down