Fix: allow to render a TimelinePoll even if the poll is loading

element-hq · Apr 25, 2023 · 3fcbf0a · 3fcbf0a
1 parent 5cfac70
commit 3fcbf0a
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 7 deletions.
diff --git a/RiotSwiftUI/Modules/Room/PollHistory/Service/MatrixSDK/PollHistoryService.swift b/RiotSwiftUI/Modules/Room/PollHistory/Service/MatrixSDK/PollHistoryService.swift
@@ -170,6 +170,7 @@ private extension PollHistoryService {
 
         do {
             newContext.pollAggregator = try PollAggregator(session: room.mxSession, room: room, pollEvent: pollStartEvent, delegate: self)
+            newContext.pollAggregator?.reloadPollData()
         } catch {
             pollAggregationContexts.removeValue(forKey: eventId)
         }

diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift
@@ -77,6 +77,8 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
                 }
             }
             .store(in: &cancellables)
+
+        pollAggregator.reloadPollData()
     }
 
     // MARK: - Public
@@ -109,13 +111,20 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
 
     func pollAggregatorDidUpdateData(_ aggregator: PollAggregator) {
         viewModel.updateWithPollDetails(buildTimelinePollFrom(aggregator.poll))
+        viewModel.updateWithPollState(.loaded)
     }
 
-    func pollAggregatorDidStartLoading(_ aggregator: PollAggregator) { }
+    func pollAggregatorDidStartLoading(_ aggregator: PollAggregator) {
+        viewModel.updateWithPollState(.loading)
+    }
 
-    func pollAggregatorDidEndLoading(_ aggregator: PollAggregator) { }
+    func pollAggregatorDidEndLoading(_ aggregator: PollAggregator) {
+        viewModel.updateWithPollState(.loaded)
+    }
 
-    func pollAggregator(_ aggregator: PollAggregator, didFailWithError: Error) { }
+    func pollAggregator(_ aggregator: PollAggregator, didFailWithError: Error) {
+        viewModel.updateWithPollState(.invalidStartEvent)
+    }
 
     // MARK: - Private
 

diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollModels.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollModels.swift
@@ -37,6 +37,12 @@ enum TimelinePollEventType {
     case ended
 }
 
+enum TimelinePollState {
+    case loading
+    case loaded
+    case invalidStartEvent
+}
+
 struct TimelinePollAnswerOption: Identifiable {
     var id: String
     var text: String
@@ -99,6 +105,7 @@ struct TimelinePollViewState: BindableState {
 }
 
 struct TimelinePollViewStateBindings {
+    var pollState: TimelinePollState
     var alertInfo: AlertInfo<TimelinePollAlertType>?
 }
 

diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollScreenState.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollScreenState.swift
@@ -23,6 +23,9 @@ enum MockTimelinePollScreenState: MockScreenState, CaseIterable {
     case openUndisclosed
     case closedUndisclosed
     case closedPollEnded
+    case loading
+    case invalidStartEvent
+    case withAlert
 
     var screenType: Any.Type {
         TimelinePollDetails.self
@@ -47,6 +50,20 @@ enum MockTimelinePollScreenState: MockScreenState, CaseIterable {
 
         let viewModel = TimelinePollViewModel(timelinePollDetails: poll)
 
+        switch self {
+        case .loading:
+            viewModel.updateWithPollState(.loading)
+        case .invalidStartEvent:
+            viewModel.updateWithPollState(.invalidStartEvent)
+        default:
+            viewModel.updateWithPollState(.loaded)
+        }
+
+        if self == .withAlert {
+            viewModel.showAnsweringFailure()
+        }
+
+
         return ([viewModel], AnyView(TimelinePollView(viewModel: viewModel.context)))
     }
 }
diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModel.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModel.swift
@@ -31,7 +31,7 @@ class TimelinePollViewModel: TimelinePollViewModelType, TimelinePollViewModelPro
     // MARK: - Setup
 
     init(timelinePollDetails: TimelinePollDetails) {
-        super.init(initialViewState: TimelinePollViewState(poll: timelinePollDetails, bindings: TimelinePollViewStateBindings()))
+        super.init(initialViewState: TimelinePollViewState(poll: timelinePollDetails, bindings: TimelinePollViewStateBindings(pollState: .loading)))
     }
 
     // MARK: - Public
@@ -58,6 +58,10 @@ class TimelinePollViewModel: TimelinePollViewModelType, TimelinePollViewModelPro
         state.poll = pollDetails
     }
 
+    func updateWithPollState(_ pollState: TimelinePollState) {
+        state.bindings.pollState = pollState
+    }
+
     func showAnsweringFailure() {
         state.bindings.alertInfo = AlertInfo(id: .failedSubmittingAnswer,
                                              title: VectorL10n.pollTimelineVoteNotRegisteredTitle,

diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModelProtocol.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModelProtocol.swift
@@ -21,6 +21,7 @@ protocol TimelinePollViewModelProtocol {
     var completion: ((TimelinePollViewModelResult) -> Void)? { get set }
 
     func updateWithPollDetails(_ pollDetails: TimelinePollDetails)
+    func updateWithPollState(_ pollState: TimelinePollState)
     func showAnsweringFailure()
     func showClosingFailure()
 }
diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollView.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollView.swift
@@ -28,6 +28,23 @@ struct TimelinePollView: View {
     @ObservedObject var viewModel: TimelinePollViewModel.Context
 
     var body: some View {
+        Group {
+            switch viewModel.pollState {
+            case .loading:
+                TimelinePollMessageView(message: "loading...")
+            case .loaded:
+                pollContent
+            case .invalidStartEvent:
+                TimelinePollMessageView(message: VectorL10n.pollTimelineReplyEndedPoll)
+            }
+        }
+        .alert(item: $viewModel.alertInfo) { info in
+            info.alert
+        }
+    }
+
+    @ViewBuilder
+    private var pollContent: some View {
         let poll = viewModel.viewState.poll
 
         VStack(alignment: .leading, spacing: 16.0) {
@@ -61,9 +78,6 @@ struct TimelinePollView: View {
         }
         .padding([.horizontal, .top], 2.0)
         .padding([.bottom])
-        .alert(item: $viewModel.alertInfo) { info in
-            info.alert
-        }
     }
 
     private var totalVotesString: String {