Fix handling of polls (#723)

* Fix handling of polls * Fixes --------- Co-authored-by: Thomas Ricouard <ricouard77@gmail.com>
2024-11-23 00:40:59 +00:00 · 2023-02-09 06:35:19 +01:00 · 2023-02-09 06:35:19 +01:00 · 70dce60b95
commit 70dce60b95
parent 11c5da05c2
17 changed files with 68 additions and 17 deletions
--- a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings
@ -387,6 +387,7 @@
 "status.poll.duration" = "Durada de l'enquesta";
 "status.poll.frequency" = "Freqüència de l'enquesta";
 "status.poll.option-n %lld" = "Opció %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Publicació de: %@";
 "status.row.was-boosted" = "impulsat";
 "status.row.was-reply" = "Ha respost a";
--- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings
@ -388,6 +388,7 @@
 "status.poll.duration" = "Umfragedauer";
 "status.poll.frequency" = "Auswahlmöglichkeiten";
 "status.poll.option-n %lld" = "Option %lld";
+"status.poll.send" = "Auswahl absenden";
 "status.post-from-%@" = "Beitrag von %@";
 "status.row.was-boosted" = "hat geboostet";
 "status.row.was-reply" = "Antwort auf";
--- a/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings
@ -388,6 +388,7 @@
 "status.poll.duration" = "Poll Duration";
 "status.poll.frequency" = "Polling Frequency";
 "status.poll.option-n %lld" = "Option %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Post from %@";
 "status.row.was-boosted" = "boosted";
 "status.row.was-reply" = "Replied to";
--- a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings
@ -389,6 +389,7 @@
 "status.poll.duration" = "Poll Duration";
 "status.poll.frequency" = "Polling Frequency";
 "status.poll.option-n %lld" = "Option %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Post from %@";
 "status.row.was-boosted" = "boosted";
 "status.row.was-reply" = "Replied to";
--- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings
@ -389,6 +389,7 @@
 "status.poll.duration" = "Duración de la encuesta";
 "status.poll.frequency" = "Frecuencia de la encuesta";
 "status.poll.option-n %lld" = "Opción %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Publicado por %@";
 "status.row.was-boosted" = "retooteó";
 "status.row.was-reply" = "Respuesta a";
--- a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings
@ -384,6 +384,7 @@
 "status.poll.duration" = "Durée du sondage";
 "status.poll.frequency" = "Fréquence de sondage";
 "status.poll.option-n %lld" = "Option %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Publication de %@";
 "status.row.was-boosted" = "a boosté";
 "status.row.was-reply" = "Répondu à";
--- a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings
@ -389,6 +389,7 @@
 "status.poll.duration" = "Durata del sondaggio";
 "status.poll.frequency" = "Frequenza di voto";
 "status.poll.option-n %lld" = "Opzione %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Post da %@";
 "status.row.was-boosted" = "ha condiviso";
 "status.row.was-reply" = "Risposta per";
--- a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings
@ -389,6 +389,7 @@
 "status.poll.frequency" = "投票頻度";
 "status.poll.option-n %lld" = "オプション %lld";
 "status.post-from-%@" = "%@ の投稿";
+"status.poll.send" = "Send Vote";
 "status.row.was-boosted" = "ブーストした";
 "status.row.was-reply" = "返信";
 "status.row.you-boosted" = "ブーストしました";
--- a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings
@ -390,6 +390,7 @@
 "status.poll.duration" = "투표 기간";
 "status.poll.frequency" = "투표 선택 옵션";
 "status.poll.option-n %lld" = "선택지 %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "%@님의 글";
 "status.row.was-boosted" = "님이 부스트함";
 "status.row.was-reply" = "댓글:";
--- a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings
@ -388,6 +388,7 @@
 "status.poll.duration" = "Avstemningens varighet";
 "status.poll.frequency" = "Avstemningsfrekvens";
 "status.poll.option-n %lld" = "Valg %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Innlegg fra %@";
 "status.row.was-boosted" = "forsterket";
 "status.row.was-reply" = "Svar til";
--- a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings
@ -382,6 +382,7 @@
 "status.poll.duration" = "Pollduur";
 "status.poll.frequency" = "Pollingfrequentie";
 "status.poll.option-n %lld" = "Optie %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Post van %@";
 "status.row.was-boosted" = "geboost";
 "status.row.was-reply" = "Geantwoord op";
--- a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings
@ -383,6 +383,7 @@
 "status.poll.duration" = "Czas trwania sondażu";
 "status.poll.frequency" = "Częstotliwość odpytywania";
 "status.poll.option-n %lld" = "Opcja %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Post od %@";
 "status.row.was-boosted" = "podbił(a)";
 "status.row.was-reply" = "Odpowiedział(a) do";
--- a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings
@ -388,6 +388,7 @@
 "status.poll.duration" = "Duração da votação";
 "status.poll.frequency" = "Frequência da votação";
 "status.poll.option-n %lld" = "Opção %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Postar de %@";
 "status.row.was-boosted" = "deu boost";
 "status.row.was-reply" = "Respondeu a";
--- a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings
@ -384,6 +384,7 @@
 "status.poll.duration" = "Anket Süresi";
 "status.poll.frequency" = "Anket Sıklığı";
 "status.poll.option-n %lld" = "Seçenek %lld";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "Gönderi tarafından %@";
 "status.row.was-boosted" = "yükseltildi";
 "status.row.was-reply" = "Şuna cevap verildi";
--- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings
@ -389,6 +389,7 @@
 "status.poll.duration" = "投票持续时间";
 "status.poll.frequency" = "投票频率";
 "status.poll.option-n %lld" = "%lld 选项";
+"status.poll.send" = "Send Vote";
 "status.post-from-%@" = "%@ 的嘟文";
 "status.row.was-boosted" = "转发";
 "status.row.was-reply" = "回复到";
--- a/Packages/Status/Sources/Status/Poll/StatusPollView.swift
+++ b/Packages/Status/Sources/Status/Poll/StatusPollView.swift
@ -36,18 +36,40 @@ public struct StatusPollView: View {
  }

  private func isSelected(option: Poll.Option) -> Bool {
-    for vote in viewModel.votes {
-      return viewModel.poll.options.firstIndex(where: { $0.id == option.id }) == vote
+    if let optionIndex = viewModel.poll.options.firstIndex(where: { $0.id == option.id }),
+       let _ = viewModel.votes.firstIndex(of: optionIndex) {
+      return true
    }
    return false
  }

+  private func buttonImage(option: Poll.Option) -> some View {
+    let isSelected = isSelected(option: option)
+    var imageName = ""
+    if viewModel.poll.multiple {
+      if isSelected {
+        imageName = "checkmark.square"
+      } else {
+        imageName = "square"
+      }
+    } else {
+      if isSelected {
+        imageName = "record.circle"
+      } else {
+        imageName = "circle"
+      }
+    }
+    return Image(systemName: imageName)
+      .foregroundColor(theme.labelColor)
+  }
+  
  public var body: some View {
    VStack(alignment: .leading) {
      ForEach(viewModel.poll.options) { option in
        HStack {
-          makeBarView(for: option)
-          if !viewModel.votes.isEmpty || viewModel.poll.expired || status.account.id == currentAccount.account?.id {
+          makeBarView(for: option, buttonImage: buttonImage(option: option))
+            .disabled(viewModel.poll.expired || (viewModel.poll.voted ?? false))
+          if viewModel.showResults || status.account.id == currentAccount.account?.id {
            Spacer()
            Text("\(percentForOption(option: option))%")
              .font(.scaledSubheadline)
@ -55,6 +77,16 @@ public struct StatusPollView: View {
          }
        }
      }
+      if !viewModel.poll.expired, !(viewModel.poll.voted ?? false), !viewModel.votes.isEmpty {
+        Button("status.poll.send") {
+          Task {
+            do {
+              await viewModel.postVotes()
+            }
+          }
+        }
+        .buttonStyle(.bordered)
+      }
      footerView

    }.onAppear {
@ -82,18 +114,13 @@ public struct StatusPollView: View {
  }

  @ViewBuilder
-  private func makeBarView(for option: Poll.Option) -> some View {
-    let isSelected = isSelected(option: option)
+  private func makeBarView(for option: Poll.Option, buttonImage: some View) -> some View {
    Button {
      if !viewModel.poll.expired,
-         viewModel.votes.isEmpty,
         let index = viewModel.poll.options.firstIndex(where: { $0.id == option.id })
      {
        withAnimation {
-          viewModel.votes.append(index)
-          Task {
-            await viewModel.postVotes()
-          }
+          viewModel.handleSelection(index)
        }
      }
    } label: {
@ -119,12 +146,9 @@ public struct StatusPollView: View {
            .clipShape(RoundedRectangle(cornerRadius: 8))

          HStack {
-            if isSelected {
-              Image(systemName: "checkmark.circle.fill")
-                .foregroundColor(.mint)
-            }
+            buttonImage
            Text(option.title)
-              .foregroundColor(.white)
+              .foregroundColor(theme.labelColor)
              .font(.scaledBody)
              .minimumScaleFactor(0.7)
          }
--- a/Packages/Status/Sources/Status/Poll/StatusPollViewModel.swift
+++ b/Packages/Status/Sources/Status/Poll/StatusPollViewModel.swift
@ -11,7 +11,7 @@ public class StatusPollViewModel: ObservableObject {
  @Published var votes: [Int] = []

  var showResults: Bool {
-    !votes.isEmpty || poll.expired
+    poll.ownVotes?.isEmpty == false || poll.expired
  }

  public init(poll: Poll) {
@ -38,4 +38,16 @@ public class StatusPollViewModel: ObservableObject {
      print(error)
    }
  }
+  
+  public func handleSelection(_ pollIndex: Int) {
+    if poll.multiple {
+      if let voterIndex = votes.firstIndex(of: pollIndex) {
+        votes.remove(at: voterIndex)
+      } else {
+        votes.append(pollIndex)
+      }
+    } else {
+      votes = [pollIndex]
+    }
+  }
 }