-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Create a block list to block a specific sender in a thread (#1530)
- Loading branch information
Showing
15 changed files
with
372 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| Infomaniak Mail - iOS App | ||
| Copyright (C) 2024 Infomaniak Network SA | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import Foundation | ||
| import InfomaniakCoreUI | ||
| import InfomaniakDI | ||
| import MailCore | ||
| import MailCoreUI | ||
| import MailResources | ||
| import SwiftUI | ||
|
|
||
| struct ConfirmationBlockRecipientView: View { | ||
| @LazyInjectService private var matomo: MatomoUtils | ||
|
|
||
| @EnvironmentObject private var mailboxManager: MailboxManager | ||
| @EnvironmentObject private var actionsManager: ActionsManager | ||
|
|
||
| let recipient: Recipient | ||
| let reportedMessage: Message | ||
| let origin: ActionOrigin | ||
| var onDismiss: (() -> Void)? | ||
|
|
||
| private var contact: CommonContact { | ||
| return CommonContactCache.getOrCreateContact(contactConfiguration: .correspondent( | ||
| correspondent: recipient, | ||
| contextMailboxManager: mailboxManager | ||
| )) | ||
| } | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .leading, spacing: 0) { | ||
| Text(MailResourcesStrings.Localizable.blockExpeditorTitle(contact.fullName)) | ||
| .textStyle(.bodyMedium) | ||
| .padding(.bottom, IKPadding.alertTitleBottom) | ||
|
|
||
| Text(MailResourcesStrings.Localizable.confirmationToBlockAnExpeditorText(recipient.email)) | ||
| .textStyle(.body) | ||
| .padding(.bottom, IKPadding.alertDescriptionBottom) | ||
|
|
||
| ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonBlockAnExpeditor) { | ||
| Task { | ||
| matomo.track(eventWithCategory: .blockUserAction, name: "confirmSelectedUser") | ||
| try await actionsManager.performAction( | ||
| target: [reportedMessage], | ||
| action: .block, | ||
| origin: origin | ||
| ) | ||
| onDismiss?() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| ConfirmationBlockRecipientView( | ||
| recipient: PreviewHelper.sampleRecipient1, | ||
| reportedMessage: PreviewHelper.sampleMessage, | ||
| origin: .floatingPanel(source: .threadList) | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| Infomaniak Mail - iOS App | ||
| Copyright (C) 2024 Infomaniak Network SA | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import InfomaniakCore | ||
| import InfomaniakCoreUI | ||
| import InfomaniakDI | ||
| import MailCore | ||
| import MailCoreUI | ||
| import MailResources | ||
| import SwiftModalPresentation | ||
| import SwiftUI | ||
|
|
||
| struct BlockSenderView: View { | ||
| @LazyInjectService private var matomo: MatomoUtils | ||
|
|
||
| @Environment(\.dismiss) private var dismiss | ||
|
|
||
| @State private var selectedRecipient: Recipient? | ||
| @State private var recipients = [Recipient]() | ||
|
|
||
| let recipientsToMessage: [Recipient: Message] | ||
| let origin: ActionOrigin | ||
|
|
||
| var body: some View { | ||
| VStack(spacing: 0) { | ||
| ForEach(recipients) { recipient in | ||
| Button { | ||
| selectedRecipient = recipient | ||
| matomo.track(eventWithCategory: .blockUserAction, name: "selectUser") | ||
| } label: { | ||
| RecipientCell(recipient: recipient) | ||
| .padding(.horizontal, value: .medium) | ||
| .padding(.vertical, value: .small) | ||
| } | ||
| if recipient != recipients.last { | ||
| IKDivider() | ||
| } | ||
| } | ||
| } | ||
| .customAlert(item: $selectedRecipient) { recipient in | ||
| ConfirmationBlockRecipientView( | ||
| recipient: recipient, | ||
| reportedMessage: recipientsToMessage[recipient]!, | ||
| origin: origin | ||
| ) { | ||
| dismiss() | ||
| } | ||
| } | ||
| .onAppear { | ||
| recipients = recipientsToMessage.keys | ||
| .sorted { | ||
| let name1 = ($0.name.isEmpty ? $0.email : $0.name) | ||
| let name2 = ($1.name.isEmpty ? $1.email : $1.name) | ||
| return name1.caseInsensitiveCompare(name2) == .orderedAscending | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| BlockSenderView( | ||
| recipientsToMessage: PreviewHelper.sampleRecipientWithMessage, | ||
| origin: .floatingPanel(source: .threadList) | ||
| ) | ||
| .accentColor(AccentColor.pink.primary.swiftUIColor) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.