Made StateStoreViewModel state mutable and removed the reducer for all the features using it.

RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift

@@ -35,7 +35,7 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
     private let selectedAnswerIdentifiersSubject = PassthroughSubject<[String], Never>()
     
     private var pollAggregator: PollAggregator
-    private var viewModel: TimelinePollViewModel!
+    private var viewModel: TimelinePollViewModelProtocol!
     private var cancellables = Set<AnyCancellable>()
     
     // MARK: Public
@@ -53,7 +53,7 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
         pollAggregator.delegate = self
         
         viewModel = TimelinePollViewModel(timelinePollDetails: buildTimelinePollFrom(pollAggregator.poll))
-        viewModel.callback = { [weak self] result in
+        viewModel.completion = { [weak self] result in
             guard let self = self else { return }
             
             switch result {
@@ -76,7 +76,7 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
                     
                     MXLog.error("[TimelinePollCoordinator]] Failed submitting response with error \(String(describing: error))")
                     
-                    self.viewModel.dispatch(action: .showAnsweringFailure)
+                    self.viewModel.showAnsweringFailure()
                 }
             }
             .store(in: &cancellables)
@@ -102,14 +102,14 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
     
     func endPoll() {
         parameters.room.sendPollEnd(for: parameters.pollStartEvent, threadId: nil, localEcho: nil, success: nil) { [weak self] error in
-            self?.viewModel.dispatch(action: .showClosingFailure)
+            self?.viewModel.showClosingFailure()
         }
     }
     
     // MARK: - PollAggregatorDelegate
     
     func pollAggregatorDidUpdateData(_ aggregator: PollAggregator) {
-        viewModel.dispatch(action: .updateWithPoll(buildTimelinePollFrom(aggregator.poll)))
+        viewModel.updateWithPollDetails(buildTimelinePollFrom(aggregator.poll))
     }
     
     func pollAggregatorDidStartLoading(_ aggregator: PollAggregator) {

RiotSwiftUI/Modules/Room/TimelinePoll/Test/Unit/TimelinePollViewModelTests.swift

@@ -85,7 +85,7 @@ class TimelinePollViewModelTests: XCTestCase {
     }
 
     func testClosedSelection() {
-        context.viewState.poll.closed = true
+        viewModel.state.poll.closed = true
 
         context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
         context.send(viewAction: .selectAnswerOptionWithIdentifier("3"))
@@ -96,7 +96,7 @@ class TimelinePollViewModelTests: XCTestCase {
     }
 
     func testSingleSelectionOnMax2Allowed() {
-        context.viewState.poll.maxAllowedSelections = 2
+        viewModel.state.poll.maxAllowedSelections = 2
         
         context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
         
@@ -106,7 +106,7 @@ class TimelinePollViewModelTests: XCTestCase {
     }
     
     func testSingleReselectionOnMax2Allowed() {
-        context.viewState.poll.maxAllowedSelections = 2
+        viewModel.state.poll.maxAllowedSelections = 2
         
         context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
         context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
@@ -117,7 +117,7 @@ class TimelinePollViewModelTests: XCTestCase {
     }
     
     func testMultipleSelectionOnMax2Allowed() {
-        context.viewState.poll.maxAllowedSelections = 2
+        viewModel.state.poll.maxAllowedSelections = 2
         
         context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
         context.send(viewAction: .selectAnswerOptionWithIdentifier("3"))

RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollModels.swift

@@ -19,13 +19,6 @@ import SwiftUI
 
 typealias TimelinePollViewModelCallback = ((TimelinePollViewModelResult) -> Void)
 
-enum TimelinePollStateAction {
-    case viewAction(TimelinePollViewAction, TimelinePollViewModelCallback?)
-    case updateWithPoll(TimelinePollDetails)
-    case showAnsweringFailure
-    case showClosingFailure
-}
-
 enum TimelinePollViewAction {
     case selectAnswerOptionWithIdentifier(String)
 }
@@ -39,7 +32,7 @@ enum TimelinePollType {
     case undisclosed
 }
 
-class TimelinePollAnswerOption: Identifiable {
+struct TimelinePollAnswerOption: Identifiable {
     var id: String
     var text: String
     var count: UInt
@@ -55,7 +48,15 @@ class TimelinePollAnswerOption: Identifiable {
     }
 }
 
-class TimelinePollDetails {
+extension MutableCollection where Element == TimelinePollAnswerOption {
+    mutating func updateEach(_ update: (inout Element) -> Void) {
+        for index in indices {
+            update(&self[index])
+        }
+    }
+}
+
+struct TimelinePollDetails {
     var question: String
     var answerOptions: [TimelinePollAnswerOption]
     var closed: Bool

RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModel.swift

@@ -19,10 +19,10 @@ import Combine
 
 @available(iOS 14, *)
 typealias TimelinePollViewModelType = StateStoreViewModel<TimelinePollViewState,
-                                                          TimelinePollStateAction,
+                                                          Never,
                                                           TimelinePollViewAction>
 @available(iOS 14, *)
-class TimelinePollViewModel: TimelinePollViewModelType {
+class TimelinePollViewModel: TimelinePollViewModelType, TimelinePollViewModelProtocol {
     
     // MARK: - Properties
 
@@ -30,7 +30,7 @@ class TimelinePollViewModel: TimelinePollViewModelType {
     
     // MARK: Public
     
-    var callback: TimelinePollViewModelCallback?
+    var completion: TimelinePollViewModelCallback?
     
     // MARK: - Setup
     
@@ -42,49 +42,47 @@ class TimelinePollViewModel: TimelinePollViewModelType {
     
     override func process(viewAction: TimelinePollViewAction) {
         switch viewAction {
-        case .selectAnswerOptionWithIdentifier(_):
-            dispatch(action: .viewAction(viewAction, callback))
-        }
-    }
-    
-    override class func reducer(state: inout TimelinePollViewState, action: TimelinePollStateAction) {
-        switch action {
-        case .viewAction(let viewAction, let callback):
-            switch viewAction {
-            
-            // Update local state. An update will be pushed from the coordinator once sent.
-            case .selectAnswerOptionWithIdentifier(let identifier):
-                guard !state.poll.closed else {
-                    return
-                }
-                
-                if (state.poll.maxAllowedSelections == 1) {
-                    updateSingleSelectPollLocalState(&state, selectedAnswerIdentifier: identifier, callback: callback)
-                } else {
-                    updateMultiSelectPollLocalState(&state, selectedAnswerIdentifier: identifier, callback: callback)
-                }
+        
+        // Update local state. An update will be pushed from the coordinator once sent.
+        case .selectAnswerOptionWithIdentifier(let identifier):
+            guard !state.poll.closed else {
+                return
+            }
+            
+            if (state.poll.maxAllowedSelections == 1) {
+                updateSingleSelectPollLocalState(selectedAnswerIdentifier: identifier, callback: completion)
+            } else {
+                updateMultiSelectPollLocalState(&state, selectedAnswerIdentifier: identifier, callback: completion)
             }
-        case .updateWithPoll(let poll):
-            state.poll = poll
-        case .showAnsweringFailure:
-            state.bindings.alertInfo = TimelinePollErrorAlertInfo(id: .failedSubmittingAnswer,
-                                                                  title: VectorL10n.pollTimelineVoteNotRegisteredTitle,
-                                                                  subtitle: VectorL10n.pollTimelineVoteNotRegisteredSubtitle)
-        case .showClosingFailure:
-            state.bindings.alertInfo = TimelinePollErrorAlertInfo(id: .failedClosingPoll,
-                                                                  title: VectorL10n.pollTimelineNotClosedTitle,
-                                                                  subtitle: VectorL10n.pollTimelineNotClosedSubtitle)
         }
     }
     
+    // MARK: - TimelinePollViewModelProtocol
+    
+    func updateWithPollDetails(_ pollDetails: TimelinePollDetails) {
+        state.poll = pollDetails
+    }
+    
+    func showAnsweringFailure() {
+        state.bindings.alertInfo = TimelinePollErrorAlertInfo(id: .failedSubmittingAnswer,
+                                                              title: VectorL10n.pollTimelineVoteNotRegisteredTitle,
+                                                              subtitle: VectorL10n.pollTimelineVoteNotRegisteredSubtitle)
+    }
+    
+    func showClosingFailure() {
+        state.bindings.alertInfo = TimelinePollErrorAlertInfo(id: .failedClosingPoll,
+                                                              title: VectorL10n.pollTimelineNotClosedTitle,
+                                                              subtitle: VectorL10n.pollTimelineNotClosedSubtitle)
+    }
+        
     // MARK: - Private
     
-    static func updateSingleSelectPollLocalState(_ state: inout TimelinePollViewState, selectedAnswerIdentifier: String, callback: TimelinePollViewModelCallback?) {
-        for answerOption in state.poll.answerOptions {
+    func updateSingleSelectPollLocalState(selectedAnswerIdentifier: String, callback: TimelinePollViewModelCallback?) {
+        state.poll.answerOptions.updateEach { answerOption in
             if answerOption.selected {
                 answerOption.selected = false
                 
-                if(answerOption.count > 0) {
+                if(state.poll.answerOptions.count > 0) {
                     answerOption.count = answerOption.count - 1
                     state.poll.totalAnswerCount -= 1
                 }
@@ -100,7 +98,7 @@ class TimelinePollViewModel: TimelinePollViewModelType {
         informCoordinatorOfSelectionUpdate(state: state, callback: callback)
     }
     
-    static func updateMultiSelectPollLocalState(_ state: inout TimelinePollViewState, selectedAnswerIdentifier: String, callback: TimelinePollViewModelCallback?) {
+    func updateMultiSelectPollLocalState(_ state: inout TimelinePollViewState, selectedAnswerIdentifier: String, callback: TimelinePollViewModelCallback?) {
         let selectedAnswerOptions = state.poll.answerOptions.filter { $0.selected == true }
         
         let isDeselecting = selectedAnswerOptions.filter { $0.id == selectedAnswerIdentifier }.count > 0
@@ -109,7 +107,11 @@ class TimelinePollViewModel: TimelinePollViewModelType {
             return
         }
         
-        for answerOption in state.poll.answerOptions where answerOption.id == selectedAnswerIdentifier {
+        state.poll.answerOptions.updateEach { answerOption in
+            if (answerOption.id != selectedAnswerIdentifier) {
+                return
+            }
+            
             if answerOption.selected {
                 answerOption.selected = false
                 answerOption.count -= 1
@@ -124,7 +126,7 @@ class TimelinePollViewModel: TimelinePollViewModelType {
         informCoordinatorOfSelectionUpdate(state: state, callback: callback)
     }
     
-    static func informCoordinatorOfSelectionUpdate(state: TimelinePollViewState, callback: TimelinePollViewModelCallback?) {
+    func informCoordinatorOfSelectionUpdate(state: TimelinePollViewState, callback: TimelinePollViewModelCallback?) {
         let selectedIdentifiers = state.poll.answerOptions.compactMap { answerOption in
             answerOption.selected ? answerOption.id : nil
         }

RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModelProtocol.swift

@@ -0,0 +1,27 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+protocol TimelinePollViewModelProtocol {
+    @available(iOS 14, *)
+    var context: TimelinePollViewModelType.Context { get }
+    var completion: ((TimelinePollViewModelResult) -> Void)? { get set }
+    
+    func updateWithPollDetails(_ pollDetails: TimelinePollDetails)
+    func showAnsweringFailure()
+    func showClosingFailure()
+}