Add topic polls full support

Xialtal · Xialtal · commit a674971f2cf7 · 2025-11-02T15:28:34.000+03:00
diff --git a/Modules/Sources/Models/Forum/Topic.swift b/Modules/Sources/Models/Forum/Topic.swift
@@ -53,12 +53,14 @@ public struct Topic: Codable, Sendable, Identifiable, Hashable {
             }
         }
         
-        public struct Option: Sendable, Codable, Hashable {
+        public struct Option: Sendable, Codable, Hashable, Identifiable {
+            public let id: Int
             public let name: String
             public let several: Bool
             public let choices: [Choice]
             
-            public init(name: String, several: Bool, choices: [Choice]) {
+            public init(id: Int, name: String, several: Bool, choices: [Choice]) {
+                self.id = id
                 self.name = name
                 self.several = several
                 self.choices = choices
@@ -128,6 +130,7 @@ public extension Topic.Poll {
         totalVotes: 12,
         options: [
             .init(
+                id: 0,
                 name: "Select not several...",
                 several: false,
                 choices: [
@@ -136,6 +139,7 @@ public extension Topic.Poll {
                 ]
             ),
             .init(
+                id: 1,
                 name: "Select several...",
                 several: true,
                 choices: [
diff --git a/Modules/Sources/ParsingClient/Parsers/TopicParser.swift b/Modules/Sources/ParsingClient/Parsers/TopicParser.swift
@@ -131,7 +131,7 @@ public struct TopicParser {
     
     private static func parsePollOptions(_ optionsRaw: [[Any]]) throws(ParsingError) -> [Topic.Poll.Option] {
         var options: [Topic.Poll.Option] = []
-        for option in optionsRaw {
+        for (idx, option) in optionsRaw.enumerated() {
             guard let name = option[safe: 0] as? String,
                   let several = option[safe: 1] as? Int,
                   let names = option[safe: 2] as? [String],
@@ -151,6 +151,7 @@ public struct TopicParser {
             }
             
             let option = Topic.Poll.Option(
+                id: idx,
                 name: name,
                 several: several == 1 ? true : false,
                 choices: choices
diff --git a/Modules/Sources/TopicFeature/Analytics/TopicFeature+Analytics.swift b/Modules/Sources/TopicFeature/Analytics/TopicFeature+Analytics.swift
@@ -23,10 +23,12 @@ extension TopicFeature {
                         .view(.onNextAppear),
                         .view(.finishedPostAnimation),
                         .view(.changeKarmaTapped),
+                        .view(.topicPollVoteButtonTapped),
                         .internal(.loadTypes),
                         .internal(.goToPost),
                         .internal(.jumpRequestFailed),
                         .internal(.changeKarma),
+                        .internal(.voteInPoll),
                         .internal(.load),
                         .internal(.refresh),
                         .pageNavigation,
diff --git a/Modules/Sources/TopicFeature/Resources/Localizable.xcstrings b/Modules/Sources/TopicFeature/Resources/Localizable.xcstrings
@@ -307,6 +307,16 @@
         }
       }
     },
+    "Vote approved" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Голос засчитан"
+          }
+        }
+      }
+    },
     "Write Post" : {
       "localizations" : {
         "ru" : {
diff --git a/Modules/Sources/TopicFeature/TopicFeature.swift b/Modules/Sources/TopicFeature/TopicFeature.swift
@@ -34,6 +34,7 @@ public struct TopicFeature: Reducer, Sendable {
         static let favoriteRemoved = LocalizedStringResource("Removed from favorites", bundle: .module)
         static let postDeleted = LocalizedStringResource("Post deleted", bundle: .module)
         static let postKarmaChanged = LocalizedStringResource("Post karma changed", bundle: .module)
+        static let topicVoteApproved = LocalizedStringResource("Vote approved", bundle: .module)
     }
     
     // MARK: - Destinations
@@ -119,6 +120,7 @@ public struct TopicFeature: Reducer, Sendable {
             case finishedPostAnimation
             case topicHatOpenButtonTapped
             case topicPollOpenButtonTapped
+            case topicPollVoteButtonTapped([Int: Set<Int>])
             case changeKarmaTapped(Int, Bool)
             case userTapped(Int)
             case urlTapped(URL)
@@ -134,6 +136,7 @@ public struct TopicFeature: Reducer, Sendable {
             case refresh
             case goToPost(postId: Int, offset: Int, forceRefresh: Bool)
             case changeKarma(postId: Int, isUp: Bool)
+            case voteInPoll(selections: [[Int]])
             case loadTopic(Int)
             case loadTypes([[TopicTypeUI]])
             case topicResponse(Result<Topic, any Error>)
@@ -234,6 +237,12 @@ public struct TopicFeature: Reducer, Sendable {
                 state.shouldShowTopicPollButton = false
                 return .none
                 
+            case .view(.topicPollVoteButtonTapped(let selections)):
+                let values = selections.sorted(by: { $0.key < $1.key }).map {
+                    Array($0.value)
+                }
+                return .send(.internal(.voteInPoll(selections: values)))
+                
             case let .view(.userTapped(id)):
                 return .send(.delegate(.openUser(id: id)))
                 
@@ -403,6 +412,20 @@ public struct TopicFeature: Reducer, Sendable {
                     jumpTo(.post(id: postId), true, &state)
                 )
                 
+            case .internal(.voteInPoll(let selections)):
+                return .concatenate(
+                    .run { [topicId = state.topicId] _ in
+                        let status = try await apiClient.voteInTopicPoll(
+                            topicId: topicId,
+                            selections: selections
+                        )
+                        let voteApproved = ToastMessage(text: Localization.topicVoteApproved, haptic: .success)
+                        await toastClient.showToast(status ? voteApproved : .whoopsSomethingWentWrong)
+                    }.cancellable(id: CancelID.loading),
+                    
+                    .send(.internal(.refresh))
+                )
+                
             case let .internal(.loadTopic(offset)):
                 if !state.isRefreshing {
                     state.isLoadingTopic = true
diff --git a/Modules/Sources/TopicFeature/TopicScreen.swift b/Modules/Sources/TopicFeature/TopicScreen.swift
@@ -203,7 +203,7 @@ public struct TopicScreen: View {
                 }
             } else {
                 PollView(poll: poll, onVoteButtonTapped: { selections in
-                    // TODO: Implement...
+                    send(.topicPollVoteButtonTapped(selections))
                 })
             }
             
diff --git a/Modules/Sources/TopicFeature/Views/PollView.swift b/Modules/Sources/TopicFeature/Views/PollView.swift
@@ -14,14 +14,28 @@ struct PollView: View {
     @Environment(\.tintColor) private var tintColor
     
     let poll: Topic.Poll
-    let onVoteButtonTapped: ([String: [Int]]) -> Void
+    let onVoteButtonTapped: ([Int: Set<Int>]) -> Void
     
+    @State private var isSending = false
     @State private var showVoteResultsButtonTapped = false
-    @State private var selections: [String: Set<Int>] = [:]
+    @State private var selections: [Int: Set<Int>] = [:]
+    
+    private var isVotable: Bool {
+        for option in poll.options {
+            if selections[option.id] == nil {
+                return false
+            }
+            if selections[option.id] != nil,
+               selections[option.id]!.isEmpty {
+                return false
+            }
+        }
+        return true
+    }
     
     init(
         poll: Topic.Poll,
-        onVoteButtonTapped: @escaping ([String: [Int]]) -> Void
+        onVoteButtonTapped: @escaping ([Int: Set<Int>]) -> Void
     ) {
         self.poll = poll
         self.onVoteButtonTapped = onVoteButtonTapped
@@ -44,7 +58,7 @@ struct PollView: View {
                             .foregroundStyle(Color(.Labels.primary))
                             .frame(maxWidth: .infinity, alignment: .leading)
                         
-                        if showVoteResultsButtonTapped {
+                        if showVoteResultsButtonTapped || poll.voted {
                             OptionChoices(choices: option.choices)
                         } else {
                             OptionChoicesSelect(option: option)
@@ -58,7 +72,9 @@ struct PollView: View {
                 .foregroundStyle(Color(.Labels.teritary))
                 .frame(maxWidth: .infinity, alignment: .leading)
             
-            PollActionButtons()
+            if !poll.voted {
+                PollActionButtons()
+            }
         }
         .padding(16)
     }
@@ -72,16 +88,18 @@ struct PollView: View {
                 if showVoteResultsButtonTapped {
                     showVoteResultsButtonTapped = false
                 } else {
-                    // TODO: Implement selection data sending...
+                    isSending = true
+                    onVoteButtonTapped(selections)
                 }
             } label: {
                 Text("Vote", bundle: .module)
                     .padding(.horizontal, 18)
                     .padding(.vertical, 9)
             }
-            .foregroundStyle(tintColor)
-            .background(tintColor.opacity(0.12))
+            .foregroundStyle(voteButtonForegroundColor())
+            .background(voteButtonBackgroundColor())
             .clipShape(RoundedRectangle(cornerRadius: 10))
+            .disabled(!showVoteResultsButtonTapped && !isVotable)
             
             Spacer()
             
@@ -93,9 +111,10 @@ struct PollView: View {
                         .padding(.horizontal, 18)
                         .padding(.vertical, 9)
                 }
-                .foregroundStyle(tintColor)
-                .background(tintColor.opacity(0.12))
+                .foregroundStyle(isSending ? Color(.Labels.quintuple) : tintColor)
+                .background(isSending ? Color(.Main.greyAlpha) : tintColor.opacity(0.12))
                 .clipShape(RoundedRectangle(cornerRadius: 10))
+                .disabled(isSending)
             }
         }
     }
@@ -109,21 +128,21 @@ struct PollView: View {
                 HStack(alignment: .top, spacing: 11) {
                     if option.several {
                         Toggle(isOn: Binding(
-                            get: { isSelected(option.name, choice.id) },
+                            get: { isSelected(option.id, choice.id) },
                             set: { isSelected in
                                 withAnimation {
-                                    updateMultiSelections(option.name, choice.id, isSelected)
+                                    updateMultiSelections(option.id, choice.id, isSelected)
                                 }
                             }
                         )) {}
                         .toggleStyle(CheckBoxToggleStyle())
                     } else {
                         Button {
                             withAnimation {
-                                selections[option.name] = Set([choice.id])
+                                selections[option.id] = Set([choice.id])
                             }
                         } label: {
-                            if isSelected(option.name, choice.id) {
+                            if isSelected(option.id, choice.id) {
                                 ZStack {
                                     Circle()
                                         .strokeBorder(Color(.Labels.quintuple))
@@ -195,21 +214,29 @@ struct PollView: View {
         return CGFloat(choice.votes) / CGFloat(totalVotes)
     }
     
-    private func isSelected(_ option: String, _ choiceId: Int) -> Bool {
-        return if selections[option] != nil {
-            selections[option]!.contains(choiceId)
+    private func voteButtonForegroundColor() -> Color {
+        return (!isVotable && !showVoteResultsButtonTapped || isSending) ? Color(.Labels.quintuple) : tintColor
+    }
+    
+    private func voteButtonBackgroundColor() -> Color {
+        return (!isVotable && !showVoteResultsButtonTapped || isSending) ? Color(.Main.greyAlpha) : tintColor.opacity(0.12)
+    }
+    
+    private func isSelected(_ optionId: Int, _ choiceId: Int) -> Bool {
+        return if selections[optionId] != nil {
+            selections[optionId]!.contains(choiceId)
         } else { false }
     }
 
-    private func updateMultiSelections(_ option: String, _ choiceId: Int, _ isSelected: Bool) {
-        if selections[option] != nil {
+    private func updateMultiSelections(_ optionId: Int, _ choiceId: Int, _ isSelected: Bool) {
+        if selections[optionId] != nil {
             if isSelected {
-                selections[option]!.insert(choiceId)
+                selections[optionId]!.insert(choiceId)
             } else {
-                selections[option]!.remove(choiceId)
+                selections[optionId]!.remove(choiceId)
             }
         } else {
-            selections[option] = Set([choiceId])
+            selections[optionId] = Set([choiceId])
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public struct TopicScreen: View {`
`203`	`203`	`}`
`204`	`204`	`} else {`
`205`	`205`	`PollView(poll: poll, onVoteButtonTapped: { selections in`
`206`		`- // TODO: Implement...`
	`206`	`+ send(.topicPollVoteButtonTapped(selections))`
`207`	`207`	`})`
`208`	`208`	`}`
`209`	`209`