Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix polls not showing results to author fix #211

This commit is contained in:
Thomas Ricouard 2023-01-21 15:38:31 +01:00
parent d0d969d52c
commit 9f7eb4361a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Packages/Status/Sources/Status/Poll/StatusPollView.swift
View File

@ -12,13 +12,20 @@ public struct StatusPollView: View {
@EnvironmentObject private var theme: Theme
@EnvironmentObject private var client: Client
@EnvironmentObject private var currentInstance: CurrentInstance
@EnvironmentObject private var currentAccount: CurrentAccount
@StateObject private var viewModel: StatusPollViewModel
private var status: AnyStatus
public init(poll: Poll) {
public init(poll: Poll, status: AnyStatus) {
_viewModel = StateObject(wrappedValue: .init(poll: poll))
self.status = status
}
private func widthForOption(option: Poll.Option, proxy: GeometryProxy) -> CGFloat {
if viewModel.poll.votesCount == 0 {
return 0
}
let totalWidth = proxy.frame(in: .local).width
let ratio = CGFloat(option.votesCount) / CGFloat(viewModel.poll.votesCount)
return totalWidth * ratio
@ -44,7 +51,7 @@ public struct StatusPollView: View {
ForEach(viewModel.poll.options) { option in
HStack {
makeBarView(for: option)
if !viewModel.votes.isEmpty || viewModel.poll.expired {
if !viewModel.votes.isEmpty || viewModel.poll.expired || status.account.id == currentAccount.account?.id {
Spacer()
Text("\(percentForOption(option: option)) %")
.font(.scaledSubheadline)
@ -98,7 +105,7 @@ public struct StatusPollView: View {
ZStack(alignment: .leading) {
Rectangle()
.background {
if viewModel.showResults {
if viewModel.showResults || status.account.id == currentAccount.account?.id {
HStack {
let width = widthForOption(option: option, proxy: proxy)
Rectangle()

2
Packages/Status/Sources/Status/Row/StatusRowView.swift
View File

@ -203,7 +203,7 @@ public struct StatusRowView: View {
makeTranslateView(status: status)
if let poll = status.poll {
StatusPollView(poll: poll)
StatusPollView(poll: poll, status: status)
}
makeMediasView(status: status)