Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Update bottom margin to accommodate iPhone X home indicator #619

Merged
merged 10 commits into from
Nov 2, 2017
Merged

Update bottom margin to accommodate iPhone X home indicator #619

Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1810423
Update bottom margin to accommodate iPhone X home indicator
Sep 17, 2017
de0e715
Merge branch 'master' into iPhoneX
Oct 26, 2017
953ac90
Skips the bottom safe area when the textinputbar is hidden
Oct 26, 2017
a292750
Merge branch 'master' into iPhoneX
Oct 27, 2017
060e2e0
Merge branch 'iPhoneX' of https://github.com/slackhq/SlackTextViewCon…
Oct 27, 2017
fa390ae
Reverting #624 to be using UIToolbar again, specially for iPhone X co…
Nov 1, 2017
0a7b7db
[skip-ci] updating changelog
Nov 1, 2017
2b157ab
Merge branch 'iPhoneX' of https://github.com/slackhq/SlackTextViewCon…
Nov 1, 2017
22fd682
Merge branch 'master' into iPhoneX
Nov 1, 2017
631fd08
Merge branch 'master' into iPhoneX
Nov 1, 2017
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
22 changes: 20 additions & 2 deletions Source/SLKTextViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,13 @@ - (void)viewDidLayoutSubviews
[super viewDidLayoutSubviews];
}

- (void)viewSafeAreaInsetsDidChange
{
[super viewSafeAreaInsetsDidChange];
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should still be wrapped in if (@available(iOS 11.0, *)) isn't it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to. It's never called for older iOS versions, not by the system nor manually. If you run it on an iOS 10 device all is well. But it also wouldn't hurt to wrap it in that.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True


[self slk_updateViewConstraints];
}


#pragma mark - Getters

Expand Down Expand Up @@ -420,7 +427,7 @@ - (CGFloat)slk_appropriateKeyboardHeightFromRect:(CGRect)rect

- (CGFloat)slk_appropriateBottomMargin
{
// A bottom margin is required only if the view is extended out of it bounds
// A bottom margin is required if the view is extended out of it bounds
if ((self.edgesForExtendedLayout & UIRectEdgeBottom) > 0) {

UITabBar *tabBar = self.tabBarController.tabBar;
Expand All @@ -431,6 +438,13 @@ - (CGFloat)slk_appropriateBottomMargin
}
}

// A bottom margin is required for iPhone X
if (@available(iOS 11.0, *)) {
if (!self.textInputbar.isHidden) {
return self.view.safeAreaInsets.bottom;
}
}

return 0.0;
}

Expand Down Expand Up @@ -882,6 +896,10 @@ - (void)setTextInputbarHidden:(BOOL)hidden animated:(BOOL)animated
}

_textInputbar.hidden = hidden;

if (@available(iOS 11.0, *)) {
[self viewSafeAreaInsetsDidChange];
}

__weak typeof(self) weakSelf = self;

Expand Down Expand Up @@ -2227,7 +2245,7 @@ - (void)slk_setupViewConstraints
NSDictionary *views = @{@"scrollView": self.scrollViewProxy,
@"autoCompletionView": self.autoCompletionView,
@"typingIndicatorView": self.typingIndicatorProxyView,
@"textInputbar": self.textInputbar,
@"textInputbar": self.textInputbar
};

[self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[scrollView(0@750)][typingIndicatorView(0)]-0@999-[textInputbar(0)]|" options:0 metrics:nil views:views]];
Expand Down