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

Jump to bottom

[TIMOB-25466] (6_3_X) iOS: Move iOS 11 guards inside method #9574

Merged
merged 2 commits into from
Oct 31, 2017
Merged

[TIMOB-25466] (6_3_X) iOS: Move iOS 11 guards inside method #9574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9240c62
[TIMOB-25466] Move iOS 11 guards inside method
hansemannn Oct 31, 2017
5c5ee4f
Merge branch '6_3_X' into TIMOB-25466
hansemannn Oct 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions iphone/Classes/TiUIWindowProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,9 +832,9 @@ -(void)setTitle:(NSString*)title_
}, [NSThread isMainThread]);
}

#if IS_XCODE_9
- (void)setLargeTitleEnabled:(id)value
{
#if IS_XCODE_9
ENSURE_UI_THREAD(setLargeTitleEnabled, value);
ENSURE_TYPE_OR_NIL(value, NSNumber);

Expand All @@ -843,10 +843,12 @@ - (void)setLargeTitleEnabled:(id)value
if (@available(iOS 11.0, *) && shouldUpdateNavBar && controller != nil && [controller navigationController] != nil) {
[[[controller navigationController] navigationBar] setPrefersLargeTitles:[TiUtils boolValue:value def:NO]];
}
#endif
}

- (void)setLargeTitleDisplayMode:(id)value
{
#if IS_XCODE_9
ENSURE_UI_THREAD(setLargeTitleDisplayMode, value);
ENSURE_TYPE_OR_NIL(value, NSNumber);

Expand All @@ -855,8 +857,8 @@ - (void)setLargeTitleDisplayMode:(id)value
if (@available(iOS 11.0, *) && shouldUpdateNavBar && controller != nil && [controller navigationController] != nil) {
[[controller navigationItem] setLargeTitleDisplayMode:[TiUtils intValue:value def:UINavigationItemLargeTitleDisplayModeAutomatic]];
}
}
#endif
}

-(void)setTitlePrompt:(NSString*)title_
{
Expand Down