fix: Small fixes for macOS

Mail/Views/Menu Drawer/MenuHeaderView.swift

@@ -16,40 +16,68 @@
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+import InfomaniakCore
+import InfomaniakDI
 import MailCore
 import MailCoreUI
 import MailResources
 import SwiftUI
 import UIKit
 
 struct MenuHeaderView: View {
+    @LazyInjectService private var platformDetector: PlatformDetectable
+
     @EnvironmentObject private var mainViewState: MainViewState
 
+    private var menuDrawerLogoHeight: CGFloat {
+        platformDetector.isMac ? UIConstants.menuDrawerLogoMacOSHeight : UIConstants.menuDrawerLogoHeight
+    }
+
     var body: some View {
-        HStack {
-            MailResourcesAsset.logoText.swiftUIImage
-                .resizable()
-                .scaledToFit()
-                .frame(height: UIConstants.menuDrawerLogoHeight)
-
-            Spacer()
-
-            Button {
-                mainViewState.settingsViewConfig = SettingsViewConfig(baseNavigationPath: [])
-            } label: {
-                IKIcon(MailResourcesAsset.cog, size: .large)
+        if platformDetector.isMac {
+            ZStack {}
+                .toolbar {
+                    ToolbarItem(placement: .topBarLeading) {
+                        logoImage
+                    }
+                    ToolbarItem(placement: .topBarTrailing) {
+                        settingsButton
+                    }
+                }
+        } else {
+            HStack {
+                logoImage
+
+                Spacer()
+
+                settingsButton
             }
-            .buttonStyle(.borderless)
-            .accessibilityLabel(MailResourcesStrings.Localizable.settingsTitle)
-            .frame(width: UIConstants.menuDrawerLogoHeight, height: UIConstants.menuDrawerLogoHeight)
-            .contentShape(Rectangle())
+            .padding(.vertical, value: .regular)
+            .padding(.leading, value: .medium)
+            .padding(.trailing, value: .verySmall)
+            .background(MailResourcesAsset.backgroundSecondaryColor.swiftUIColor)
+            .clipped()
+            .shadow(color: MailResourcesAsset.menuDrawerShadowColor.swiftUIColor, radius: 1, x: 0, y: 2)
+        }
+    }
+
+    private var logoImage: some View {
+        MailResourcesAsset.logoText.swiftUIImage
+            .resizable()
+            .scaledToFit()
+            .frame(height: menuDrawerLogoHeight)
+    }
+
+    private var settingsButton: some View {
+        Button {
+            mainViewState.settingsViewConfig = SettingsViewConfig(baseNavigationPath: [])
+        } label: {
+            IKIcon(MailResourcesAsset.cog, size: .large)
         }
-        .padding(.vertical, value: .regular)
-        .padding(.leading, value: .medium)
-        .padding(.trailing, value: .verySmall)
-        .background(MailResourcesAsset.backgroundSecondaryColor.swiftUIColor)
-        .clipped()
-        .shadow(color: MailResourcesAsset.menuDrawerShadowColor.swiftUIColor, radius: 1, x: 0, y: 2)
+        .buttonStyle(.borderless)
+        .accessibilityLabel(MailResourcesStrings.Localizable.settingsTitle)
+        .frame(width: menuDrawerLogoHeight, height: menuDrawerLogoHeight)
+        .contentShape(Rectangle())
     }
 }
 

Mail/Views/New Message/Select Mailbox/CurrentComposeMailboxView.swift

@@ -55,8 +55,8 @@ struct CurrentComposeMailboxView: View {
                     .padding(.bottom, value: .medium)
 
                 if let defaultMailbox = viewModel.defaultMailbox,
-                   let account = accountManager.account(for: defaultMailbox.userId) {
-                    SelectedMailboxView(account: account, selectedMailbox: defaultMailbox)
+                   let mailboxManager = accountManager.getMailboxManager(for: defaultMailbox) {
+                    SelectedMailboxView(selectedMailboxManager: mailboxManager)
                         .frame(maxHeight: .infinity, alignment: .top)
                 }
 

Mail/Views/New Message/Select Mailbox/SelectComposeMailboxView.swift

@@ -57,8 +57,8 @@ struct SelectComposeMailboxView: View {
             }
 
             if let selectedMailbox = viewModel.selectedMailbox,
-               let account = accountManager.account(for: selectedMailbox.userId), viewModel.selectionMade {
-                SelectedMailboxView(account: account, selectedMailbox: selectedMailbox)
+               let mailboxManager = accountManager.getMailboxManager(for: selectedMailbox) {
+                SelectedMailboxView(selectedMailboxManager: mailboxManager)
                     .padding(.horizontal, value: .small)
                     .padding(.bottom, value: .regular)
             }

Mail/Views/New Message/Select Mailbox/SelectedMailboxView.swift

@@ -23,15 +23,16 @@ import MailResources
 import SwiftUI
 
 struct SelectedMailboxView: View {
-    @EnvironmentObject private var mailboxManager: MailboxManager
-
-    let account: Account
-    let selectedMailbox: Mailbox
+    let selectedMailboxManager: MailboxManager
 
     var body: some View {
         HStack(spacing: UIPadding.small) {
-            AvatarView(mailboxManager: mailboxManager, contactConfiguration: .user(user: account.user), size: 40)
-            Text(selectedMailbox.email)
+            AvatarView(
+                mailboxManager: selectedMailboxManager,
+                contactConfiguration: .user(user: selectedMailboxManager.account.user),
+                size: 40
+            )
+            Text(selectedMailboxManager.mailbox.email)
                 .textStyle(.body)
                 .frame(maxWidth: .infinity, alignment: .leading)
             MailResourcesAsset.checkmarkCircleFill.swiftUIImage
@@ -48,5 +49,5 @@ struct SelectedMailboxView: View {
 }
 
 #Preview {
-    SelectedMailboxView(account: PreviewHelper.sampleAccount, selectedMailbox: PreviewHelper.sampleMailbox)
+    SelectedMailboxView(selectedMailboxManager: PreviewHelper.sampleMailboxManager)
 }

Mail/Views/Thread/Message/MessageHeader/MessageHeaderDetailView.swift

@@ -75,6 +75,8 @@ struct MessageHeaderDetailView: View {
 }
 
 struct RecipientLabel: View {
+    @EnvironmentObject var mailboxManager: MailboxManager
+
     @Binding var labelWidth: CGFloat
     let title: String
     let recipients: RealmSwift.List<Recipient>
@@ -112,6 +114,8 @@ struct RecipientLabel: View {
             }
             .adaptivePanel(item: $contactViewRecipient) { recipient in
                 ContactActionsView(recipient: recipient)
+                    .environmentObject(mailboxManager)
+                // We need to manually pass environmentObject because of a bug with SwiftUI end popovers on macOS
             }
         }
         .padding(.bottom, 2)

Mail/Views/Thread/Message/MessageHeader/MessageHeaderSummaryView.swift

@@ -60,6 +60,8 @@ struct MessageHeaderSummaryView: View {
                     }
                     .adaptivePanel(item: $contactViewRecipient) { recipient in
                         ContactActionsView(recipient: recipient)
+                            .environmentObject(mailboxManager)
+                        // We need to manually pass environmentObject because of a bug with SwiftUI end popovers on macOS
                     }
                     .disabled(!isMessageInteractive)
                 }

MailCore/UI/UIConstants.swift

@@ -88,6 +88,7 @@ public extension UIConstants {
     static let menuDrawerMaxWidth: CGFloat = 352
     static let menuDrawerTrailingSpacing: CGFloat = 64
     static let menuDrawerLogoHeight: CGFloat = 48
+    static let menuDrawerLogoMacOSHeight: CGFloat = 32
     static let menuDrawerQuotaSize: CGFloat = 40
 
     static let unreadIconSize: CGFloat = 8