From 86ca4aeb6f62ccb0e74e71c1f4909e69db3b4e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Coye=20de=20Brune=CC=81lis?=
 <adrien.coye@infomaniak.com>
Date: Wed, 2 Aug 2023 15:37:44 +0200
Subject: [PATCH] chore: PR Feedback. (IKSnackBarAvoider/ShareViewController)

---
 Mail/Helpers/AppAssembly.swift                |  4 ++--
 Mail/Utils/SnackBarAwareModifier.swift        |  2 +-
 .../Utils/SnackBar/IKSnackBar+Extension.swift | 19 +------------------
 MailShareExtension/ShareViewController.swift  | 10 ++++++----
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/Mail/Helpers/AppAssembly.swift b/Mail/Helpers/AppAssembly.swift
index da729263ed..5f6961e1ab 100644
--- a/Mail/Helpers/AppAssembly.swift
+++ b/Mail/Helpers/AppAssembly.swift
@@ -67,8 +67,8 @@ enum ApplicationAssembly {
             Factory(type: MatomoUtils.self) { _, _ in
                 MatomoUtils(siteId: Constants.matomoId, baseURL: URLConstants.matomo.url)
             },
-            Factory(type: SnackBarAvoider.self) { _, _ in
-                SnackBarAvoider()
+            Factory(type: IKSnackBarAvoider.self) { _, _ in
+                IKSnackBarAvoider()
             },
             Factory(type: DraftManager.self) { _, _ in
                 DraftManager()
diff --git a/Mail/Utils/SnackBarAwareModifier.swift b/Mail/Utils/SnackBarAwareModifier.swift
index 188d1092aa..0f6868f5cc 100644
--- a/Mail/Utils/SnackBarAwareModifier.swift
+++ b/Mail/Utils/SnackBarAwareModifier.swift
@@ -21,7 +21,7 @@ import MailCore
 import SwiftUI
 
 struct SnackBarAwareModifier: ViewModifier {
-    @InjectService var avoider: SnackBarAvoider
+    @InjectService var avoider: IKSnackBarAvoider
     var inset: CGFloat {
         didSet {
             avoider.addAvoider(inset: inset)
diff --git a/MailCore/Utils/SnackBar/IKSnackBar+Extension.swift b/MailCore/Utils/SnackBar/IKSnackBar+Extension.swift
index e7cb44daa8..a7bebfe803 100644
--- a/MailCore/Utils/SnackBar/IKSnackBar+Extension.swift
+++ b/MailCore/Utils/SnackBar/IKSnackBar+Extension.swift
@@ -41,23 +41,6 @@ public extension SnackBarStyle {
     }
 }
 
-// TODO: delete
-public final class SnackBarAvoider {
-    public var snackBarInset: CGFloat = 0
-
-    public init() { /* Needed to init */ }
-
-    public func addAvoider(inset: CGFloat) {
-        if inset != snackBarInset {
-            snackBarInset = inset
-        }
-    }
-
-    public func removeAvoider() {
-        snackBarInset = 0
-    }
-}
-
 public extension IKSnackBar {
     @discardableResult
     @MainActor
@@ -76,7 +59,7 @@ public extension IKSnackBar {
         anchor _: CGFloat = 0,
         contextView: UIView? = nil
     ) -> IKSnackBar? {
-        @LazyInjectService var avoider: SnackBarAvoider
+        @LazyInjectService var avoider: IKSnackBarAvoider
 
         let snackbar: IKSnackBar?
         if let contextView = contextView {
diff --git a/MailShareExtension/ShareViewController.swift b/MailShareExtension/ShareViewController.swift
index b4c5289f82..c084f577fa 100644
--- a/MailShareExtension/ShareViewController.swift
+++ b/MailShareExtension/ShareViewController.swift
@@ -66,10 +66,12 @@ final class ShareNavigationViewController: UIViewController {
         }
 
         // We need to go threw wrapping to use SwiftUI in an NSExtension.
-        let hostingController = UIHostingController(rootView: ComposeMessageWrapperView(dismissHandler: {
-                                                                                            self.dismiss(animated: true)
-                                                                                        },
-                                                                                        itemProviders: itemProviders))
+        let rootView = ComposeMessageWrapperView(dismissHandler: {
+                                                     self.dismiss(animated: true)
+                                                 },
+                                                 itemProviders: itemProviders)
+            .defaultAppStorage(.shared)
+        let hostingController = UIHostingController(rootView: rootView)
         hostingController.view.translatesAutoresizingMaskIntoConstraints = false
         addChild(hostingController)
         view.addSubview(hostingController.view)