feat: Can add group and teams avatar

Author: Matthieu-dgl

Mail/Views/New Message/AutocompletionCell.swift

@@ -29,6 +29,16 @@ struct AutocompletionCell: View {
     let alreadyAppend: Bool
     let unknownRecipient: Bool
 
+    var contactConfiguration: ContactConfiguration {
+        if let groupContact = autocompletion as? GroupContact {
+            return .groupContact(group: groupContact)
+        } else if let addressBook = autocompletion as? AddressBook {
+            return .addressBook(addressbook: addressBook)
+        } else {
+            return .emptyContact
+        }
+    }
+
     var body: some View {
         HStack(spacing: IKPadding.intermediate) {
             Button {
@@ -37,7 +47,7 @@ struct AutocompletionCell: View {
                 if unknownRecipient {
                     UnknownRecipientCell(email: autocompletion.autocompletableName)
                 } else {
-                    RecipientCell(contact: autocompletion, highlight: highlight)
+                    RecipientCell(contact: autocompletion, contactConfiguration: contactConfiguration, highlight: highlight)
                 }
             }
             .allowsHitTesting(!alreadyAppend || unknownRecipient)

MailCore/Cache/ContactManager/ContactManager+DB.swift

@@ -149,8 +149,7 @@ public extension ContactManager {
 
     func getContacts(with groupContactId: Int) -> [MergedContact] {
         let frozenContacts = fetchResults(ofType: MergedContact.self) { partial in
-            partial
-                .where { $0.groupContactId == [groupContactId] }
+            partial.filter("ANY remoteGroupContactId == %@", groupContactId)
         }
         return Array(frozenContacts.freezeIfNeeded())
     }
@@ -160,7 +159,6 @@ public extension ContactManager {
             partial
                 .where { $0.remoteAddressBookId == addressbookId }
         }
-
         return Array(contacts.freezeIfNeeded())
     }
 

MailCore/Models/Contact/Contact.swift

@@ -34,7 +34,7 @@ public struct InfomaniakContact: Codable, Identifiable {
     public var favorite: Bool?
     public var nickname: String?
     public var organization: String?
-    public var groupContactId: RealmSwift.List<Int>?
+    public var groupContactId: List<Int>?
 
     enum CodingKeys: String, CodingKey {
         case id
@@ -73,6 +73,6 @@ public struct InfomaniakContact: Codable, Identifiable {
         favorite = try values.decodeIfPresent(Bool.self, forKey: .favorite)
         nickname = try values.decodeIfPresent(String.self, forKey: .nickname)
         organization = try values.decodeIfPresent(String.self, forKey: .organization)
-        groupContactId = try values.decodeIfPresent(RealmSwift.List<Int>.self, forKey: .groupContactId)
+        groupContactId = try values.decodeIfPresent(List<Int>.self, forKey: .groupContactId)
     }
 }

MailCore/Models/Contact/ContactConfiguration.swift

@@ -28,9 +28,9 @@ public enum ContactConfiguration: CustomDebugStringConvertible {
             return ".user:\(user.displayName) \(user.email)"
         case .contact(let contact):
             return ".contact:\(contact.fullName) \(contact.email)"
-        case .groupContact(let groupContactId):
+        case .groupContact:
             return ".groupContact"
-        case .addressBook(let addressBookId):
+        case .addressBook:
             return ".addressBook"
         case .emptyContact:
             return ".emptyContact"
@@ -46,7 +46,7 @@ public enum ContactConfiguration: CustomDebugStringConvertible {
     case user(user: UserProfile)
     case contact(contact: CommonContact)
     case groupContact(group: GroupContact)
-    case addressBook(adressbook: AddressBook)
+    case addressBook(addressbook: AddressBook)
     case emptyContact
 
     public func freezeIfNeeded() -> Self {

MailCore/Models/MergedContact.swift

@@ -53,7 +53,7 @@ public final class MergedContact: Object, Identifiable {
     @Persisted public var remoteAvatarURL: String?
     @Persisted public var remoteIdentifier: String?
     @Persisted public var remoteAddressBookId: Int?
-    public var groupContactId: [Int]?
+    @Persisted public var remoteGroupContactId: List<Int>
 
     /// Local
     @Persisted public var localIdentifier: String?
@@ -129,7 +129,7 @@ public final class MergedContact: Object, Identifiable {
         remoteAvatarURL = contact.avatar
         remoteIdentifier = contact.id
         remoteAddressBookId = contact.addressbookId
-//        remoteGroupContactId = contact.groupContactId
+        remoteGroupContactId = contact.groupContactId ?? List<Int>()
     }
 
     static func computeId(email: String, name: String?) -> String {

MailCoreUI/Components/AvatarView.swift

@@ -61,6 +61,10 @@ public struct AvatarView: View {
         Group {
             if case .emptyContact = contactConfiguration {
                 UnknownRecipientView(size: size)
+            } else if case .addressBook = contactConfiguration {
+                GroupRecipientsView(size: size)
+            } else if case .groupContact = contactConfiguration {
+                GroupRecipientsView(size: size)
             } else if let avatarImageRequest = getAvatarImageRequest() {
                 LazyImage(request: avatarImageRequest) { state in
                     if let image = state.image {

MailCoreUI/Components/GroupRecipientsView.swift

@@ -0,0 +1,50 @@
+/*
+ Infomaniak Mail - iOS App
+ Copyright (C) 2024 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 InfomaniakCoreSwiftUI
+import MailCore
+import MailResources
+import SwiftUI
+
+struct GroupRecipientsView: View {
+    let size: CGFloat
+
+    private var iconSize: CGFloat {
+        return size - 2 * IKPadding.small
+    }
+
+    public init(size: CGFloat) {
+        self.size = size
+    }
+
+    public var body: some View {
+        Circle()
+            .fill(Color.accentColor)
+            .frame(width: size, height: size)
+            .overlay {
+                MailResourcesAsset.teamsUser.swiftUIImage
+                    .resizable()
+                    .foregroundStyle(MailResourcesAsset.backgroundColor)
+                    .frame(width: iconSize, height: iconSize)
+            }
+    }
+}
+
+#Preview {
+    GroupRecipientsView(size: 40)
+}

MailResources/Assets.xcassets/teams-user.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "teams-user.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}