From 50bd01e8b4e4cd1c4c46d287c31514881a81e9dd Mon Sep 17 00:00:00 2001
From: Sean Goldin <EvilOne@users.noreply.github.com>
Date: Sat, 21 Jan 2023 09:50:38 -0600
Subject: [PATCH] Poll results UI update (#233)

* Update constant to use CGFloat extension

* Fill full width when 100%

* Remove space
---
 .../Sources/DesignSystem/DesignSystem.swift      |  1 +
 .../Sources/Status/Poll/StatusPollView.swift     | 16 +++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift b/Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift
index 534f9ef6..ae0ddc12 100644
--- a/Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift
+++ b/Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift
@@ -6,4 +6,5 @@ public extension CGFloat {
   static let statusColumnsSpacing: CGFloat = 8
   static let maxColumnWidth: CGFloat = 650
   static let sidebarWidth: CGFloat = 80
+  static let pollBarHeight: CGFloat = 30
 }
diff --git a/Packages/Status/Sources/Status/Poll/StatusPollView.swift b/Packages/Status/Sources/Status/Poll/StatusPollView.swift
index 2559d64c..378166c6 100644
--- a/Packages/Status/Sources/Status/Poll/StatusPollView.swift
+++ b/Packages/Status/Sources/Status/Poll/StatusPollView.swift
@@ -5,10 +5,6 @@ import Network
 import SwiftUI
 
 public struct StatusPollView: View {
-  enum Constants {
-    static let barHeight: CGFloat = 30
-  }
-
   @EnvironmentObject private var theme: Theme
   @EnvironmentObject private var client: Client
   @EnvironmentObject private var currentInstance: CurrentInstance
@@ -53,7 +49,7 @@ public struct StatusPollView: View {
           makeBarView(for: option)
           if !viewModel.votes.isEmpty || viewModel.poll.expired || status.account.id == currentAccount.account?.id {
             Spacer()
-            Text("\(percentForOption(option: option)) %")
+            Text("\(percentForOption(option: option))%")
               .font(.scaledSubheadline)
               .frame(width: 40)
           }
@@ -110,14 +106,16 @@ public struct StatusPollView: View {
                   let width = widthForOption(option: option, proxy: proxy)
                   Rectangle()
                     .foregroundColor(theme.tintColor)
-                    .frame(height: Constants.barHeight)
+                    .frame(height: .pollBarHeight)
                     .frame(width: width)
-                  Spacer()
+                  if width != proxy.size.width {
+                    Spacer()
+                  }
                 }
               }
             }
             .foregroundColor(theme.tintColor.opacity(0.40))
-            .frame(height: Constants.barHeight)
+            .frame(height: .pollBarHeight)
             .clipShape(RoundedRectangle(cornerRadius: 8))
 
           HStack {
@@ -133,7 +131,7 @@ public struct StatusPollView: View {
           .padding(.leading, 12)
         }
       }
-      .frame(height: Constants.barHeight)
+      .frame(height: .pollBarHeight)
     }
   }
 }