From a8acab4b86d5b6cb8931cbdbc32f94d50974e962 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Wed, 2 Apr 2025 15:50:38 +1100 Subject: [PATCH] Merged caused some odd issues --- .../MessageInfoScreen.swift | 58 ++++--------------- 1 file changed, 10 insertions(+), 48 deletions(-) diff --git a/Session/Media Viewing & Editing/MessageInfoScreen.swift b/Session/Media Viewing & Editing/MessageInfoScreen.swift index 2dc775d48..7f79d4459 100644 --- a/Session/Media Viewing & Editing/MessageInfoScreen.swift +++ b/Session/Media Viewing & Editing/MessageInfoScreen.swift @@ -515,18 +515,6 @@ struct MessageBubble: View { } else { switch messageViewModel.cellType { - case .mediaMessage: - if let bodyText: NSAttributedString = VisibleMessageCell.getBodyAttributedText( - for: messageViewModel, - theme: ThemeManager.currentTheme, - primaryColor: ThemeManager.primaryColor, - textColor: bodyLabelTextColor, - searchText: nil, - using: dependencies - ) { - AttributedText(bodyText) - .padding(.all, Self.inset) - } case .voiceMessage: if let attachment: Attachment = messageViewModel.attachments?.first(where: { $0.isAudio }){ // TODO: Playback Info and check if playing function is needed @@ -534,42 +522,16 @@ struct MessageBubble: View { } case .audio, .genericAttachment: if let attachment: Attachment = messageViewModel.attachments?.first { - VStack( - alignment: .leading, - spacing: Values.smallSpacing - ) { - DocumentView_SwiftUI( - maxWidth: $maxWidth, - attachment: attachment, - textColor: bodyLabelTextColor - ) - .modifier(MaxWidthEqualizer.notify) - .frame( - width: maxWidth, - alignment: .leading - ) - - if let bodyText: NSAttributedString = VisibleMessageCell.getBodyAttributedText( - for: messageViewModel, - theme: ThemeManager.currentTheme, - primaryColor: ThemeManager.primaryColor, - textColor: bodyLabelTextColor, - searchText: nil, - using: dependencies - ) { - ZStack{ - AttributedText(bodyText) - .padding(.horizontal, Self.inset) - .padding(.bottom, Self.inset) - } - .modifier(MaxWidthEqualizer.notify) - .frame( - width: maxWidth, - alignment: .leading - ) - } - } - .modifier(MaxWidthEqualizer(width: $maxWidth)) + DocumentView_SwiftUI( + maxWidth: $maxWidth, + attachment: attachment, + textColor: bodyLabelTextColor + ) + .modifier(MaxWidthEqualizer.notify) + .frame( + width: maxWidth, + alignment: .leading + ) } default: EmptyView() }