feat(Snooze): Core feature

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/Alerts/CustomScheduleAlertView.swift

@@ -25,23 +25,32 @@ import MailCoreUI
 import MailResources
 import SwiftUI
 
+extension ScheduleType {
+    var alertErrorMessage: String {
+        let limit = Int(minimumInterval / 60)
+
+        switch self {
+        case .scheduledDraft:
+            return MailResourcesStrings.Localizable.errorScheduleDelayTooShort(limit)
+        case .snooze:
+            return MailResourcesStrings.Localizable.errorScheduledSnoozeDelayTooShort(limit)
+        }
+    }
+}
+
 struct CustomScheduleAlertView: View {
     @LazyInjectService private var matomo: MatomoUtils
 
     @State private var isShowingError = false
     @State private var selectedDate: Date
 
+    let type: ScheduleType
     let confirmAction: (Date) -> Void
     let cancelAction: (() -> Void)?
 
-    private let maximumDelay = Date.now.addingTimeInterval(60 * 60 * 24 * 365 * 10) // 10 years
-
-    private var isDelayTooShort: Bool {
-        selectedDate < Date.minimumScheduleDelay
-    }
-
-    init(startingDate: Date, confirmAction: @escaping (Date) -> Void, cancelAction: (() -> Void)? = nil) {
-        _selectedDate = .init(initialValue: startingDate)
+    init(type: ScheduleType, date: Date?, confirmAction: @escaping (Date) -> Void, cancelAction: (() -> Void)? = nil) {
+        _selectedDate = .init(wrappedValue: date ?? type.minimumDate)
+        self.type = type
         self.confirmAction = confirmAction
         self.cancelAction = cancelAction
     }
@@ -55,33 +64,43 @@ struct CustomScheduleAlertView: View {
             DatePicker(
                 MailResourcesStrings.Localizable.datePickerTitle,
                 selection: $selectedDate,
-                in: Date.minimumScheduleDelay.addingTimeInterval(60) ... maximumDelay
+                in: type.minimumDate ... type.maximumDate
             )
             .labelsHidden()
             .onChange(of: selectedDate) { newDate in
-                isShowingError = newDate < Date.minimumScheduleDelay || newDate > maximumDelay
+                isShowingError = !type.isDateInValidTimeframe(newDate)
             }
 
-            Text(MailResourcesStrings.Localizable.errorScheduleDelayTooShortPlural(5))
+            Text(type.alertErrorMessage)
                 .textStyle(.labelError)
                 .padding(.top, value: .micro)
                 .opacity(isShowingError ? 1 : 0)
                 .padding(.bottom, value: .mini)
 
-            ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonScheduleTitle,
-                             secondaryButtonTitle: MailResourcesStrings.Localizable.buttonCancel,
-                             primaryButtonEnabled: !isShowingError,
-                             primaryButtonAction: executeActionIfPossible,
-                             secondaryButtonAction: cancelAction)
+            ModalButtonsView(
+                primaryButtonTitle: MailResourcesStrings.Localizable.buttonConfirm,
+                secondaryButtonTitle: MailResourcesStrings.Localizable.buttonCancel,
+                primaryButtonEnabled: !isShowingError,
+                primaryButtonAction: executeActionIfPossible,
+                secondaryButtonAction: cancelAction
+            )
         }
     }
 
     private func executeActionIfPossible() throws {
-        guard !isDelayTooShort else {
+        guard type.isDateInValidTimeframe(selectedDate) else {
             isShowingError = true
             throw MailError.tooShortScheduleDelay
         }
+
         confirmAction(selectedDate)
-        matomo.track(eventWithCategory: .scheduleSend, name: "customSchedule")
+        UserDefaults.shared[keyPath: type.lastCustomScheduleDateKeyPath] = selectedDate
+        matomo.track(eventWithCategory: type.matomoCategory, name: "customSchedule")
+    }
+}
+
+#Preview {
+    CustomScheduleAlertView(type: .scheduledDraft, date: .now) { date in
+        print("Selected Date: \(date)")
     }
 }

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/New Message/ComposeMessageView.swift

