Merge pull request #1082 from Infomaniak/discovery-ipad

feat: Present DiscoveryView with discoveryPresenter

Mail/Views/AI Writer/AIPromptPresenter.swift

@@ -25,11 +25,6 @@ extension View {
                                                @ViewBuilder modalContent: @escaping () -> ModalContent) -> some View {
         modifier(AIPromptPresenter(isPresented: isPresented, modalContent: modalContent))
     }
-
-    func aiDiscoveryPresenter<ModalContent: View>(isPresented: Binding<Bool>,
-                                                  @ViewBuilder modalContent: @escaping () -> ModalContent) -> some View {
-        modifier(AIDiscoveryPresenter(isPresented: isPresented, modalContent: modalContent))
-    }
 }
 
 struct AIPromptPresenter<ModalContent: View>: ViewModifier {
@@ -55,25 +50,3 @@ struct AIPromptPresenter<ModalContent: View>: ViewModifier {
             }
     }
 }
-
-struct AIDiscoveryPresenter<ModalContent: View>: ViewModifier {
-    @Environment(\.isCompactWindow) private var isCompactWindow
-
-    @Binding var isPresented: Bool
-
-    @ViewBuilder let modalContent: () -> ModalContent
-
-    func body(content: Content) -> some View {
-        content
-            .sheet(isPresented: Binding(get: { isCompactWindow && isPresented }, set: { isPresented = $0 })) {
-                if #available(iOS 16.0, *) {
-                    modalContent().modifier(SelfSizingPanelViewModifier())
-                } else {
-                    modalContent().modifier(SelfSizingPanelBackportViewModifier())
-                }
-            }
-            .customAlert(isPresented: Binding(get: { !isCompactWindow && isPresented }, set: { isPresented = $0 })) {
-                modalContent()
-            }
-    }
-}

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

@@ -0,0 +1,48 @@
+/*
+ Infomaniak Mail - iOS App
+ Copyright (C) 2022 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 SwiftUI
+
+extension View {
+    func discoveryPresenter<ModalContent: View>(isPresented: Binding<Bool>,
+                                                @ViewBuilder modalContent: @escaping () -> ModalContent) -> some View {
+        modifier(DiscoveryPresenter(isPresented: isPresented, modalContent: modalContent))
+    }
+}
+
+struct DiscoveryPresenter<ModalContent: View>: ViewModifier {
+    @Environment(\.isCompactWindow) private var isCompactWindow
+
+    @Binding var isPresented: Bool
+
+    @ViewBuilder let modalContent: ModalContent
+
+    func body(content: Content) -> some View {
+        content
+            .sheet(isPresented: Binding(get: { isCompactWindow && isPresented }, set: { isPresented = $0 })) {
+                if #available(iOS 16.0, *) {
+                    modalContent.modifier(SelfSizingPanelViewModifier())
+                } else {
+                    modalContent.modifier(SelfSizingPanelBackportViewModifier())
+                }
+            }
+            .customAlert(isPresented: Binding(get: { !isCompactWindow && isPresented }, set: { isPresented = $0 })) {
+                modalContent
+            }
+    }
+}

Mail/Views/New Message/ComposeMessageView.swift

@@ -194,7 +194,7 @@ struct ComposeMessageView: View {
                 dismissMessageView()
             }
         }
-        .aiDiscoveryPresenter(isPresented: $isShowingAIPopover) {
+        .discoveryPresenter(isPresented: $isShowingAIPopover) {
             DiscoveryView(item: .aiDiscovery) {
                 UserDefaults.shared.shouldPresentAIFeature = false
             } completionHandler: { willShowAIPrompt in

Mail/Views/SplitView.swift

@@ -109,14 +109,14 @@ struct SplitView: View {
                 }
             }
         }
-        .floatingPanel(isPresented: $isShowingUpdateAvailable) {
+        .discoveryPresenter(isPresented: $isShowingUpdateAvailable) {
             DiscoveryView(item: .updateDiscovery) { /* Empty on purpose */ } completionHandler: { update in
                 guard update else { return }
                 let url: URLConstants = Bundle.main.isRunningInTestFlight ? .testFlight : .appStore
                 openURL(url.url)
             }
         }
-        .floatingPanel(isPresented: $isShowingSyncDiscovery) {
+        .discoveryPresenter(isPresented: $isShowingSyncDiscovery) {
             DiscoveryView(item: .syncDiscovery) {
                 UserDefaults.shared.shouldPresentSyncDiscovery = false
             } completionHandler: { update in