From 2286fb37098e05682a07fab4e5ea676b2187c489 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Fri, 26 Mar 2021 11:22:58 +1100 Subject: [PATCH 1/2] show quote message body when there are attachments --- .../Message Cells/Content Views/QuoteView.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Session/Conversations/Message Cells/Content Views/QuoteView.swift b/Session/Conversations/Message Cells/Content Views/QuoteView.swift index e24bbeb14..99946ec16 100644 --- a/Session/Conversations/Message Cells/Content Views/QuoteView.swift +++ b/Session/Conversations/Message Cells/Content Views/QuoteView.swift @@ -178,7 +178,9 @@ final class QuoteView : UIView { imageView.set(.width, to: thumbnailSize) imageView.set(.height, to: thumbnailSize) mainStackView.addArrangedSubview(imageView) - body = (thumbnail != nil) ? "Image" : (isAudio ? "Audio" : "Document") + if (body ?? "").isEmpty { + body = (thumbnail != nil) ? "Image" : (isAudio ? "Audio" : "Document") + } } // Body label let bodyLabel = UILabel() @@ -189,9 +191,11 @@ final class QuoteView : UIView { bodyLabel.attributedText = given(body) { MentionUtilities.highlightMentions(in: $0, isOutgoingMessage: isOutgoing, threadID: threadID, attributes: [:]) } ?? given(attachments.first?.contentType) { NSAttributedString(string: MIMETypeUtil.isAudio($0) ? "Audio" : "Document") } ?? NSAttributedString(string: "Document") bodyLabel.textColor = textColor + /* if hasAttachments { bodyLabel.numberOfLines = 1 } + */ let bodyLabelSize = bodyLabel.systemLayoutSizeFitting(availableSpace) // Label stack view var authorLabelHeight: CGFloat? From d8a02f15a7b069176cb15f553ceb495a796e9cdf Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Fri, 26 Mar 2021 14:09:50 +1100 Subject: [PATCH 2/2] fix long messages in group chat being cut off --- Session/Conversations/Message Cells/VisibleMessageCell.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index bb0e6d370..71e6655f2 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -555,7 +555,8 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate { switch viewItem.interaction.interactionType() { case .outgoingMessage: return screen.width - contactThreadHSpacing - gutterSize case .incomingMessage: - let leftGutterSize = shouldShowProfilePicture(for: viewItem) ? gutterSize : contactThreadHSpacing + let isGroupThread = viewItem.interaction.thread.isGroupThread() + let leftGutterSize = isGroupThread ? gutterSize : contactThreadHSpacing return screen.width - leftGutterSize - gutterSize default: preconditionFailure() }