@@ -267,7 +267,7 @@ struct ComposeMessageView: View {
                 changeFolderAction: changeSelectedFolder
             ) {
                 mainViewState.isShowingMyKSuiteUpgrade = true
-                matomo.track(eventWithCategory: .myKSuiteUpgrade, name: "dailyLimitReachedUpgrade")
+                matomo.track(eventWithCategory: .myKSuiteUpgradeBottomSheet, name: "dailyLimitReachedUpgrade")
             }
         }
         .customAlert(item: $isShowingAlert) { alert in
@@ -304,10 +304,9 @@ struct ComposeMessageView: View {
         .matomoView(view: ["ComposeMessage"])
         .scheduleFloatingPanel(
             isPresented: $isShowingSchedulePanel,
-            draftSaveOption: $draft.action,
-            draftDate: $draft.scheduleDate,
-            mailboxManager: mailboxManager,
-            completionHandler: dismissMessageView
+            type: .scheduledDraft,
+            initialDate: draft.scheduleDate,
+            completionHandler: didScheduleDraft
         )
     }
 
@@ -338,6 +337,17 @@ struct ComposeMessageView: View {
         }
     }
 
+    private func didScheduleDraft(_ date: Date) {
+        if let liveDraft = draft.thaw() {
+            try? liveDraft.realm?.write {
+                liveDraft.scheduleDate = date
+                liveDraft.action = .schedule
+            }
+        }
+
+        dismissMessageView()
+    }
+
     private func didTouchSend() {
         guard !draft.subject.isEmpty else {
             matomo.track(eventWithCategory: .newMessage, name: "sendWithoutSubject")
@@ -347,7 +357,7 @@ struct ComposeMessageView: View {
 
         let mailbox = mailboxManager.mailbox
         let mailboxIsFull = mailbox.quotas?.progression ?? 0 >= 1
-        if mailbox.isFree && mailbox.isLimited && mailboxIsFull {
+        if mailbox.isMyKSuiteFree && mailboxIsFull {
             matomo.track(eventWithCategory: .newMessage, name: "trySendingWithMailboxFull")
             Task {
                 if let liveDraft = draft.thaw() {
@@ -360,7 +370,7 @@ struct ComposeMessageView: View {
                 message: MailResourcesStrings.Localizable.myKSuiteSpaceFullAlert,
                 action: IKSnackBar.Action(title: MailResourcesStrings.Localizable.buttonUpgrade) {
                     mainViewState.isShowingMyKSuiteUpgrade = true
-                    matomo.track(eventWithCategory: .myKSuiteUpgrade, name: "notEnoughStorageUpgrade")
+                    matomo.track(eventWithCategory: .myKSuiteUpgradeBottomSheet, name: "notEnoughStorageUpgrade")
                 }
             )
             return

Mail/Views/New Message/Scheduled panel/CustomScheduleButton.swift → Mail/Views/Schedule/CustomScheduleButton.swift

@@ -17,6 +17,7 @@
  */
 
 import DesignSystem
+import InfomaniakCoreCommonUI
 import InfomaniakDI
 import MailCore
 import MailCoreUI
@@ -25,12 +26,15 @@ import MyKSuite
 import SwiftUI
 
 struct CustomScheduleButton: View {
+    @LazyInjectService private var matomo: MatomoUtils
+
     @Environment(\.dismiss) private var dismiss
+    @EnvironmentObject private var mailboxManager: MailboxManager
 
-    @Binding var customSchedule: Bool
+    @Binding var isShowingCustomScheduleAlert: Bool
     @Binding var isShowingMyKSuiteUpgrade: Bool
 
-    let isMyKSuiteStandard: Bool
+    let type: ScheduleType
 
     var body: some View {
         Button(action: showCustomSchedulePicker) {
@@ -42,7 +46,7 @@ struct CustomScheduleButton: View {
                     .textStyle(.body)
                     .frame(maxWidth: .infinity, alignment: .leading)
 
-                if isMyKSuiteStandard {
+                if mailboxManager.mailbox.isMyKSuiteFree {
                     MyKSuitePlusChip()
                 }
 
@@ -53,11 +57,24 @@ struct CustomScheduleButton: View {
     }
 
     private func showCustomSchedulePicker() {
-        if isMyKSuiteStandard {
+        if mailboxManager.mailbox.isMyKSuiteFree {
+            let eventName = type == .scheduledDraft ? "scheduledCustomDate" : "snoozeCustomDate"
+            matomo.track(eventWithCategory: .myKSuiteUpgradeBottomSheet, name: eventName)
             isShowingMyKSuiteUpgrade = true
         } else {
-            customSchedule = true
+            matomo.track(eventWithCategory: type.matomoCategory, name: "customSchedule")
+            isShowingCustomScheduleAlert = true
         }
+
         dismiss()
     }
 }
+
+#Preview {
+    CustomScheduleButton(
+        isShowingCustomScheduleAlert: .constant(true),
+        isShowingMyKSuiteUpgrade: .constant(false),
+        type: .scheduledDraft
+    )
+    .environmentObject(PreviewHelper.sampleMailboxManager)
+}