git.iko.soy/usage-menubar
on master help sign in
feat: use provider emoji 🅲 Claude, 🅉 z.ai in menu bar
abde53aiko
UsageMenubar/MenuView.swift+2−2
compare with master
unifiedsplit
@@ -259,7 +259,7 @@ struct MenuView: View {
259 VStack(spacing: 8) {
259 VStack(spacing: 8) {
260 HStack(alignment: .firstTextBaseline, spacing: 8) {
260 HStack(alignment: .firstTextBaseline, spacing: 8) {
261 headlineNumber(
261 headlineNumber(
262− text: "🕐 \(percent)%",
262+ text: "🅲 \(percent)%",
263 color: Self.usageColor(percent),
263 color: Self.usageColor(percent),
264 trend: viewModel.claudeTrend,
264 trend: viewModel.claudeTrend,
265 copiedConfirmation: viewModel.copiedClaudeConfirmation,
265 copiedConfirmation: viewModel.copiedClaudeConfirmation,
@@ -379,7 +379,7 @@ struct MenuView: View {
379 VStack(spacing: 8) {
379 VStack(spacing: 8) {
380 HStack(alignment: .firstTextBaseline, spacing: 8) {
380 HStack(alignment: .firstTextBaseline, spacing: 8) {
381 headlineNumber(
381 headlineNumber(
382− text: "🕑 \(fiveHour)%",
382+ text: "🅉 \(fiveHour)%",
383 color: Self.usageColor(fiveHour),
383 color: Self.usageColor(fiveHour),
384 trend: viewModel.zaiTrend,
384 trend: viewModel.zaiTrend,
385 copiedConfirmation: viewModel.copiedZaiConfirmation,
385 copiedConfirmation: viewModel.copiedZaiConfirmation,
UsageMenubar/ViewModel.swift+12−12
@@ -238,11 +238,11 @@ final class ViewModel: ObservableObject {
238 }
238 }
239
239
240 /// The text to show in the menu bar. Each configured provider contributes a
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,
241+ /// segment prefixed with a provider emoji; segments are separated by ` · `
242+ /// (middle dot). Within a segment, windows are listed as bare percentages
242− /// windows are separated by a space. An unconfigured service produces no
243+ /// separated by spaces. An unconfigured service produces no segment.
243− /// segment — no placeholder, no icon.
244 ///
244 ///
245− /// Example: `⚡42 · 🕐62% 📅8% · 🕑12% 📆3%`
245+ /// Example: `⚡42 · 🅲62% 8% · 🅉12% 3%`
246 ///
246 ///
247 /// Takes its values as parameters rather than reading the properties: `@Published`
247 /// Takes its values as parameters rather than reading the properties: `@Published`
248 /// publishes in `willSet`, so a Combine subscriber that called back into the view
248 /// publishes in `willSet`, so a Combine subscriber that called back into the view
@@ -263,28 +263,28 @@ final class ViewModel: ObservableObject {
263 segments.append("⚡\(formatBalance(balance))")
263 segments.append("⚡\(formatBalance(balance))")
264 }
264 }
265
265
266− // Claude — windows joined by space within the segment
266+ // Claude — provider emoji + bare percentages
267 var claudeWindows: [String] = []
267 var claudeWindows: [String] = []
268 if let fiveHour = claudeFiveHourPercent, fiveHour > 0 {
268 if let fiveHour = claudeFiveHourPercent, fiveHour > 0 {
269− claudeWindows.append("🕐\(fiveHour)%")
269+ claudeWindows.append("\(fiveHour)%")
270 }
270 }
271 if let sevenDay = claudeSevenDayPercent, sevenDay > 0 {
271 if let sevenDay = claudeSevenDayPercent, sevenDay > 0 {
272− claudeWindows.append("📅\(sevenDay)%")
272+ claudeWindows.append("\(sevenDay)%")
273 }
273 }
274 if !claudeWindows.isEmpty {
274 if !claudeWindows.isEmpty {
275− segments.append(claudeWindows.joined(separator: " "))
275+ segments.append("🅲" + claudeWindows.joined(separator: " "))
276 }
276 }
277
277
278− // z.ai — windows joined by space within the segment
278+ // z.ai — provider emoji + bare percentages
279 var zaiWindows: [String] = []
279 var zaiWindows: [String] = []
280 if let zaiFiveHour = zaiFiveHourPercent, zaiFiveHour > 0 {
280 if let zaiFiveHour = zaiFiveHourPercent, zaiFiveHour > 0 {
281− zaiWindows.append("🕑\(zaiFiveHour)%")
281+ zaiWindows.append("\(zaiFiveHour)%")
282 }
282 }
283 if let zaiWeekly = zaiWeeklyPercent, zaiWeekly > 0 {
283 if let zaiWeekly = zaiWeeklyPercent, zaiWeekly > 0 {
284− zaiWindows.append("📆\(zaiWeekly)%")
284+ zaiWindows.append("\(zaiWeekly)%")
285 }
285 }
286 if !zaiWindows.isEmpty {
286 if !zaiWindows.isEmpty {
287− segments.append(zaiWindows.joined(separator: " "))
287+ segments.append("🅉" + zaiWindows.joined(separator: " "))
288 }
288 }
289
289
290 if segments.isEmpty {
290 if segments.isEmpty {
UsageMenubarTests/StatusBarTextTests.swift+17−17
@@ -17,7 +17,7 @@ final class StatusBarTextTests: XCTestCase {
17 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
17 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
18 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
18 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
19 )
19 )
20− XCTAssertEqual(title, "⚡42 · 🕐62% 📅8%")
20+ XCTAssertEqual(title, "⚡42 · \u{1F172}62% 8%")
21 }
21 }
22
22
23 func testHyperOnly() {
23 func testHyperOnly() {
@@ -37,7 +37,7 @@ final class StatusBarTextTests: XCTestCase {
37 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
37 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
38 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
38 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
39 )
39 )
40− XCTAssertEqual(title, "🕐62% 📅8%")
40+ XCTAssertEqual(title, "\u{1F172}62% 8%")
41 }
41 }
42
42
43 func testLoadingWithNothingToShow() {
43 func testLoadingWithNothingToShow() {
@@ -70,7 +70,7 @@ final class StatusBarTextTests: XCTestCase {
70 claudeFiveHourPercent: 62, claudeSevenDayPercent: nil,
70 claudeFiveHourPercent: 62, claudeSevenDayPercent: nil,
71 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
71 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
72 )
72 )
73− XCTAssertEqual(title, "🕐62%")
73+ XCTAssertEqual(title, "\u{1F172}62%")
74 }
74 }
75
75
76 func testLoadingKeepsAStaleBalanceOnScreen() {
76 func testLoadingKeepsAStaleBalanceOnScreen() {
@@ -80,7 +80,7 @@ final class StatusBarTextTests: XCTestCase {
80 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
80 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
81 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
81 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
82 )
82 )
83− XCTAssertEqual(title, "⚡42 · 🕐62% 📅8%")
83+ XCTAssertEqual(title, "⚡42 · \u{1F172}62% 8%")
84 }
84 }
85
85
86 func testZeroPercentIsShownRatherThanOmitted() {
86 func testZeroPercentIsShownRatherThanOmitted() {
@@ -90,7 +90,7 @@ final class StatusBarTextTests: XCTestCase {
90 claudeFiveHourPercent: 0, claudeSevenDayPercent: 8,
90 claudeFiveHourPercent: 0, claudeSevenDayPercent: 8,
91 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
91 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
92 )
92 )
93− XCTAssertEqual(title, "⚡42 · 📅8%")
93+ XCTAssertEqual(title, "⚡42 · \u{1F172}8%")
94 }
94 }
95
95
96 func testBothClaudeWindowsZero() {
96 func testBothClaudeWindowsZero() {
@@ -110,7 +110,7 @@ final class StatusBarTextTests: XCTestCase {
110 claudeFiveHourPercent: 62, claudeSevenDayPercent: nil,
110 claudeFiveHourPercent: 62, claudeSevenDayPercent: nil,
111 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
111 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
112 )
112 )
113− XCTAssertEqual(title, "🕐62%")
113+ XCTAssertEqual(title, "\u{1F172}62%")
114 }
114 }
115
115
116 func testSevenDayOnly() {
116 func testSevenDayOnly() {
@@ -120,7 +120,7 @@ final class StatusBarTextTests: XCTestCase {
120 claudeFiveHourPercent: nil, claudeSevenDayPercent: 8,
120 claudeFiveHourPercent: nil, claudeSevenDayPercent: 8,
121 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
121 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
122 )
122 )
123− XCTAssertEqual(title, "📅8%")
123+ XCTAssertEqual(title, "\u{1F172}8%")
124 }
124 }
125
125
126 // MARK: - Hyper not configured
126 // MARK: - Hyper not configured
@@ -154,7 +154,7 @@ final class StatusBarTextTests: XCTestCase {
154 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
154 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
155 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
155 zaiFiveHourPercent: nil, zaiWeeklyPercent: nil
156 )
156 )
157− XCTAssertEqual(title, "🕐62% 📅8%")
157+ XCTAssertEqual(title, "\u{1F172}62% 8%")
158 }
158 }
159
159
160 // MARK: - z.ai in Title
160 // MARK: - z.ai in Title
@@ -166,7 +166,7 @@ final class StatusBarTextTests: XCTestCase {
166 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
166 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
167 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
167 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
168 )
168 )
169− XCTAssertEqual(title, "🕑12%")
169+ XCTAssertEqual(title, "\u{1F169}12%")
170 }
170 }
171
171
172 func testZaiWithHyper() {
172 func testZaiWithHyper() {
@@ -176,7 +176,7 @@ final class StatusBarTextTests: XCTestCase {
176 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
176 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
177 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
177 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
178 )
178 )
179− XCTAssertEqual(title, "⚡42 · 🕑12%")
179+ XCTAssertEqual(title, "⚡42 · \u{1F169}12%")
180 }
180 }
181
181
182 func testZaiWithClaude() {
182 func testZaiWithClaude() {
@@ -186,7 +186,7 @@ final class StatusBarTextTests: XCTestCase {
186 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
186 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
187 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
187 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
188 )
188 )
189− XCTAssertEqual(title, "🕐62% 📅8% · 🕑12%")
189+ XCTAssertEqual(title, "\u{1F172}62% 8% · \u{1F169}12%")
190 }
190 }
191
191
192 func testAllThreeServices() {
192 func testAllThreeServices() {
@@ -196,7 +196,7 @@ final class StatusBarTextTests: XCTestCase {
196 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
196 claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
197 zaiFiveHourPercent: 12, zaiWeeklyPercent: 3
197 zaiFiveHourPercent: 12, zaiWeeklyPercent: 3
198 )
198 )
199− XCTAssertEqual(title, "⚡42 · 🕐62% 📅8% · 🕑12% 📆3%")
199+ XCTAssertEqual(title, "⚡42 · \u{1F172}62% 8% · \u{1F169}12% 3%")
200 }
200 }
201
201
202 func testZaiZeroIsOmitted() {
202 func testZaiZeroIsOmitted() {
@@ -216,7 +216,7 @@ final class StatusBarTextTests: XCTestCase {
216 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
216 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
217 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
217 zaiFiveHourPercent: 12, zaiWeeklyPercent: nil
218 )
218 )
219− XCTAssertEqual(title, "🕑12%")
219+ XCTAssertEqual(title, "\u{1F169}12%")
220 }
220 }
221
221
222 // MARK: - z.ai Weekly
222 // MARK: - z.ai Weekly
@@ -228,7 +228,7 @@ final class StatusBarTextTests: XCTestCase {
228 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
228 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
229 zaiFiveHourPercent: nil, zaiWeeklyPercent: 3
229 zaiFiveHourPercent: nil, zaiWeeklyPercent: 3
230 )
230 )
231− XCTAssertEqual(title, "📆3%")
231+ XCTAssertEqual(title, "\u{1F169}3%")
232 }
232 }
233
233
234 func testZaiWeeklyWithFiveHour() {
234 func testZaiWeeklyWithFiveHour() {
@@ -238,7 +238,7 @@ final class StatusBarTextTests: XCTestCase {
238 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
238 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
239 zaiFiveHourPercent: 12, zaiWeeklyPercent: 3
239 zaiFiveHourPercent: 12, zaiWeeklyPercent: 3
240 )
240 )
241− XCTAssertEqual(title, "🕑12% 📆3%")
241+ XCTAssertEqual(title, "\u{1F169}12% 3%")
242 }
242 }
243
243
244 func testZaiWeeklyZeroIsOmitted() {
244 func testZaiWeeklyZeroIsOmitted() {
@@ -248,7 +248,7 @@ final class StatusBarTextTests: XCTestCase {
248 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
248 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
249 zaiFiveHourPercent: 12, zaiWeeklyPercent: 0
249 zaiFiveHourPercent: 12, zaiWeeklyPercent: 0
250 )
250 )
251− XCTAssertEqual(title, "🕑12%")
251+ XCTAssertEqual(title, "\u{1F169}12%")
252 }
252 }
253
253
254 func testLoadingKeepsZaiWeeklyOnScreen() {
254 func testLoadingKeepsZaiWeeklyOnScreen() {
@@ -258,7 +258,7 @@ final class StatusBarTextTests: XCTestCase {
258 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
258 claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
259 zaiFiveHourPercent: nil, zaiWeeklyPercent: 3
259 zaiFiveHourPercent: nil, zaiWeeklyPercent: 3
260 )
260 )
261− XCTAssertEqual(title, "📆3%")
261+ XCTAssertEqual(title, "\u{1F169}3%")
262 }
262 }
263
263
264 // MARK: - Claude Window Percentages
264 // MARK: - Claude Window Percentages