diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 0eb91a319..15a56da41 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -234,7 +234,7 @@ B83786802586D296003CE78E /* KeyPairMigrationSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B837867F2586D296003CE78E /* KeyPairMigrationSheet.swift */; }; B83F2B88240CB75A000A54AB /* UIImage+Scaling.swift in Sources */ = {isa = PBXBuildFile; fileRef = B83F2B87240CB75A000A54AB /* UIImage+Scaling.swift */; }; B84664F5235022F30083A1CD /* MentionUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B84664F4235022F30083A1CD /* MentionUtilities.swift */; }; - B849789625D4A2F500D0D0B3 /* LinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B849789525D4A2F500D0D0B3 /* LinkView.swift */; }; + B849789625D4A2F500D0D0B3 /* LinkPreviewViewV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B849789525D4A2F500D0D0B3 /* LinkPreviewViewV2.swift */; }; B85357BF23A1AE0800AAF6CD /* SeedReminderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85357BE23A1AE0800AAF6CD /* SeedReminderView.swift */; }; B85357C323A1BD1200AAF6CD /* SeedVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85357C223A1BD1200AAF6CD /* SeedVC.swift */; }; B8544E3323D50E4900299F14 /* AppearanceUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8544E3223D50E4900299F14 /* AppearanceUtilities.swift */; }; @@ -1285,7 +1285,7 @@ B840729F2565F1670037CB17 /* OWSQuotedReplyModel+Conversion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OWSQuotedReplyModel+Conversion.swift"; sourceTree = ""; }; B84664F4235022F30083A1CD /* MentionUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionUtilities.swift; sourceTree = ""; }; B847570023D568EB00759540 /* SignalServiceKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SignalServiceKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - B849789525D4A2F500D0D0B3 /* LinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkView.swift; sourceTree = ""; }; + B849789525D4A2F500D0D0B3 /* LinkPreviewViewV2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreviewViewV2.swift; sourceTree = ""; }; B85357BE23A1AE0800AAF6CD /* SeedReminderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedReminderView.swift; sourceTree = ""; }; B85357C223A1BD1200AAF6CD /* SeedVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedVC.swift; sourceTree = ""; }; B8544E3023D16CA500299F14 /* DeviceUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceUtilities.swift; sourceTree = ""; }; @@ -2228,7 +2228,7 @@ 34B6A902218B3F62007C4606 /* TypingIndicatorView.swift */, C328250E25CA06020062D0A7 /* VoiceMessageViewV2.swift */, B8569AE225CBB19A00DBA3DB /* DocumentView.swift */, - B849789525D4A2F500D0D0B3 /* LinkView.swift */, + B849789525D4A2F500D0D0B3 /* LinkPreviewViewV2.swift */, ); path = "Content Views"; sourceTree = ""; @@ -5015,7 +5015,7 @@ B85A68B12587141A008CC492 /* Storage+Resetting.swift in Sources */, 3496955E219B605E00DCFE74 /* PhotoLibrary.swift in Sources */, 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */, - B849789625D4A2F500D0D0B3 /* LinkView.swift in Sources */, + B849789625D4A2F500D0D0B3 /* LinkPreviewViewV2.swift in Sources */, C3D0972B2510499C00F6E3E4 /* BackgroundPoller.swift in Sources */, C3548F0624456447009433A8 /* PNModeVC.swift in Sources */, B80A579F23DFF1F300876683 /* NewClosedGroupVC.swift in Sources */, diff --git a/Session/Conversations V2/Message Cells/Content Views/LinkView.swift b/Session/Conversations V2/Message Cells/Content Views/LinkPreviewViewV2.swift similarity index 94% rename from Session/Conversations V2/Message Cells/Content Views/LinkView.swift rename to Session/Conversations V2/Message Cells/Content Views/LinkPreviewViewV2.swift index 74d5dff80..a15c22cd9 100644 --- a/Session/Conversations V2/Message Cells/Content Views/LinkView.swift +++ b/Session/Conversations V2/Message Cells/Content Views/LinkPreviewViewV2.swift @@ -1,5 +1,5 @@ -final class LinkView : UIView { +final class LinkPreviewViewV2 : UIView { private let viewItem: ConversationViewItem private let maxWidth: CGFloat private let delegate: UITextViewDelegate & BodyTextViewDelegate @@ -44,8 +44,8 @@ final class LinkView : UIView { hStackView.pin(to: hStackViewContainer) let imageViewContainer = UIView() - imageViewContainer.set(.width, to: LinkView.imageSize) - imageViewContainer.set(.height, to: LinkView.imageSize) + imageViewContainer.set(.width, to: LinkPreviewViewV2.imageSize) + imageViewContainer.set(.height, to: LinkPreviewViewV2.imageSize) imageViewContainer.clipsToBounds = true let imageView = UIImageView() diff --git a/Session/Conversations V2/Message Cells/VisibleMessageCell.swift b/Session/Conversations V2/Message Cells/VisibleMessageCell.swift index 62e1d747b..39f9bbfc1 100644 --- a/Session/Conversations V2/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations V2/Message Cells/VisibleMessageCell.swift @@ -232,9 +232,9 @@ final class VisibleMessageCell : MessageCell, UITextViewDelegate, BodyTextViewDe let inset: CGFloat = 12 let maxWidth = VisibleMessageCell.getMaxWidth(for: viewItem) - 2 * inset if viewItem.linkPreview != nil { - let linkView = LinkView(for: viewItem, maxWidth: maxWidth, delegate: self) - snContentView.addSubview(linkView) - linkView.pin(to: snContentView) + let linkPreviewView = LinkPreviewViewV2(for: viewItem, maxWidth: maxWidth, delegate: self) + snContentView.addSubview(linkPreviewView) + linkPreviewView.pin(to: snContentView) } else { // Stack view let stackView = UIStackView(arrangedSubviews: [])