git.iko.soy/usage-menubar
on master help sign in
feat: use dots to separate providers only in menu bar

Within a provider, windows are separated by spaces. Between providers, segments are separated by middle dots. Before: ⚡42 · 🕐62% · 📅8% · 🤖12% · 📆3% After: ⚡42 · 🕐62% 📅8% · 🤖12% 📆3%

commita4745cdf6dcfa0d780730fa90b27b25ab334059d authoriko <mail@iko.soy> dateFri 17 Jul 2026, 13:54 (3 months ago) parenta489805
2 files changed+36−20
compare with master
unifiedsplit
UsageMenubar/ViewModel.swift+29−13 UsageMenubarTests/StatusBarTextTests.swift+7−7
UsageMenubar/ViewModel.swift+29−13
@@ -237,11 +237,12 @@ final class ViewModel: ObservableObject {
237237 balanceFormatter.string(from: NSNumber(value: value)) ?? "\(value)"
238238 }
239239
240− /// The text to show in the menu bar: `⚡{balance}` (Hyper), `🕐{percent}%` (Claude
241− /// 5-hour), `📅{percent}%` (Claude 7-day), `🤖{percent}%` (z.ai 5-hour), and
242− /// `📆{percent}%` (z.ai weekly) — each omitted when absent or at 0%, and entirely
243− /// absent when the service is not configured. An unconfigured service produces no
244− /// placeholder in the menu bar.
240+ /// The text to show in the menu bar. Each configured provider contributes a
241+ /// segment; segments are separated by ` · ` (middle dot). Within a segment,
242+ /// windows are separated by a space. An unconfigured service produces no
243+ /// segment — no placeholder, no icon.
244+ ///
245+ /// Example: `⚡42 · 🕐62% 📅8% · 🤖12% 📆3%`
245246 ///
246247 /// Takes its values as parameters rather than reading the properties: `@Published`
247248 /// publishes in `willSet`, so a Combine subscriber that called back into the view
@@ -255,28 +256,43 @@ final class ViewModel: ObservableObject {
255256 zaiFiveHourPercent: Int?,
256257 zaiWeeklyPercent: Int?
257258 ) -> String {
258− var parts: [String] = []
259+ var segments: [String] = []
260+
261+ // Hyper
259262 if hyperConfigured, let balance = balance {
260− parts.append("⚡\(formatBalance(balance))")
263+ segments.append("⚡\(formatBalance(balance))")
261264 }
265+
266+ // Claude — windows joined by space within the segment
267+ var claudeWindows: [String] = []
262268 if let fiveHour = claudeFiveHourPercent, fiveHour > 0 {
263− parts.append("🕐\(fiveHour)%")
269+ claudeWindows.append("🕐\(fiveHour)%")
264270 }
265271 if let sevenDay = claudeSevenDayPercent, sevenDay > 0 {
266− parts.append("📅\(sevenDay)%")
272+ claudeWindows.append("📅\(sevenDay)%")
273+ }
274+ if !claudeWindows.isEmpty {
275+ segments.append(claudeWindows.joined(separator: " "))
267276 }
277+
278+ // z.ai — windows joined by space within the segment
279+ var zaiWindows: [String] = []
268280 if let zaiFiveHour = zaiFiveHourPercent, zaiFiveHour > 0 {
269− parts.append("🤖\(zaiFiveHour)%")
281+ zaiWindows.append("🤖\(zaiFiveHour)%")
270282 }
271283 if let zaiWeekly = zaiWeeklyPercent, zaiWeekly > 0 {
272− parts.append("📆\(zaiWeekly)%")
284+ zaiWindows.append("📆\(zaiWeekly)%")
285+ }
286+ if !zaiWindows.isEmpty {
287+ segments.append(zaiWindows.joined(separator: " "))
273288 }
274− if parts.isEmpty {
289+
290+ if segments.isEmpty {
275291 // No service is configured or has anything to show. While loading,
276292 // show an ellipsis; otherwise the title is empty.
277293 return isLoading ? "…" : ""
278294 }
279− return parts.joined(separator: " · ")
295+ return segments.joined(separator: " · ")
280296 }
281297
282298 /// The text to show in the menu bar for the current state.
UsageMenubarTests/StatusBarTextTests.swift+7−7
@@ -17,7 +17,7 @@ final class StatusBarTextTests: XCTestCase {
1717 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
1818 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
1919 )
20− XCTAssertEqual(title, "⚡42 · 🕐62% · 📅8%")
20+ XCTAssertEqual(title, "⚡42 · 🕐62% 📅8%")
2121 }
2222
2323 func testHyperOnly() {
@@ -37,7 +37,7 @@ final class StatusBarTextTests: XCTestCase {
3737 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
3838 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
3939 )
40− XCTAssertEqual(title, "🕐62% · 📅8%")
40+ XCTAssertEqual(title, "🕐62% 📅8%")
4141 }
4242
4343 func testLoadingWithNothingToShow() {
@@ -80,7 +80,7 @@ final class StatusBarTextTests: XCTestCase {
8080 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
8181 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
8282 )
83− XCTAssertEqual(title, "⚡42 · 🕐62% · 📅8%")
83+ XCTAssertEqual(title, "⚡42 · 🕐62% 📅8%")
8484 }
8585
8686 func testZeroPercentIsShownRatherThanOmitted() {
@@ -154,7 +154,7 @@ final class StatusBarTextTests: XCTestCase {
154154 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
155155 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
156156 )
157− XCTAssertEqual(title, "🕐62% · 📅8%")
157+ XCTAssertEqual(title, "🕐62% 📅8%")
158158 }
159159
160160 // MARK: - z.ai in Title
@@ -186,7 +186,7 @@ final class StatusBarTextTests: XCTestCase {
186186 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
187187 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
188188 )
189− XCTAssertEqual(title, "🕐62% · 📅8% · 🤖12%")
189+ XCTAssertEqual(title, "🕐62% 📅8% · 🤖12%")
190190 }
191191
192192 func testAllThreeServices() {
@@ -196,7 +196,7 @@ final class StatusBarTextTests: XCTestCase {
196196 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
197197 zaiFiveHourPercent: 12, zaiWeeklyPercent: 3
198198 )
199− XCTAssertEqual(title, "⚡42 · 🕐62% · 📅8% · 🤖12% · 📆3%")
199+ XCTAssertEqual(title, "⚡42 · 🕐62% 📅8% · 🤖12% 📆3%")
200200 }
201201
202202 func testZaiZeroIsOmitted() {
@@ -238,7 +238,7 @@ final class StatusBarTextTests: XCTestCase {
238238 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
239239 zaiFiveHourPercent: 12, zaiWeeklyPercent: 3
240240 )
241− XCTAssertEqual(title, "🤖12% · 📆3%")
241+ XCTAssertEqual(title, "🤖12% 📆3%")
242242 }
243243
244244 func testZaiWeeklyZeroIsOmitted() {