Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

1 - Should fix SYIOS-64 Chat room : unexpected blank lines are added into history when user types in growing textview

Browse source 
2 - do not scroll anymore to the bottom when the device orientation is updated

3 - do not resize the growing textview height when the keyboard is dismissed : it provides weird UX.
This commit is contained in:
ylecollen 2015-01-22 17:31:44 +01:00
parent 37c1a4859c
commit ea7991c6f4
1 changed files with 28 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
matrixConsole/matrixConsole/ViewController/RoomViewController.m
View file

@ -93,6 +93,7 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
UIView* inputAccessoryView;
BOOL isKeyboardObserver;
BOOL isKeyboardDisplayed;
CGFloat keyboardHeight;
// default contraint values
CGFloat defaultMessagesTableViewBottomConstraint;
@ -356,7 +357,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(coordinator.transitionDuration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (!isKeyboardDisplayed) {
[self updateMessageTextViewFrame];
[self scrollToBottomAnimated:YES];
}
// Cell width will be updated, force table refresh to take into account changes of message components
[self.messagesTableView reloadData];
@ -377,7 +377,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
if (!isKeyboardDisplayed) {
[self updateMessageTextViewFrame];
[self scrollToBottomAnimated:YES];
}
}
@ -784,36 +783,24 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
// if the keyboard is displayed, check if the keyboard is hiding with a slide animation
if (inputAccessoryView && inputAccessoryView.superview) {
UIEdgeInsets insets = self.messagesTableView.contentInset;
CGFloat screenHeight = 0;
CGSize screenSize = [[UIScreen mainScreen] bounds].size;
UIViewController* rootViewController = self;
// get the root view controller to extract the application size
while (rootViewController.parentViewController && ![rootViewController isKindOfClass:[UISplitViewController class]]) {
rootViewController = rootViewController.parentViewController;
// on IOS 8, the screen size is oriented
if ((NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_7_1) && UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
screenSize = CGSizeMake(screenSize.height, screenSize.width);
}
// IOS 6 ?
// IOS 7 always gives the screen size in portrait
// IOS 8 takes care about the orientation
if (rootViewController.view.frame.size.width > rootViewController.view.frame.size.height) {
screenHeight = MIN(screenSize.width, screenSize.height);
}
else {
screenHeight = MAX(screenSize.width, screenSize.height);
}
keyboardHeight = screenSize.height - inputAccessoryView.superview.frame.origin.y;
insets.bottom = screenHeight - inputAccessoryView.superview.frame.origin.y;
insets.bottom = keyboardHeight + self.controlView.frame.size.height - defaultMessagesTableViewBottomConstraint;
// Move the control view
// Don't forget the offset related to tabBar
CGFloat newConstant = insets.bottom - [AppDelegate theDelegate].masterTabBarController.tabBar.frame.size.height;
CGFloat newConstant = keyboardHeight - [AppDelegate theDelegate].masterTabBarController.tabBar.frame.size.height;
// draw over the bound
if ((_controlViewBottomConstraint.constant < 0) || (insets.bottom < self.controlView.frame.size.height)) {
newConstant = 0;
insets.bottom = self.controlView.frame.size.height;
}
@ -1408,7 +1395,7 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
return;
}
CGFloat keyboardHeight = (endRect.origin.y == 0) ? endRect.size.width : endRect.size.height;
keyboardHeight = (endRect.origin.y == 0) ? endRect.size.width : endRect.size.height;
// bottom view offset
// Don't forget the offset related to tabBar
@ -1421,6 +1408,9 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
// The tableview bottom margin has the same value as the defauft bottom view height;
insets.bottom = keyboardHeight + self.controlView.frame.size.height - defaultMessagesTableViewBottomConstraint;
// compute the visible area (tableview + text input)
CGFloat maxTextHeight = (self.view.frame.size.height - defaultMessagesTableViewBottomConstraint - keyboardHeight - self.navigationController.navigationBar.frame.size.height - MIN([UIApplication sharedApplication].statusBarFrame.size.height, [UIApplication sharedApplication].statusBarFrame.size.width));
// get the animation info
NSNumber *curveValue = [[notif userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey];
UIViewAnimationCurve animationCurve = curveValue.intValue;
@ -1440,10 +1430,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
isKeyboardDisplayed = YES;
// compute the visible area (tableview + text input)
// the tableview must use at least 50 pixels to let the user hides the keybaord
CGFloat maxTextHeight = (self.view.frame.size.height - insets.bottom - self.navigationController.navigationBar.frame.size.height - MIN([UIApplication sharedApplication].statusBarFrame.size.height, [UIApplication sharedApplication].statusBarFrame.size.width)) - 50;
[UIView animateWithDuration:animationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState | (animationCurve << 16) animations:^{
// Move up control view
@ -1522,9 +1508,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
[self.view layoutIfNeeded];
// update the text input height
[self updateMessageTextViewFrame];
} else {
// get the animation info
@ -1544,8 +1527,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
[self.view layoutIfNeeded];
} completion:^(BOOL finished) {
// update the text input height
[self updateMessageTextViewFrame];
}];
}
}
@ -2002,24 +1983,26 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
// update the controlView height
_controlViewHeightConstraint.constant = controlViewHeight;
// the tableview must be scrolled up to adapt its size to the growing textview
_messagesTableViewBottomConstraint.constant = controlViewHeight;
UIEdgeInsets insets = self.messagesTableView.contentInset;
// if the keyboard is not displayed
if (!isKeyboardDisplayed) {
// messagesTableView content inset needs to be set to the new bottom view height
UIEdgeInsets insets = self.messagesTableView.contentInset;
insets.bottom = controlViewHeight;
self.messagesTableView.contentInset = insets;
} //else self.messagesTableView.contentInset is equal to the keyboard height
insets.bottom = [AppDelegate theDelegate].masterTabBarController.tabBar.frame.size.height + controlViewHeight - defaultMessagesTableViewBottomConstraint;
} else {
insets.bottom = keyboardHeight + controlViewHeight - defaultMessagesTableViewBottomConstraint;
}
// scroll to bottom if the user did not scroll to the last 5 pixels of the tableview
// add a little margin to avoid approximated values issue
if ((self.messagesTableView.contentSize.height - self.messagesTableView.contentOffset.y - 5) <= (self.messagesTableView.frame.size.height - self.messagesTableView.contentInset.bottom)) {
// force to render the view
[self.view layoutIfNeeded];
// to have a valid sscroll to bottom
[self scrollToBottomAnimated:NO];
self.messagesTableView.contentInset = insets;
if (isKeyboardDisplayed) {
// scroll to bottom if the user did not scroll to the last 5 pixels of the tableview
// add a little margin to avoid approximated values issue
if ((self.messagesTableView.contentSize.height - self.messagesTableView.contentOffset.y - 30) <= (self.messagesTableView.frame.size.height - self.messagesTableView.contentInset.bottom)) {
// force to render the view
[self.view layoutIfNeeded];
// to have a valid sscroll to bottom
[self scrollToBottomAnimated:NO];
}
}
}