From 71ce598355b10d75cc09a14919095dc72cde0248 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Fri, 5 Jul 2024 14:43:36 +0100 Subject: [PATCH] ios: make message corners rounded in theme preview (#4410) Co-authored-by: Levitating Pineapple --- apps/ios/Shared/Views/Helpers/ChatItemClipShape.swift | 11 ++++++++--- .../Views/UserSettings/AppearanceSettings.swift | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/ios/Shared/Views/Helpers/ChatItemClipShape.swift b/apps/ios/Shared/Views/Helpers/ChatItemClipShape.swift index 3e5200f281..477dc567eb 100644 --- a/apps/ios/Shared/Views/Helpers/ChatItemClipShape.swift +++ b/apps/ios/Shared/Views/Helpers/ChatItemClipShape.swift @@ -38,12 +38,17 @@ struct ChatItemClipped: ViewModifier { switch chatItem.content { case .sndMsgContent, - .rcvMsgContent, + .rcvMsgContent, + .rcvDecryptionError, + .rcvGroupInvitation, + .sndGroupInvitation, .sndDeleted, - .rcvDeleted, + .rcvDeleted, + .rcvIntegrityError, .sndModerated, .rcvModerated, - .rcvBlocked: 18 + .rcvBlocked, + .invalidJSON: 18 default: 8 } }() diff --git a/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift b/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift index 89f8c12423..18cf5fa199 100644 --- a/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift +++ b/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift @@ -305,13 +305,16 @@ struct ChatThemePreview: View { let view = VStack { if withMessages { let alice = ChatItem.getSample(1, CIDirection.directRcv, Date.now, NSLocalizedString("Good afternoon!", comment: "message preview")) + let bob = ChatItem.getSample(2, CIDirection.directSnd, Date.now, NSLocalizedString("Good morning!", comment: "message preview"), quotedItem: CIQuote.getSample(alice.id, alice.meta.itemTs, alice.content.text, chatDir: alice.chatDir)) HStack { ChatItemView(chat: Chat.sampleData, chatItem: alice, revealed: Binding.constant(false)) + .modifier(ChatItemClipped()) Spacer() } HStack { Spacer() - ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, CIDirection.directSnd, Date.now, NSLocalizedString("Good morning!", comment: "message preview"), quotedItem: CIQuote.getSample(alice.id, alice.meta.itemTs, alice.content.text, chatDir: alice.chatDir)), revealed: Binding.constant(false)) + ChatItemView(chat: Chat.sampleData, chatItem: bob, revealed: Binding.constant(false)) + .modifier(ChatItemClipped()) .frame(alignment: .trailing) } } else {