Polls history (#2244)

2026-11-03 16:10:20 +00:00 · 2023-12-18 16:38:39 +01:00
parent 4ac0ad51d7
commit 72a84badcb
73 changed files with 1516 additions and 202 deletions
@@ -43,6 +43,7 @@ class RoomScreenInteractionHandler {
    private let application: ApplicationProtocol
    private let appSettings: AppSettings
    private let analyticsService: AnalyticsService
+    private let pollInteractionHandler: PollInteractionHandlerProtocol
    
    private let actionsSubject: PassthroughSubject<RoomScreenInteractionHandlerAction, Never> = .init()
    var actions: AnyPublisher<RoomScreenInteractionHandlerAction, Never> {
@@ -73,6 +74,7 @@ class RoomScreenInteractionHandler {
        self.application = application
        self.appSettings = appSettings
        self.analyticsService = analyticsService
+        pollInteractionHandler = PollInteractionHandler(analyticsService: analyticsService, roomProxy: roomProxy)
    }
    
    // MARK: Timeline Item Action Menu
@@ -274,9 +276,8 @@ class RoomScreenInteractionHandler {

    func sendPollResponse(pollStartID: String, optionID: String) {
        Task {
-            let sendPollResponseResult = await roomProxy.timeline.sendPollResponse(pollStartID: pollStartID, answers: [optionID])
-            analyticsService.trackPollVote()
-
+            let sendPollResponseResult = await pollInteractionHandler.sendPollResponse(pollStartID: pollStartID, optionID: optionID)
+            
            switch sendPollResponseResult {
            case .success:
                break
@@ -288,9 +289,8 @@ class RoomScreenInteractionHandler {
    
    func endPoll(pollStartID: String) {
        Task {
-            let endPollResult = await roomProxy.timeline.endPoll(pollStartID: pollStartID,
-                                                                 text: "The poll with event id: \(pollStartID) has ended")
-            analyticsService.trackPollEnd()
+            let endPollResult = await pollInteractionHandler.endPoll(pollStartID: pollStartID)
+            
            switch endPollResult {
            case .success:
                break
@@ -0,0 +1,174 @@
+//
+// Copyright 2023 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 SwiftUI
+
+enum PollViewAction {
+    case selectOption(optionID: String)
+    case edit
+    case end
+}
+
+struct PollView: View {
+    private let feedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
+    
+    let poll: Poll
+    let editable: Bool
+    let actionHandler: (PollViewAction) -> Void
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 16) {
+            questionView
+            optionsView
+            summaryView
+            toolbarView
+        }
+        .frame(maxWidth: 450)
+    }
+
+    // MARK: - Private
+
+    private var questionView: some View {
+        HStack(alignment: .top, spacing: 12) {
+            let asset = poll.hasEnded ? Asset.Images.pollsEnd : Asset.Images.polls
+
+            Image(asset.name)
+                .resizable()
+                .scaledFrame(size: 22)
+                .accessibilityHidden(true)
+
+            Text(poll.question)
+                .multilineTextAlignment(.leading)
+                .font(.compound.bodyLGSemibold)
+        }
+    }
+
+    private var optionsView: some View {
+        ForEach(poll.options, id: \.id) { option in
+            Button {
+                guard !option.isSelected else { return }
+                actionHandler(.selectOption(optionID: option.id))
+                feedbackGenerator.impactOccurred()
+            } label: {
+                PollOptionView(pollOption: option,
+                               showVotes: showVotes,
+                               isFinalResult: poll.hasEnded)
+                    .foregroundColor(progressBarColor(for: option))
+            }
+            .disabled(poll.hasEnded)
+        }
+    }
+
+    @ViewBuilder
+    private var summaryView: some View {
+        if let summaryText = poll.summaryText {
+            Text(summaryText)
+                .font(.compound.bodySM)
+                .scaledPadding(.leading, showVotes ? 0 : 32)
+                .foregroundColor(.compound.textSecondary)
+                .frame(maxWidth: .infinity, alignment: showVotes ? .trailing : .leading)
+        }
+    }
+
+    @ViewBuilder
+    private var toolbarView: some View {
+        if !poll.hasEnded, poll.createdByAccountOwner {
+            Button {
+                toolbarAction()
+            } label: {
+                Text(editable ? L10n.actionEditPoll : L10n.actionEndPoll)
+                    .lineLimit(2, reservesSpace: false)
+                    .font(.compound.bodyLGSemibold)
+                    .foregroundColor(.compound.textOnSolidPrimary)
+                    .padding(.horizontal, 24)
+                    .padding(.vertical, 10)
+                    .frame(maxWidth: .infinity)
+                    .background {
+                        Capsule()
+                            .foregroundColor(.compound.bgActionPrimaryRest)
+                    }
+            }
+            .padding(.top, 8)
+        }
+    }
+    
+    private func toolbarAction() {
+        if editable {
+            actionHandler(.edit)
+        } else {
+            actionHandler(.end)
+        }
+    }
+
+    private func progressBarColor(for option: Poll.Option) -> Color {
+        if poll.hasEnded {
+            return option.isWinning ? .compound.textActionAccent : .compound.textDisabled
+        } else {
+            return .compound.textPrimary
+        }
+    }
+
+    private var showVotes: Bool {
+        poll.hasEnded || poll.kind == .disclosed
+    }
+}
+
+private extension Poll {
+    var summaryText: String? {
+        guard !hasEnded else {
+            return options.first.map {
+                L10n.commonPollTotalVotes($0.allVotes)
+            }
+        }
+
+        switch kind {
+        case .disclosed:
+            return options.first.map {
+                L10n.commonPollTotalVotes($0.allVotes)
+            }
+        case .undisclosed:
+            return L10n.commonPollUndisclosedText
+        }
+    }
+}
+
+struct PollView_Previews: PreviewProvider, TestablePreview {
+    static var previews: some View {
+        PollView(poll: .disclosed(), editable: false) { _ in }
+            .padding()
+            .previewDisplayName("Disclosed")
+
+        PollView(poll: .undisclosed(), editable: false) { _ in }
+            .padding()
+            .previewDisplayName("Undisclosed")
+
+        PollView(poll: .endedDisclosed, editable: false) { _ in }
+            .padding()
+            .previewDisplayName("Ended, Disclosed")
+
+        PollView(poll: .endedUndisclosed, editable: false) { _ in }
+            .padding()
+            .previewDisplayName("Ended, Undisclosed")
+
+        PollView(poll: .disclosed(createdByAccountOwner: true), editable: true) { _ in }
+            .padding()
+            .previewDisplayName("Creator, disclosed")
+        
+        PollView(poll: .emptyDisclosed, editable: true) { _ in }
+            .padding()
+            .previewDisplayName("Creator, no votes")
+    }
+}
@@ -19,136 +19,35 @@ import SwiftUI
 struct PollRoomTimelineView: View {
    let timelineItem: PollRoomTimelineItem
    @EnvironmentObject private var context: RoomScreenViewModel.Context
-
+    
    private let feedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
-
+    
    var body: some View {
        TimelineStyler(timelineItem: timelineItem) {
-            VStack(alignment: .leading, spacing: 16) {
-                questionView
-                optionsView
-                summaryView
-                toolbarView
+            PollView(poll: poll, editable: timelineItem.isEditable) { action in
+                switch action {
+                case .selectOption(let optionID):
+                    guard let eventID, let option = poll.options.first(where: { $0.id == optionID }), !option.isSelected else { return }
+                    context.send(viewAction: .poll(.selectOption(pollStartID: eventID, optionID: option.id)))
+                case .edit:
+                    guard let eventID else { return }
+                    context.send(viewAction: .poll(.edit(pollStartID: eventID, poll: poll)))
+                case .end:
+                    guard let eventID else { return }
+                    context.send(viewAction: .poll(.end(pollStartID: eventID)))
+                }
            }
-            .frame(maxWidth: 450)
-        }
-    }
-
-    // MARK: - Private
-
-    private var poll: Poll {
-        timelineItem.poll
-    }
-
-    private var eventID: String? {
-        timelineItem.id.eventID
-    }
-
-    private var questionView: some View {
-        HStack(alignment: .top, spacing: 12) {
-            let asset = poll.hasEnded ? Asset.Images.pollsEnd : Asset.Images.polls
-
-            Image(asset.name)
-                .resizable()
-                .scaledFrame(size: 22)
-                .accessibilityHidden(true)
-
-            Text(poll.question)
-                .multilineTextAlignment(.leading)
-                .font(.compound.bodyLGSemibold)
-        }
-    }
-
-    private var optionsView: some View {
-        ForEach(poll.options, id: \.id) { option in
-            Button {
-                guard let eventID, !option.isSelected else { return }
-                context.send(viewAction: .poll(.selectOption(pollStartID: eventID, optionID: option.id)))
-                feedbackGenerator.impactOccurred()
-            } label: {
-                PollOptionView(pollOption: option,
-                               showVotes: showVotes,
-                               isFinalResult: poll.hasEnded)
-                    .foregroundColor(progressBarColor(for: option))
-            }
-            .disabled(poll.hasEnded || eventID == nil)
-        }
-    }
-
-    @ViewBuilder
-    private var summaryView: some View {
-        if let summaryText = poll.summaryText {
-            Text(summaryText)
-                .font(.compound.bodySM)
-                .scaledPadding(.leading, showVotes ? 0 : 32)
-                .foregroundColor(.compound.textSecondary)
-                .frame(maxWidth: .infinity, alignment: showVotes ? .trailing : .leading)
-        }
-    }
-
-    @ViewBuilder
-    private var toolbarView: some View {
-        if !poll.hasEnded, poll.createdByAccountOwner {
-            Button {
-                toolbarAction()
-            } label: {
-                Text(timelineItem.isEditable ? L10n.actionEditPoll : L10n.actionEndPoll)
-                    .lineLimit(2, reservesSpace: false)
-                    .font(.compound.bodyLGSemibold)
-                    .foregroundColor(.compound.textOnSolidPrimary)
-                    .padding(.horizontal, 24)
-                    .padding(.vertical, 10)
-                    .frame(maxWidth: .infinity)
-                    .background {
-                        Capsule()
-                            .foregroundColor(.compound.bgActionPrimaryRest)
-                    }
-            }
-            .padding(.top, 8)
        }
    }
    
-    private func toolbarAction() {
-        guard let eventID else {
-            return
-        }
-        
-        if timelineItem.isEditable {
-            context.send(viewAction: .poll(.edit(pollStartID: eventID, poll: poll)))
-        } else {
-            context.send(viewAction: .poll(.end(pollStartID: eventID)))
-        }
+    // MARK: - Private
+    
+    private var poll: Poll {
+        timelineItem.poll
    }
-
-    private func progressBarColor(for option: Poll.Option) -> Color {
-        if poll.hasEnded {
-            return option.isWinning ? .compound.textActionAccent : .compound.textDisabled
-        } else {
-            return .compound.textPrimary
-        }
-    }
-
-    private var showVotes: Bool {
-        poll.hasEnded || poll.kind == .disclosed
-    }
-}
-
-private extension Poll {
-    var summaryText: String? {
-        guard !hasEnded else {
-            return options.first.map {
-                L10n.commonPollTotalVotes($0.allVotes)
-            }
-        }
-
-        switch kind {
-        case .disclosed:
-            return options.first.map {
-                L10n.commonPollTotalVotes($0.allVotes)
-            }
-        case .undisclosed:
-            return L10n.commonPollUndisclosedText
-        }
+    
+    private var eventID: String? {
+        timelineItem.id.eventID
    }
 }