mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-23 01:52:44 +02:00
Removed deprecated StateStoreViewModel dispatching and reducing
This commit is contained in:
committed by
Stefan Ceriu
parent
fc2fdc8ae7
commit
1df0be344d
+25
-34
@@ -19,7 +19,7 @@
|
||||
import Combine
|
||||
import SwiftUI
|
||||
|
||||
typealias SpaceCreationSettingsViewModelType = StateStoreViewModel<SpaceCreationSettingsViewState, SpaceCreationSettingsStateAction, SpaceCreationSettingsViewAction>
|
||||
typealias SpaceCreationSettingsViewModelType = StateStoreViewModel<SpaceCreationSettingsViewState, SpaceCreationSettingsViewAction>
|
||||
|
||||
class SpaceCreationSettingsViewModel: SpaceCreationSettingsViewModelType, SpaceCreationSettingsViewModelProtocol {
|
||||
// MARK: - Properties
|
||||
@@ -44,20 +44,27 @@ class SpaceCreationSettingsViewModel: SpaceCreationSettingsViewModelType, SpaceC
|
||||
}
|
||||
|
||||
private func setupServiceObserving() {
|
||||
let defaultAddressUpdatePublisher = spaceCreationSettingsService.defaultAddressSubject
|
||||
.map(SpaceCreationSettingsStateAction.updateRoomDefaultAddress)
|
||||
.eraseToAnyPublisher()
|
||||
dispatch(actionPublisher: defaultAddressUpdatePublisher)
|
||||
spaceCreationSettingsService
|
||||
.defaultAddressSubject
|
||||
.sink(receiveValue: { [weak self] address in
|
||||
self?.state.defaultAddress = address
|
||||
})
|
||||
.store(in: &cancellables)
|
||||
|
||||
let addressValidationUpdatePublisher = spaceCreationSettingsService.addressValidationSubject
|
||||
.map(SpaceCreationSettingsStateAction.updateAddressValidationStatus)
|
||||
.eraseToAnyPublisher()
|
||||
dispatch(actionPublisher: addressValidationUpdatePublisher)
|
||||
spaceCreationSettingsService
|
||||
.addressValidationSubject
|
||||
.sink(receiveValue: { [weak self] status in
|
||||
self?.state.addressMessage = status.message
|
||||
self?.state.isAddressValid = status.isValid
|
||||
})
|
||||
.store(in: &cancellables)
|
||||
|
||||
let avatarUpdatePublisher = spaceCreationSettingsService.avatarViewDataSubject
|
||||
.map(SpaceCreationSettingsStateAction.updateAvatar)
|
||||
.eraseToAnyPublisher()
|
||||
dispatch(actionPublisher: avatarUpdatePublisher)
|
||||
spaceCreationSettingsService
|
||||
.avatarViewDataSubject
|
||||
.sink(receiveValue: { [weak self] avatar in
|
||||
self?.state.avatar = avatar
|
||||
})
|
||||
.store(in: &cancellables)
|
||||
}
|
||||
|
||||
private static func defaultState(creationParameters: SpaceCreationParameters, validationStatus: SpaceCreationSettingsAddressValidationStatus) -> SpaceCreationSettingsViewState {
|
||||
@@ -84,7 +91,7 @@ class SpaceCreationSettingsViewModel: SpaceCreationSettingsViewModelType, SpaceC
|
||||
|
||||
func updateAvatarImage(with image: UIImage?) {
|
||||
creationParameters.userSelectedAvatar = image
|
||||
dispatch(action: .updateAvatarImage(image))
|
||||
state.avatarImage = image
|
||||
}
|
||||
|
||||
override func process(viewAction: SpaceCreationSettingsViewAction) {
|
||||
@@ -101,7 +108,7 @@ class SpaceCreationSettingsViewModel: SpaceCreationSettingsViewModelType, SpaceC
|
||||
spaceCreationSettingsService.roomName = newValue
|
||||
creationParameters.address = spaceCreationSettingsService.defaultAddressSubject.value
|
||||
creationParameters.name = newValue
|
||||
dispatch(action: .updateRoomNameError(newValue.isEmpty ? VectorL10n.spacesCreationEmptyRoomNameError : nil))
|
||||
state.roomNameError = newValue.isEmpty ? VectorL10n.spacesCreationEmptyRoomNameError : nil
|
||||
case .addressChanged(let newValue):
|
||||
spaceCreationSettingsService.userDefinedAddress = newValue
|
||||
creationParameters.userDefinedAddress = newValue
|
||||
@@ -109,28 +116,12 @@ class SpaceCreationSettingsViewModel: SpaceCreationSettingsViewModelType, SpaceC
|
||||
creationParameters.topic = newValue
|
||||
}
|
||||
}
|
||||
|
||||
override class func reducer(state: inout SpaceCreationSettingsViewState, action: SpaceCreationSettingsStateAction) {
|
||||
switch action {
|
||||
case .updateRoomNameError(let error):
|
||||
state.roomNameError = error
|
||||
case .updateRoomDefaultAddress(let defaultAddress):
|
||||
state.defaultAddress = defaultAddress
|
||||
case .updateAddressValidationStatus(let validationStatus):
|
||||
state.addressMessage = validationStatus.message
|
||||
state.isAddressValid = validationStatus.isValid
|
||||
case .updateAvatar(let avatar):
|
||||
state.avatar = avatar
|
||||
case .updateAvatarImage(let image):
|
||||
state.avatarImage = image
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func done() {
|
||||
guard !context.roomName.isEmpty else {
|
||||
dispatch(action: .updateRoomNameError(VectorL10n.spacesCreationEmptyRoomNameError))
|
||||
state.roomNameError = VectorL10n.spacesCreationEmptyRoomNameError
|
||||
return
|
||||
}
|
||||
|
||||
@@ -143,7 +134,7 @@ class SpaceCreationSettingsViewModel: SpaceCreationSettingsViewModelType, SpaceC
|
||||
creationParameters.userDefinedAddress = context.address
|
||||
creationParameters.address = spaceCreationSettingsService.defaultAddressSubject.value
|
||||
|
||||
dispatch(action: .updateRoomNameError(nil))
|
||||
state.roomNameError = nil
|
||||
callback?(.done)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user