Skip to content

fix: align quota percentages at the trailing edge #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chattymin merged 1 commit into from
Sep 12, 2026
Merged

fix: align quota percentages at the trailing edge #292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 31 additions & 73 deletions Sources/PokeTokenBar/UI/PopoverView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,27 +452,9 @@ struct PopoverView: View {
}
}

@ViewBuilder
private func antigravityBucketRow(_ bucket: AntigravityQuotaBucket) -> some View {
let name = l.antigravityWindow(window: bucket.window, bucketId: bucket.bucketId)
let utilization = bucket.usedPercent
VStack(alignment: .leading, spacing: 2) {
HStack {
Text(name)
.font(.callout)
Spacer()
Text(limitPercentText(utilization))
.font(.callout)
.monospacedDigit()
.foregroundStyle(limitColor(utilization))
if let reset = bucket.resetDate {
resetLabel(reset)
.font(.caption)
.foregroundStyle(.tertiary)
}
}
LimitProgressBar(usedPercent: utilization, tint: limitColor(utilization))
}
quotaRow(name: l.antigravityWindow(window: bucket.window, bucketId: bucket.bucketId),
utilization: bucket.usedPercent, reset: bucket.resetDate)
}

@ViewBuilder
Expand Down Expand Up @@ -550,29 +532,40 @@ struct PopoverView: View {
return Text(" (\(f.string(from: reset)))")
}
private func resetLabel(_ reset: Date) -> Text {
Text("· \(reset, style: .relative)") + resetClockSuffix(reset)
Text("\(reset, style: .relative)") + resetClockSuffix(reset)
}

@ViewBuilder
private func limitRow(name: String, window: LimitWindow?) -> some View {
if let window, let utilization = window.utilization {
VStack(alignment: .leading, spacing: 2) {
HStack {
Text(name)
.font(.callout)
Spacer()
Text(limitPercentText(utilization))
.font(.callout)
quotaRow(name: name, utilization: utilization, reset: window.resetDate)
}
}

/// All quota types share the same trailing percentage alignment.
private func quotaRow(name: String, utilization: Double, reset: Date?,
detail: String? = nil) -> some View {
VStack(alignment: .leading, spacing: 2) {
HStack {
Text(name).font(.callout)
Spacer()
if let detail {
Text(detail)
.font(.caption)
.monospacedDigit()
.foregroundStyle(limitColor(utilization))
if let reset = window.resetDate {
resetLabel(reset)
.font(.caption)
.foregroundStyle(.tertiary)
}
.foregroundStyle(.secondary)
}
LimitProgressBar(usedPercent: utilization, tint: limitColor(utilization))
if let reset {
resetLabel(reset)
.font(.caption)
.foregroundStyle(.tertiary)
}
Text(limitPercentText(utilization))
.font(.callout)
.monospacedDigit()
.foregroundStyle(limitColor(utilization))
}
LimitProgressBar(usedPercent: utilization, tint: limitColor(utilization))
}
}

Expand Down Expand Up @@ -724,50 +717,15 @@ struct PopoverView: View {
@ViewBuilder
private func codexLimitRow(name: String, window: CodexRateLimitWindow?) -> some View {
if let window {
let utilization = Double(window.usedPercent)
VStack(alignment: .leading, spacing: 2) {
HStack {
Text(name)
.font(.callout)
Spacer()
Text(limitPercentText(utilization))
.font(.callout)
.monospacedDigit()
.foregroundStyle(limitColor(utilization))
if let reset = window.resetDate {
resetLabel(reset)
.font(.caption)
.foregroundStyle(.tertiary)
}
}
LimitProgressBar(usedPercent: utilization, tint: limitColor(utilization))
}
quotaRow(name: name, utilization: Double(window.usedPercent), reset: window.resetDate)
}
}

@ViewBuilder
private func codexSpendLimitRow(_ limit: CodexSpendControlLimit?) -> some View {
if let limit {
let utilization = Double(limit.usedPercent)
VStack(alignment: .leading, spacing: 2) {
HStack {
Text(l.personalSpendLimit)
.font(.callout)
Spacer()
Text("\(limit.used) / \(limit.limit)")
.font(.caption)
.monospacedDigit()
.foregroundStyle(.secondary)
Text(limitPercentText(utilization))
.font(.callout)
.monospacedDigit()
.foregroundStyle(limitColor(utilization))
resetLabel(limit.resetDate)
.font(.caption)
.foregroundStyle(.tertiary)
}
LimitProgressBar(usedPercent: utilization, tint: limitColor(utilization))
}
quotaRow(name: l.personalSpendLimit, utilization: Double(limit.usedPercent),
reset: limit.resetDate, detail: "\(limit.used) / \(limit.limit)")
}
}

Expand Down