This repository has been archived by the owner on Oct 30, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Update bottom margin to accommodate iPhone X home indicator #619
Merged
Merged
Changes from all 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
de0e715
Merge branch 'master' into iPhoneX
953ac90
Skips the bottom safe area when the textinputbar is hidden
a292750
Merge branch 'master' into iPhoneX
060e2e0
Merge branch 'iPhoneX' of https://github.com/slackhq/SlackTextViewCon…
fa390ae
Reverting #624 to be using UIToolbar again, specially for iPhone X co…
0a7b7db
[skip-ci] updating changelog
2b157ab
Merge branch 'iPhoneX' of https://github.com/slackhq/SlackTextViewCon…
22fd682
Merge branch 'master' into iPhoneX
631fd08
Merge branch 'master' into iPhoneX
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -237,6 +237,13 @@ - (void)viewDidLayoutSubviews | |
[super viewDidLayoutSubviews]; | ||
} | ||
|
||
- (void)viewSafeAreaInsetsDidChange | ||
{ | ||
[super viewSafeAreaInsetsDidChange]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should still be wrapped in There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. True |
||
|
||
[self slk_updateViewConstraints]; | ||
} | ||
|
||
|
||
#pragma mark - Getters | ||
|
||
|
@@ -417,7 +424,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; | ||
|
@@ -428,6 +435,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; | ||
} | ||
|
||
|
@@ -892,6 +906,10 @@ - (void)setTextInputbarHidden:(BOOL)hidden animated:(BOOL)animated | |
} | ||
|
||
_textInputbar.hidden = hidden; | ||
|
||
if (@available(iOS 11.0, *)) { | ||
[self viewSafeAreaInsetsDidChange]; | ||
} | ||
|
||
__weak typeof(self) weakSelf = self; | ||
|
||
|
@@ -2237,7 +2255,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]]; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dzenbot @hipwelljo regression?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dzenbot intentionally reverted that to UIToolbar
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, thanks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We did revert it back tho, in https://github.com/slackhq/SlackTextViewController/pull/619/files#diff-19e165dd48b58feca5abccfcedc9efd8R29
Using
UIToolbar
was still better for being able to extend the view to the very bottom on iPhone X. I would have liked moving away fromUIToolbar
but this seemed like the quickest and safest way of being iPhone X complaint.