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

update media message UI

Browse Source
pull/647/head
ryanzhao 3 years ago
parent 5b6be3912d
commit 6a6ea137f6
3 changed files with 76 additions and 80 deletions
Show Stats Download Patch File Download Diff File

2
Podfile.lock
Unescape Escape View File

@ -232,4 +232,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 6ab902a81a379cc2c0a9a92c334c78d413190338
COCOAPODS: 1.11.3
COCOAPODS: 1.11.2

2
Session/Conversations/Message Cells/Content Views/MediaView.swift
Unescape Escape View File

@ -60,6 +60,8 @@ public class MediaView: UIView {
backgroundColor = Colors.unimportant
clipsToBounds = true
layer.masksToBounds = true
layer.cornerRadius = VisibleMessageCell.largeCornerRadius
createContents()
}

152
Session/Conversations/Message Cells/VisibleMessageCell.swift
Unescape Escape View File

@ -19,12 +19,12 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
private lazy var authorLabelHeightConstraint = authorLabel.set(.height, to: 0)
private lazy var profilePictureViewLeftConstraint = profilePictureView.pin(.left, to: .left, of: self, withInset: VisibleMessageCell.groupThreadHSpacing)
private lazy var profilePictureViewWidthConstraint = profilePictureView.set(.width, to: Values.verySmallProfilePictureSize)
private lazy var bubbleViewLeftConstraint1 = bubbleView.pin(.left, to: .right, of: profilePictureView, withInset: VisibleMessageCell.groupThreadHSpacing)
private lazy var bubbleViewLeftConstraint2 = bubbleView.leftAnchor.constraint(greaterThanOrEqualTo: leftAnchor, constant: VisibleMessageCell.gutterSize)
private lazy var bubbleViewTopConstraint = bubbleView.pin(.top, to: .bottom, of: authorLabel, withInset: VisibleMessageCell.authorLabelBottomSpacing)
private lazy var bubbleViewRightConstraint1 = bubbleView.pin(.right, to: .right, of: self, withInset: -VisibleMessageCell.contactThreadHSpacing)
private lazy var bubbleViewRightConstraint2 = bubbleView.rightAnchor.constraint(lessThanOrEqualTo: rightAnchor, constant: -VisibleMessageCell.gutterSize)
private lazy var messageStatusImageViewTopConstraint = messageStatusImageView.pin(.top, to: .bottom, of: bubbleView, withInset: 0)
private lazy var bubbleViewLeftConstraint1 = snContentView.pin(.left, to: .right, of: profilePictureView, withInset: VisibleMessageCell.groupThreadHSpacing)
private lazy var bubbleViewLeftConstraint2 = snContentView.leftAnchor.constraint(greaterThanOrEqualTo: leftAnchor, constant: VisibleMessageCell.gutterSize)
private lazy var bubbleViewTopConstraint = snContentView.pin(.top, to: .bottom, of: authorLabel, withInset: VisibleMessageCell.authorLabelBottomSpacing)
private lazy var bubbleViewRightConstraint1 = snContentView.pin(.right, to: .right, of: self, withInset: -VisibleMessageCell.contactThreadHSpacing)
private lazy var bubbleViewRightConstraint2 = snContentView.rightAnchor.constraint(lessThanOrEqualTo: rightAnchor, constant: -VisibleMessageCell.gutterSize)
private lazy var messageStatusImageViewTopConstraint = messageStatusImageView.pin(.top, to: .bottom, of: snContentView, withInset: 0)
private lazy var messageStatusImageViewWidthConstraint = messageStatusImageView.set(.width, to: VisibleMessageCell.messageStatusImageViewSize)
private lazy var messageStatusImageViewHeightConstraint = messageStatusImageView.set(.height, to: VisibleMessageCell.messageStatusImageViewSize)
private lazy var timerViewOutgoingMessageConstraint = timerView.pin(.left, to: .left, of: self, withInset: VisibleMessageCell.contactThreadHSpacing)
@ -79,7 +79,13 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
return result
}()
private lazy var snContentView = UIView()
private lazy var snContentView: UIStackView = {
let result = UIStackView(arrangedSubviews: [])
result.axis = .vertical
result.spacing = Values.smallSpacing
result.alignment = .leading
return result
}()
internal lazy var messageStatusImageView: UIImageView = {
let result = UIImageView()
@ -170,29 +176,22 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
moderatorIconImageView.pin(.trailing, to: .trailing, of: profilePictureView, withInset: 1)
moderatorIconImageView.pin(.bottom, to: .bottom, of: profilePictureView, withInset: 4.5)
// Bubble background view (used for the 'highlighted' animation)
addSubview(bubbleBackgroundView)
// Bubble view
addSubview(bubbleView)
// Content view
addSubview(snContentView)
bubbleViewLeftConstraint1.isActive = true
bubbleViewTopConstraint.isActive = true
bubbleViewRightConstraint1.isActive = true
bubbleBackgroundView.pin(to: bubbleView)
// bubbleBackgroundView.pin(to: snContentView)
// Timer view
addSubview(timerView)
timerView.center(.vertical, in: bubbleView)
timerView.center(.vertical, in: snContentView)
timerViewOutgoingMessageConstraint.isActive = true
// Content view
bubbleView.addSubview(snContentView)
snContentView.pin(to: bubbleView)
// Message status image view
addSubview(messageStatusImageView)
messageStatusImageViewTopConstraint.isActive = true
messageStatusImageView.pin(.right, to: .right, of: bubbleView, withInset: -1)
messageStatusImageView.pin(.right, to: .right, of: snContentView, withInset: -1)
messageStatusImageView.pin(.bottom, to: .bottom, of: self, withInset: -1)
messageStatusImageViewWidthConstraint.isActive = true
messageStatusImageViewHeightConstraint.isActive = true
@ -201,11 +200,11 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
addSubview(replyButton)
replyButton.addSubview(replyIconImageView)
replyIconImageView.center(in: replyButton)
replyButton.pin(.left, to: .right, of: bubbleView, withInset: Values.smallSpacing)
replyButton.center(.vertical, in: bubbleView)
replyButton.pin(.left, to: .right, of: snContentView, withInset: Values.smallSpacing)
replyButton.center(.vertical, in: snContentView)
// Remaining constraints
authorLabel.pin(.left, to: .left, of: bubbleView, withInset: VisibleMessageCell.authorLabelInset)
authorLabel.pin(.left, to: .left, of: snContentView, withInset: VisibleMessageCell.authorLabelInset)
}
override func setUpGestureRecognizers() {
@ -374,12 +373,8 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
playbackInfo: ConversationViewModel.PlaybackInfo?,
lastSearchText: String?
) {
let direction: Direction = cellViewModel.variant == .standardOutgoing ? .outgoing : .incoming
let bodyLabelTextColor: UIColor = {
let direction: Direction = (cellViewModel.variant == .standardOutgoing ?
.outgoing :
.incoming
)
switch (direction, AppModeManager.shared.currentAppMode) {
case (.outgoing, .dark), (.incoming, .light): return .black
case (.outgoing, .light): return Colors.grey
@ -387,14 +382,22 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
}
}()
snContentView.subviews.forEach { $0.removeFromSuperview() }
snContentView.alignment = direction == .incoming ? .leading : .trailing
for subview in snContentView.arrangedSubviews {
snContentView.removeArrangedSubview(subview)
subview.removeFromSuperview()
}
for subview in bubbleView.subviews {
subview.removeFromSuperview()
}
albumView = nil
bodyTextView = nil
// Handle the deleted state first (it's much simpler than the others)
guard cellViewModel.variant != .standardIncomingDeleted else {
let deletedMessageView: DeletedMessageView = DeletedMessageView(textColor: bodyLabelTextColor)
snContentView.addSubview(deletedMessageView)
snContentView.addArrangedSubview(deletedMessageView)
deletedMessageView.pin(to: snContentView)
return
}
@ -402,7 +405,7 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
// If it's an incoming media message and the thread isn't trusted then show the placeholder view
if cellViewModel.cellType != .textOnlyMessage && cellViewModel.variant == .standardIncoming && !cellViewModel.threadIsTrusted {
let mediaPlaceholderView = MediaPlaceholderView(cellViewModel: cellViewModel, textColor: bodyLabelTextColor)
snContentView.addSubview(mediaPlaceholderView)
snContentView.addArrangedSubview(mediaPlaceholderView)
mediaPlaceholderView.pin(to: snContentView)
return
}
@ -429,8 +432,9 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
bodyLabelTextColor: bodyLabelTextColor,
lastSearchText: lastSearchText
)
snContentView.addSubview(linkPreviewView)
linkPreviewView.pin(to: snContentView)
bubbleView.addSubview(linkPreviewView)
bubbleView.pin(to: linkPreviewView, withInset: -inset)
snContentView.addArrangedSubview(bubbleView)
self.bodyTextView = linkPreviewView.bodyTextView
case .openGroupInvitation:
@ -440,9 +444,9 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
textColor: bodyLabelTextColor,
isOutgoing: (cellViewModel.variant == .standardOutgoing)
)
snContentView.addSubview(openGroupInvitationView)
openGroupInvitationView.pin(to: snContentView)
bubbleView.addSubview(openGroupInvitationView)
bubbleView.pin(to: openGroupInvitationView, withInset: -inset)
snContentView.addArrangedSubview(openGroupInvitationView)
}
}
else {
@ -483,15 +487,29 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
stackView.addArrangedSubview(bodyTextView)
// Constraints
snContentView.addSubview(stackView)
stackView.pin(to: snContentView, withInset: inset)
bubbleView.addSubview(stackView)
stackView.pin(to: bubbleView, withInset: inset)
snContentView.addArrangedSubview(bubbleView)
}
case .mediaMessage:
// Stack view
let stackView = UIStackView(arrangedSubviews: [])
stackView.axis = .vertical
stackView.spacing = Values.smallSpacing
// Body text view
if let body: String = cellViewModel.body, !body.isEmpty {
let inset: CGFloat = 12
let maxWidth: CGFloat = (VisibleMessageCell.getMaxWidth(for: cellViewModel) - 2 * inset)
let bodyTextView = VisibleMessageCell.getBodyTextView(
for: cellViewModel,
with: maxWidth,
textColor: bodyLabelTextColor,
searchText: lastSearchText,
delegate: self
)
self.bodyTextView = bodyTextView
bubbleView.addSubview(bodyTextView)
bodyTextView.pin(to: bubbleView, withInset: inset)
snContentView.addArrangedSubview(bubbleView)
}
// Album view
let maxMessageWidth: CGFloat = VisibleMessageCell.getMaxWidth(for: cellViewModel)
@ -508,34 +526,16 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
albumView.set(.width, to: size.width)
albumView.set(.height, to: size.height)
albumView.loadMedia()
stackView.addArrangedSubview(albumView)
// Body text view
if let body: String = cellViewModel.body, !body.isEmpty {
let inset: CGFloat = 12
let maxWidth: CGFloat = (size.width - (2 * inset))
let bodyTextView = VisibleMessageCell.getBodyTextView(
for: cellViewModel,
with: maxWidth,
textColor: bodyLabelTextColor,
searchText: lastSearchText,
delegate: self
)
self.bodyTextView = bodyTextView
stackView.addArrangedSubview(UIView(wrapping: bodyTextView, withInsets: UIEdgeInsets(top: 0, left: inset, bottom: inset, right: inset)))
}
snContentView.addArrangedSubview(albumView)
unloadContent = { albumView.unloadMedia() }
// Constraints
snContentView.addSubview(stackView)
stackView.pin(to: snContentView)
case .audio:
guard let attachment: Attachment = cellViewModel.attachments?.first(where: { $0.isAudio }) else {
return
}
let inset: CGFloat = 12
let voiceMessageView: VoiceMessageView = VoiceMessageView()
voiceMessageView.update(
with: attachment,
@ -544,9 +544,10 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
playbackRate: (playbackInfo?.playbackRate ?? 1),
oldPlaybackRate: (playbackInfo?.oldPlaybackRate ?? 1)
)
snContentView.addSubview(voiceMessageView)
voiceMessageView.pin(to: snContentView)
bubbleView.addSubview(voiceMessageView)
voiceMessageView.pin(to: bubbleView, withInset: inset)
snContentView.addArrangedSubview(bubbleView)
self.voiceMessageView = voiceMessageView
case .genericAttachment:
@ -555,15 +556,6 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
let inset: CGFloat = 12
let maxWidth = (VisibleMessageCell.getMaxWidth(for: cellViewModel) - 2 * inset)
// Stack view
let stackView = UIStackView(arrangedSubviews: [])
stackView.axis = .vertical
stackView.spacing = Values.smallSpacing
// Document view
let documentView = DocumentView(attachment: attachment, textColor: bodyLabelTextColor)
stackView.addArrangedSubview(documentView)
// Body text view
if let body: String = cellViewModel.body, !body.isEmpty { // delegate should always be set at this point
let bodyTextView = VisibleMessageCell.getBodyTextView(
@ -575,12 +567,14 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
)
self.bodyTextView = bodyTextView
stackView.addArrangedSubview(bodyTextView)
bubbleView.addSubview(bodyTextView)
bodyTextView.pin(to: bubbleView, withInset: inset)
snContentView.addArrangedSubview(bubbleView)
}
// Constraints
snContentView.addSubview(stackView)
stackView.pin(to: snContentView, withInset: inset)
// Document view
let documentView = DocumentView(attachment: attachment, textColor: bodyLabelTextColor)
snContentView.addArrangedSubview(documentView)
}
}
@ -720,7 +714,7 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
reply()
}
else if bubbleView.frame.contains(location) {
else if snContentView.frame.contains(location) {
delegate?.handleItemTapped(cellViewModel, gestureRecognizer: gestureRecognizer)
}
}

Write Preview
Loading…
Cancel
Save