diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 14a417be1..e3ef7b89c 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -166,6 +166,7 @@ 7BFD1A8A2745C4F000FB91B9 /* Permissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A892745C4F000FB91B9 /* Permissions.swift */; }; 7BFD1A8C2747150E00FB91B9 /* TurnServerInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A8B2747150E00FB91B9 /* TurnServerInfo.swift */; }; 7BFD1A972747689000FB91B9 /* Session-Turn-Server in Resources */ = {isa = PBXBuildFile; fileRef = 7BFD1A962747689000FB91B9 /* Session-Turn-Server */; }; + 94B3DC172AF8592200C88531 /* QuoteView_SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */; }; 99978E3F7A80275823CA9014 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29E827FDF6C1032BB985740C /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionNotificationServiceExtension.framework */; }; A11CD70D17FA230600A2D1B1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */; }; A163E8AB16F3F6AA0094D68B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A163E8AA16F3F6A90094D68B /* Security.framework */; }; @@ -1308,6 +1309,7 @@ 8E946CB54A221018E23599DE /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig"; sourceTree = ""; }; 92E8569C96285EE3CDB5960D /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SignalUtilitiesKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SignalUtilitiesKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 93359C81CF2660040B7CD106 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionUtilitiesKit_SessionUtilitiesKitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionUtilitiesKit_SessionUtilitiesKitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuoteView_SwiftUI.swift; sourceTree = ""; }; A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; A163E8AA16F3F6A90094D68B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; A1C32D4D17A0652C000A904E /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; @@ -2443,6 +2445,7 @@ 7BA37AF82AEB365C002438F8 /* DocumentView_SwiftUI.swift */, 7BAFA7592AAEA281001DA43E /* LinkPreviewView_SwiftUI.swift */, 7B5802982AAEF1B50050EEB1 /* OpenGroupInvitationView_SwiftUI.swift */, + 94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */, ); path = SwiftUI; sourceTree = ""; @@ -6291,6 +6294,7 @@ B886B4A72398B23E00211ABE /* QRCodeVC.swift in Sources */, 4C586926224FAB83003FD070 /* AVAudioSession+OWS.m in Sources */, C331FFF42558FF0300070591 /* PNOptionView.swift in Sources */, + 94B3DC172AF8592200C88531 /* QuoteView_SwiftUI.swift in Sources */, 7BB92B3F28C825FD0082762F /* NewConversationViewModel.swift in Sources */, 4C4AE6A1224AF35700D4AF6F /* SendMediaNavigationController.swift in Sources */, B82149C125D605C6009C0F2A /* InfoBanner.swift in Sources */, diff --git a/Session/Conversations/Input View/InputView.swift b/Session/Conversations/Input View/InputView.swift index f4eb8e9e1..3d6ab8382 100644 --- a/Session/Conversations/Input View/InputView.swift +++ b/Session/Conversations/Input View/InputView.swift @@ -257,8 +257,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M guard let quoteDraftInfo = quoteDraftInfo else { return } let hInset: CGFloat = 6 // Slight visual adjustment - let maxWidth = additionalContentContainer.bounds.width - + let quoteView: QuoteView = QuoteView( for: .draft, authorId: quoteDraftInfo.model.authorId, @@ -268,9 +267,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M currentUserBlinded15PublicKey: quoteDraftInfo.model.currentUserBlinded15PublicKey, currentUserBlinded25PublicKey: quoteDraftInfo.model.currentUserBlinded25PublicKey, direction: (quoteDraftInfo.isOutgoing ? .outgoing : .incoming), - attachment: quoteDraftInfo.model.attachment, - hInset: hInset, - maxWidth: maxWidth + attachment: quoteDraftInfo.model.attachment ) { [weak self] in self?.quoteDraftInfo = nil } diff --git a/Session/Conversations/Message Cells/Content Views/QuoteView.swift b/Session/Conversations/Message Cells/Content Views/QuoteView.swift index 176e13560..76de4d401 100644 --- a/Session/Conversations/Message Cells/Content Views/QuoteView.swift +++ b/Session/Conversations/Message Cells/Content Views/QuoteView.swift @@ -34,8 +34,6 @@ final class QuoteView: UIView { currentUserBlinded25PublicKey: String?, direction: Direction, attachment: Attachment?, - hInset: CGFloat, - maxWidth: CGFloat, onCancel: (() -> ())? = nil ) { self.onCancel = onCancel @@ -51,9 +49,7 @@ final class QuoteView: UIView { currentUserBlinded15PublicKey: currentUserBlinded15PublicKey, currentUserBlinded25PublicKey: currentUserBlinded25PublicKey, direction: direction, - attachment: attachment, - hInset: hInset, - maxWidth: maxWidth + attachment: attachment ) } @@ -74,9 +70,7 @@ final class QuoteView: UIView { currentUserBlinded15PublicKey: String?, currentUserBlinded25PublicKey: String?, direction: Direction, - attachment: Attachment?, - hInset: CGFloat, - maxWidth: CGFloat + attachment: Attachment? ) { // There's quite a bit of calculation going on here. It's a bit complex so don't make changes // if you don't need to. If you do then test: @@ -90,21 +84,6 @@ final class QuoteView: UIView { let labelStackViewVMargin = QuoteView.labelStackViewVMargin let smallSpacing = Values.smallSpacing let cancelButtonSize = QuoteView.cancelButtonSize - var availableWidth: CGFloat - - // Subtract smallSpacing twice; once for the spacing in between the stack view elements and - // once for the trailing margin. - if attachment == nil { - availableWidth = maxWidth - 2 * hInset - Values.accentLineThickness - 2 * smallSpacing - } - else { - availableWidth = maxWidth - 2 * hInset - thumbnailSize - 2 * smallSpacing - } - - if case .draft = mode { - availableWidth -= cancelButtonSize - } - var body: String? = quotedText // Main stack view diff --git a/Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift b/Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift new file mode 100644 index 000000000..531a99322 --- /dev/null +++ b/Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift @@ -0,0 +1,223 @@ +// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved. + +import SwiftUI +import SessionUIKit +import SessionMessagingKit +import SessionUtilitiesKit + +struct QuoteView_SwiftUI: View { + public enum Mode { case regular, draft } + public enum Direction { case incoming, outgoing } + public struct Info { + var mode: Mode + var authorId: String + var quotedText: String? + var threadVariant: SessionThread.Variant + var currentUserPublicKey: String? + var currentUserBlinded15PublicKey: String? + var currentUserBlinded25PublicKey: String? + var direction: Direction + var attachment: Attachment? + } + + @State private var thumbnail: UIImage? = nil + + private static let thumbnailSize: CGFloat = 48 + private static let iconSize: CGFloat = 24 + private static let labelStackViewSpacing: CGFloat = 2 + private static let labelStackViewVMargin: CGFloat = 4 + private static let cancelButtonSize: CGFloat = 33 + private static let cornerRadius: CGFloat = 4 + + private var info: Info + private var onCancel: (() -> ())? + + private var isCurrentUser: Bool { + return [ + info.currentUserPublicKey, + info.currentUserBlinded15PublicKey, + info.currentUserBlinded25PublicKey + ] + .compactMap { $0 } + .asSet() + .contains(info.authorId) + } + private var quotedText: String? { + if let quotedText = info.quotedText, !quotedText.isEmpty { + return quotedText + } + + if let attachment = info.attachment { + return attachment.shortDescription + } + + return nil + } + private var author: String? { + guard !isCurrentUser else { return "MEDIA_GALLERY_SENDER_NAME_YOU".localized() } + guard quotedText != nil else { + // When we can't find the quoted message we want to hide the author label + return Profile.displayNameNoFallback( + id: info.authorId, + threadVariant: info.threadVariant + ) + } + + return Profile.displayName( + id: info.authorId, + threadVariant: info.threadVariant + ) + } + + public init(info: Info, onCancel: (() -> ())? = nil) { + self.info = info + self.onCancel = onCancel + if let attachment = info.attachment, attachment.isVisualMedia { + attachment.thumbnail( + size: .small, + success: { [self] image, _ in + self.thumbnail = image + }, + failure: {} + ) + } + } + + var body: some View { + HStack( + alignment: .center, + spacing: Values.smallSpacing + ) { + if let attachment: Attachment = info.attachment { + // Attachment thumbnail + if let image: UIImage = { + if let thumbnail = self.thumbnail { + return thumbnail + } + + let fallbackImageName: String = (MIMETypeUtil.isAudio(attachment.contentType) ? "attachment_audio" : "actionsheet_document_black") + return UIImage(named: fallbackImageName)?.withRenderingMode(.alwaysTemplate) + }() { + Image(uiImage: image) + .resizable() + .foregroundColor(themeColor: { + switch info.mode { + case .regular: return (info.direction == .outgoing ? + .messageBubble_outgoingText : + .messageBubble_incomingText + ) + case .draft: return .textPrimary + } + }()) + .frame( + width: Self.thumbnailSize, + height: Self.thumbnailSize, + alignment: .center + ) + .cornerRadius(Self.cornerRadius) + } + } else { + // Line view + let lineColor: ThemeValue = { + switch info.mode { + case .regular: return (info.direction == .outgoing ? .messageBubble_outgoingText : .primary) + case .draft: return .primary + } + }() + + Rectangle() + .foregroundColor(themeColor: lineColor) + .frame(width: Values.accentLineThickness) + } + + // Quoted text and author + VStack( + alignment: .leading, + spacing: Self.labelStackViewSpacing + ) { + let targetThemeColor: ThemeValue = { + switch info.mode { + case .regular: return (info.direction == .outgoing ? + .messageBubble_outgoingText : + .messageBubble_incomingText + ) + case .draft: return .textPrimary + } + }() + + if let author = self.author { + Text(author) + .bold() + .font(.system(size: Values.smallFontSize)) + .foregroundColor(themeColor: targetThemeColor) + } + + if let quotedText = self.quotedText, let textColor = ThemeManager.currentTheme.color(for: targetThemeColor) { + AttributedText( + MentionUtilities.highlightMentions( + in: quotedText, + threadVariant: info.threadVariant, + currentUserPublicKey: info.currentUserPublicKey, + currentUserBlinded15PublicKey: info.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: info.currentUserBlinded25PublicKey, + isOutgoingMessage: (info.direction == .outgoing), + textColor: textColor, + theme: ThemeManager.currentTheme, + primaryColor: ThemeManager.primaryColor, + attributes: [ + .foregroundColor: textColor, + .font: UIFont.systemFont(ofSize: Values.smallFontSize) + ] + ) + ) + } else { + Text("QUOTED_MESSAGE_NOT_FOUND".localized()) + .font(.system(size: Values.smallFontSize)) + .foregroundColor(themeColor: targetThemeColor) + } + } + .padding(.vertical, Self.labelStackViewVMargin) + + if info.mode == .draft { + // Cancel button + Button( + action: { + onCancel?() + }, + label: { + if let image = UIImage(named: "X")?.withRenderingMode(.alwaysTemplate) { + Image(uiImage: image) + .foregroundColor(themeColor: .textPrimary) + .frame( + width: Self.cancelButtonSize, + height: Self.cancelButtonSize, + alignment: .center + ) + } + } + ) + } + } + .padding(.trailing, Values.smallSpacing) + } +} + +#Preview { + ZStack { + if #available(iOS 14.0, *) { + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() + } else { + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) + } + + QuoteView_SwiftUI( + info: QuoteView_SwiftUI.Info( + mode: .draft, + authorId: "", + threadVariant: .contact, + direction: .outgoing + ) + ) + .frame(height: 40) + } +} diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index 414f1ef77..7e82e213a 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -547,9 +547,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate { .outgoing : .incoming ), - attachment: cellViewModel.quoteAttachment, - hInset: hInset, - maxWidth: maxWidth + attachment: cellViewModel.quoteAttachment ) let quoteViewContainer = UIView(wrapping: quoteView, withInsets: UIEdgeInsets(top: 0, leading: hInset, bottom: 0, trailing: hInset)) stackView.addArrangedSubview(quoteViewContainer)