Use MainActor in StreamChat, Images, Fonts, Appearance, Utils (#984)

Author: laevandus

Sources/StreamChatSwiftUI/Appearance.swift

@@ -5,7 +5,7 @@
 import SwiftUI
 
 /// An object containing visual configuration for the whole application.
-public class Appearance {
+@MainActor public class Appearance {
     public var colors: ColorPalette
     public var images: Images
     public var fonts: Fonts
@@ -21,21 +21,20 @@ public class Appearance {
     }
 
     /// Provider for custom localization which is dependent on App Bundle.
-    public nonisolated(unsafe)
-    static var localizationProvider: @Sendable (_ key: String, _ table: String) -> String = { key, table in
+    public static var localizationProvider: @Sendable (_ key: String, _ table: String) -> String = { key, table in
         Bundle.streamChatUI.localizedString(forKey: key, value: nil, table: table)
     }
 }
 
 // MARK: - Appearance + Default
 
 public extension Appearance {
-    nonisolated(unsafe) static var `default`: Appearance = .init()
+    static let `default`: Appearance = .init()
 }
 
 /// Provides the default value of the `Appearance` class.
 public struct AppearanceKey: EnvironmentKey {
-    public static var defaultValue: Appearance { Appearance() }
+    public static var defaultValue: Appearance { StreamConcurrency.onMain { Appearance() } }
 }
 
 extension EnvironmentValues {

Sources/StreamChatSwiftUI/ChatChannel/ChannelControllerFactory.swift

@@ -6,7 +6,7 @@ import StreamChat
 import SwiftUI
 
 /// Factory for creating channel controllers.
-class ChannelControllerFactory {
+@MainActor class ChannelControllerFactory {
     @Injected(\.chatClient) var chatClient
 
     var currentChannelController: ChatChannelController?

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/MediaAttachmentsViewModel.swift

@@ -128,7 +128,7 @@ public struct MediaItem: Identifiable {
         self.imageAttachment = imageAttachment
     }
 
-    public var mediaAttachment: MediaAttachment? {
+    @MainActor public var mediaAttachment: MediaAttachment? {
         if let videoAttachment {
             return MediaAttachment(url: videoAttachment.videoURL, type: .video)
         } else if let imageAttachment {

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -814,11 +814,11 @@ import SwiftUI
 }
 
 extension ChatMessage: Identifiable {
-    public var scrollMessageId: String {
+    @MainActor public var scrollMessageId: String {
         messageId
     }
 
-    var messageId: String {
+    @MainActor var messageId: String {
         InjectedValues[\.utils].messageIdBuilder.makeMessageId(for: self)
     }
 

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -938,7 +938,7 @@ struct FileAddedAsset: Sendable {
 }
 
 // The converter responsible to map attachments to assets and vice versa.
-class MessageAttachmentsConverter {
+@MainActor class MessageAttachmentsConverter {
     @Injected(\.utils) var utils
 
     /// Converts the added assets to payloads.

Sources/StreamChatSwiftUI/ChatChannel/Composer/PhotoAssetsUtils.swift

@@ -7,7 +7,7 @@ import StreamChat
 import SwiftUI
 
 /// Helper class that loads assets from the photo library.
-public class PhotoAssetLoader: NSObject, ObservableObject {
+@MainActor public class PhotoAssetLoader: NSObject, ObservableObject {
     @Injected(\.chatClient) private var chatClient
 
     @Published var loadedImages = [String: UIImage]()

Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift

@@ -423,8 +423,6 @@ extension ChatMessage {
 }
 
 public struct MediaAttachment: Identifiable, Equatable {
-    @Injected(\.utils) var utils
-
     let url: URL
     let type: MediaAttachmentType
     var uploadingState: AttachmentUploadingState?
@@ -433,11 +431,12 @@ public struct MediaAttachment: Identifiable, Equatable {
         url.absoluteString
     }
 
-    func generateThumbnail(
+    @MainActor func generateThumbnail(
         resize: Bool,
         preferredSize: CGSize,
         completion: @escaping @MainActor (Result<UIImage, Error>) -> Void
     ) {
+        let utils = InjectedValues[\.utils]
         if type == .image {
             utils.imageLoader.loadImage(
                 url: url,

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageBubble.swift

@@ -218,8 +218,8 @@ extension ChatMessage {
     ///  - colors: The color pallete.
     ///  - injectedBackgroundColor: If you need a custom background color injected.
     /// - Returns: The background colors (can be many for gradients) for the message cell.
-    public func bubbleBackground(colors: ColorPalette, injectedBackgroundColor: UIColor? = nil) -> [Color] {
-        if let injectedBackgroundColor = injectedBackgroundColor {
+    @MainActor public func bubbleBackground(colors: ColorPalette, injectedBackgroundColor: UIColor? = nil) -> [Color] {
+        if let injectedBackgroundColor {
             return [Color(injectedBackgroundColor)]
         }
         var colors = colors

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListConfig.swift

@@ -153,7 +153,7 @@ public struct MessageDisplayOptions {
     public let shouldAnimateReactions: Bool
     public let reactionsPlacement: ReactionsPlacement
     public let showOriginalTranslatedButton: Bool
-    public let messageLinkDisplayResolver: (ChatMessage) -> [NSAttributedString.Key: Any]
+    public let messageLinkDisplayResolver: @MainActor (ChatMessage) -> [NSAttributedString.Key: Any]
     public let spacerWidth: (CGFloat) -> CGFloat
     public let reactionsTopPadding: (ChatMessage) -> CGFloat
     public let dateSeparator: (ChatMessage, ChatMessage) -> Date?
@@ -173,7 +173,7 @@ public struct MessageDisplayOptions {
         shouldAnimateReactions: Bool = true,
         reactionsPlacement: ReactionsPlacement = .top,
         showOriginalTranslatedButton: Bool = false,
-        messageLinkDisplayResolver: @escaping (ChatMessage) -> [NSAttributedString.Key: Any] = MessageDisplayOptions
+        messageLinkDisplayResolver: @escaping @MainActor (ChatMessage) -> [NSAttributedString.Key: Any] = MessageDisplayOptions
             .defaultLinkDisplay,
         spacerWidth: @escaping (CGFloat) -> CGFloat = MessageDisplayOptions.defaultSpacerWidth,
         reactionsTopPadding: @escaping (ChatMessage) -> CGFloat = MessageDisplayOptions.defaultReactionsTopPadding,
@@ -216,7 +216,7 @@ public struct MessageDisplayOptions {
         }
     }
 
-    public static var defaultLinkDisplay: (ChatMessage) -> [NSAttributedString.Key: Any] {
+    public static var defaultLinkDisplay: @MainActor (ChatMessage) -> [NSAttributedString.Key: Any] {
         { _ in
             [
                 NSAttributedString.Key.foregroundColor: UIColor(InjectedValues[\.colors].tintColor)

Sources/StreamChatSwiftUI/ChatChannel/Utils/ChatChannelExtensions.swift

@@ -45,7 +45,7 @@ extension ChatChannel {
     /// - Parameters:
     ///  - currentUserId: the id of the current user.
     /// - Returns: the typing indicator string.
-    public func typingIndicatorString(currentUserId: UserId?) -> String {
+    @MainActor public func typingIndicatorString(currentUserId: UserId?) -> String {
         let chatUserNamer = InjectedValues[\.utils].chatUserNamer
         let typingUsers = currentlyTypingUsersFiltered(currentUserId: currentUserId)
         if let user = typingUsers.first(where: { user in user.name != nil }), let name = chatUserNamer.name(forUser: user) {