Merge pull request #664 from Infomaniak/fix-avatar-images

Fix avatar images
Infomaniak · Mar 30, 2023 · 363118a · 363118a
2 parents dd41bc4 + a283681
commit 363118a
Show file tree

Hide file tree

Showing 19 changed files with 168 additions and 185 deletions.
diff --git a/.package.resolved b/.package.resolved
@@ -139,8 +139,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kean/Nuke",
       "state" : {
-        "revision" : "33f7e93be5d4ec027d42af77a8ec4680d1862ad2",
-        "version" : "11.6.4"
+        "revision" : "f4d9b95788679d0654c032961f73e7e9c16ca6b4",
+        "version" : "12.1.0"
       }
     },
     {

diff --git a/Mail/Components/AvatarView.swift b/Mail/Components/AvatarView.swift
@@ -0,0 +1,45 @@
+/*
+ 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 InfomaniakCore
+import MailCore
+import NukeUI
+import SwiftUI
+
+struct AvatarView: View {
+    let avatarDisplayable: AvatarDisplayable
+    var size: CGFloat = 28
+
+    var body: some View {
+        if let avatarImageRequest = avatarDisplayable.avatarImageRequest {
+            LazyImage(request: avatarImageRequest) { state in
+                if let image = state.image {
+                    ContactImage(image: image, size: size)
+                } else {
+                    InitialsView(
+                        initials: avatarDisplayable.initials,
+                        color: avatarDisplayable.initialsBackgroundColor,
+                        size: size
+                    )
+                }
+            }
+        } else {
+            InitialsView(initials: avatarDisplayable.initials, color: avatarDisplayable.initialsBackgroundColor, size: size)
+        }
+    }
+}
diff --git a/Mail/Components/ContactImage.swift b/Mail/Components/ContactImage.swift
@@ -20,17 +20,15 @@ import MailCore
 import SwiftUI
 
 struct ContactImage: View {
-    var image: Image
-    var size: CGFloat
+    let image: Image
+    let size: CGFloat
 
     var body: some View {
-        ZStack {
-            image
-                .resizable()
-                .scaledToFit()
-                .frame(width: size, height: size)
-                .clipShape(Circle())
-        }
+        image
+            .resizable()
+            .scaledToFit()
+            .frame(width: size, height: size)
+            .clipShape(Circle())
     }
 }
 

diff --git a/Mail/Components/RecipientAutocompletionCell.swift b/Mail/Components/RecipientAutocompletionCell.swift
@@ -24,7 +24,7 @@ struct RecipientAutocompletionCell: View {
 
     var body: some View {
         HStack {
-            RecipientImage(recipient: recipient)
+            AvatarView(avatarDisplayable: recipient, size: 40)
 
             if recipient.name.isEmpty {
                 Text(recipient.email)

diff --git a/Mail/Components/RecipientImage.swift b/Mail/Components/RecipientImage.swift
diff --git a/Mail/Components/ThreadCell.swift b/Mail/Components/ThreadCell.swift
@@ -123,7 +123,7 @@ struct ThreadCell: View {
             Group {
                 if density == .large, let recipient = dataHolder.recipientToDisplay {
                     ZStack {
-                        RecipientImage(recipient: recipient)
+                        AvatarView(avatarDisplayable: recipient, size: 40)
                         CheckboxView(isSelected: isSelected, density: density)
                             .opacity(isSelected ? 1 : 0)
                     }

diff --git a/Mail/Views/Bottom sheets/ContactActionsView.swift b/Mail/Views/Bottom sheets/ContactActionsView.swift
@@ -64,7 +64,7 @@ struct ContactActionsView: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 16) {
             HStack {
-                RecipientImage(recipient: recipient, size: 32)
+                AvatarView(avatarDisplayable: recipient, size: 32)
                 VStack(alignment: .leading) {
                     Text(recipient.contact?.name ?? recipient.formattedName)
                         .textStyle(.bodyMedium)

diff --git a/Mail/Views/SplitView.swift b/Mail/Views/SplitView.swift
@@ -44,7 +44,6 @@ public class SplitViewManager: ObservableObject {
     @Published var showSearch = false
     @Published var selectedFolder: Folder?
     var splitViewController: UISplitViewController?
-    @Published var avatarImage = MailResourcesAsset.placeholderAvatar.swiftUIImage
 
     init(folder: Folder?) {
         selectedFolder = folder

diff --git a/Mail/Views/Switch User/AccountCellView.swift b/Mail/Views/Switch User/AccountCellView.swift
@@ -70,15 +70,9 @@ struct AccountHeaderCell: View {
     let account: Account
     @Binding var isSelected: Bool
 
-    @State private var avatarImage = MailResourcesAsset.placeholderAvatar.swiftUIImage
-
     var body: some View {
         HStack(spacing: 8) {
-            avatarImage
-                .resizable()
-                .frame(width: 38, height: 38)
-                .clipShape(Circle())
-
+            AvatarView(avatarDisplayable: account.user, size: 38)
             VStack(alignment: .leading, spacing: 2) {
                 Text(account.user.displayName)
                     .textStyle(.bodyMedium)
@@ -93,9 +87,6 @@ struct AccountHeaderCell: View {
                     .foregroundColor(.accentColor)
             }
         }
-        .task {
-            avatarImage = await account.user.avatarImage
-        }
     }
 }
 

diff --git a/Mail/Views/Switch User/AccountView.swift b/Mail/Views/Switch User/AccountView.swift
@@ -51,7 +51,6 @@ struct AccountView: View {
 
     @LazyInjectService private var matomo: MatomoUtils
 
-    @State private var avatarImage = MailResourcesAsset.placeholderAvatar.swiftUIImage
     private let account = AccountManager.instance.currentAccount!
     @State private var isShowingLogoutAlert = false
     @State private var isShowingDeleteAccount = false
@@ -63,11 +62,7 @@ struct AccountView: View {
         NavigationView {
             VStack(spacing: 0) {
                 ScrollView {
-                    // Header
-                    avatarImage
-                        .resizable()
-                        .frame(width: 104, height: 104)
-                        .clipShape(Circle())
+                    AvatarView(avatarDisplayable: account.user, size: 104)
                         .padding(.top, 24)
                         .padding(.bottom, 16)
 
@@ -127,9 +122,6 @@ struct AccountView: View {
                 Label(MailResourcesStrings.Localizable.buttonClose, systemImage: "xmark")
             })
         }
-        .task {
-            avatarImage = await account.user.avatarImage
-        }
         .sheet(isPresented: $isShowingDeleteAccount) {
             DeleteAccountView(account: account, delegate: delegate)
         }

diff --git a/Mail/Views/Thread List/ThreadListView.swift b/Mail/Views/Thread List/ThreadListView.swift
@@ -352,16 +352,7 @@ private struct ThreadListToolbar: ViewModifier {
                             Button {
                                 isShowingSwitchAccount.toggle()
                             } label: {
-                                splitViewManager.avatarImage
-                                    .resizable()
-                                    .scaledToFit()
-                                    .frame(width: 28, height: 28)
-                                    .clipShape(Circle())
-                            }
-                            .task {
-                                if let account = AccountManager.instance.currentAccount {
-                                    splitViewManager.avatarImage = await account.user.avatarImage
-                                }
+                                AvatarView(avatarDisplayable: AccountManager.instance.currentAccount.user)
                             }
                         }
                     }

diff --git a/Mail/Views/Thread/MessageHeaderSummaryView.swift b/Mail/Views/Thread/MessageHeaderSummaryView.swift
@@ -43,7 +43,7 @@ struct MessageHeaderSummaryView: View {
                         matomo.track(eventWithCategory: .message, name: "selectAvatar")
                         recipientTapped(recipient)
                     } label: {
-                        RecipientImage(recipient: recipient, size: 40)
+                        AvatarView(avatarDisplayable: recipient, size: 40)
                     }
                 }
 

diff --git a/MailCore/Utils/Nuke+Authorization.swift → MailCore/API/MailApiFetcher+Nuke.swift b/MailCore/Utils/Nuke+Authorization.swift → MailCore/API/MailApiFetcher+Nuke.swift
@@ -17,16 +17,24 @@
  */
 
 import Foundation
+import InfomaniakCore
 import Nuke
 
-extension ImagePipeline {
-    public func imageWithAuthentication(for url: URL, delegate: (any ImageTaskDelegate)? = nil) async throws -> ImageResponse {
+public extension MailApiFetcher {
+    func avatarImageRequestForContact(_ contact: MergedContact) -> ImageRequest? {
+        guard let avatarPath = contact.remote?.avatar else { return nil }
+        let endpoint = Endpoint.resource(avatarPath)
+
+        return authenticatedImageRequest(endpoint.url)
+    }
+
+    func authenticatedImageRequest(_ url: URL) -> ImageRequest? {
         var urlRequest = URLRequest(url: url)
         urlRequest.addValue(
-            "Bearer \(AccountManager.instance.currentAccount.token.accessToken)",
+            "Bearer \(currentToken?.accessToken ?? "")",
             forHTTPHeaderField: "Authorization"
         )
 
-        return try await image(for: ImageRequest(urlRequest: urlRequest), delegate: delegate)
+        return ImageRequest(urlRequest: urlRequest)
     }
 }
diff --git a/MailCore/Cache/AccountManager.swift b/MailCore/Cache/AccountManager.swift
@@ -59,34 +59,6 @@ public extension InfomaniakNetworkLoginable {
     }
 }
 
-public extension InfomaniakUser {
-    var cachedAvatarImage: Image? {
-        if let avatarURL = URL(string: avatar),
-           let avatarUIImage = ImagePipeline.shared.cache[avatarURL]?.image {
-            return Image(uiImage: avatarUIImage)
-        }
-
-        return nil
-    }
-
-    var avatarImage: Image {
-        get async {
-            if let avatarURL = URL(string: avatar),
-               let avatarImage = try? await ImagePipeline.shared.image(for: avatarURL).image {
-                return Image(uiImage: avatarImage)
-            } else {
-                let backgroundColor = UIColor.backgroundColor(from: id, with: UIConstants.avatarColors)
-                let initialsImage = UIImage.getInitialsPlaceholder(
-                    with: displayName,
-                    size: CGSize(width: 40, height: 40),
-                    backgroundColor: backgroundColor
-                )
-                return Image(uiImage: initialsImage)
-            }
-        }
-    }
-}
-
 @globalActor actor AccountActor: GlobalActor {
     static let shared = AccountActor()