Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4781_swiftui_template_example2

This commit is contained in:
David Langley
2021-09-23 12:31:33 +01:00
57 changed files with 2033 additions and 1885 deletions

View File

@@ -1,4 +1,4 @@
//
//
// Copyright 2021 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,7 +42,7 @@ class TemplateUserProfileViewModel: TemplateUserProfileViewModelType, TemplateUs
return TemplateUserProfileViewModel(templateUserProfileService: templateUserProfileService)
}
fileprivate init(templateUserProfileService: TemplateUserProfileServiceProtocol) {
private init(templateUserProfileService: TemplateUserProfileServiceProtocol) {
self.templateUserProfileService = templateUserProfileService
super.init(initialViewState: Self.defaultState(templateUserProfileService: templateUserProfileService))
setupPresenceObserving()
@@ -72,10 +72,8 @@ class TemplateUserProfileViewModel: TemplateUserProfileViewModelType, TemplateUs
cancel()
case .done:
done()
case .incrementCount:
dispatch(action: .incrementCount)
case .decrementCount:
dispatch(action: .decrementCount)
case .incrementCount, .decrementCount:
dispatch(action: .viewAction(viewAction))
}
}
@@ -83,10 +81,15 @@ class TemplateUserProfileViewModel: TemplateUserProfileViewModelType, TemplateUs
switch action {
case .updatePresence(let presence):
state.presence = presence
case .incrementCount:
state.count += 1
case .decrementCount:
state.count -= 1
case .viewAction(let viewAction):
switch viewAction {
case .incrementCount:
state.count += 1
case .decrementCount:
state.count -= 1
case .cancel, .done:
break
}
}
UILog.debug("[TemplateUserProfileViewModel] reducer with action \(action) produced state: \(state)")
}