From ae2a17a527edcde237644a6dda2c99ccbf1b9b22 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Mon, 24 Jul 2023 15:20:32 +1000 Subject: [PATCH] add message failing status --- .../MessageInfoView.swift | 19 +++++++++++++++++-- .../Shared Models/MessageViewModel.swift | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Session/Media Viewing & Editing/MessageInfoView.swift b/Session/Media Viewing & Editing/MessageInfoView.swift index bdde363f6..e423bc3be 100644 --- a/Session/Media Viewing & Editing/MessageInfoView.swift +++ b/Session/Media Viewing & Editing/MessageInfoView.swift @@ -59,15 +59,29 @@ struct MessageInfoView: View { hasAtLeastOneReadReceipt: messageViewModel.hasAtLeastOneReadReceipt ) - HStack { - if let image: UIImage = image { + HStack(spacing: 6) { + if let image: UIImage = image?.withRenderingMode(.alwaysTemplate) { Image(uiImage: image) + .resizable() + .scaledToFit() + .foregroundColor(.red) + .frame(width: 13, height: 12) } if let statusText: String = statusText { Text(statusText) + .font(.system(size: 11)) + .foregroundColor(.red) } } + .padding( + EdgeInsets( + top: -8, + leading: 30, + bottom: 4, + trailing: 30 + ) + ) } // TODO: Attachment carousel view @@ -325,6 +339,7 @@ struct MessageInfoView: View { struct MessageInfoView_Previews: PreviewProvider { static var messageViewModel: MessageViewModel { let result = MessageViewModel( + optimisticMessageId: UUID(), threadId: "d4f1g54sdf5g1d5f4g65ds4564df65f4g65d54gdfsg", threadVariant: .contact, threadHasDisappearingMessagesEnabled: false, diff --git a/SessionMessagingKit/Shared Models/MessageViewModel.swift b/SessionMessagingKit/Shared Models/MessageViewModel.swift index 9a3d1cc37..f47142195 100644 --- a/SessionMessagingKit/Shared Models/MessageViewModel.swift +++ b/SessionMessagingKit/Shared Models/MessageViewModel.swift @@ -665,7 +665,7 @@ public extension MessageViewModel { self.expiresStartedAtMs = expiresStartedAtMs self.expiresInSeconds = expiresInSeconds - self.state = .sending + self.state = state self.hasAtLeastOneReadReceipt = false self.mostRecentFailureText = nil self.isSenderOpenGroupModerator = isSenderOpenGroupModerator