oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

This commit is contained in:
Matthew Chen 2018-07-13 16:24:36 -04:00
parent 96a8df5f88
commit 687efabede
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View File

@ -143,7 +143,7 @@ NS_ASSUME_NONNULL_BEGIN
[self.messageBubbleView configureViews];
[self.messageBubbleView loadContent];
if (self.viewItem.hasDateOrUnreadBreak) {
if (self.viewItem.hasCellHeader) {
CGFloat headerHeight =
[self.headerView measureWithConversationViewItem:self.viewItem conversationStyle:self.conversationStyle]
.height;
@ -342,7 +342,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssert(cellSize.width > 0 && cellSize.height > 0);
if (self.viewItem.hasDateOrUnreadBreak) {
if (self.viewItem.hasCellHeader) {
cellSize.height +=
[self.headerView measureWithConversationViewItem:self.viewItem conversationStyle:self.conversationStyle]
.height;

23
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -4958,14 +4958,14 @@ typedef enum : NSUInteger {
// ...and always show the "disappearing messages" animation.
shouldHideFooter
= ([timestampText isEqualToString:nextTimestampText] && receiptStatus == nextReceiptStatus
&& outgoingMessage.messageState != TSOutgoingMessageStateFailed
&& !nextViewItem.hasDateOrUnreadBreak && !isDisappearingMessage);
&& outgoingMessage.messageState != TSOutgoingMessageStateFailed && !nextViewItem.hasCellHeader
&& !isDisappearingMessage);
}
// clustering
if (previousViewItem == nil) {
isFirstInCluster = YES;
} else if (viewItem.hasDateOrUnreadBreak) {
} else if (viewItem.hasCellHeader) {
isFirstInCluster = YES;
} else {
isFirstInCluster = previousViewItem.interaction.interactionType != OWSInteractionType_OutgoingMessage;
@ -4973,7 +4973,7 @@ typedef enum : NSUInteger {
if (nextViewItem == nil) {
isLastInCluster = YES;
} else if (nextViewItem.hasDateOrUnreadBreak) {
} else if (nextViewItem.hasCellHeader) {
isLastInCluster = YES;
} else {
isLastInCluster = nextViewItem.interaction.interactionType != OWSInteractionType_OutgoingMessage;
@ -4997,16 +4997,15 @@ typedef enum : NSUInteger {
// We can skip the "incoming message status" footer in a cluster if the next message
// has the same footer and no "date break" separates us.
// ...but always show the "disappearing messages" animation.
shouldHideFooter
= ([timestampText isEqualToString:nextTimestampText] && !nextViewItem.hasDateOrUnreadBreak &&
[NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
&& !isDisappearingMessage);
shouldHideFooter = ([timestampText isEqualToString:nextTimestampText] && !nextViewItem.hasCellHeader &&
[NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
&& !isDisappearingMessage);
}
// clustering
if (previousViewItem == nil) {
isFirstInCluster = YES;
} else if (viewItem.hasDateOrUnreadBreak) {
} else if (viewItem.hasCellHeader) {
isFirstInCluster = YES;
} else if (previousViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
isFirstInCluster = YES;
@ -5019,7 +5018,7 @@ typedef enum : NSUInteger {
isLastInCluster = YES;
} else if (nextViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
isLastInCluster = YES;
} else if (nextViewItem.hasDateOrUnreadBreak) {
} else if (nextViewItem.hasCellHeader) {
isLastInCluster = YES;
} else {
TSIncomingMessage *nextIncomingMessage = (TSIncomingMessage *)nextViewItem.interaction;
@ -5039,7 +5038,7 @@ typedef enum : NSUInteger {
shouldShowSenderName
= (![NSObject isNullableObject:previousIncomingSenderId equalTo:incomingSenderId]
|| viewItem.hasDateOrUnreadBreak);
|| viewItem.hasCellHeader);
}
if (shouldShowSenderName) {
senderName = [self.contactsManager
@ -5056,7 +5055,7 @@ typedef enum : NSUInteger {
shouldShowSenderAvatar = YES;
if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {
shouldShowSenderAvatar = (![NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
|| nextViewItem.hasDateOrUnreadBreak);
|| nextViewItem.hasCellHeader);
}
}
}

2
Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
View File

@ -54,7 +54,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
@property (nonatomic, readonly) BOOL isQuotedReply;
@property (nonatomic, readonly) BOOL hasQuotedAttachment;
@property (nonatomic, readonly) BOOL hasQuotedText;
@property (nonatomic, readonly) BOOL hasDateOrUnreadBreak;
@property (nonatomic, readonly) BOOL hasCellHeader;
@property (nonatomic, readonly) BOOL isExpiringMessage;

4
Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
View File

@ -150,7 +150,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
return message.isExpiringMessage;
}
- (BOOL)hasDateOrUnreadBreak
- (BOOL)hasCellHeader
{
return self.shouldShowDate || self.unreadIndicator;
}
@ -277,7 +277,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
{
OWSAssert(previousLayoutItem);
if (self.hasDateOrUnreadBreak) {
if (self.hasCellHeader) {
return OWSMessageHeaderViewDateHeaderVMargin;
}