Topic poll improvements

Author: Xialtal

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 (idx, option) in optionsRaw.enumerated() {
+        for (optionId, 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,7 +151,7 @@ public struct TopicParser {
             }
 
             let option = Topic.Poll.Option(
-                id: idx,
+                id: optionId,
                 name: name,
                 several: several == 1 ? true : false,
                 choices: choices

Modules/Sources/TopicFeature/TopicFeature.swift

@@ -237,7 +237,7 @@ public struct TopicFeature: Reducer, Sendable {
                 state.shouldShowTopicPollButton = false
                 return .none
 
-            case .view(.topicPollVoteButtonTapped(let selections)):
+            case let .view(.topicPollVoteButtonTapped(selections)):
                 let values = selections.sorted(by: { $0.key < $1.key }).map {
                     Array($0.value)
                 }
@@ -412,7 +412,7 @@ public struct TopicFeature: Reducer, Sendable {
                     jumpTo(.post(id: postId), true, &state)
                 )
 
-            case .internal(.voteInPoll(let selections)):
+            case let .internal(.voteInPoll(selections)):
                 return .concatenate(
                     .run { [topicId = state.topicId] _ in
                         let status = try await apiClient.voteInTopicPoll(

Modules/Sources/TopicFeature/TopicScreen.swift

@@ -75,7 +75,7 @@ public struct TopicScreen: View {
                                 if !store.isLoadingTopic {
                                     Header()
 
-                                    if let poll = store.topic!.poll {
+                                    if let poll = store.topic?.poll {
                                         Poll(poll)
                                     }
 

Modules/Sources/TopicFeature/Views/PollView.swift

@@ -11,15 +11,19 @@ import SharedUI
 
 struct PollView: View {
 
-    @Environment(\.tintColor) private var tintColor
+    // MARK: - Properties
 
-    let poll: Topic.Poll
-    let onVoteButtonTapped: ([Int: Set<Int>]) -> Void
+    @Environment(\.tintColor) private var tintColor
 
     @State private var isSending = false
     @State private var showVoteResultsButtonTapped = false
     @State private var selections: [Int: Set<Int>] = [:]
 
+    let poll: Topic.Poll
+    let onVoteButtonTapped: ([Int: Set<Int>]) -> Void
+    
+    // MARK: - Computed Properties
+    
     private var isVotable: Bool {
         for option in poll.options {
             if selections[option.id] == nil {
@@ -33,6 +37,8 @@ struct PollView: View {
         return true
     }
 
+    // MARK: - Init
+    
     init(
         poll: Topic.Poll,
         onVoteButtonTapped: @escaping ([Int: Set<Int>]) -> Void
@@ -41,6 +47,8 @@ struct PollView: View {
         self.onVoteButtonTapped = onVoteButtonTapped
     }
 
+    // MARK: - Body
+    
     var body: some View {
         VStack(spacing: 12) {
             if !poll.name.isEmpty {
@@ -245,6 +253,8 @@ struct PollView: View {
     }
 }
 
+// MARK: - CheckBox Toggle Style
+
 struct CheckBoxToggleStyle: ToggleStyle {
     func makeBody(configuration: Configuration) -> some View {
         HStack {
@@ -272,6 +282,8 @@ struct CheckBoxToggleStyle: ToggleStyle {
     }
 }
 
+// MARK: - Previews
+
 #Preview {
     VStack {
         PollView(poll: .mock, onVoteButtonTapped: { selections in