From e792810c3c7f43385ca9eaa4ea3510d79d6a9d5c Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Thu, 22 Aug 2024 16:11:40 +0200 Subject: [PATCH] Change imdn icon --- Linphone/UI/Main/Conversations/Fragments/ChatBubbleView.swift | 3 ++- Linphone/UI/Main/Conversations/Model/Message.swift | 4 ++-- .../Main/Conversations/ViewModel/ConversationViewModel.swift | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Linphone/UI/Main/Conversations/Fragments/ChatBubbleView.swift b/Linphone/UI/Main/Conversations/Fragments/ChatBubbleView.swift index d89e39460..d7fed15c1 100644 --- a/Linphone/UI/Main/Conversations/Fragments/ChatBubbleView.swift +++ b/Linphone/UI/Main/Conversations/Fragments/ChatBubbleView.swift @@ -132,8 +132,9 @@ struct ChatBubbleView: View { if (conversationViewModel.displayedConversation != nil && conversationViewModel.displayedConversation!.isGroup) || message.isOutgoing { if message.status == .sending { ProgressView() + .controlSize(.mini) .progressViewStyle(CircularProgressViewStyle(tint: .orangeMain500)) - .frame(width: 15, height: 15) + .frame(width: 10, height: 10) .padding(.top, 1) } else if message.status != nil { Image(conversationViewModel.getImageIMDN(status: message.status!)) diff --git a/Linphone/UI/Main/Conversations/Model/Message.swift b/Linphone/UI/Main/Conversations/Model/Message.swift index 067621a79..a351c04b9 100644 --- a/Linphone/UI/Main/Conversations/Model/Message.swift +++ b/Linphone/UI/Main/Conversations/Model/Message.swift @@ -26,7 +26,7 @@ public struct Message: Identifiable, Hashable { case sent case received case read - case error(DraftMessage) + case error public func hash(into hasher: inout Hasher) { switch self { @@ -53,7 +53,7 @@ public struct Message: Identifiable, Hashable { return true case (.read, .read): return true - case ( .error(_), .error(_)): + case ( .error, .error): return true default: return false diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift index f0600c597..6d267ac39 100644 --- a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift +++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift @@ -294,6 +294,8 @@ class ConversationViewModel: ObservableObject { statusTmp = .received case .Displayed: statusTmp = .read + case .NotDelivered: + statusTmp = .error default: statusTmp = .sending } @@ -1255,7 +1257,7 @@ class ConversationViewModel: ObservableObject { case .read: return "checks" case .error: - return "" + return "warning-circle" } }