Fix the vote progress view not having full width when the Poll is closed

Author: nuno-vieira

Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollAllOptionsView.swift

@@ -31,7 +31,8 @@ struct PollAllOptionsView: View {
                                 viewModel: viewModel,
                                 option: option,
                                 optionFont: fonts.headline,
-                                alternativeStyle: true
+                                alternativeStyle: true,
+                                checkboxButtonSpacing: 8
                             )
                         }
                     }

Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollAttachmentView.swift

@@ -190,51 +190,53 @@ struct PollOptionView: View {
     var maxVotes: Int?
     /// If true, only option name and vote count is shown, otherwise votes indicator and avatars appear as well.
     var alternativeStyle: Bool = false
-    
+    /// The spacing between the checkbox and the option name.
+    /// By default it is 4. For All Options View is 8.
+    var checkboxButtonSpacing: CGFloat = 4
+
     var body: some View {
-        VStack(spacing: 4) {
-            HStack(alignment: .top) {
-                if !viewModel.poll.isClosed {
-                    Button {
-                        if viewModel.optionVotedByCurrentUser(option) {
-                            viewModel.removePollVote(for: option)
-                        } else {
-                            viewModel.castPollVote(for: option)
-                        }
-                    } label: {
-                        if viewModel.optionVotedByCurrentUser(option) {
-                            Image(systemName: "checkmark.circle.fill")
-                        } else {
-                            Image(systemName: "circle")
-                        }
+        HStack(alignment: .top, spacing: checkboxButtonSpacing) {
+            if !viewModel.poll.isClosed {
+                Button {
+                    if viewModel.optionVotedByCurrentUser(option) {
+                        viewModel.removePollVote(for: option)
+                    } else {
+                        viewModel.castPollVote(for: option)
+                    }
+                } label: {
+                    if viewModel.optionVotedByCurrentUser(option) {
+                        Image(systemName: "checkmark.circle.fill")
+                    } else {
+                        Image(systemName: "circle")
                     }
                 }
-
-                Text(option.text)
-                    .font(optionFont)
-                Spacer()
-                if !alternativeStyle, viewModel.showVoterAvatars {
-                    HStack(spacing: -4) {
-                        ForEach(
-                            option.latestVotes.sorted(by: { $0.createdAt > $1.createdAt }).suffix(2)
-                        ) { vote in
-                            MessageAvatarView(
-                                avatarURL: vote.user?.imageURL,
-                                size: .init(width: 20, height: 20)
-                            )
+            }
+            VStack(spacing: 4) {
+                HStack(alignment: .top) {
+                    Text(option.text)
+                        .font(optionFont)
+                    Spacer()
+                    if !alternativeStyle, viewModel.showVoterAvatars {
+                        HStack(spacing: -4) {
+                            ForEach(
+                                option.latestVotes.sorted(by: { $0.createdAt > $1.createdAt }).suffix(2)
+                            ) { vote in
+                                MessageAvatarView(
+                                    avatarURL: vote.user?.imageURL,
+                                    size: .init(width: 20, height: 20)
+                                )
+                            }
                         }
                     }
+                    Text("\(viewModel.poll.voteCountsByOption?[option.id] ?? 0)")
+                }
+                if !alternativeStyle {
+                    PollVotesIndicatorView(
+                        alternativeStyle: viewModel.poll.isClosed && viewModel.hasMostVotes(for: option),
+                        optionVotes: optionVotes ?? 0,
+                        maxVotes: maxVotes ?? 0
+                    )
                 }
-                Text("\(viewModel.poll.voteCountsByOption?[option.id] ?? 0)")
-            }
-            
-            if !alternativeStyle {
-                PollVotesIndicatorView(
-                    alternativeStyle: viewModel.poll.isClosed && viewModel.hasMostVotes(for: option),
-                    optionVotes: optionVotes ?? 0,
-                    maxVotes: maxVotes ?? 0
-                )
-                .padding(.leading, 24)
             }
         }
     }