CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
fix: 统一主面板状态行的图标与文字对齐
Bobd3a66ff23e79
diff --git a/CodexBar/Views/Menu/AutoRefreshCountdownView.swift b/CodexBar/Views/Menu/AutoRefreshCountdownView.swiftindex a737d69..6acde54 100644--- a/CodexBar/Views/Menu/AutoRefreshCountdownView.swift+++ b/CodexBar/Views/Menu/AutoRefreshCountdownView.swift@@ -47,22 +47,24 @@ private struct AutoRefreshCountdownCircle: View {var body: some View {ZStack {Circle()- .stroke(color.opacity(0.15), lineWidth: 1.4)+ .strokeBorder(color.opacity(0.15), lineWidth: Metrics.lineWidth)Circle()+ .inset(by: Metrics.lineWidth / 2).trim(from: 1 - progress, to: 1).stroke(color,- style: StrokeStyle(lineWidth: 1.4, lineCap: .round)+ style: StrokeStyle(lineWidth: Metrics.lineWidth, lineCap: .round)).rotationEffect(.degrees(-90))}- .frame(width: 8, height: 8)+ .frame(width: MenuMetrics.statusIconSize, height: MenuMetrics.statusIconSize)// 只让刷新起点变化触发动画, 避免每秒 tick 被补间.animation(isActive ? .linear(duration: Metrics.resetAnimationDuration) : nil, value: startedAt)}private enum Metrics {+ static let lineWidth: CGFloat = 1.4static let resetAnimationDuration: TimeInterval = 0.50}}diff --git a/CodexBar/Views/Menu/CodexServiceStatusRow.swift b/CodexBar/Views/Menu/CodexServiceStatusRow.swiftindex 79588b1..27ed268 100644--- a/CodexBar/Views/Menu/CodexServiceStatusRow.swift+++ b/CodexBar/Views/Menu/CodexServiceStatusRow.swift@@ -8,21 +8,21 @@ struct CodexServiceStatusRow: View {var body: some View {Link(destination: CodexServiceStatusService.statusPageURL) {- HStack(spacing: 8) {+ HStack(spacing: MenuMetrics.statusIconSpacing) {ZStack {Image(systemName: statusSymbol).resizable().scaledToFit()- .frame(width: statusSymbolSize, height: statusSymbolSize)+ .frame(width: MenuMetrics.statusIconSize, height: MenuMetrics.statusIconSize).id(statusSymbol).transition(allowsAnimations ? .opacity : .identity)}- .font(.system(size: MenuMetrics.accountIconSize, weight: .medium))+ .font(.system(size: MenuMetrics.statusIconSize, weight: .medium)).foregroundStyle(statusColor)- .frame(width: MenuMetrics.accountIconSize, height: MenuMetrics.accountIconSize)+ .frame(width: MenuMetrics.statusIconSize, height: MenuMetrics.statusIconSize)Text("service-status.title")- .font(.caption.weight(.semibold))+ .font(.caption).foregroundStyle(Color.codexLabel).layoutPriority(1)@@ -79,16 +79,6 @@ struct CodexServiceStatusRow: View {}}- private var statusSymbolSize: CGFloat {- switch monitor.state {- // 三角和斜向工具的视觉面积较小, 略放大以接近圆形符号- case let .available(status) where status.level == .partialOutage || status.level == .underMaintenance:- MenuMetrics.accountIconSize + 1- default:- MenuMetrics.accountIconSize- }- }-private var statusColor: Color {switch monitor.state {case let .available(status): status.level.tint(for: colorScheme)diff --git a/CodexBar/Views/Menu/CodexStatusMenuSections.swift b/CodexBar/Views/Menu/CodexStatusMenuSections.swiftindex 9899b17..768a26b 100644--- a/CodexBar/Views/Menu/CodexStatusMenuSections.swift+++ b/CodexBar/Views/Menu/CodexStatusMenuSections.swift@@ -6,6 +6,8 @@ enum MenuMetrics {static let panelPadding: CGFloat = 10static let panelCornerRadius: CGFloat = 8static let accountIconSize: CGFloat = 14+ static let statusIconSize: CGFloat = 10+ static let statusIconSpacing: CGFloat = 8static let loadingVerticalPadding: CGFloat = 16}@@ -281,7 +283,7 @@ struct UpdatedAtRow: View {var body: some View {HStack {- HStack(spacing: 5) {+ HStack(spacing: MenuMetrics.statusIconSpacing) {AutoRefreshCountdownTimeline(startedAt: countdownStartedAt,interval: countdownInterval,@@ -289,13 +291,15 @@ struct UpdatedAtRow: View {color: .blue)- Text("usage.status.last-updated")- .foregroundStyle(Self.secondaryTextColor)+ HStack(spacing: 5) {+ Text("usage.status.last-updated")+ .foregroundStyle(Self.secondaryTextColor)- Text(Self.timeFormatter.string(from: snapshot.generatedAt))- .monospacedDigit()- .numericTransition(value: snapshot.generatedAt, comparison: snapshot.generatedAt.timeIntervalSinceReferenceDate, enabled: allowsAnimations)- .foregroundStyle(Self.secondaryTextColor)+ Text(Self.timeFormatter.string(from: snapshot.generatedAt))+ .monospacedDigit()+ .numericTransition(value: snapshot.generatedAt, comparison: snapshot.generatedAt.timeIntervalSinceReferenceDate, enabled: allowsAnimations)+ .foregroundStyle(Self.secondaryTextColor)+ }}.font(.caption2).animation(Metrics.statusAnimation, value: snapshot.generatedAt)