mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-10 01:01:36 +00:00
remove appSettings from SpaceScreen
This commit is contained in:
@@ -351,7 +351,6 @@ class SpaceFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
spaceServiceProxy: spaceServiceProxy,
|
spaceServiceProxy: spaceServiceProxy,
|
||||||
selectedSpaceRoomPublisher: selectedSpaceRoomSubject.asCurrentValuePublisher(),
|
selectedSpaceRoomPublisher: selectedSpaceRoomSubject.asCurrentValuePublisher(),
|
||||||
userSession: flowParameters.userSession,
|
userSession: flowParameters.userSession,
|
||||||
appSettings: flowParameters.appSettings,
|
|
||||||
userIndicatorController: flowParameters.userIndicatorController)
|
userIndicatorController: flowParameters.userIndicatorController)
|
||||||
let coordinator = SpaceScreenCoordinator(parameters: parameters)
|
let coordinator = SpaceScreenCoordinator(parameters: parameters)
|
||||||
spaceScreenCoordinator = coordinator
|
spaceScreenCoordinator = coordinator
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ struct SpaceScreenCoordinatorParameters {
|
|||||||
let spaceServiceProxy: SpaceServiceProxyProtocol
|
let spaceServiceProxy: SpaceServiceProxyProtocol
|
||||||
let selectedSpaceRoomPublisher: CurrentValuePublisher<String?, Never>
|
let selectedSpaceRoomPublisher: CurrentValuePublisher<String?, Never>
|
||||||
let userSession: UserSessionProtocol
|
let userSession: UserSessionProtocol
|
||||||
let appSettings: AppSettings
|
|
||||||
let userIndicatorController: UserIndicatorControllerProtocol
|
let userIndicatorController: UserIndicatorControllerProtocol
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,7 +50,6 @@ final class SpaceScreenCoordinator: CoordinatorProtocol {
|
|||||||
spaceServiceProxy: parameters.spaceServiceProxy,
|
spaceServiceProxy: parameters.spaceServiceProxy,
|
||||||
selectedSpaceRoomPublisher: parameters.selectedSpaceRoomPublisher,
|
selectedSpaceRoomPublisher: parameters.selectedSpaceRoomPublisher,
|
||||||
userSession: parameters.userSession,
|
userSession: parameters.userSession,
|
||||||
appSettings: parameters.appSettings,
|
|
||||||
userIndicatorController: parameters.userIndicatorController)
|
userIndicatorController: parameters.userIndicatorController)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ class SpaceScreenViewModel: SpaceScreenViewModelType, SpaceScreenViewModelProtoc
|
|||||||
private let spaceServiceProxy: SpaceServiceProxyProtocol
|
private let spaceServiceProxy: SpaceServiceProxyProtocol
|
||||||
private let clientProxy: ClientProxyProtocol
|
private let clientProxy: ClientProxyProtocol
|
||||||
private let mediaProvider: MediaProviderProtocol
|
private let mediaProvider: MediaProviderProtocol
|
||||||
private let appSettings: AppSettings
|
|
||||||
private let userIndicatorController: UserIndicatorControllerProtocol
|
private let userIndicatorController: UserIndicatorControllerProtocol
|
||||||
|
|
||||||
private let actionsSubject: PassthroughSubject<SpaceScreenViewModelAction, Never> = .init()
|
private let actionsSubject: PassthroughSubject<SpaceScreenViewModelAction, Never> = .init()
|
||||||
@@ -28,14 +27,12 @@ class SpaceScreenViewModel: SpaceScreenViewModelType, SpaceScreenViewModelProtoc
|
|||||||
spaceServiceProxy: SpaceServiceProxyProtocol,
|
spaceServiceProxy: SpaceServiceProxyProtocol,
|
||||||
selectedSpaceRoomPublisher: CurrentValuePublisher<String?, Never>,
|
selectedSpaceRoomPublisher: CurrentValuePublisher<String?, Never>,
|
||||||
userSession: UserSessionProtocol,
|
userSession: UserSessionProtocol,
|
||||||
appSettings: AppSettings,
|
|
||||||
userIndicatorController: UserIndicatorControllerProtocol) {
|
userIndicatorController: UserIndicatorControllerProtocol) {
|
||||||
self.spaceRoomListProxy = spaceRoomListProxy
|
self.spaceRoomListProxy = spaceRoomListProxy
|
||||||
self.spaceServiceProxy = spaceServiceProxy
|
self.spaceServiceProxy = spaceServiceProxy
|
||||||
clientProxy = userSession.clientProxy
|
clientProxy = userSession.clientProxy
|
||||||
mediaProvider = userSession.mediaProvider
|
mediaProvider = userSession.mediaProvider
|
||||||
self.userIndicatorController = userIndicatorController
|
self.userIndicatorController = userIndicatorController
|
||||||
self.appSettings = appSettings
|
|
||||||
|
|
||||||
super.init(initialViewState: SpaceScreenViewState(space: spaceRoomListProxy.spaceServiceRoomPublisher.value,
|
super.init(initialViewState: SpaceScreenViewState(space: spaceRoomListProxy.spaceServiceRoomPublisher.value,
|
||||||
rooms: spaceRoomListProxy.spaceRoomsPublisher.value,
|
rooms: spaceRoomListProxy.spaceRoomsPublisher.value,
|
||||||
|
|||||||
@@ -229,7 +229,6 @@ struct SpaceScreen_Previews: PreviewProvider, TestablePreview {
|
|||||||
spaceServiceProxy: SpaceServiceProxyMock(.init()),
|
spaceServiceProxy: SpaceServiceProxyMock(.init()),
|
||||||
selectedSpaceRoomPublisher: .init(nil),
|
selectedSpaceRoomPublisher: .init(nil),
|
||||||
userSession: userSession,
|
userSession: userSession,
|
||||||
appSettings: AppSettings(),
|
|
||||||
userIndicatorController: UserIndicatorControllerMock())
|
userIndicatorController: UserIndicatorControllerMock())
|
||||||
|
|
||||||
if isManagingRooms {
|
if isManagingRooms {
|
||||||
|
|||||||
@@ -341,7 +341,6 @@ struct SpaceScreenViewModelTests {
|
|||||||
spaceServiceProxy: spaceServiceProxy,
|
spaceServiceProxy: spaceServiceProxy,
|
||||||
selectedSpaceRoomPublisher: .init(nil),
|
selectedSpaceRoomPublisher: .init(nil),
|
||||||
userSession: UserSessionMock(.init(clientProxy: clientProxy)),
|
userSession: UserSessionMock(.init(clientProxy: clientProxy)),
|
||||||
appSettings: AppSettings(),
|
|
||||||
userIndicatorController: UserIndicatorControllerMock())
|
userIndicatorController: UserIndicatorControllerMock())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user