Unified · Split
| @@ -50,27 +50,24 @@ struct MenuDescriptor { · 49 unmodified lines | ||
| 50 | 50 | func usageSection(for provider: UsageProvider, titlePrefix: String) -> Section { |
| 51 | 51 | let meta = store.metadata(for: provider) |
| 52 | 52 | var entries: [Entry] = [] |
| 53 | − let headline = { (text: String) in Entry.text("\(meta.displayName) · \(text)", .headline) } | |
| 53 | + let headline = Entry.text(meta.displayName, .headline) | |
| 54 | 54 | |
| 55 | − entries.append(headline(meta.sessionLabel)) | |
| 55 | + entries.append(headline) | |
| 56 | 56 | if let snap = store.snapshot(for: provider) { |
| 57 | − entries.append(.text( | |
| 58 | − UsageFormatter.usageLine(remaining: snap.primary.remainingPercent, used: snap.primary.usedPercent), | |
| 59 | − .primary)) | |
| 57 | + let sessionLine = UsageFormatter | |
| 58 | + .usageLine(remaining: snap.primary.remainingPercent, used: snap.primary.usedPercent) | |
| 59 | + entries.append(.text("\(meta.sessionLabel): \(sessionLine)", .primary)) | |
| 60 | 60 | if let reset = snap.primary.resetDescription { entries.append(.text("Resets \(reset)", .secondary)) } |
| 61 | 61 | |
| 62 | − entries.append(headline(meta.weeklyLabel)) | |
| 63 | − entries.append(.text( | |
| 64 | − UsageFormatter | |
| 65 | − .usageLine(remaining: snap.secondary.remainingPercent, used: snap.secondary.usedPercent), | |
| 66 | − .primary)) | |
| 62 | + let weeklyLine = UsageFormatter | |
| 63 | + .usageLine(remaining: snap.secondary.remainingPercent, used: snap.secondary.usedPercent) | |
| 64 | + entries.append(.text("\(meta.weeklyLabel): \(weeklyLine)", .primary)) | |
| 67 | 65 | if let reset = snap.secondary.resetDescription { entries.append(.text("Resets \(reset)", .secondary)) } |
| 68 | 66 | |
| 69 | 67 | if meta.supportsOpus, let opus = snap.tertiary { |
| 70 | − entries.append(headline(meta.opusLabel ?? "Opus")) | |
| 71 | − entries.append(.text( | |
| 72 | − UsageFormatter.usageLine(remaining: opus.remainingPercent, used: opus.usedPercent), | |
| 73 | − .primary)) | |
| 68 | + let opusTitle = meta.opusLabel ?? "Opus" | |
| 69 | + let opusLine = UsageFormatter.usageLine(remaining: opus.remainingPercent, used: opus.usedPercent) | |
| 70 | + entries.append(.text("\(opusTitle): \(opusLine)", .primary)) | |
| 74 | 71 | if let reset = opus.resetDescription { entries.append(.text("Resets \(reset)", .secondary)) } |
| 75 | 72 | } |
| 76 | 73 | |