feat: Scheduled sending

Mail/Components/Custom Buttons/ModalButtonsView.swift

@@ -28,6 +28,7 @@ struct ModalButtonsView: View {
     let primaryButtonTitle: String
     var secondaryButtonTitle: String? = MailResourcesStrings.Localizable.buttonCancel
     var primaryButtonEnabled = true
+    var primaryButtonDismiss = true
     let primaryButtonAction: () async -> Void
     var secondaryButtonAction: (() -> Void)?
 
@@ -47,7 +48,9 @@ struct ModalButtonsView: View {
                     isButtonLoading = true
                     await primaryButtonAction()
                     isButtonLoading = false
-                    dismiss()
+                    if primaryButtonDismiss {
+                        dismiss()
+                    }
                 }
             }
             .buttonStyle(.ikBorderedProminent)

Mail/Components/ThreadCell/ThreadCell.swift

@@ -43,9 +43,6 @@ struct ThreadCellDataHolder {
     /// Sender of the last message that is not in the Sent folder, otherwise the last message of the thread
     let recipientToDisplay: Recipient?
 
-    /// Date of the last message of the folder, otherwise the last message of the thread
-    let date: String
-
     /// Subject of the first message
     let subject: String
 
@@ -58,8 +55,6 @@ struct ThreadCellDataHolder {
         // swiftlint:disable:next last_where
         let lastMessageNotFromSent = thread.messages.filter(Self.lastMessageNotFromSentPredicate).last ?? thread.messages.last
 
-        date = thread.date.formatted(.thread(.list))
-
         subject = thread.formattedSubject
 
         isInWrittenByMeFolder = FolderRole.writtenByMeFolders.contains { $0 == thread.folder?.role }
@@ -181,7 +176,7 @@ struct ThreadCell: View {
                     ),
                     messageCount: thread.messages.count,
                     prominentMessageCount: thread.hasUnseenMessages,
-                    formattedDate: dataHolder.date,
+                    date: thread.date,
                     showDraftPrefix: thread.hasDrafts
                 )
 

Mail/Components/ThreadCell/ThreadCellHeaderView.swift

@@ -25,7 +25,7 @@ struct ThreadCellHeaderView: View, Equatable {
     let recipientsTitle: String
     let messageCount: Int
     let prominentMessageCount: Bool
-    let formattedDate: String
+    let date: Date
     let showDraftPrefix: Bool
 
     var body: some View {
@@ -49,11 +49,7 @@ struct ThreadCellHeaderView: View, Equatable {
             }
             .frame(maxWidth: .infinity, alignment: .leading)
 
-            Text(formattedDate)
-                .textStyle(.bodySmallSecondary)
-                .lineLimit(1)
-                .layoutPriority(1)
-                .accessibilityHidden(true)
+            HeaderDateView(date: date, format: .list)
         }
     }
 }

Mail/Utils/Date+Extension.swift

@@ -52,4 +52,8 @@ extension Date {
         components.second = -1
         return Calendar.current.date(byAdding: components, to: startOfMonth)!
     }
+
+    static var minimumScheduleDelay: Date {
+        Date.now.addingTimeInterval(5 * 60)
+    }
 }

Mail/Utils/DraftUtils.swift

@@ -30,13 +30,8 @@ enum DraftUtils {
         composeMessageIntent: Binding<ComposeMessageIntent?>
     ) {
         guard let message = thread.messages.first else { return }
-        // If we already have the draft locally, present it directly
-        if let draft = mailboxManager.draft(messageUid: message.uid)?.detached() {
-            matomoOpenDraft(isLoadedRemotely: false)
-            composeMessageIntent.wrappedValue = ComposeMessageIntent.existing(draft: draft, originMailboxManager: mailboxManager)
-        } else {
-            DraftUtils.editDraft(from: message, mailboxManager: mailboxManager, composeMessageIntent: composeMessageIntent)
-        }
+
+        DraftUtils.editDraft(from: message, mailboxManager: mailboxManager, composeMessageIntent: composeMessageIntent)
     }
 
     public static func editDraft(
@@ -58,6 +53,19 @@ enum DraftUtils {
         }
     }
 
