mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Revise scrolling behavior of messages view.
// FREEBIE
This commit is contained in:
parent
25232596f6
commit
4e1dda275d
|
@ -167,11 +167,10 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value)
|
||||||
{
|
{
|
||||||
OWSAssert(self.superview);
|
OWSAssert(self.superview);
|
||||||
|
|
||||||
self.frame = CGRectMake(
|
self.frame = CGRectMake(round(self.superview.left + (self.superview.width - self.width) * 0.5f),
|
||||||
round(self.superview.bounds.origin.x + (self.superview.bounds.size.width - self.frame.size.width) * 0.5f),
|
round(self.superview.top + (self.superview.height - self.height) * 0.5f),
|
||||||
round(self.superview.bounds.origin.y + (self.superview.bounds.size.height - self.frame.size.height) * 0.5f),
|
self.width,
|
||||||
self.frame.size.width,
|
self.height);
|
||||||
self.frame.size.height);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - Debugging
|
#pragma mark - Debugging
|
||||||
|
|
|
@ -1302,9 +1302,13 @@ NS_ASSUME_NONNULL_BEGIN
|
||||||
if (counter < 1) {
|
if (counter < 1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
[ThreadUtil sendMessageWithText:[@(counter) description]
|
[ThreadUtil
|
||||||
inThread:thread
|
sendMessageWithText:[[@(counter) description]
|
||||||
messageSender:messageSender];
|
stringByAppendingString:@" Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
|
||||||
|
@"Suspendisse rutrum, nulla vitae pretium hendrerit, tellus "
|
||||||
|
@"turpis pharetra libero, vitae sodales tortor ante vel sem."]
|
||||||
|
inThread:thread
|
||||||
|
messageSender:messageSender];
|
||||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) 1.f * NSEC_PER_SEC),
|
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) 1.f * NSEC_PER_SEC),
|
||||||
dispatch_get_main_queue(), ^{
|
dispatch_get_main_queue(), ^{
|
||||||
[self sendTextMessage:counter - 1 thread:thread];
|
[self sendTextMessage:counter - 1 thread:thread];
|
||||||
|
|
|
@ -98,6 +98,8 @@ typedef enum : NSUInteger {
|
||||||
|
|
||||||
- (void)didPasteAttachment:(SignalAttachment * _Nullable)attachment;
|
- (void)didPasteAttachment:(SignalAttachment * _Nullable)attachment;
|
||||||
|
|
||||||
|
- (void)textViewDidChangeSize;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
#pragma mark -
|
#pragma mark -
|
||||||
|
@ -146,6 +148,28 @@ typedef enum : NSUInteger {
|
||||||
[super paste:sender];
|
[super paste:sender];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)setFrame:(CGRect)frame
|
||||||
|
{
|
||||||
|
BOOL didChangeSize = !CGSizeEqualToSize(frame.size, self.frame.size);
|
||||||
|
|
||||||
|
[super setFrame:frame];
|
||||||
|
|
||||||
|
if (didChangeSize) {
|
||||||
|
[self.textViewPasteDelegate textViewDidChangeSize];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)setBounds:(CGRect)bounds
|
||||||
|
{
|
||||||
|
BOOL didChangeSize = !CGSizeEqualToSize(bounds.size, self.bounds.size);
|
||||||
|
|
||||||
|
[super setBounds:bounds];
|
||||||
|
|
||||||
|
if (didChangeSize) {
|
||||||
|
[self.textViewPasteDelegate textViewDidChangeSize];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
#pragma mark -
|
#pragma mark -
|
||||||
|
@ -782,6 +806,7 @@ typedef enum : NSUInteger {
|
||||||
|
|
||||||
self.senderId = ME_MESSAGE_IDENTIFIER;
|
self.senderId = ME_MESSAGE_IDENTIFIER;
|
||||||
self.senderDisplayName = ME_MESSAGE_IDENTIFIER;
|
self.senderDisplayName = ME_MESSAGE_IDENTIFIER;
|
||||||
|
self.automaticallyScrollsToMostRecentMessage = NO;
|
||||||
|
|
||||||
[self initializeToolbars];
|
[self initializeToolbars];
|
||||||
|
|
||||||
|
@ -935,14 +960,6 @@ typedef enum : NSUInteger {
|
||||||
[self setBarButtonItemsForDisappearingMessagesConfiguration:configuration];
|
[self setBarButtonItemsForDisappearingMessagesConfiguration:configuration];
|
||||||
[self setNavigationTitle];
|
[self setNavigationTitle];
|
||||||
|
|
||||||
NSInteger numberOfMessages = (NSInteger)[self.messageMappings numberOfItemsInGroup:self.thread.uniqueId];
|
|
||||||
if (numberOfMessages > 0) {
|
|
||||||
NSIndexPath *lastCellIndexPath = [NSIndexPath indexPathForRow:numberOfMessages - 1 inSection:0];
|
|
||||||
[self.collectionView scrollToItemAtIndexPath:lastCellIndexPath
|
|
||||||
atScrollPosition:UICollectionViewScrollPositionBottom
|
|
||||||
animated:NO];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Other views might change these custom menu items, so we
|
// Other views might change these custom menu items, so we
|
||||||
// need to set them every time we enter this view.
|
// need to set them every time we enter this view.
|
||||||
SEL saveSelector = NSSelectorFromString(@"save:");
|
SEL saveSelector = NSSelectorFromString(@"save:");
|
||||||
|
@ -961,6 +978,35 @@ typedef enum : NSUInteger {
|
||||||
[self resetContentAndLayout];
|
[self resetContentAndLayout];
|
||||||
|
|
||||||
[((OWSMessagesToolbarContentView *)self.inputToolbar.contentView)ensureSubviews];
|
[((OWSMessagesToolbarContentView *)self.inputToolbar.contentView)ensureSubviews];
|
||||||
|
|
||||||
|
[self scrollToDefaultPosition];
|
||||||
|
[self.collectionView.collectionViewLayout
|
||||||
|
invalidateLayoutWithContext:[JSQMessagesCollectionViewFlowLayoutInvalidationContext context]];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSIndexPath *_Nullable)indexPathOfUnreadMessagesIndicator
|
||||||
|
{
|
||||||
|
int numberOfMessages = (int)[self.messageMappings numberOfItemsInGroup:self.thread.uniqueId];
|
||||||
|
for (int i = 0; i < numberOfMessages; i++) {
|
||||||
|
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0];
|
||||||
|
id<OWSMessageData> message = [self messageAtIndexPath:indexPath];
|
||||||
|
if (message.messageType == TSUnreadIndicatorAdapter) {
|
||||||
|
return indexPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)scrollToDefaultPosition
|
||||||
|
{
|
||||||
|
NSIndexPath *_Nullable indexPath = [self indexPathOfUnreadMessagesIndicator];
|
||||||
|
if (indexPath) {
|
||||||
|
[self.collectionView scrollToItemAtIndexPath:indexPath
|
||||||
|
atScrollPosition:UICollectionViewScrollPositionTop
|
||||||
|
animated:NO];
|
||||||
|
} else {
|
||||||
|
[self scrollToBottomAnimated:NO];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)resetContentAndLayout
|
- (void)resetContentAndLayout
|
||||||
|
@ -3022,11 +3068,7 @@ typedef enum : NSUInteger {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const CGFloat kIsAtBottomTolerancePts = 5;
|
BOOL wasAtBottom = [self isScrolledToBottom];
|
||||||
BOOL wasAtBottom = (self.collectionView.contentOffset.y +
|
|
||||||
self.collectionView.bounds.size.height +
|
|
||||||
kIsAtBottomTolerancePts >=
|
|
||||||
self.collectionView.contentSize.height);
|
|
||||||
// We want sending messages to feel snappy. So, if the only
|
// We want sending messages to feel snappy. So, if the only
|
||||||
// update is a new outgoing message AND we're already scrolled to
|
// update is a new outgoing message AND we're already scrolled to
|
||||||
// the bottom of the conversation, skip the scroll animation.
|
// the bottom of the conversation, skip the scroll animation.
|
||||||
|
@ -3052,11 +3094,11 @@ typedef enum : NSUInteger {
|
||||||
}
|
}
|
||||||
case YapDatabaseViewChangeInsert: {
|
case YapDatabaseViewChangeInsert: {
|
||||||
[self.collectionView insertItemsAtIndexPaths:@[ rowChange.newIndexPath ]];
|
[self.collectionView insertItemsAtIndexPaths:@[ rowChange.newIndexPath ]];
|
||||||
scrollToBottom = YES;
|
|
||||||
|
|
||||||
TSInteraction *interaction = [self interactionAtIndexPath:rowChange.newIndexPath];
|
TSInteraction *interaction = [self interactionAtIndexPath:rowChange.newIndexPath];
|
||||||
if (![interaction isKindOfClass:[TSOutgoingMessage class]]) {
|
if ([interaction isKindOfClass:[TSOutgoingMessage class]]) {
|
||||||
shouldAnimateScrollToBottom = YES;
|
scrollToBottom = YES;
|
||||||
|
shouldAnimateScrollToBottom = NO;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -3088,6 +3130,13 @@ typedef enum : NSUInteger {
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL)isScrolledToBottom
|
||||||
|
{
|
||||||
|
const CGFloat kIsAtBottomTolerancePts = 5;
|
||||||
|
return (self.collectionView.contentOffset.y + self.collectionView.bounds.size.height + kIsAtBottomTolerancePts
|
||||||
|
>= self.collectionView.contentSize.height);
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark - UICollectionView DataSource
|
#pragma mark - UICollectionView DataSource
|
||||||
|
|
||||||
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
|
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
|
||||||
|
@ -3608,6 +3657,18 @@ typedef enum : NSUInteger {
|
||||||
completion:nil];
|
completion:nil];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)textViewDidChangeSize
|
||||||
|
{
|
||||||
|
OWSAssert([NSThread isMainThread]);
|
||||||
|
|
||||||
|
BOOL wasAtBottom = [self isScrolledToBottom];
|
||||||
|
if (wasAtBottom) {
|
||||||
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
|
[self scrollToBottomAnimated:NO];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark - OWSMessagesToolbarContentDelegate
|
#pragma mark - OWSMessagesToolbarContentDelegate
|
||||||
|
|
||||||
- (void)voiceMemoGestureDidStart
|
- (void)voiceMemoGestureDidStart
|
||||||
|
|
Loading…
Reference in a new issue