Use UserIndicatorPresenter for onboarding personalisation.

Remove the service from the display name screen to match the avatar screen.
Add a loading indicator to PhotoPickerPresenter.
Fix layout issue when selecting non-square avatar image.
This commit is contained in:
Doug
2022-03-15 16:00:06 +00:00
parent 071a43cc90
commit ed9139a41a
20 changed files with 158 additions and 207 deletions
@@ -28,54 +28,43 @@ class OnboardingDisplayNameViewModel: OnboardingDisplayNameViewModelType, Onboar
// MARK: Private
private let onboardingDisplayNameService: OnboardingDisplayNameServiceProtocol
// MARK: Public
var completion: (() -> Void)?
var completion: ((OnboardingDisplayNameViewModelResult) -> Void)?
// MARK: - Setup
static func makeOnboardingDisplayNameViewModel(onboardingDisplayNameService: OnboardingDisplayNameServiceProtocol) -> OnboardingDisplayNameViewModelProtocol {
return OnboardingDisplayNameViewModel(onboardingDisplayNameService: onboardingDisplayNameService)
}
private init(onboardingDisplayNameService: OnboardingDisplayNameServiceProtocol) {
self.onboardingDisplayNameService = onboardingDisplayNameService
super.init(initialViewState: Self.defaultState(onboardingDisplayNameService: onboardingDisplayNameService))
}
private static func defaultState(onboardingDisplayNameService: OnboardingDisplayNameServiceProtocol) -> OnboardingDisplayNameViewState {
// Start with a blank display name to encourage the user not to just use the first part of their MXID.
return OnboardingDisplayNameViewState(bindings: OnboardingDisplayNameBindings(displayName: ""))
init(displayName: String = "") {
super.init(initialViewState: OnboardingDisplayNameViewState(bindings: OnboardingDisplayNameBindings(displayName: displayName)))
}
// MARK: - Public
override func process(viewAction: OnboardingDisplayNameViewAction) {
switch viewAction {
case .validateDisplayName:
validateDisplayName()
case .save:
setDisplayName()
completion?(.save(state.bindings.displayName))
case .skip:
completion?()
completion?(.skip)
}
}
func update(with error: Error) {
if let error = error as NSError? {
state.bindings.alertInfo = AlertInfo(error: error)
}
}
// MARK: - Private
private func setDisplayName() {
state.isWaiting = true
onboardingDisplayNameService.setDisplayName(context.displayName) { [weak self] result in
guard let self = self else { return }
self.state.isWaiting = false
switch result {
case .success(_):
self.completion?()
case .failure(let error):
self.state.bindings.alertInfo = AlertInfo(error: error as NSError)
}
private func validateDisplayName() {
if state.bindings.displayName.count > 256 {
guard state.validationErrorMessage == nil else { return }
state.validationErrorMessage = VectorL10n.onboardingDisplayNameMaxLength
} else if state.validationErrorMessage != nil {
state.validationErrorMessage = nil
}
}
}