mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Refine appearance of quoted reply message cells.
This commit is contained in:
parent
d6f3df82ae
commit
5235f6eee9
|
@ -367,9 +367,9 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
OWSAssert(!lastSubview);
|
||||
|
||||
TSMessage *message = (TSMessage *)self.viewItem.interaction;
|
||||
OWSQuotedMessageView *quotedMessageView =
|
||||
[OWSQuotedMessageView quotedMessageViewForConversation:message.quotedMessage
|
||||
displayableQuotedText:self.viewItem.displayableQuotedText];
|
||||
OWSQuotedMessageView *quotedMessageView = [OWSQuotedMessageView
|
||||
quotedMessageViewForConversation:message.quotedMessage
|
||||
displayableQuotedText:(self.viewItem.hasQuotedText ? self.viewItem.displayableQuotedText : nil)];
|
||||
[quotedMessageView createContents];
|
||||
[self.bubbleView addSubview:quotedMessageView];
|
||||
|
||||
|
@ -1178,7 +1178,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
OWSAssert(self.viewItem);
|
||||
OWSAssert([self.viewItem.interaction isKindOfClass:[TSMessage class]]);
|
||||
|
||||
if (!self.isQuotedReply) {
|
||||
if (!self.isQuotedReply || !self.hasQuotedText) {
|
||||
return CGSizeZero;
|
||||
}
|
||||
|
||||
|
|
|
@ -65,7 +65,6 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
}
|
||||
|
||||
OWSAssert(quotedMessage);
|
||||
OWSAssert(displayableQuotedText);
|
||||
|
||||
_quotedMessage = quotedMessage;
|
||||
_displayableQuotedText = displayableQuotedText;
|
||||
|
@ -74,6 +73,11 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
return self;
|
||||
}
|
||||
|
||||
- (BOOL)hasQuotedAttachment
|
||||
{
|
||||
return self.quotedMessage.contentType.length > 0;
|
||||
}
|
||||
|
||||
- (BOOL)hasQuotedAttachmentThumbnail
|
||||
{
|
||||
return (self.quotedMessage.contentType.length > 0 &&
|
||||
|
@ -99,8 +103,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
|
||||
UIView *_Nullable quotedAttachmentView = nil;
|
||||
// TODO:
|
||||
// if (self.hasQuotedAttachmentThumbnail)
|
||||
{
|
||||
if (self.hasQuotedAttachment) {
|
||||
// TODO:
|
||||
quotedAttachmentView = [UIView containerView];
|
||||
quotedAttachmentView.userInteractionEnabled = NO;
|
||||
|
@ -162,7 +165,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
} else {
|
||||
[stripeAndTextContainer autoPinTrailingToSuperviewMarginWithInset:self.quotedContentHInset];
|
||||
}
|
||||
[stripeAndTextContainer autoPinBottomToSuperviewMarginWithInset:self.quotedContentHInset];
|
||||
[stripeAndTextContainer autoPinBottomToSuperviewMarginWithInset:self.quotedTextBottomInset];
|
||||
[stripeAndTextContainer setContentHuggingLow];
|
||||
[stripeAndTextContainer setCompressionResistanceLow];
|
||||
|
||||
|
@ -204,7 +207,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
result.width += self.quotedContentHInset;
|
||||
|
||||
CGFloat thumbnailHeight = 0.f;
|
||||
if (self.hasQuotedAttachmentThumbnail) {
|
||||
if (self.hasQuotedAttachment) {
|
||||
result.width += self.quotedAttachmentHSpacing;
|
||||
result.width += self.quotedAttachmentSize;
|
||||
|
||||
|
@ -249,7 +252,6 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
CGSize textSize = CGSizeCeil([quotedTextLabel sizeThatFits:CGSizeMake(maxQuotedTextWidth, CGFLOAT_MAX)]);
|
||||
|
||||
quotedTextWidth = textSize.width + self.quotedReplyStripeThickness + self.quotedReplyStripeHSpacing;
|
||||
result.height += self.quotedAuthorBottomSpacing;
|
||||
result.height += textSize.height + self.quotedReplyStripeVExtension * 2;
|
||||
}
|
||||
|
||||
|
@ -371,6 +373,13 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
return 8.f;
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
|
||||
- (CGSize)sizeThatFits:(CGSize)size
|
||||
{
|
||||
return [self sizeForMaxWidth:CGFLOAT_MAX];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
Loading…
Reference in a new issue