Skip to content

CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息

fix: 优化菜单栏提示与热力图过渡

Bob494b2e49f11b
diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxproj
index 6a6a8c6..b3ce10e 100644
--- a/CodexBar.xcodeproj/project.pbxproj
+++ b/CodexBar.xcodeproj/project.pbxproj
@@ -282,7 +282,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 34;
+ CURRENT_PROJECT_VERSION = 35;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
@@ -298,7 +298,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 3.2.6;
+ MARKETING_VERSION = 3.2.7;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
@@ -321,7 +321,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 34;
+ CURRENT_PROJECT_VERSION = 35;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
@@ -337,7 +337,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 3.2.6;
+ MARKETING_VERSION = 3.2.7;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/CodexBar/App/CodexBarApp.swift b/CodexBar/App/CodexBarApp.swift
index be3982a..a464cb6 100644
--- a/CodexBar/App/CodexBarApp.swift
+++ b/CodexBar/App/CodexBarApp.swift
@@ -13,7 +13,7 @@ struct CodexBarApp: App {
}
// 缩短系统工具提示首次出现的延迟 (毫秒)
- UserDefaults.standard.set(200, forKey: "NSInitialToolTipDelay")
+ UserDefaults.standard.set(500, forKey: "NSInitialToolTipDelay")
}
var body: some Scene {
diff --git a/CodexBar/Controllers/StatusItemController.swift b/CodexBar/Controllers/StatusItemController.swift
index b4b913c..4491b57 100644
--- a/CodexBar/Controllers/StatusItemController.swift
+++ b/CodexBar/Controllers/StatusItemController.swift
@@ -290,12 +290,21 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
var symbolName: String {
usesErrorImage ? Metrics.errorStatusSymbolName : Metrics.normalStatusSymbolName
}
+
+ var toolTip: String? {
+ progress?.toolTip
+ }
}
private struct StatusIconProgress: Equatable {
+ let label: String
let percent: Int
let isStale: Bool
+ var toolTip: String {
+ "\(label) 剩余 \(percent)%"
+ }
+
init?(snapshot: CodexQuotaSnapshot?, selection: MenuBarQuotaSelection) {
guard let targetWindowId = selection.windowId,
let snapshot,
@@ -306,6 +315,7 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
return nil
}
+ label = window.label
percent = window.remainingPercent
isStale = snapshot.isRateLimitsStale
}
@@ -475,10 +485,10 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
private func hotKeyConflictMessage(for shortcut: GlobalHotKeyShortcut) -> String {
if shortcut == .default {
- return "默认快捷键 \(shortcut.label) 已被占用,请重新设置"
+ return "默认快捷键 \(shortcut.label) 已被占用"
}
- return "快捷键已被占用,请重新设置"
+ return "快捷键已被占用"
}
private func updateStatusImage() {
@@ -496,6 +506,8 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
}
private func updateStatusImage(_ state: StatusIconState) {
+ statusItem.button?.toolTip = state.toolTip
+
guard state != statusIconState else {
return
}
diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swift
index e39d78b..1760e0f 100644
--- a/CodexBar/Views/Menu/UsageHeatmap.swift
+++ b/CodexBar/Views/Menu/UsageHeatmap.swift
@@ -639,28 +639,12 @@ struct UsageHeatmapDayDetailView: View {
}
private var tokenText: some View {
- ZStack(alignment: .trailing) {
- if let tokenCount = context.day.tokenCount {
- TokenCountText(
- tokens: tokenCount,
- font: tokenFont,
- reservedNumericWidth: Metrics.tokenMinimumWidth,
- reservedUnitWidth: Metrics.tokenUnitWidth
- )
- .foregroundStyle(Color.codexLabel)
- .transition(.opacity)
- } else {
- Text("--")
- .font(tokenFont)
- .foregroundStyle(Color.codexLabel)
- .transition(.opacity)
- }
- }
- .frame(
- width: Metrics.tokenMinimumWidth + Metrics.tokenUnitWidth,
- alignment: .trailing
+ HeatmapTokenText(
+ tokenCount: context.day.tokenCount,
+ font: tokenFont,
+ numericWidth: Metrics.tokenMinimumWidth,
+ unitWidth: Metrics.tokenUnitWidth
)
- .animation(Metrics.statusAnimation, value: context.day.tokenCount == nil)
}
private var dateFont: Font {
@@ -782,6 +766,112 @@ struct UsageHeatmapDayDetailView: View {
}
}
+/// token 详情在数字和 `--` 之间切换时只做淡入淡出, 数字之间仍保留滚动过渡
+private struct HeatmapTokenText: View {
+ let tokenCount: Int?
+ let font: Font
+ let numericWidth: CGFloat
+ let unitWidth: CGFloat
+
+ @State private var displayedTokenCount: Int?
+ @State private var isVisible = true
+ @State private var fadeTask: Task<Void, Never>?
+
+ init(
+ tokenCount: Int?,
+ font: Font,
+ numericWidth: CGFloat,
+ unitWidth: CGFloat
+ ) {
+ self.tokenCount = tokenCount
+ self.font = font
+ self.numericWidth = numericWidth
+ self.unitWidth = unitWidth
+ _displayedTokenCount = State(initialValue: tokenCount)
+ }
+
+ var body: some View {
+ content
+ .opacity(isVisible ? 1 : 0)
+ .frame(width: width, alignment: .trailing)
+ .onChange(of: tokenCount) { _, newTokenCount in
+ updateDisplayedTokenCount(newTokenCount)
+ }
+ .onDisappear {
+ fadeTask?.cancel()
+ }
+ }
+
+ @ViewBuilder
+ private var content: some View {
+ if let displayedTokenCount {
+ TokenCountText(
+ tokens: displayedTokenCount,
+ font: font,
+ reservedNumericWidth: numericWidth,
+ reservedUnitWidth: unitWidth
+ )
+ .foregroundStyle(Color.codexLabel)
+ } else {
+ Text("--")
+ .font(font)
+ .foregroundStyle(Color.codexLabel)
+ }
+ }
+
+ private func updateDisplayedTokenCount(_ newTokenCount: Int?) {
+ fadeTask?.cancel()
+
+ if (displayedTokenCount == nil) == (newTokenCount == nil) {
+ updateTokenCountWithoutFade(newTokenCount)
+ return
+ }
+
+ fadeToTokenCount(newTokenCount)
+ }
+
+ private func updateTokenCountWithoutFade(_ newTokenCount: Int?) {
+ guard displayedTokenCount != newTokenCount || !isVisible else {
+ return
+ }
+
+ withAnimation(Metrics.numericAnimation) {
+ displayedTokenCount = newTokenCount
+ isVisible = true
+ }
+ }
+
+ private func fadeToTokenCount(_ newTokenCount: Int?) {
+ fadeTask = Task { @MainActor in
+ withAnimation(Metrics.fadeAnimation) {
+ isVisible = false
+ }
+
+ try? await Task.sleep(for: .milliseconds(Metrics.fadeDelayMilliseconds))
+ guard !Task.isCancelled else {
+ return
+ }
+
+ displayedTokenCount = newTokenCount
+ withAnimation(Metrics.fadeAnimation) {
+ isVisible = true
+ }
+
+ fadeTask = nil
+ }
+ }
+
+ private var width: CGFloat {
+ numericWidth + unitWidth
+ }
+
+ private enum Metrics {
+ static let fadeAnimation = Animation.easeInOut(duration: 0.12)
+ static let fadeDelayMilliseconds: UInt64 = 120
+ static let numericAnimation = Animation.codexStatus
+ }
+}
+
/// 日期拆成三段以获得更自然的数字滚动过渡
private struct AnimatedDateText: View {
let startDate: String
diff --git a/README.md b/README.md
index 53ea061..2caafc6 100644
--- a/README.md
+++ b/README.md
@@ -76,9 +76,15 @@ CodexBar 使用 Sparkle 检查更新。安装后,新版本会通过内置更
## 安装
-### 下载
+### Homebrew
-从 [Releases](https://github.com/bob-zebedy/CodexBar/releases) 下载最新 DMG,打开后把 `CodexBar.app` 拖入 `/Applications`。
+```bash
+brew install --cask bob-zebedy/tap/codexbar
+```
+
+### 下载安装
+
+从 [Releases](https://github.com/bob-zebedy/CodexBar/releases) 下载最新 DMG,打开后把 `CodexBar.app` 拖入 `/Applications`
后续版本会通过内置 Sparkle 自动更新推送。
diff --git a/appcast.xml b/appcast.xml
index 890b856..7a9f865 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -7,6 +7,15 @@
<link>https://codexbar.zabrian.app/appcast.xml</link>
<description>CodexBar appcast feed</description>
<language>zh-CN</language>
+ <item>
+ <title>CodexBar.app 3.2.7</title>
+ <sparkle:version>35</sparkle:version>
+ <sparkle:shortVersionString>3.2.7</sparkle:shortVersionString>
+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#3.2.7</sparkle:releaseNotesLink>
+ <pubDate>Tue, 30 Jun 2026 13:36:55 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v3.2.7.dmg" sparkle:edSignature="v1CNOWyRse3F/axyOBG17ZePKw43EzRYAeZHcFp4jm6tz8Q0zPN/MPLcfTvo/H710N36B4xqwuHclu9/3gFvAg==" length="3474123" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar.app 3.2.6</title>
<sparkle:version>34</sparkle:version>