feat(Snooze): Snooze actions (#3) (#1736)

Author: valentinperignon

Mail/Components/ActionsPanelButton.swift

@@ -42,7 +42,7 @@ struct ActionsPanelButton<Content: View>: View {
             panelSource: panelSource,
             popoverArrowEdge: popoverArrowEdge
         ) { action in
-            if action == .markAsUnread {
+            if action == .markAsUnread || action == .snooze || action == .modifySnooze {
                 dismiss()
             }
         }

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

@@ -53,6 +53,7 @@ struct ActionsPanelViewModifier: ViewModifier {
     @ModalState private var messagesToMove: [Message]?
     @ModalState private var flushAlert: FlushAlertState?
     @ModalState private var shareMailLink: ShareMailLinkResult?
+    @ModalState private var messagesToSnooze: [Message]?
     @ModalState private var messagesToDownload: [Message]?
 
     @Binding var messages: [Message]?
@@ -73,10 +74,20 @@ struct ActionsPanelViewModifier: ViewModifier {
             nearestReportedForPhishingMessagesAlert: $reportedForPhishingMessages,
             nearestReportedForDisplayProblemMessageAlert: $reportedForDisplayProblemMessage,
             nearestShareMailLinkPanel: $shareMailLink,
+            nearestMessagesToSnooze: $messagesToSnooze,
             messagesToDownload: $messagesToDownload
         )
     }
 
+    private var initialSnoozedDate: Date? {
+        guard let messages,
+              let initialDate = messages.first?.snoozeEndDate,
+              messages.allSatisfy({ $0.isSnoozed && $0.snoozeEndDate == initialDate })
+        else { return nil }
+
+        return initialDate
+    }
+
     func body(content: Content) -> some View {
         content.adaptivePanel(item: $messages, popoverArrowEdge: popoverArrowEdge) { messages in
             ActionsView(
@@ -136,5 +147,10 @@ struct ActionsPanelViewModifier: ViewModifier {
                     .backport.presentationDetents([.medium, .large])
             }
         }
+        .snoozedFloatingPanel(
+            messages: messagesToSnooze,
+            initialDate: initialSnoozedDate,
+            folder: originFolder?.freezeIfNeeded()
+        ) { completionHandler?($0) }
     }
 }

Mail/Views/Schedule/SnoozedFloatingPanel.swift

@@ -0,0 +1,71 @@
+/*
+ Infomaniak Mail - iOS App
+ Copyright (C) 2025 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 MailCore
+import SwiftUI
+
+extension View {
+    func snoozedFloatingPanel(
+        messages: [Message]?,
+        initialDate: Date?,
+        folder: Folder?,
+        completionHandler: ((Action) -> Void)? = nil
+    ) -> some View {
+        modifier(
+            SnoozedFloatingPanel(
+                messages: messages,
+                initialDate: initialDate,
+                folder: folder,
+                completionHandler: completionHandler
+            )
+        )
+    }
+}
+
+struct SnoozedFloatingPanel: ViewModifier {
+    @EnvironmentObject private var actionsManager: ActionsManager
+
+    @State private var isShowingPanel = false
+
+    let messages: [Message]?
+    let initialDate: Date?
+    let folder: Folder?
+    let completionHandler: ((Action) -> Void)?
+
+    func body(content: Content) -> some View {
+        content
+            .onChange(of: messages) { newValue in
+                isShowingPanel = newValue != nil
+            }
+            .scheduleFloatingPanel(
+                isPresented: $isShowingPanel,
+                type: .snooze,
+                initialDate: initialDate,
+                completionHandler: handleSelectedDate
+            )
+    }
+
+    private func handleSelectedDate(_ date: Date) {
+        guard let messages else { return }
+
+        Task {
+            let action = try await actionsManager.performSnooze(messages: messages, date: date, originFolder: folder)
+            completionHandler?(action)
+        }
+    }
+}

Mail/Views/Thread/SnoozedThreadHeaderView.swift

@@ -16,31 +16,55 @@
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+import MailCore
 import MailResources
 import SwiftUI
 
 struct SnoozedThreadHeaderView: View {
+    @Environment(\.dismiss) private var dismiss
+    @EnvironmentObject private var actionsManager: ActionsManager
+
+    @State private var messagesToSnooze: [Message]?
+
     let date: Date
-    let shouldDisplayActions: Bool
+    let messages: [Message]
+    let folder: Folder?
+
+    private var origin: ActionOrigin {
+        return .threadHeader(originFolder: folder, nearestMessagesToSnooze: $messagesToSnooze)
+    }
 
     var body: some View {
         MessageHeaderActionView(
             icon: MailResourcesAsset.alarmClockFilled.swiftUIImage,
             message: MailResourcesStrings.Localizable.snoozeAlertTitle(date.formatted(.messageHeader)),
             isFirst: true,
-            shouldDisplayActions: shouldDisplayActions
+            shouldDisplayActions: folder?.canAccessSnoozeActions ?? false
         ) {
             Button(MailResourcesStrings.Localizable.buttonModify, action: edit)
             MessageHeaderDivider()
             Button(MailResourcesStrings.Localizable.buttonCancelReminder, action: cancel)
         }
+        .snoozedFloatingPanel(
+            messages: messagesToSnooze,
+            initialDate: date,
+            folder: folder
+        ) { _ in dismiss() }
     }
 
-    private func edit() {}
+    private func edit() {
+        Task {
+            try await actionsManager.performAction(target: messages, action: .modifySnooze, origin: origin)
+        }
+    }
 
-    private func cancel() {}
+    private func cancel() {
+        Task {
+            try await actionsManager.performAction(target: messages, action: .cancelSnooze, origin: origin)
+        }
+    }
 }
 
 #Preview {
-    SnoozedThreadHeaderView(date: .now, shouldDisplayActions: true)
+    SnoozedThreadHeaderView(date: .now, messages: [], folder: nil)
 }

Mail/Views/Thread/ThreadView.swift

@@ -56,10 +56,7 @@ struct ThreadView: View {
                 .padding(.horizontal, value: .medium)
 
                 if thread.isSnoozed, let snoozeEndDate = thread.snoozeEndDate {
-                    SnoozedThreadHeaderView(
-                        date: snoozeEndDate,
-                        shouldDisplayActions: thread.folder?.canAccessSnoozeActions ?? false
-                    )
+                    SnoozedThreadHeaderView(date: snoozeEndDate, messages: thread.messages.toArray(), folder: thread.folder)
                 }
 
                 MessageListView(messages: thread.messages.toArray(), mailboxManager: mailboxManager)

MailCore/Cache/Actions/Action+List.swift

@@ -79,14 +79,26 @@ extension Action: CaseIterable {
     }
 
     public var shouldDisableMultipleSelection: Bool {
-        return ![.openMovePanel, .saveThreadInkDrive, .shareMailLink, .reportJunk, .phishing, .block, .blockList].contains(self)
+        return ![
+            .openMovePanel,
+            .saveThreadInkDrive,
+            .shareMailLink,
+            .reportJunk,
+            .phishing,
+            .block,
+            .blockList,
+            .snooze,
+            .modifySnooze
+        ].contains(self)
     }
 
     private static func actionsForMessage(_ message: Message, origin: ActionOrigin,
                                           userIsStaff: Bool,
                                           userEmail: String) -> (quickActions: [Action], listActions: [Action]) {
         @LazyInjectService var platformDetector: PlatformDetectable
 
+        let snoozedActions = snoozedActions([message], folder: origin.frozenFolder)
+
         var spamAction: Action? {
             guard !message.fromMe(currentMailboxEmail: userEmail) else { return nil }
             return message.folder?.role == .spam ? .nonSpam : .reportJunk
@@ -107,7 +119,9 @@ extension Action: CaseIterable {
             userIsStaff ? .reportDisplayProblem : nil
         ]
 
-        return (Action.quickActions, tempListActions.compactMap { $0 })
+        let listActions = snoozedActions + tempListActions.compactMap { $0 }
+
+        return (Action.quickActions, listActions)
     }
 
     private static func actionsForMessagesInDifferentThreads(_ messages: [Message], originFolder: Folder?, userEmail: String)
@@ -121,6 +135,8 @@ extension Action: CaseIterable {
             .delete
         ]
 
+        let snoozedActions = snoozedActions(messages, folder: originFolder)
+
         var spamAction: Action? {
             let selfThread = messages.flatMap(\.from).allSatisfy { $0.isMeOrPlusMe(currentMailboxEmail: userEmail) }
             guard !selfThread else { return nil }
@@ -134,7 +150,9 @@ extension Action: CaseIterable {
             .saveThreadInkDrive
         ]
 
-        return (quickActions, tempListActions.compactMap { $0 })
+        let listActions = snoozedActions + tempListActions.compactMap { $0 }
+
+        return (quickActions, listActions)
     }
 
     private static func actionsForMessagesInSameThreads(_ messages: [Message], originFolder: Folder?, userEmail: String)
@@ -149,6 +167,7 @@ extension Action: CaseIterable {
             return originFolder?.role == .spam ? .nonSpam : .reportJunk
         }
 
+        let snoozedActions = snoozedActions(messages, folder: originFolder)
         let tempListActions: [Action?] = [
             .openMovePanel,
             spamAction,
@@ -157,8 +176,22 @@ extension Action: CaseIterable {
             showUnstar ? .unstar : .star,
             .saveThreadInkDrive
         ]
+        let listActions = snoozedActions + tempListActions.compactMap { $0 }
 
-        return (Action.quickActions, tempListActions.compactMap { $0 })
+        return (Action.quickActions, listActions)
+    }
+
+    private static func snoozedActions(_ messages: [Message], folder: Folder?) -> [Action] {
+        guard folder?.canAccessSnoozeActions == true else { return [] }
+
+        let messagesFromFolder = messages.filter { $0.folder?.remoteId == folder?.remoteId }
+        guard !messagesFromFolder.isEmpty else { return [] }
+
+        if messagesFromFolder.allSatisfy(\.isSnoozed) {
+            return [.modifySnooze, .cancelSnooze]
+        } else {
+            return [.snooze]
+        }
     }
 
     public static func actionsForMessages(_ messages: [Message],
@@ -193,6 +226,27 @@ extension Action: RawRepresentable {
 }
 
 public extension Action {
+    // MARK: Thread actions
+
+    static let snooze = Action(
+        id: "snooze",
+        title: MailResourcesStrings.Localizable.actionSnooze,
+        iconResource: MailResourcesAsset.alarmClock,
+        matomoName: "snooze"
+    )
+    static let modifySnooze = Action(
+        id: "modifySnooze",
+        title: MailResourcesStrings.Localizable.actionModifySnooze,
+        iconResource: MailResourcesAsset.alarmClock,
+        matomoName: "modifySnooze"
+    )
+    static let cancelSnooze = Action(
+        id: "cancelSnooze",
+        title: MailResourcesStrings.Localizable.actionCancelSnooze,
+        iconResource: MailResourcesAsset.circleCross,
+        matomoName: "cancelSnooze"
+    )
+
     // MARK: Mail actions
 
     static let delete = Action(

MailCore/Cache/Actions/ActionOrigin.swift

@@ -26,6 +26,7 @@ public struct ActionOrigin {
         case toolbar
         case multipleSelection
         case shortcut
+        case threadHeader
     }
 
     public enum FloatingPanelSource {
@@ -45,6 +46,7 @@ public struct ActionOrigin {
     private(set) var nearestReportedForPhishingMessagesAlert: Binding<[Message]?>?
     private(set) var nearestReportedForDisplayProblemMessageAlert: Binding<Message?>?
     private(set) var nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>?
+    private(set) var nearestMessagesToSnooze: Binding<[Message]?>?
     private(set) var messagesToDownload: Binding<[Message]?>?
 
     init(
@@ -59,6 +61,7 @@ public struct ActionOrigin {
         nearestReportedForPhishingMessagesAlert: Binding<[Message]?>? = nil,
         nearestReportedForDisplayProblemMessageAlert: Binding<Message?>? = nil,
         nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil,
+        nearestMessagesToSnooze: Binding<[Message]?>? = nil,
         messagesToDownload: Binding<[Message]?>? = nil
     ) {
         self.type = type
@@ -72,6 +75,7 @@ public struct ActionOrigin {
         self.nearestReportedForPhishingMessagesAlert = nearestReportedForPhishingMessagesAlert
         self.nearestReportedForDisplayProblemMessageAlert = nearestReportedForDisplayProblemMessageAlert
         self.nearestShareMailLinkPanel = nearestShareMailLinkPanel
+        self.nearestMessagesToSnooze = nearestMessagesToSnooze
         self.messagesToDownload = messagesToDownload
     }
 
@@ -90,6 +94,7 @@ public struct ActionOrigin {
                                      nearestReportedForPhishingMessagesAlert: Binding<[Message]?>? = nil,
                                      nearestReportedForDisplayProblemMessageAlert: Binding<Message?>? = nil,
                                      nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil,
+                                     nearestMessagesToSnooze: Binding<[Message]?>? = nil,
                                      messagesToDownload: Binding<[Message]?>? = nil) -> ActionOrigin {
         return ActionOrigin(
             type: .floatingPanel(source: source),
@@ -102,6 +107,7 @@ public struct ActionOrigin {
             nearestReportedForPhishingMessagesAlert: nearestReportedForPhishingMessagesAlert,
             nearestReportedForDisplayProblemMessageAlert: nearestReportedForDisplayProblemMessageAlert,
             nearestShareMailLinkPanel: nearestShareMailLinkPanel,
+            nearestMessagesToSnooze: nearestMessagesToSnooze,
             messagesToDownload: messagesToDownload
         )
     }
@@ -134,4 +140,8 @@ public struct ActionOrigin {
                                 nearestFlushAlert: Binding<FlushAlertState?>? = nil) -> ActionOrigin {
         ActionOrigin(type: .shortcut, folder: originFolder, nearestFlushAlert: nearestFlushAlert)
     }
+
+    public static func threadHeader(originFolder: Folder? = nil, nearestMessagesToSnooze: Binding<[Message]?>? = nil) -> ActionOrigin {
+        return ActionOrigin(type: .threadHeader, folder: originFolder, nearestMessagesToSnooze: nearestMessagesToSnooze)
+    }
 }