From 00300afecb20385e97fef846b8f2e0a4bbc5d53d Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 7 May 2021 15:47:40 +1000 Subject: [PATCH] Swap out sent open group invitation icon --- .../Content Views/OpenGroupInvitationView.swift | 7 +++++-- .../Conversations/Message Cells/VisibleMessageCell.swift | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Session/Conversations/Message Cells/Content Views/OpenGroupInvitationView.swift b/Session/Conversations/Message Cells/Content Views/OpenGroupInvitationView.swift index bd328fe8d..7a1065044 100644 --- a/Session/Conversations/Message Cells/Content Views/OpenGroupInvitationView.swift +++ b/Session/Conversations/Message Cells/Content Views/OpenGroupInvitationView.swift @@ -3,6 +3,7 @@ final class OpenGroupInvitationView : UIView { private let name: String private let rawURL: String private let textColor: UIColor + private let isOutgoing: Bool private lazy var url: String = { if let range = rawURL.range(of: "?public_key=") { @@ -17,10 +18,11 @@ final class OpenGroupInvitationView : UIView { private static let iconImageViewSize: CGFloat = 48 // MARK: Lifecycle - init(name: String, url: String, textColor: UIColor) { + init(name: String, url: String, textColor: UIColor, isOutgoing: Bool) { self.name = name self.rawURL = url self.textColor = textColor + self.isOutgoing = isOutgoing super.init(frame: CGRect.zero) setUpViewHierarchy() } @@ -58,7 +60,8 @@ final class OpenGroupInvitationView : UIView { labelStackView.axis = .vertical // Icon let iconSize = OpenGroupInvitationView.iconSize - let icon = UIImage(named: "Plus")?.withTint(.white)?.resizedImage(to: CGSize(width: iconSize, height: iconSize)) + let iconName = isOutgoing ? "Globe" : "Plus" + let icon = UIImage(named: iconName)?.withTint(.white)?.resizedImage(to: CGSize(width: iconSize, height: iconSize)) let iconImageViewSize = OpenGroupInvitationView.iconImageViewSize let iconImageView = UIImageView(image: icon) iconImageView.contentMode = .center diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index 064065f84..d6c1e2977 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -321,7 +321,7 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate { snContentView.addSubview(linkPreviewView) linkPreviewView.pin(to: snContentView) } else if let openGroupInvitationName = message.openGroupInvitationName, let openGroupInvitationURL = message.openGroupInvitationURL { - let openGroupInvitationView = OpenGroupInvitationView(name: openGroupInvitationName, url: openGroupInvitationURL, textColor: bodyLabelTextColor) + let openGroupInvitationView = OpenGroupInvitationView(name: openGroupInvitationName, url: openGroupInvitationURL, textColor: bodyLabelTextColor, isOutgoing: isOutgoing) snContentView.addSubview(openGroupInvitationView) openGroupInvitationView.pin(to: snContentView) } else {