feat(Snooze): Display alert when user tries to move a snoozed message/thread (#1771)

Author: PhilippeWeidmann

Mail/Utils/ShortcutModifier.swift

@@ -31,7 +31,7 @@ struct ShortcutModifier: ViewModifier {
 
     @LazyInjectService private var matomo: MatomoUtils
 
-    @ModalState private var flushAlert: FlushAlertState?
+    @ModalState private var destructiveAlert: DestructiveActionAlertState?
 
     @ObservedObject var viewModel: ThreadListViewModel
     @ObservedObject var multipleSelectionViewModel: MultipleSelectionViewModel
@@ -59,8 +59,8 @@ struct ShortcutModifier: ViewModifier {
 
             content
         }
-        .customAlert(item: $flushAlert) { item in
-            FlushFolderAlertView(flushAlert: item, folder: viewModel.frozenFolder)
+        .customAlert(item: $destructiveAlert) { item in
+            DestructiveActionAlertView(destructiveAlert: item)
         }
     }
 
@@ -79,7 +79,7 @@ struct ShortcutModifier: ViewModifier {
             try await actionsManager.performAction(
                 target: messages,
                 action: .delete,
-                origin: .shortcut(originFolder: viewModel.frozenFolder, nearestFlushAlert: $flushAlert)
+                origin: .shortcut(originFolder: viewModel.frozenFolder, nearestDestructiveAlert: $destructiveAlert)
             )
         }
     }

Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift

@@ -51,7 +51,7 @@ struct ActionsPanelViewModifier: ViewModifier {
     @ModalState private var blockSenderAlert: BlockRecipientAlertState?
     @ModalState private var blockSendersList: BlockRecipientState?
     @ModalState private var messagesToMove: [Message]?
-    @ModalState private var flushAlert: FlushAlertState?
+    @ModalState private var destructiveAlert: DestructiveActionAlertState?
     @ModalState private var shareMailLink: ShareMailLinkResult?
     @ModalState private var messagesToSnooze: [Message]?
     @ModalState private var messagesToDownload: [Message]?
@@ -66,7 +66,7 @@ struct ActionsPanelViewModifier: ViewModifier {
         .floatingPanel(
             source: panelSource,
             originFolder: originFolder?.freezeIfNeeded(),
-            nearestFlushAlert: $flushAlert,
+            nearestDestructiveAlert: $destructiveAlert,
             nearestMessagesToMoveSheet: $messagesToMove,
             nearestBlockSenderAlert: $blockSenderAlert,
             nearestBlockSendersList: $blockSendersList,
@@ -130,8 +130,8 @@ struct ActionsPanelViewModifier: ViewModifier {
                 completionHandler: completionHandler
             )
         }
-        .customAlert(item: $flushAlert) { item in
-            FlushFolderAlertView(flushAlert: item, folder: originFolder)
+        .customAlert(item: $destructiveAlert) { item in
+            DestructiveActionAlertView(destructiveAlert: item)
         }
         .customAlert(item: $messagesToDownload) { messages in
             ConfirmationSaveThreadInKdrive(targetMessages: messages)

Mail/Views/Thread List/DestructiveActionAlertView.swift

@@ -0,0 +1,98 @@
+/*
+ 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 DesignSystem
+import InfomaniakCoreCommonUI
+import InfomaniakCoreSwiftUI
+import InfomaniakDI
+import MailCore
+import MailResources
+import SwiftUI
+
+extension DestructiveActionAlertState {
+    var title: String {
+        switch type {
+        case .flushFolder(let frozenFolder):
+            switch frozenFolder?.role {
+            case .spam:
+                return MailResourcesStrings.Localizable.threadListEmptySpamButton
+            case .trash:
+                return MailResourcesStrings.Localizable.threadListEmptyTrashButton
+            default:
+                return ""
+            }
+
+        case .permanentlyDelete(let impactedMessages):
+            return MailResourcesStrings.Localizable.threadListDeletionConfirmationAlertTitle(impactedMessages)
+
+        case .deleteSnooze:
+            return MailResourcesStrings.Localizable.actionDelete
+
+        case .archiveSnooze:
+            return MailResourcesStrings.Localizable.actionArchive
+
+        case .moveSnooze:
+            return MailResourcesStrings.Localizable.actionMove
+        }
+    }
+
+    var description: String {
+        switch type {
+        case .flushFolder:
+            return MailResourcesStrings.Localizable.threadListEmptyFolderAlertDescription
+
+        case .permanentlyDelete(let impactedMessages):
+            return MailResourcesStrings.Localizable.threadListDeletionConfirmationAlertDescription(impactedMessages)
+
+        case .deleteSnooze(let impactedMessages):
+            return MailResourcesStrings.Localizable.snoozeDeleteConfirmAlertDescription(impactedMessages)
+
+        case .archiveSnooze(let impactedMessages):
+            return MailResourcesStrings.Localizable.snoozeArchiveConfirmAlertDescription(impactedMessages)
+
+        case .moveSnooze(let impactedMessages):
+            return MailResourcesStrings.Localizable.snoozeArchiveConfirmAlertDescription(impactedMessages)
+        }
+    }
+}
+
+struct DestructiveActionAlertView: View {
+    @LazyInjectService private var matomo: MatomoUtils
+
+    let destructiveAlert: DestructiveActionAlertState
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: IKPadding.large) {
+            Text(destructiveAlert.title)
+                .textStyle(.bodyMedium)
+            Text(destructiveAlert.description)
+                .textStyle(.body)
+
+            ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonConfirm) {
+                if case .flushFolder(let frozenFolder) = destructiveAlert.type, let frozenFolder {
+                    matomo.track(eventWithCategory: .threadList, name: "empty\(frozenFolder.matomoName.capitalized)Confirm")
+                }
+                await destructiveAlert.completion()
+            }
+        }
+    }
+}
+
+#Preview {
+    DestructiveActionAlertView(destructiveAlert: DestructiveActionAlertState(type: .deleteSnooze(10)) { /* Preview */ })
+}

Mail/Views/Thread List/FlushFolderAlertView.swift

@@ -40,7 +40,7 @@ struct FlushFolderView: View {
     let folder: Folder
     let mailboxManager: MailboxManager
 
-    @Binding var flushAlert: FlushAlertState?
+    @Binding var destructiveAlert: DestructiveActionAlertState?
 
     private var label: String {
         Self.labels[folder.role ?? .trash] ?? ""
@@ -60,7 +60,7 @@ struct FlushFolderView: View {
                     matomo.track(eventWithCategory: .threadList, name: "empty\(folder.matomoName.capitalized)")
 
                     let frozenFolder = folder.freezeIfNeeded()
-                    flushAlert = FlushAlertState {
+                    destructiveAlert = DestructiveActionAlertState(type: .flushFolder(frozenFolder)) {
                         await tryOrDisplayError {
                             _ = try await mailboxManager.flushFolder(folder: frozenFolder)
                         }
@@ -87,5 +87,5 @@ struct FlushFolderView: View {
 #Preview {
     FlushFolderView(folder: PreviewHelper.sampleFolder,
                     mailboxManager: PreviewHelper.sampleMailboxManager,
-                    flushAlert: .constant(nil))
+                    destructiveAlert: .constant(nil))
 }

Mail/Views/Thread List/FlushFolderView.swift

@@ -78,6 +78,6 @@ struct ThreadListCellContextMenu: ViewModifier {
         guard action != .archive else {
             return nil
         }
-        return action.isDestructive ? .destructive : nil
+        return action.isDestructive(for: thread) ? .destructive : nil
     }
 }

Mail/Views/Thread List/ThreadListCellContextMenu.swift

@@ -123,7 +123,7 @@ struct ThreadListToolbar: ViewModifier {
                                     action: action,
                                     origin: .multipleSelection(
                                         originFolder: originFolder,
-                                        nearestFlushAlert: $mainViewState.flushAlert,
+                                        nearestDestructiveAlert: $mainViewState.destructiveAlert,
                                         nearestMessagesToMoveSheet: nil
                                     )
                                 )

Mail/Views/Thread List/ThreadListModifiers.swift

@@ -33,15 +33,15 @@ private struct SwipeActionView: View {
 
     @Binding var actionPanelMessages: [Message]?
     @Binding var moveSheetMessages: [Message]?
-    @Binding var flushAlert: FlushAlertState?
+    @Binding var destructiveAlert: DestructiveActionAlertState?
 
     let viewModel: ThreadListable
     let thread: Thread
     let action: Action
 
     private var isDestructive: Bool {
-        let shouldWarnBeforeDeletion = thread.folder?.shouldWarnBeforeDeletion ?? false
-        return action.isDestructive && networkMonitor.isConnected && !shouldWarnBeforeDeletion
+        guard networkMonitor.isConnected else { return false }
+        return action.isDestructive(for: thread)
     }
 
     var body: some View {
@@ -56,7 +56,7 @@ private struct SwipeActionView: View {
                             originFolder: thread.folder,
                             nearestMessagesActionsPanel: $actionPanelMessages,
                             nearestMessagesToMoveSheet: $moveSheetMessages,
-                            nearestFlushAlert: $flushAlert
+                            nearestDestructiveAlert: $destructiveAlert
                         )
                     )
 
@@ -125,7 +125,7 @@ struct ThreadListSwipeActions: ViewModifier {
                 SwipeActionView(
                     actionPanelMessages: $actionPanelMessages,
                     moveSheetMessages: $messagesToMove,
-                    flushAlert: $mainViewState.flushAlert,
+                    destructiveAlert: $mainViewState.destructiveAlert,
                     viewModel: viewModel,
                     thread: thread,
                     action: action
@@ -149,7 +149,7 @@ extension View {
     SwipeActionView(
         actionPanelMessages: .constant(nil),
         moveSheetMessages: .constant(nil),
-        flushAlert: .constant(nil),
+        destructiveAlert: .constant(nil),
         viewModel: ThreadListViewModel(mailboxManager: PreviewHelper.sampleMailboxManager,
                                        frozenFolder: PreviewHelper.sampleFolder,
                                        selectedThreadOwner: PreviewHelper.mockSelectedThreadOwner),

Mail/Views/Thread List/ThreadListSwipeAction.swift

@@ -103,7 +103,7 @@ struct ThreadListView: View {
                         FlushFolderView(
                             folder: viewModel.frozenFolder,
                             mailboxManager: viewModel.mailboxManager,
-                            flushAlert: $mainViewState.flushAlert
+                            destructiveAlert: $mainViewState.destructiveAlert
                         )
                         .threadListCellAppearance()
                     }
@@ -220,8 +220,8 @@ struct ThreadListView: View {
         .task(id: viewModel.mailboxManager.mailbox.id) {
             updateFetchingTask()
         }
-        .customAlert(item: $mainViewState.flushAlert) { item in
-            FlushFolderAlertView(flushAlert: item, folder: viewModel.frozenFolder)
+        .customAlert(item: $mainViewState.destructiveAlert) { item in
+            DestructiveActionAlertView(destructiveAlert: item)
         }
         .customAlert(isPresented: $isShowingUpdateAlert) {
             // swiftlint:disable:next trailing_closure

Mail/Views/Thread List/ThreadListView.swift

@@ -43,7 +43,7 @@ struct ThreadViewToolbarModifier: ViewModifier {
     @State private var replyOrReplyAllMessage: Message?
     @State private var messagesToMove: [Message]?
 
-    @ModalState private var nearestFlushAlert: FlushAlertState?
+    @ModalState private var destructiveAlert: DestructiveActionAlertState?
 
     private let frozenThread: Thread
 
@@ -111,8 +111,8 @@ struct ThreadViewToolbarModifier: ViewModifier {
                     }
                 }
             }
-            .customAlert(item: $nearestFlushAlert) { item in
-                FlushFolderAlertView(flushAlert: item)
+            .customAlert(item: $destructiveAlert) { item in
+                DestructiveActionAlertView(destructiveAlert: item)
             }
     }
 
@@ -147,7 +147,7 @@ struct ThreadViewToolbarModifier: ViewModifier {
                 try await actionsManager.performAction(
                     target: frozenMessages,
                     action: action,
-                    origin: .toolbar(originFolder: frozenFolder, nearestFlushAlert: $nearestFlushAlert)
+                    origin: .toolbar(originFolder: frozenFolder, nearestDestructiveAlert: $destructiveAlert)
                 )
             }
         }