+    public static func editDraft(
+        from draft: Draft,
+        mailboxManager: MailboxManageable,
+        composeMessageIntent: Binding<ComposeMessageIntent?>
+    ) {
+        let draftDetached = draft.detached()
+        matomoOpenDraft(isLoadedRemotely: false)
+        composeMessageIntent.wrappedValue = ComposeMessageIntent.existing(
+            draft: draftDetached,
+            originMailboxManager: mailboxManager
+        )
+    }
+
     private static func matomoOpenDraft(isLoadedRemotely: Bool) {
         @InjectService var matomo: MatomoUtils
         matomo.track(eventWithCategory: .newMessage, name: "openFromDraft")

Mail/Views/Alerts/CustomScheduleAlertView.swift

@@ -0,0 +1,86 @@
+/*
+ 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 InfomaniakCoreCommonUI
+import InfomaniakCoreSwiftUI
+import InfomaniakDI
+import MailCore
+import MailCoreUI
+import MailResources
+import SwiftUI
+
+struct CustomScheduleAlertView: View {
+    @LazyInjectService private var matomo: MatomoUtils
+
+    @State private var isShowingError = false
+    @State private var selectedDate: Date
+
+    let startingDate: Date
+    let confirmAction: (Date) -> Void
+    let cancelAction: (() -> Void)?
+
+    private var isDelayTooShort: Bool {
+        selectedDate < Date.minimumScheduleDelay
+    }
+
+    init(startingDate: Date, confirmAction: @escaping (Date) -> Void, cancelAction: (() -> Void)? = nil) {
+        _selectedDate = .init(initialValue: startingDate)
+        self.startingDate = startingDate
+        self.confirmAction = confirmAction
+        self.cancelAction = cancelAction
+    }
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            Text(MailResourcesStrings.Localizable.datePickerTitle)
+                .textStyle(.bodyMedium)
+                .padding(.bottom, IKPadding.alertTitleBottom)
+            DatePicker(
+                MailResourcesStrings.Localizable.datePickerTitle,
+                selection: $selectedDate,
+                in: Date.minimumScheduleDelay...
+            )
+            .labelsHidden()
+            .onChange(of: selectedDate) { newDate in
+                isShowingError = newDate < Date.minimumScheduleDelay
+            }
+
+            Text(MailResourcesStrings.Localizable.errorScheduleDelayTooShort)
+                .textStyle(.labelError)
+                .padding(.top, value: .extraSmall)
+                .opacity(isShowingError ? 1 : 0)
+                .padding(.bottom, IKPadding.alertDescriptionBottom)
+
+            ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonScheduleTitle,
+                             secondaryButtonTitle: MailResourcesStrings.Localizable.buttonCancel,
+                             primaryButtonEnabled: !isShowingError,
+                             primaryButtonDismiss: !isDelayTooShort,
+                             primaryButtonAction: executeActionIfPossible,
+                             secondaryButtonAction: cancelAction)
+        }
+    }
+
+    private func executeActionIfPossible() {
+        guard !isDelayTooShort else {
+            isShowingError = true
+            return
+        }
+        confirmAction(selectedDate)
+        matomo.track(eventWithCategory: .scheduleSend, name: "customSchedule")
+    }
+}

Mail/Views/Alerts/ModifyMessageScheduleAlertView.swift

@@ -0,0 +1,60 @@
+/*
+ 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 InfomaniakCoreSwiftUI
+import MailCore
+import MailResources
+import SwiftUI
+
+struct ModifyMessageScheduleAlertView: View {
+    @EnvironmentObject private var mainViewState: MainViewState
+    @EnvironmentObject private var mailboxManager: MailboxManager
+
+    let draftResource: String
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: IKPadding.medium) {
+            Text(MailResourcesStrings.Localizable.editSendTitle)
+                .textStyle(.bodyMedium)
+            Text(MailResourcesStrings.Localizable.editSendDescription)
+                .textStyle(.body)
+            ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonModify,
+                             secondaryButtonTitle: MailResourcesStrings.Localizable.buttonCancel,
+                             primaryButtonAction: modifySchedule)
+        }
+    }
+
+    private func modifySchedule() {
+        Task {
+            await tryOrDisplayError {
+                try await mailboxManager.moveScheduleToDraft(draftResource: draftResource)
+                guard let draft = try await mailboxManager.loadRemotely(from: draftResource) else { return }
+
+                DraftUtils.editDraft(
+                    from: draft,
+                    mailboxManager: mailboxManager,
+                    composeMessageIntent: $mainViewState.composeMessageIntent
+                )
+            }
+        }
+    }
+}
+
+#Preview {
+    ModifyMessageScheduleAlertView(draftResource: "")
+}

Mail/Views/Bottom sheets/Discovery/DiscoveryView.swift

@@ -23,12 +23,16 @@ import MailCore
 import MailResources
 import SwiftUI
 
-public struct DiscoveryItem {
+public struct DiscoveryItem: Equatable {
     public let image: MailResourcesImages
     public let title: String
     public let description: String
     public let primaryButtonLabel: String
     public let matomoCategory: MatomoUtils.EventCategory
+
+    public static func == (lhs: DiscoveryItem, rhs: DiscoveryItem) -> Bool {
+        lhs.title == rhs.title && lhs.description == rhs.description
+    }
 }
 
 public extension DiscoveryItem {
@@ -63,6 +67,14 @@ public extension DiscoveryItem {
         primaryButtonLabel: MailResourcesStrings.Localizable.buttonSetNow,
         matomoCategory: .setAsDefaultApp
     )
+
+    static let scheduleDiscovery = DiscoveryItem(
+        image: MailResourcesAsset.updateRequired,
+        title: MailResourcesStrings.Localizable.disabledFeatureFlagTitle,
+        description: MailResourcesStrings.Localizable.disabledFeatureFlagDescription,
+        primaryButtonLabel: MailResourcesStrings.Localizable.buttonClose,
+        matomoCategory: .scheduleSend
+    )
 }
 
 struct DiscoveryView: View {
@@ -81,9 +93,17 @@ struct DiscoveryView: View {
     var body: some View {
         Group {
             if isCompactWindow {
-                DiscoveryBottomSheetView(item: item, nowButton: didTouchNowButton, laterButton: didTouchLaterButton)
+                DiscoveryBottomSheetView(
+                    item: item,
+                    nowButton: didTouchNowButton,
+                    laterButton: didTouchLaterButton
+                )
             } else {
-                DiscoveryAlertView(item: item, nowButton: didTouchNowButton, laterButton: didTouchLaterButton)
+                DiscoveryAlertView(
+                    item: item,
+                    nowButton: didTouchNowButton,
+                    laterButton: didTouchLaterButton
+                )
             }
         }
         .onAppear {
@@ -114,6 +134,11 @@ struct DiscoveryBottomSheetView: View {
     let nowButton: () -> Void
     let laterButton: () -> Void
 
+    var shouldDisplayLaterButton: Bool {
+        guard item != .scheduleDiscovery else { return false }
+        return true
+    }
+
     var body: some View {
         VStack(spacing: 32) {
             item.image.swiftUIImage
@@ -130,8 +155,10 @@ struct DiscoveryBottomSheetView: View {
                 Button(item.primaryButtonLabel, action: nowButton)
                     .buttonStyle(.ikBorderedProminent)
 
-                Button(MailResourcesStrings.Localizable.buttonLater, action: laterButton)
-                    .buttonStyle(.ikBorderless)
+                if shouldDisplayLaterButton {
+                    Button(MailResourcesStrings.Localizable.buttonLater, action: laterButton)
+                        .buttonStyle(.ikBorderless)
+                }
             }
             .ikButtonFullWidth(true)
             .controlSize(.large)
@@ -145,7 +172,7 @@ struct DiscoveryAlertView: View {
     let item: DiscoveryItem
 
     let nowButton: () -> Void
-    let laterButton: () -> Void
+    let laterButton: (() -> Void)?
 
     var body: some View {
         VStack(spacing: IKPadding.large) {
@@ -159,12 +186,19 @@ struct DiscoveryAlertView: View {
                 .multilineTextAlignment(.center)
                 .textStyle(.bodySecondary)
 
-            ModalButtonsView(
-                primaryButtonTitle: item.primaryButtonLabel,
-                secondaryButtonTitle: MailResourcesStrings.Localizable.buttonLater,
-                primaryButtonAction: nowButton,
-                secondaryButtonAction: laterButton
-            )
+            if let laterButton {
+                ModalButtonsView(
+                    primaryButtonTitle: item.primaryButtonLabel,
+                    secondaryButtonTitle: MailResourcesStrings.Localizable.buttonLater,
+                    primaryButtonAction: nowButton,
+                    secondaryButtonAction: laterButton
+                )
+            } else {
+                ModalButtonsView(
+                    primaryButtonTitle: item.primaryButtonLabel,
+                    primaryButtonAction: nowButton
+                )
+            }
         }
     }
 }

Mail/Views/Menu Drawer/FolderListViewModel.swift

@@ -111,7 +111,7 @@ struct FolderListViewModelWorker {
     private func filterFolders(_ folders: Results<Folder>, searchQuery: String) -> [Folder] {
         guard !searchQuery.isEmpty else {
             // swiftlint:disable:next empty_count
-            return Array(folders.where { $0.parents.count == 0 })
+            return Array(folders.filter { ($0.parents.count == 0 || $0.role != nil) && $0.shouldBeDisplayed })
         }
 
         return folders.filter {