Fix room avatars on timeline (#213)

ElementX/Sources/AppCoordinator.swift

@@ -369,8 +369,9 @@ class AppCoordinator: Coordinator {
                                                         roomProxy: roomProxy)
 
         let parameters = RoomScreenCoordinatorParameters(timelineController: timelineController,
+                                                         mediaProvider: userSession.mediaProvider,
                                                          roomName: roomProxy.displayName ?? roomProxy.name,
-                                                         roomAvatar: userSession.mediaProvider.imageFromURLString(roomProxy.avatarURL, avatarSize: .room(on: .timeline)))
+                                                         roomAvatarUrl: roomProxy.avatarURL)
         let coordinator = RoomScreenCoordinator(parameters: parameters)
 
         add(childCoordinator: coordinator)

ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift

@@ -18,8 +18,9 @@ import SwiftUI
 
 struct RoomScreenCoordinatorParameters {
     let timelineController: RoomTimelineControllerProtocol
+    let mediaProvider: MediaProviderProtocol
     let roomName: String?
-    let roomAvatar: UIImage?
+    let roomAvatarUrl: String?
 }
 
 final class RoomScreenCoordinator: Coordinator, Presentable {
@@ -43,8 +44,9 @@ final class RoomScreenCoordinator: Coordinator, Presentable {
         
         let viewModel = RoomScreenViewModel(timelineController: parameters.timelineController,
                                             timelineViewFactory: RoomTimelineViewFactory(),
+                                            mediaProvider: parameters.mediaProvider,
                                             roomName: parameters.roomName,
-                                            roomAvatar: parameters.roomAvatar)
+                                            roomAvatarUrl: parameters.roomAvatarUrl)
         
         let view = RoomScreen(context: viewModel.context)
         roomScreenViewModel = viewModel

ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift

@@ -25,20 +25,23 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
 
     private let timelineController: RoomTimelineControllerProtocol
     private let timelineViewFactory: RoomTimelineViewFactoryProtocol
+    private let mediaProvider: MediaProviderProtocol
 
     // MARK: - Setup
     
     init(timelineController: RoomTimelineControllerProtocol,
          timelineViewFactory: RoomTimelineViewFactoryProtocol,
+         mediaProvider: MediaProviderProtocol,
          roomName: String?,
-         roomAvatar: UIImage? = nil,
+         roomAvatarUrl: String? = nil,
          roomEncryptionBadge: UIImage? = nil) {
         self.timelineController = timelineController
         self.timelineViewFactory = timelineViewFactory
+        self.mediaProvider = mediaProvider
         
         super.init(initialViewState: RoomScreenViewState(roomId: timelineController.roomId,
                                                          roomTitle: roomName ?? "Unknown room 💥",
-                                                         roomAvatar: roomAvatar,
+                                                         roomAvatar: nil,
                                                          roomEncryptionBadge: roomEncryptionBadge,
                                                          bindings: .init(composerText: "", composerFocused: false)))
         
@@ -64,6 +67,15 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
         state.contextMenuBuilder = buildContexMenuForItemId(_:)
         
         buildTimelineViews()
+
+        if let roomAvatarUrl = roomAvatarUrl {
+            Task {
+                if case let .success(avatar) = await mediaProvider.loadImageFromURLString(roomAvatarUrl,
+                                                                                          avatarSize: .room(on: .timeline)) {
+                    state.roomAvatar = avatar
+                }
+            }
+        }
     }
     
     // MARK: - Public

ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift

@@ -72,8 +72,9 @@ struct RoomHeaderView_Previews: PreviewProvider {
     static var bodyPlain: some View {
         let viewModel = RoomScreenViewModel(timelineController: MockRoomTimelineController(),
                                             timelineViewFactory: RoomTimelineViewFactory(),
+                                            mediaProvider: MockMediaProvider(),
                                             roomName: "Some Room name",
-                                            roomAvatar: Asset.Images.appLogo.image)
+                                            roomAvatarUrl: "mock_url")
 
         RoomHeaderView(context: viewModel.context)
             .previewLayout(.sizeThatFits)
@@ -84,8 +85,9 @@ struct RoomHeaderView_Previews: PreviewProvider {
     static var bodyEncrypted: some View {
         let viewModel = RoomScreenViewModel(timelineController: MockRoomTimelineController(),
                                             timelineViewFactory: RoomTimelineViewFactory(),
+                                            mediaProvider: MockMediaProvider(),
                                             roomName: "Some Room name",
-                                            roomAvatar: nil,
+                                            roomAvatarUrl: nil,
                                             roomEncryptionBadge: Asset.Images.encryptionTrusted.image)
 
         RoomHeaderView(context: viewModel.context)

ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift

@@ -64,6 +64,7 @@ struct RoomScreen_Previews: PreviewProvider {
     static var body: some View {
         let viewModel = RoomScreenViewModel(timelineController: MockRoomTimelineController(),
                                             timelineViewFactory: RoomTimelineViewFactory(),
+                                            mediaProvider: MockMediaProvider(),
                                             roomName: "Preview room")
         
         NavigationView {

ElementX/Sources/Screens/RoomScreen/View/TimelineItemList.swift

@@ -172,6 +172,7 @@ struct TimelineItemList_Previews: PreviewProvider {
     static var body: some View {
         let viewModel = RoomScreenViewModel(timelineController: MockRoomTimelineController(),
                                             timelineViewFactory: RoomTimelineViewFactory(),
+                                            mediaProvider: MockMediaProvider(),
                                             roomName: nil)
         
         TimelineItemList(bottomVisiblePublisher: PassthroughSubject(), scrollToBottomPublisher: PassthroughSubject())

ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift

@@ -59,6 +59,7 @@ struct TimelineView_Previews: PreviewProvider {
     static var body: some View {
         let viewModel = RoomScreenViewModel(timelineController: MockRoomTimelineController(),
                                             timelineViewFactory: RoomTimelineViewFactory(),
+                                            mediaProvider: MockMediaProvider(),
                                             roomName: nil)
         
         TimelineView()

ElementX/Sources/Services/Media/MockMediaProvider.swift

@@ -27,11 +27,19 @@ struct MockMediaProvider: MediaProviderProtocol {
     }
     
     func imageFromURLString(_ urlString: String?, avatarSize: AvatarSize?) -> UIImage? {
-        if urlString != nil {
+        guard urlString != nil else {
-            return UIImage(systemName: "photo")
+            return nil
         }
-        
+
-        return nil
+        if let avatarSize = avatarSize {
+            switch avatarSize {
+            case .room:
+                return Asset.Images.appLogo.image
+            default:
+                return UIImage(systemName: "photo")
+            }
+        }
+        return UIImage(systemName: "photo")
     }
         
     func loadImageFromURLString(_ urlString: String, avatarSize: AvatarSize?) async -> Result<UIImage, MediaProviderError> {

ElementX/Sources/UITestsAppCoordinator.swift

@@ -116,13 +116,15 @@ class MockScreen: Identifiable {
             return SplashScreenCoordinator()
         case .roomPlainNoAvatar:
             let parameters = RoomScreenCoordinatorParameters(timelineController: MockRoomTimelineController(),
+                                                             mediaProvider: MockMediaProvider(),
                                                              roomName: "Some room name",
-                                                             roomAvatar: nil)
+                                                             roomAvatarUrl: nil)
             return RoomScreenCoordinator(parameters: parameters)
         case .roomEncryptedWithAvatar:
             let parameters = RoomScreenCoordinatorParameters(timelineController: MockRoomTimelineController(),
+                                                             mediaProvider: MockMediaProvider(),
                                                              roomName: "Some room name",
-                                                             roomAvatar: Asset.Images.appLogo.image)
+                                                             roomAvatarUrl: "mock_url")
             return RoomScreenCoordinator(parameters: parameters)
         case .sessionVerification:
             let parameters = SessionVerificationCoordinatorParameters(sessionVerificationControllerProxy: MockSessionVerificationControllerProxy())