-
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.
- Loading branch information
Showing
5 changed files
with
198 additions
and
11 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
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,127 @@ | ||
| /* | ||
| 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 MailCore | ||
| import SwiftUI | ||
|
|
||
| @available(macCatalyst 16.0, iOS 16.0, *) | ||
| struct DraggedThread: Transferable, Codable { | ||
| let threadIds: [String] | ||
|
|
||
| static var transferRepresentation: some TransferRepresentation { | ||
| CodableRepresentation(contentType: .plainText) | ||
| } | ||
| } | ||
|
|
||
| extension EnvironmentValues { | ||
| @Entry | ||
| var isHovered = false | ||
| } | ||
|
|
||
| extension Notification.Name { | ||
| static let dropThreadSuccess = Notification.Name("dropThreadSuccess") | ||
| } | ||
|
|
||
| struct DropThreadViewModifier: ViewModifier { | ||
| @EnvironmentObject private var mailboxManager: MailboxManager | ||
| @EnvironmentObject private var actionsManager: ActionsManager | ||
|
|
||
| @State private var isDropTargeted = false | ||
|
|
||
| let destinationFolder: Folder | ||
|
|
||
| func body(content: Content) -> some View { | ||
| if #available(macCatalyst 16.0, iOS 16.0, *) { | ||
| content | ||
| .contentShape(Rectangle()) | ||
| .dropDestination(for: DraggedThread.self) { draggedThreads, _ in | ||
| let flatThreads = draggedThreads.flatMap(\.threadIds) | ||
| handleDroppedThreads(flatThreads) | ||
|
|
||
| return true | ||
| } isTargeted: { | ||
| isDropTargeted = $0 | ||
| } | ||
| .environment(\.isHovered, isDropTargeted) | ||
| } else { | ||
| content | ||
| } | ||
| } | ||
|
|
||
| private func handleDroppedThreads(_ draggedThreadsIds: [String]) { | ||
| let threads = draggedThreadsIds.compactMap { | ||
| mailboxManager.getThread(from: $0) | ||
| } | ||
|
|
||
| guard let originFolder = threads.first(where: { $0.folder != nil })?.folder, | ||
| originFolder != destinationFolder else { | ||
| return | ||
| } | ||
|
|
||
| let movedMessages = threads.flatMap(\.messages) | ||
|
|
||
| Task { | ||
| await tryOrDisplayError { | ||
| try await actionsManager.performMove( | ||
| messages: movedMessages, | ||
| from: originFolder, | ||
| to: destinationFolder | ||
| ) | ||
| } | ||
| NotificationCenter.default.post(name: .dropThreadSuccess, object: nil) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| struct DraggableThreadViewModifier: ViewModifier { | ||
| let draggedThreadId: [String] | ||
| let onSuccess: () -> Void | ||
|
|
||
| func body(content: Content) -> some View { | ||
| if #available(macCatalyst 16.0, iOS 16.0, *) { | ||
| content | ||
| .onAppear { | ||
| NotificationCenter.default.addObserver(forName: .dropThreadSuccess, object: nil, queue: .main) { _ in | ||
| onSuccess() | ||
| } | ||
| } | ||
| .onDisappear { | ||
| NotificationCenter.default.removeObserver(self, name: .dropThreadSuccess, object: nil) | ||
| } | ||
| #if os(macOS) || targetEnvironment(macCatalyst) | ||
| .draggable(DraggedThread(threadIds: draggedThreadId)) { | ||
| DraggedEnvelopeView(amount: draggedThreadId.count) | ||
| } | ||
| #else | ||
| .draggable(DraggedThread(threadIds: draggedThreadId)) | ||
| #endif | ||
| } else { | ||
| content | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension View { | ||
| func dropThreadDestination(destinationFolder: Folder) -> some View { | ||
| modifier(DropThreadViewModifier(destinationFolder: destinationFolder)) | ||
| } | ||
|
|
||
| func draggableThread(_ draggedThreadIds: [String], onSuccess: @escaping () -> Void) -> some View { | ||
| modifier(DraggableThreadViewModifier(draggedThreadId: draggedThreadIds, onSuccess: onSuccess)) | ||
| } | ||
| } |
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,40 @@ | ||
| /* | ||
| 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 MailCore | ||
| import SwiftUI | ||
|
|
||
| struct DraggedEnvelopeView: View { | ||
| let amount: Int | ||
|
|
||
| var body: some View { | ||
| Image(systemName: "envelope.fill") | ||
| .font(.title) | ||
| .padding(value: .small) | ||
| .overlay(alignment: .bottomTrailing) { | ||
| if amount > 1 { | ||
| Text("\(amount)") | ||
| .padding(.horizontal, value: .small) | ||
| .padding(.vertical, value: .extraSmall) | ||
| .background(.red, in: .circle) | ||
| .foregroundStyle(.primary) | ||
| .font(MailTextStyle.bodySmall.font) | ||
| } | ||
| } | ||
| } | ||
| } |
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