Skip to content

feat: show time until usage window reset in notch usage bars #9

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
grayashh merged 2 commits into from
Jun 12, 2026
Merged

feat: show time until usage window reset in notch usage bars #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfb87bd
feat: show time until usage window reset in notch usage bars
Jduarte-BOA Jun 12, 2026
f66cd56
fix: refresh reset countdown every minute via TimelineView
Jduarte-BOA Jun 12, 2026
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
43 changes: 26 additions & 17 deletions buddi/Buddi/Bridge/BuddyTabView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,10 @@ struct BuddyTabView: View {
.foregroundColor(Color(nsColor: BuddyManager.shared.effectiveIdentity.rarity.nsColor).opacity(0.8))

if usageService.isAvailable {
if let fh = usageService.usage.fiveHour {
UsageBar(
label: "Session",
percent: fh.utilization / 100,
detail: "\(Int(fh.utilization))%",
color: fh.utilization > 80 ? .red : fh.utilization > 60 ? .yellow : Color(red: 0.35, green: 0.55, blue: 1.0)
)
}
if let sd = usageService.usage.sevenDay {
UsageBar(
label: "Weekly",
percent: sd.utilization / 100,
detail: "\(Int(sd.utilization))%",
color: sd.utilization > 80 ? .red : sd.utilization > 60 ? .yellow : Color(red: 0.35, green: 0.55, blue: 1.0)
)
TimelineView(.periodic(from: .now, by: 60)) { context in
VStack(spacing: 3) {
usageBars(now: context.date)
}
}
}
}
Expand All @@ -92,6 +81,26 @@ struct BuddyTabView: View {
}
}

@ViewBuilder
private func usageBars(now: Date) -> some View {
if let fh = usageService.usage.fiveHour {
UsageBar(
label: "Session",
percent: fh.utilization / 100,
detail: fh.resetsAt.map { "\(Int(fh.utilization))% · \(formatResetTime($0, now: now))" } ?? "\(Int(fh.utilization))%",
color: fh.utilization > 80 ? .red : fh.utilization > 60 ? .yellow : Color(red: 0.35, green: 0.55, blue: 1.0)
)
}
if let sd = usageService.usage.sevenDay {
UsageBar(
label: "Weekly",
percent: sd.utilization / 100,
detail: sd.resetsAt.map { "\(Int(sd.utilization))% · \(formatResetTime($0, now: now))" } ?? "\(Int(sd.utilization))%",
color: sd.utilization > 80 ? .red : sd.utilization > 60 ? .yellow : Color(red: 0.35, green: 0.55, blue: 1.0)
)
}
}

private var sessions: [SessionState] { bridge.sessionMonitor.instances }

private static let dayTimeFormatter: DateFormatter = {
Expand All @@ -100,8 +109,8 @@ struct BuddyTabView: View {
return f
}()

private func formatResetTime(_ date: Date) -> String {
let remaining = date.timeIntervalSinceNow
private func formatResetTime(_ date: Date, now: Date = Date()) -> String {
let remaining = date.timeIntervalSince(now)
if remaining <= 0 { return "now" }
let hours = Int(remaining) / 3600
let minutes = (Int(remaining) % 3600) / 60
Expand Down
Loading