CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
feat: 优化额度周期显示与选项布局
Bobc81142b1bc98
diff --git a/CodexBar/Models/CodexQuotaModels.swift b/CodexBar/Models/CodexQuotaModels.swiftindex 9cde7b2..6133b5e 100644--- a/CodexBar/Models/CodexQuotaModels.swift+++ b/CodexBar/Models/CodexQuotaModels.swift@@ -124,15 +124,32 @@ nonisolated struct QuotaWindow: Equatable, Identifiable {return String(localized: "quota.window.fallback")}- if minutes.isMultiple(of: 1440) {- return "\(minutes / 1440)d"+ let minutesPerHour = 60+ let minutesPerDay = 24 * minutesPerHour+ let minutesPerWeek = 7 * minutesPerDay+ let minutesPerMonth = 4 * minutesPerWeek++ if minutes.isMultiple(of: minutesPerMonth) {+ let months = minutes / minutesPerMonth+ return months == 1 ? "Monthly" : "\(months) Months"}- if minutes.isMultiple(of: 60) {- return "\(minutes / 60)h"+ if minutes.isMultiple(of: minutesPerWeek) {+ let weeks = minutes / minutesPerWeek+ return weeks == 1 ? "Weekly" : "\(weeks) Weeks"}- return "\(minutes)m"+ if minutes.isMultiple(of: minutesPerDay) {+ let days = minutes / minutesPerDay+ return days == 1 ? "Daily" : "\(days) Days"+ }++ if minutes.isMultiple(of: minutesPerHour) {+ let hours = minutes / minutesPerHour+ return hours == 1 ? "Hourly" : "\(hours) Hours"+ }++ return "\(minutes) Mins"}}diff --git a/CodexBar/Views/Menu/QuotaRow.swift b/CodexBar/Views/Menu/QuotaRow.swiftindex 2cf4b0f..b8f6cf8 100644--- a/CodexBar/Views/Menu/QuotaRow.swift+++ b/CodexBar/Views/Menu/QuotaRow.swift@@ -46,9 +46,9 @@ struct QuotaRow: View {private extension QuotaRow {enum Metrics {- static let labelWidth: CGFloat = 34- static let labelMinimumScaleFactor: CGFloat = 0.75- static let labelBarSpacing: CGFloat = 12+ static let labelWidth: CGFloat = 60+ static let labelMinimumScaleFactor: CGFloat = 0.8+ static let labelBarSpacing: CGFloat = 10static let barPercentSpacing: CGFloat = 8static let percentWidth: CGFloat = 37static let percentResetSpacing: CGFloat = 6@@ -239,7 +239,7 @@ private struct SegmentedQuotaBar: View, Animatable {private extension SegmentedQuotaBar {enum Metrics {static let segmentCount = 50- static let segmentWidth: CGFloat = 3.5+ static let segmentWidth: CGFloat = 3static let segmentSpacing: CGFloat = 2static let segmentHeight: CGFloat = 12diff --git a/CodexBar/Views/Settings/AppSettingsView.swift b/CodexBar/Views/Settings/AppSettingsView.swiftindex c73eb07..0408b8e 100644--- a/CodexBar/Views/Settings/AppSettingsView.swift+++ b/CodexBar/Views/Settings/AppSettingsView.swift@@ -183,7 +183,6 @@ private extension AppSettingsView {static let tabVerticalPadding: CGFloat = 7static let tabContentSpacing = paddingstatic let windowChromeHeight = padding * 2 + tabBarHeight + tabContentSpacing- static let menuBarQuotaPickerWidth: CGFloat = 72static let dataUpdateIntervalPickerWidth: CGFloat = 90static let syncStatusRowHeight: CGFloat = 16static let syncStatusValueWidth: CGFloat = 160@@ -395,7 +394,7 @@ private extension AppSettingsView {.labelsHidden().pickerStyle(.menu).controlSize(.small)- .frame(width: Metrics.menuBarQuotaPickerWidth)+ .fixedSize(horizontal: true, vertical: false).transition(.opacity.combined(with: .move(edge: .trailing)))}}diff --git a/CodexBarTests/CodexQuotaAndIdentityTests.swift b/CodexBarTests/CodexQuotaAndIdentityTests.swiftindex c7a9924..3446a18 100644--- a/CodexBarTests/CodexQuotaAndIdentityTests.swift+++ b/CodexBarTests/CodexQuotaAndIdentityTests.swift@@ -33,6 +33,34 @@ struct CodexQuotaAndIdentityTests {#expect(!QuotaWindow(kind: .primary, windowDurationMins: nil, usedPercent: nil, resetsAt: nil).hasData)}+ @Test func quotaWindowLabelsUseLargestExactUnitAndFourWeekMonths() {+ let cases: [(minutes: Int, expected: String)] = [+ (1, "1 Mins"),+ (59, "59 Mins"),+ (60, "Hourly"),+ (90, "90 Mins"),+ (300, "5 Hours"),+ (1439, "1439 Mins"),+ (1440, "Daily"),+ (1441, "1441 Mins"),+ (2160, "36 Hours"),+ (6 * 1440, "6 Days"),+ (7 * 1440, "Weekly"),+ (8 * 1440, "8 Days"),+ (14 * 1440, "2 Weeks"),+ (21 * 1440, "3 Weeks"),+ (28 * 1440, "Monthly"),+ (30 * 1440, "30 Days"),+ (35 * 1440, "5 Weeks"),+ (56 * 1440, "2 Months"),+ (57 * 1440, "57 Days")+ ]+ for (minutes, expected) in cases {+ let window = QuotaWindow(kind: .secondary, windowDurationMins: minutes, usedPercent: 0, resetsAt: nil)+ #expect(window.label == expected)+ }+ }+@Test func primaryLimitPrecedesAlphabeticalLimitsAndUsesMatchingCredits() throws {let response = try TestFixtures.decode(AccountRateLimitsResponse.self, """{"rateLimits":{"limitId":"codex","primary":{"usedPercent":99}},diff --git a/Docs/UserGuide/main-panel.md b/Docs/UserGuide/main-panel.mdindex e67db44..ebf8650 100644--- a/Docs/UserGuide/main-panel.md+++ b/Docs/UserGuide/main-panel.md@@ -46,7 +46,7 @@ CodexBar 会展示 Codex 返回的全部额度分组和窗口。每个额度窗口包含以下信息:-- 窗口名称,例如 `5h` 或 `7d`+- 窗口名称,例如 `5 Hours` 或 `Weekly`- 剩余比例- 分段进度条- 下一次重置时间diff --git a/Docs/en/UserGuide/main-panel.md b/Docs/en/UserGuide/main-panel.mdindex 969eab7..aade47a 100644--- a/Docs/en/UserGuide/main-panel.md+++ b/Docs/en/UserGuide/main-panel.md@@ -46,7 +46,7 @@ CodexBar shows every rate-limit group and window returned by Codex.Each rate-limit window includes:-- A window name, such as `5h` or `7d`+- A window name, such as `5 Hours` or `Weekly`- Remaining percentage- A segmented progress bar- The next reset time