feat: Display loading overlay

Infomaniak · Jun 16, 2023 · 531c175 · 531c175
1 parent f863f56
commit 531c175
Showing 1 changed file with 25 additions and 14 deletions.
diff --git a/Mail/Views/New Message/V2/ComposeMessageViewV2.swift b/Mail/Views/New Message/V2/ComposeMessageViewV2.swift
@@ -18,6 +18,7 @@
 
 import InfomaniakCoreUI
 import InfomaniakDI
+import Introspect
 import MailCore
 import MailResources
 import RealmSwift
@@ -130,6 +131,16 @@ struct ComposeMessageViewV2: View {
                     DraftManager.shared.syncDraft(mailboxManager: mailboxManager)
                 }
             }
+            .overlay {
+                if isLoadingContent {
+                    ProgressView()
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                        .background(MailResourcesAsset.backgroundColor.swiftUIColor)
+                }
+            }
+            .introspectScrollView { scrollView in
+                scrollView.keyboardDismissMode = .interactive
+            }
             .navigationTitle(MailResourcesStrings.Localizable.buttonNewMessage)
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
@@ -148,22 +159,22 @@ struct ComposeMessageViewV2: View {
             }
         }
         .interactiveDismissDisabled()
-            .customAlert(isPresented: $alert.isShowing) {
-                switch alert.state {
-                case let .link(handler):
-                    AddLinkView(actionHandler: handler)
-                case let .emptySubject(handler):
-                    EmptySubjectView(actionHandler: handler)
-                case .none:
-                    EmptyView()
-                }
+        .customAlert(isPresented: $alert.isShowing) {
+            switch alert.state {
+            case let .link(handler):
+                AddLinkView(actionHandler: handler)
+            case let .emptySubject(handler):
+                EmptySubjectView(actionHandler: handler)
+            case .none:
+                EmptyView()
             }
-            .customAlert(isPresented: $isShowingCancelAttachmentsError) {
-                AttachmentsUploadInProgressErrorView {
-                    dismiss()
-                }
+        }
+        .customAlert(isPresented: $isShowingCancelAttachmentsError) {
+            AttachmentsUploadInProgressErrorView {
+                dismiss()
             }
-            .matomoView(view: ["ComposeMessage"])
+        }
+        .matomoView(view: ["ComposeMessage"])
     }
 
     private func didTouchDismiss() {