refactor: ReportJunkView native floatingPanel

Infomaniak · Apr 27, 2023 · ca9e27c · ca9e27c
1 parent 046f9ed
commit ca9e27c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift b/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift
@@ -33,7 +33,7 @@ struct ActionsPanelViewModifier: ViewModifier {
     @StateObject private var moveSheet = MoveSheet()
 
     @Binding var actionsTarget: ActionsTarget?
-    @State var reportDisplayProblemMessage: Message?
+    @State var reportJunkActionsTarget: ActionsTarget?
 
     var completionHandler: (() -> Void)?
 
@@ -43,7 +43,8 @@ struct ActionsPanelViewModifier: ViewModifier {
                 ActionsView(mailboxManager: mailboxManager,
                             target: target,
                             moveSheet: moveSheet,
-                            messageReply: $navigationStore.messageReply) {
+                            messageReply: $navigationStore.messageReply,
+                            reportJunkActionsTarget: $reportJunkActionsTarget) {
                     completionHandler?()
                 }
             }
@@ -52,8 +53,8 @@ struct ActionsPanelViewModifier: ViewModifier {
                     MoveEmailView.sheetView(from: folderId, moveHandler: handler)
                 }
             }
-            .floatingPanel(item: $reportDisplayProblemMessage) { message in
-                ReportJunkView(mailboxManager: mailboxManager, target: .message(message))
+            .floatingPanel(item: $reportJunkActionsTarget) { target in
+                ReportJunkView(mailboxManager: mailboxManager, target: target)
             }
     }
 }
diff --git a/Mail/Views/Bottom sheets/Actions/ActionsView.swift b/Mail/Views/Bottom sheets/Actions/ActionsView.swift
@@ -29,6 +29,7 @@ struct ActionsView: View {
          target: ActionsTarget,
          moveSheet: MoveSheet? = nil,
          messageReply: Binding<MessageReply?>? = nil,
+         reportJunkActionsTarget: Binding<ActionsTarget?>? = nil,
          completionHandler: (() -> Void)? = nil) {
         var matomoCategory = MatomoUtils.EventCategory.bottomSheetMessageActions
         if case .threads = target {
@@ -39,6 +40,7 @@ struct ActionsView: View {
                                      target: target,
                                      moveSheet: moveSheet,
                                      messageReply: messageReply,
+                                     reportJunkActionsTarget: reportJunkActionsTarget,
                                      matomoCategory: matomoCategory,
                                      completionHandler: completionHandler)
     }

diff --git a/Mail/Views/Bottom sheets/Actions/ActionsViewModel.swift b/Mail/Views/Bottom sheets/Actions/ActionsViewModel.swift
@@ -209,7 +209,8 @@ enum ActionsTarget: Equatable, Identifiable {
     private let mailboxManager: MailboxManager
     private let target: ActionsTarget
     private let moveSheet: MoveSheet?
-    private let replyHandler: ((Message, ReplyMode) -> Void)?
+    private let messageReply: Binding<MessageReply?>?
+    private let reportJunkActionsTarget: Binding<ActionsTarget?>?
     private let completionHandler: (() -> Void)?
 
     private let matomoCategory: MatomoUtils.EventCategory?
@@ -222,13 +223,15 @@ enum ActionsTarget: Equatable, Identifiable {
     init(mailboxManager: MailboxManager,
          target: ActionsTarget,
          moveSheet: MoveSheet? = nil,
+         messageReply: Binding<MessageReply?>? = nil,
+         reportJunkActionsTarget: Binding<ActionsTarget?>? = nil,
          matomoCategory: MatomoUtils.EventCategory? = nil,
-         replyHandler: ((Message, ReplyMode) -> Void)? = nil,
          completionHandler: (() -> Void)? = nil) {
         self.mailboxManager = mailboxManager
         self.target = target.freeze()
         self.moveSheet = moveSheet
-        self.replyHandler = replyHandler
+        self.messageReply = messageReply
+        self.reportJunkActionsTarget = reportJunkActionsTarget
         self.completionHandler = completionHandler
         self.matomoCategory = matomoCategory
         setActions()
@@ -445,7 +448,7 @@ enum ActionsTarget: Equatable, Identifiable {
     }
 
     private func displayReportJunk() {
-        //globalSheet.open(state: .reportJunk(threadBottomSheet: state, target: target))
+        reportJunkActionsTarget?.wrappedValue = target
     }
 
     private func block() async throws {

diff --git a/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift b/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift
@@ -27,9 +27,7 @@ struct ReportJunkView: View {
     var actions: [Action] = []
 
     init(mailboxManager: MailboxManager,
-         target: ActionsTarget,
-         globalSheet: GlobalBottomSheet,
-         globalAlert: GlobalAlert) {
+         target: ActionsTarget) {
         viewModel = ActionsViewModel(mailboxManager: mailboxManager,
                                      target: target)
         if case .message(let message) = target {
@@ -58,10 +56,7 @@ struct ReportJunkView: View {
 
 struct ReportJunkView_Previews: PreviewProvider {
     static var previews: some View {
-        ReportJunkView(mailboxManager: PreviewHelper.sampleMailboxManager,
-                       target: .threads([PreviewHelper.sampleThread], false),
-                       globalSheet: GlobalBottomSheet(),
-                       globalAlert: GlobalAlert())
+        ReportJunkView(mailboxManager: PreviewHelper.sampleMailboxManager, target: .message(PreviewHelper.sampleMessage))
             .accentColor(AccentColor.pink.primary.swiftUIColor)
     }
 }
diff --git a/Mail/Views/SplitView.swift b/Mail/Views/SplitView.swift
@@ -38,9 +38,7 @@ extension EnvironmentValues {
 
 class GlobalBottomSheet: DisplayedFloatingPanelState<GlobalBottomSheet.State> {
     enum State {
-        case getMoreStorage
         case restoreEmails
-        case reportJunk(target: ActionsTarget)
     }
 }