Use the room heroes when computing a DM avatar. (#2900)

* Use room heroes for DM avatar content ID.

* Use RoomAvatar.heroes for the DM Details stack.

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

@@ -15,19 +15,18 @@
 //
 
 import Combine
-import Foundation
+import Compound
 import SwiftUI
 
 struct RoomHeaderView: View {
-    let roomID: String
     let roomName: String
-    let avatarURL: URL?
+    let roomAvatar: RoomAvatar
     
     let imageProvider: ImageProviderProtocol?
     
     var body: some View {
         HStack(spacing: 12) {
-            roomAvatar
+            avatarImage
                 .accessibilityHidden(true)
             Text(roomName)
                 .font(.compound.bodyLGSemibold)
@@ -37,28 +36,28 @@ struct RoomHeaderView: View {
         .frame(maxWidth: .infinity, alignment: .leading)
     }
     
-    private var roomAvatar: some View {
-        LoadableAvatarImage(url: avatarURL,
-                            name: roomName,
-                            contentID: roomID,
-                            avatarSize: .room(on: .timeline),
-                            imageProvider: imageProvider)
+    private var avatarImage: some View {
+        RoomAvatarImage(avatar: roomAvatar,
+                        avatarSize: .room(on: .timeline),
+                        imageProvider: imageProvider)
             .accessibilityIdentifier(A11yIdentifiers.roomScreen.avatar)
     }
 }
 
 struct RoomHeaderView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        RoomHeaderView(roomID: "1",
-                       roomName: "Some Room name",
-                       avatarURL: URL.picturesDirectory,
+        RoomHeaderView(roomName: "Some Room name",
+                       roomAvatar: .room(id: "1",
+                                         name: "Some Room Name",
+                                         avatarURL: URL.picturesDirectory),
                        imageProvider: MockMediaProvider())
             .previewLayout(.sizeThatFits)
             .padding()
         
-        RoomHeaderView(roomID: "1",
-                       roomName: "Some Room name",
-                       avatarURL: nil,
+        RoomHeaderView(roomName: "Some Room name",
+                       roomAvatar: .room(id: "1",
+                                         name: "Some Room Name",
+                                         avatarURL: nil),
                        imageProvider: MockMediaProvider())
             .previewLayout(.sizeThatFits)
             .padding()

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

@@ -137,9 +137,8 @@ struct RoomScreen: View {
         // .principal + .primaryAction works better than .navigation leading + trailing
         // as the latter disables interaction in the action button for rooms with long names
         ToolbarItem(placement: .principal) {
-            RoomHeaderView(roomID: context.viewState.roomID,
-                           roomName: context.viewState.roomTitle,
-                           avatarURL: context.viewState.roomAvatarURL,
+            RoomHeaderView(roomName: context.viewState.roomTitle,
+                           roomAvatar: context.viewState.roomAvatar,
                            imageProvider: context.imageProvider)
                 // Using a button stops it from getting truncated in the navigation bar
                 .onTapGesture {
@@ -184,7 +183,9 @@ struct RoomScreen: View {
 // MARK: - Previews
 
 struct RoomScreen_Previews: PreviewProvider, TestablePreview {
-    static let viewModel = RoomScreenViewModel(roomProxy: RoomProxyMock(.init(name: "Preview room", hasOngoingCall: true)),
+    static let viewModel = RoomScreenViewModel(roomProxy: RoomProxyMock(.init(id: "stable_id",
+                                                                              name: "Preview room",
+                                                                              hasOngoingCall: true)),
                                                timelineController: MockRoomTimelineController(),
                                                mediaProvider: MockMediaProvider(),
                                                mediaPlayerProvider: MediaPlayerProviderMock(),

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

@@ -84,7 +84,8 @@ struct TimelineView: UIViewControllerRepresentable {
 // MARK: - Previews
 
 struct TimelineView_Previews: PreviewProvider, TestablePreview {
-    static let viewModel = RoomScreenViewModel(roomProxy: RoomProxyMock(.init(name: "Preview room")),
+    static let viewModel = RoomScreenViewModel(roomProxy: RoomProxyMock(.init(id: "stable_id",
+                                                                              name: "Preview room")),
                                                timelineController: MockRoomTimelineController(),
                                                mediaProvider: MockMediaProvider(),
                                                mediaPlayerProvider: MediaPlayerProviderMock(),