felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 23:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Room details: Do not scroll to bottom on each new events. Update outgoing message to be left aligned

Browse Source
This commit is contained in:
giomfo
2014-11-19 17:08:55 +01:00
parent 0866b7e799
commit 14caf240c7
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
syMessaging/syMessaging/Base.lproj/Main.storyboard
View File

@@ -146,7 +146,7 @@
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eVZ-HH-LWn" id="5tf-BC-9Ed">
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="text message" textAlignment="right" translatesAutoresizingMaskIntoConstraints="NO" id="7qn-gi-w7s">
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="text message" translatesAutoresizingMaskIntoConstraints="NO" id="7qn-gi-w7s">
<rect key="frame" x="349" y="20" width="200" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>

24
syMessaging/syMessaging/ViewController/RoomViewController.m
View File

@@ -354,6 +354,7 @@ NSString *const kFailedEventId = @"failedEventId";
// Here a new event is added
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:messages.count inSection:0];
[messages addObject:event];
BOOL shouldScrollToBottom = (self.messagesTableView.contentOffset.y + self.messagesTableView.frame.size.height >= self.messagesTableView.contentSize.height);
// Refresh table display (Disable animation during cells insertion to prevent flickering)
[UIView setAnimationsEnabled:NO];
@@ -366,7 +367,9 @@ NSString *const kFailedEventId = @"failedEventId";
[self.messagesTableView endUpdates];
[UIView setAnimationsEnabled:YES];
[self scrollToBottomAnimated:YES];
if (shouldScrollToBottom) {
[self scrollToBottomAnimated:YES];
}
}
}];
@@ -770,11 +773,7 @@ NSString *const kFailedEventId = @"failedEventId";
displayText = [mxHandler displayTextFor:mxEvent inSubtitleMode:NO];
}
if (displayText) {
// Use a TextView template to compute cell height
UITextView *dummyTextView = [[UITextView alloc] initWithFrame:CGRectMake(0, 0, ROOM_MESSAGE_CELL_MAX_TEXTVIEW_WIDTH, MAXFLOAT)];
dummyTextView.font = [UIFont systemFontOfSize:14];
dummyTextView.text = displayText;
contentSize = [dummyTextView sizeThatFits:dummyTextView.frame.size];
contentSize = [self textContentSize:displayText];
}
// Check whether the previous message has been sent by the same user.
@@ -1008,8 +1007,6 @@ NSString *const kFailedEventId = @"failedEventId";
}
}
} else {
// Text message will be displayed in textView with max width
cell.msgTextViewWidthConstraint.constant = ROOM_MESSAGE_CELL_MAX_TEXTVIEW_WIDTH;
// Cancel potential attachment loading
cell.attachmentView.imageURL = nil;
cell.attachmentView.hidden = YES;
@@ -1024,6 +1021,8 @@ NSString *const kFailedEventId = @"failedEventId";
cell.messageTextView.textColor = [UIColor blueColor];
}
cell.messageTextView.text = displayText;
// Adjust textView width constraint
cell.msgTextViewWidthConstraint.constant = [self textContentSize:displayText].width;
}
// Turn on link detection only when it is usefull
@@ -1045,6 +1044,14 @@ NSString *const kFailedEventId = @"failedEventId";
return cell;
}
- (CGSize)textContentSize:(NSString*)textMsg {
// Use a TextView template to compute cell height
UITextView *dummyTextView = [[UITextView alloc] initWithFrame:CGRectMake(0, 0, ROOM_MESSAGE_CELL_MAX_TEXTVIEW_WIDTH, MAXFLOAT)];
dummyTextView.font = [UIFont systemFontOfSize:14];
dummyTextView.text = textMsg;
return [dummyTextView sizeThatFits:dummyTextView.frame.size];
}
- (CGSize)attachmentContentSize:(MXEvent*)mxEvent {
CGSize contentSize;
NSString *msgtype = mxEvent.content[@"msgtype"];
@@ -1497,7 +1504,6 @@ NSString *const kFailedEventId = @"failedEventId";
// Refresh table display
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
[self.messagesTableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
[self scrollToBottomAnimated:YES];
break;
}
}