Bundle ClientProxy & MediaProvider injections together in UserSession.

ElementX/Sources/Screens/RoomDirectorySearchScreen/RoomDirectorySearchScreenCoordinator.swift

@@ -9,8 +9,7 @@ import Combine
 import SwiftUI
 
 struct RoomDirectorySearchScreenCoordinatorParameters {
-    let clientProxy: ClientProxyProtocol
-    let mediaProvider: MediaProviderProtocol
+    let userSession: UserSessionProtocol
     let userIndicatorController: UserIndicatorControllerProtocol
 }
 
@@ -31,9 +30,8 @@ final class RoomDirectorySearchScreenCoordinator: CoordinatorProtocol {
     }
     
     init(parameters: RoomDirectorySearchScreenCoordinatorParameters) {
-        viewModel = RoomDirectorySearchScreenViewModel(clientProxy: parameters.clientProxy,
-                                                       userIndicatorController: parameters.userIndicatorController,
-                                                       mediaProvider: parameters.mediaProvider)
+        viewModel = RoomDirectorySearchScreenViewModel(userSession: parameters.userSession,
+                                                       userIndicatorController: parameters.userIndicatorController)
     }
     
     func start() {

ElementX/Sources/Screens/RoomDirectorySearchScreen/RoomDirectorySearchScreenViewModel.swift

@@ -19,13 +19,12 @@ class RoomDirectorySearchScreenViewModel: RoomDirectorySearchScreenViewModelType
         actionsSubject.eraseToAnyPublisher()
     }
         
-    init(clientProxy: ClientProxyProtocol,
-         userIndicatorController: UserIndicatorControllerProtocol,
-         mediaProvider: MediaProviderProtocol) {
-        roomDirectorySearchProxy = clientProxy.roomDirectorySearchProxy()
+    init(userSession: UserSessionProtocol,
+         userIndicatorController: UserIndicatorControllerProtocol) {
+        roomDirectorySearchProxy = userSession.clientProxy.roomDirectorySearchProxy()
         self.userIndicatorController = userIndicatorController
         
-        super.init(initialViewState: RoomDirectorySearchScreenViewState(), mediaProvider: mediaProvider)
+        super.init(initialViewState: RoomDirectorySearchScreenViewState(), mediaProvider: userSession.mediaProvider)
         
         state.rooms = roomDirectorySearchProxy.resultsPublisher.value
         

ElementX/Sources/Screens/RoomDirectorySearchScreen/View/RoomDirectorySearchScreen.swift

@@ -91,9 +91,8 @@ struct RoomDirectorySearchScreen_Previews: PreviewProvider, TestablePreview {
         
         let clientProxy = ClientProxyMock(.init(roomDirectorySearchProxy: roomDirectorySearchProxy))
         
-        return RoomDirectorySearchScreenViewModel(clientProxy: clientProxy,
-                                                  userIndicatorController: UserIndicatorControllerMock(),
-                                                  mediaProvider: MediaProviderMock(configuration: .init()))
+        return RoomDirectorySearchScreenViewModel(userSession: UserSessionMock(.init(clientProxy: clientProxy)),
+                                                  userIndicatorController: UserIndicatorControllerMock())
     }()
     
     static var previews: some View {