ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 10:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove create room parameters by reference and use coordinator flow instead

Browse Source
This commit is contained in:
Flavio Alescio
2023-05-12 18:38:19 +02:00
committed by Flescio
parent 372a2d5360
commit 6723da16c6
30 changed files with 227 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/CreateRoom/CreateRoomCoordinator.swift
+8 -2
View File
@@ -19,12 +19,14 @@ import SwiftUI
struct CreateRoomCoordinatorParameters {
let userSession: UserSessionProtocol
let createRoomParameters: CreateRoomVolatileParameters
let createRoomParameters: CurrentValuePublisher<CreateRoomFlowParameters, Never>
let selectedUsers: CurrentValuePublisher<[UserProfile], Never>
}
enum CreateRoomCoordinatorAction {
case createRoom
case deselectUser(UserProfile)
case updateDetails(CreateRoomFlowParameters)
}
final class CreateRoomCoordinator: CoordinatorProtocol {
@@ -39,7 +41,9 @@ final class CreateRoomCoordinator: CoordinatorProtocol {
init(parameters: CreateRoomCoordinatorParameters) {
self.parameters = parameters
viewModel = CreateRoomViewModel(userSession: parameters.userSession, createRoomParameters: parameters.createRoomParameters)
viewModel = CreateRoomViewModel(userSession: parameters.userSession,
createRoomParameters: parameters.createRoomParameters,
selectedUsers: parameters.selectedUsers)
}
func start() {
@@ -50,6 +54,8 @@ final class CreateRoomCoordinator: CoordinatorProtocol {
self.actionsSubject.send(.deselectUser(user))
case .createRoom:
self.actionsSubject.send(.createRoom)
case .updateDetails(let details):
self.actionsSubject.send(.updateDetails(details))
}
}
.store(in: &cancellables)
ElementX/Sources/Screens/CreateRoom/CreateRoomModels.swift
+1
View File
@@ -19,6 +19,7 @@ import Foundation
enum CreateRoomViewModelAction {
case createRoom
case deselectUser(UserProfile)
case updateDetails(CreateRoomFlowParameters)
}
struct CreateRoomViewState: BindableState {
ElementX/Sources/Screens/CreateRoom/CreateRoomViewModel.swift
+21 -9
View File
@@ -21,15 +21,25 @@ typealias CreateRoomViewModelType = StateStoreViewModel<CreateRoomViewState, Cre
class CreateRoomViewModel: CreateRoomViewModelType, CreateRoomViewModelProtocol {
private var actionsSubject: PassthroughSubject<CreateRoomViewModelAction, Never> = .init()
private let createRoomParameters: CreateRoomVolatileParameters
private var createRoomParameters: CreateRoomFlowParameters
var actions: AnyPublisher<CreateRoomViewModelAction, Never> {
actionsSubject.eraseToAnyPublisher()
}
init(userSession: UserSessionProtocol,
createRoomParameters: CurrentValuePublisher<CreateRoomFlowParameters, Never>,
selectedUsers: CurrentValuePublisher<[UserProfile], Never>) {
let parameters = createRoomParameters.value
self.createRoomParameters = parameters
let bindings = CreateRoomViewStateBindings(roomName: parameters.name, roomTopic: parameters.topic, isRoomPrivate: parameters.isRoomPrivate)
init(userSession: UserSessionProtocol, createRoomParameters: CreateRoomVolatileParameters) {
let bindings = CreateRoomViewStateBindings(roomName: createRoomParameters.name, roomTopic: createRoomParameters.topic, isRoomPrivate: createRoomParameters.isRoomPrivate)
self.createRoomParameters = createRoomParameters
super.init(initialViewState: CreateRoomViewState(selectedUsers: createRoomParameters.selectedUsers, bindings: bindings), imageProvider: userSession.mediaProvider)
super.init(initialViewState: CreateRoomViewState(selectedUsers: selectedUsers.value, bindings: bindings), imageProvider: userSession.mediaProvider)
selectedUsers
.sink { [weak self] users in
self?.state.selectedUsers = users
}
.store(in: &cancellables)
setupBindings()
}
@@ -41,7 +51,6 @@ class CreateRoomViewModel: CreateRoomViewModelType, CreateRoomViewModelProtocol
case .createRoom:
actionsSubject.send(.createRoom)
case .deselectUser(let user):
state.selectedUsers.removeAll(where: { $0.userID == user.userID })
actionsSubject.send(.deselectUser(user))
}
}
@@ -51,10 +60,13 @@ class CreateRoomViewModel: CreateRoomViewModelType, CreateRoomViewModelProtocol
private func setupBindings() {
context.$viewState
.map(\.bindings)
.throttle(for: 0.5, scheduler: DispatchQueue.main, latest: true)
.sink { [weak self] bindings in
self?.createRoomParameters.name = bindings.roomName
self?.createRoomParameters.topic = bindings.roomTopic
self?.createRoomParameters.isRoomPrivate = bindings.isRoomPrivate
guard let self else { return }
createRoomParameters.name = bindings.roomName
createRoomParameters.topic = bindings.roomTopic
createRoomParameters.isRoomPrivate = bindings.isRoomPrivate
actionsSubject.send(.updateDetails(createRoomParameters))
}
.store(in: &cancellables)
}
ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
+6 -5
View File
@@ -160,16 +160,17 @@ struct CreateRoom_Previews: PreviewProvider {
static let viewModel = {
let userSession = MockUserSession(clientProxy: MockClientProxy(userID: "@userid:example.com"),
mediaProvider: MockMediaProvider())
let parameters = CreateRoomVolatileParameters()
parameters.selectedUsers = [.mockAlice, .mockBob, .mockCharlie]
return CreateRoomViewModel(userSession: userSession, createRoomParameters: parameters)
let parameters = CreateRoomFlowParameters()
let selectedUsers: [UserProfile] = [.mockAlice, .mockBob, .mockCharlie]
return CreateRoomViewModel(userSession: userSession, createRoomParameters: .init(parameters), selectedUsers: .init(selectedUsers))
}()
static let emtpyViewModel = {
let userSession = MockUserSession(clientProxy: MockClientProxy(userID: "@userid:example.com"),
mediaProvider: MockMediaProvider())
let parameters = CreateRoomVolatileParameters()
return CreateRoomViewModel(userSession: userSession, createRoomParameters: parameters)
let parameters = CreateRoomFlowParameters()
return CreateRoomViewModel(userSession: userSession, createRoomParameters: .init(parameters), selectedUsers: .init([]))
}()
static var previews: some View {