Skip to content

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

refactor: 统一主面板与辅助窗口的字体层级

Bobacb53797502f
diff --git a/CodexBar/Views/Log/LogPreview.swift b/CodexBar/Views/Log/LogPreview.swift
index 86880d3..fedd2c8 100644
--- a/CodexBar/Views/Log/LogPreview.swift
+++ b/CodexBar/Views/Log/LogPreview.swift
@@ -12,13 +12,9 @@ private nonisolated struct LogCodePreview {
/// 将 JSON 格式化并做轻量 token 高亮, 非 JSON 保持纯文本
private nonisolated enum LogCodePreviewFormatter {
- private static var font: NSFont {
- NSFont.monospacedSystemFont(ofSize: 12, weight: .regular)
- }
-
private static var baseAttributes: [NSAttributedString.Key: Any] {
[
- .font: font,
+ .font: LogTypography.fullTextFont,
.foregroundColor: NSColor.labelColor
]
}
diff --git a/CodexBar/Views/Log/LogView.swift b/CodexBar/Views/Log/LogView.swift
index ec93e20..324d000 100644
--- a/CodexBar/Views/Log/LogView.swift
+++ b/CodexBar/Views/Log/LogView.swift
@@ -1,6 +1,19 @@
import AppKit
import SwiftUI
+enum LogTypography {
+ static let titleFont = Font.body.weight(.semibold)
+ static let bodyFont = Font.body.weight(.regular)
+ static let sectionTitleFont = Font.caption.weight(.semibold)
+ static let captionFont = Font.caption.weight(.regular)
+ static let badgeFont = Font.caption.weight(.medium)
+ static let controlFont = Font.system(size: NSFont.smallSystemFontSize, weight: .regular)
+
+ nonisolated static var fullTextFont: NSFont {
+ .monospacedSystemFont(ofSize: 12, weight: .regular)
+ }
+}
+
/// app-server 交互日志窗口根视图
struct LogView: View {
@ObservedObject var store: AppServerLogViewModel
@@ -17,7 +30,7 @@ struct LogView: View {
if let error = store.errorMessage {
Text(error)
- .font(.caption)
+ .font(LogTypography.captionFont)
.foregroundStyle(.red)
.padding(8)
}
@@ -50,10 +63,10 @@ struct LogView: View {
.foregroundStyle(.tint)
Text("log.app-server.window.title")
- .font(.headline)
+ .font(LogTypography.titleFont)
Text(verbatim: "\(store.totalCount)")
- .font(.caption.monospacedDigit())
+ .font(LogTypography.badgeFont.monospacedDigit())
.foregroundStyle(Color.codexSecondaryLabel)
.numericTransition(value: store.totalCount, comparison: Double(store.totalCount))
.padding(.horizontal, 7)
@@ -70,6 +83,7 @@ struct LogView: View {
Label("common.action.clear", systemImage: "trash")
}
.controlSize(.small)
+ .font(LogTypography.controlFont)
.disabled(store.totalCount == 0 || store.isLoading)
}
.padding(.horizontal, 16)
@@ -83,6 +97,7 @@ struct LogView: View {
.foregroundStyle(.tertiary)
Text("log.empty.no-entries")
+ .font(LogTypography.bodyFont)
.foregroundStyle(.secondary)
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -160,7 +175,7 @@ private struct LogRow: View {
)
} else if entry.status == .pending {
Text("log.status.waiting-response")
- .font(.caption.monospaced())
+ .font(LogTypography.captionFont)
.foregroundStyle(.secondary)
}
}
@@ -204,11 +219,11 @@ private struct LogRow: View {
.frame(width: 12)
Text(Self.timeFormatter.string(from: entry.requestedAt))
- .font(.caption.monospaced())
+ .font(LogTypography.captionFont.monospaced())
.foregroundStyle(.secondary)
Text(entry.source.label)
- .font(.caption2.weight(.semibold))
+ .font(LogTypography.badgeFont)
.foregroundStyle(entry.status.tint)
.padding(.horizontal, 6)
.padding(.vertical, 1)
@@ -219,13 +234,13 @@ private struct LogRow: View {
if let method = entry.method {
Text(method)
- .font(.caption.weight(.medium).monospaced())
+ .font(LogTypography.sectionTitleFont.monospaced())
.foregroundStyle(.primary)
} else if entry.detail != nil {
// 无方法名的记录 (信息/进程级错误) 直接预览正文
// 避免标签后留空
Text(verbatim: currentInlinePreview?.summary ?? "")
- .font(.caption)
+ .font(LogTypography.captionFont)
.foregroundStyle(.secondary)
.lineLimit(1)
.truncationMode(.tail)
@@ -248,12 +263,12 @@ private struct LogRow: View {
return VStack(alignment: .leading, spacing: 2) {
HStack(spacing: 6) {
Text(caption)
- .font(.caption2.weight(.semibold))
+ .font(LogTypography.sectionTitleFont)
.foregroundStyle(.tertiary)
if let time {
Text(Self.timeFormatter.string(from: time))
- .font(.caption2.monospaced())
+ .font(LogTypography.captionFont.monospaced())
.foregroundStyle(.tertiary)
}
@@ -273,10 +288,10 @@ private struct LogRow: View {
}
.buttonStyle(.borderless)
.controlSize(.small)
- .font(.caption)
+ .font(LogTypography.controlFont)
Text(verbatim: inline?.text ?? "")
- .font(.caption.monospaced())
+ .font(LogTypography.captionFont.monospaced())
.foregroundStyle(color)
.lineLimit(1)
.truncationMode(.tail)
@@ -316,15 +331,15 @@ private struct FullLogTextView: View {
VStack(spacing: 0) {
HStack(spacing: 10) {
Text(item.request.title)
- .font(.headline)
+ .font(LogTypography.titleFont)
Text(verbatim: "\(item.document.characterCount)")
- .font(.caption.monospacedDigit())
+ .font(LogTypography.captionFont.monospacedDigit())
.foregroundStyle(.secondary)
if let language = item.document.language {
Text(language)
- .font(.caption2.weight(.semibold))
+ .font(LogTypography.badgeFont)
.foregroundStyle(.secondary)
.padding(.horizontal, 6)
.padding(.vertical, 2)
@@ -342,6 +357,7 @@ private struct FullLogTextView: View {
Label("common.action.copy", systemImage: "doc.on.doc")
}
.controlSize(.small)
+ .font(LogTypography.controlFont)
Button {
dismiss()
@@ -349,6 +365,7 @@ private struct FullLogTextView: View {
Label("common.action.close", systemImage: "xmark")
}
.controlSize(.small)
+ .font(LogTypography.controlFont)
}
.padding(.horizontal, 14)
.padding(.vertical, 10)
diff --git a/CodexBar/Views/Menu/ActivityCard.swift b/CodexBar/Views/Menu/ActivityCard.swift
index 8146983..eca7933 100644
--- a/CodexBar/Views/Menu/ActivityCard.swift
+++ b/CodexBar/Views/Menu/ActivityCard.swift
@@ -156,13 +156,14 @@ struct ActivityCard: View {
text: detail, tint: content.tint, effect: allowsAnimations ? content.statusTextEffect : .none,
lineLimit: nil, supplement: content.detailSupplement
)
+ .font(MenuMetrics.bodyFont)
.numericTransition(value: [detail, content.detailSupplement])
.fixedSize(horizontal: false, vertical: true)
.clipped()
}
if let recent = content.recent {
Text(recent)
- .font(.caption2)
+ .font(MenuMetrics.bodyFont)
.foregroundStyle(Color.codexSecondaryLabel)
.numericTransition(value: recent)
.fixedSize(horizontal: false, vertical: true)
@@ -185,7 +186,7 @@ struct ActivityCard: View {
singleLineWidthReserve: Metrics.headerWidthReserve,
wrappedLayout: wrappedHeaderLayout(for: content.taskID)
)
- .font(.caption.weight(.semibold))
+ .font(MenuMetrics.titleFont)
.foregroundStyle(Color.codexLabel)
.numericTransition(value: content.header)
.fixedSize(horizontal: false, vertical: true)
@@ -222,7 +223,7 @@ struct ActivityCard: View {
HStack(alignment: .firstTextBaseline, spacing: 10) {
if content.otherTaskCount > 0 {
Text(verbatim: "+\(content.otherTaskCount)")
- .font(.caption2.monospacedDigit().weight(.semibold))
+ .font(MenuMetrics.badgeFont)
// 必须是具体 Color, 层级样式在 numericText 的过渡层里会被重新解析成别的层级
.foregroundStyle(Color.codexSecondaryLabel)
.numericTransition(value: content.otherTaskCount, comparison: Double(content.otherTaskCount))
@@ -261,11 +262,11 @@ struct ActivityCard: View {
tokenMetric("usage.token-usage.cached-input", tokens: tokenUsage.cachedInputTokens)
VStack(spacing: 3) {
Text("usage.token-usage.cache-hit-rate")
- .font(.caption2)
+ .font(MenuMetrics.bodyFont)
.foregroundStyle(Color.codexSecondaryLabel)
.minimumScaleFactor(0.65)
Text(tokenUsage.cacheHitRate.map { $0.formatted(.percent.precision(.fractionLength(0 ... 1))) } ?? "—")
- .font(.caption2.monospacedDigit().weight(.semibold))
+ .font(MenuMetrics.valueFont)
.foregroundStyle(Color.codexLabel)
.numericTransition(value: tokenUsage.cacheHitRate, comparison: tokenUsage.cacheHitRate ?? 0)
}
@@ -278,10 +279,10 @@ struct ActivityCard: View {
private func tokenMetric(_ title: LocalizedStringKey, tokens: Int64) -> some View {
VStack(spacing: 3) {
Text(title)
- .font(.caption2)
+ .font(MenuMetrics.bodyFont)
.foregroundStyle(Color.codexSecondaryLabel)
.minimumScaleFactor(0.65)
- TokenCountText(tokens: Int(tokens), font: .caption2.monospacedDigit().weight(.semibold))
+ TokenCountText(tokens: Int(tokens), font: MenuMetrics.valueFont)
.foregroundStyle(Color.codexLabel)
}
.frame(minWidth: 0, maxWidth: .infinity)
diff --git a/CodexBar/Views/Menu/ActivityCenterView.swift b/CodexBar/Views/Menu/ActivityCenterView.swift
index f696d24..eebf49f 100644
--- a/CodexBar/Views/Menu/ActivityCenterView.swift
+++ b/CodexBar/Views/Menu/ActivityCenterView.swift
@@ -335,6 +335,7 @@ struct ActivityCenterView: View {
tint: tint,
effect: allowsAnimations ? effect : .none
)
+ .font(.caption2)
.numericTransition(value: detail)
if let tokenUsage {
Spacer(minLength: 0)
diff --git a/CodexBar/Views/Menu/ActivityStatusText.swift b/CodexBar/Views/Menu/ActivityStatusText.swift
index 2fe80a3..5c2d856 100644
--- a/CodexBar/Views/Menu/ActivityStatusText.swift
+++ b/CodexBar/Views/Menu/ActivityStatusText.swift
@@ -27,7 +27,6 @@ struct ActivityStatusText: View {
.allowsHitTesting(false)
}
}
- .font(.caption2)
.lineLimit(lineLimit)
.truncationMode(.tail)
.anchorPreference(key: ActivityIonizationSourceKey.self, value: .bounds) { bounds in
diff --git a/CodexBar/Views/Menu/CodexServiceStatusRow.swift b/CodexBar/Views/Menu/CodexServiceStatusRow.swift
index d1ed612..9d048c9 100644
--- a/CodexBar/Views/Menu/CodexServiceStatusRow.swift
+++ b/CodexBar/Views/Menu/CodexServiceStatusRow.swift
@@ -22,7 +22,7 @@ struct CodexServiceStatusRow: View {
.frame(width: MenuMetrics.statusIconSize, height: MenuMetrics.statusIconSize)
Text(statusTitle)
- .font(.caption)
+ .font(MenuMetrics.bodyFont)
.foregroundStyle(Color.codexLabel)
.numericTransition(value: monitor.state)
.layoutPriority(1)
@@ -31,7 +31,7 @@ struct CodexServiceStatusRow: View {
if !displayedComponents.isEmpty {
Text(verbatim: displayedComponents.map { Self.shortComponentName($0) }.joined(separator: " • "))
- .font(.caption2.weight(.medium))
+ .font(MenuMetrics.bodyFont)
.foregroundStyle(statusColor)
.numericTransition(value: displayedComponents)
.truncationMode(.tail)
diff --git a/CodexBar/Views/Menu/CodexStatusMenuSections.swift b/CodexBar/Views/Menu/CodexStatusMenuSections.swift
index adc5d57..4798d58 100644
--- a/CodexBar/Views/Menu/CodexStatusMenuSections.swift
+++ b/CodexBar/Views/Menu/CodexStatusMenuSections.swift
@@ -1,8 +1,13 @@
import Foundation
import SwiftUI
-/// 菜单面板内共享的固定尺寸, 保持各分区对齐
+/// 主面板共享的字体和尺寸, 按内容角色区分层级并保持各分区对齐
enum MenuMetrics {
+ static let titleFont = Font.caption.weight(.semibold)
+ static let bodyFont = Font.caption.weight(.regular)
+ static let valueFont = Font.caption.weight(.semibold).monospacedDigit()
+ static let badgeFont = Font.caption.weight(.medium).monospacedDigit()
+
static let panelPadding: CGFloat = 10
static let panelCornerRadius: CGFloat = 8
static let accountIconSize: CGFloat = 14
@@ -30,7 +35,7 @@ struct AccountCard: View {
.onTapGesture(count: 2, perform: onRefresh)
Text(title)
- .font(.caption.weight(.semibold))
+ .font(MenuMetrics.titleFont)
.lineLimit(1)
.truncationMode(.middle)
.blur(radius: isEmail && isEmailBlurred ? 3 : 0)
@@ -50,7 +55,7 @@ struct AccountCard: View {
if let plan {
Text(plan.uppercased())
- .font(.caption2.weight(.bold))
+ .font(MenuMetrics.badgeFont)
.foregroundStyle(
Self.planBadgeTint(for: plan, colorScheme: colorScheme)
)
@@ -104,7 +109,7 @@ struct StatusAccountCard: View {
if let text = display.text {
Text(text)
- .font(.caption.weight(.semibold))
+ .font(MenuMetrics.titleFont)
.foregroundStyle(display.color)
.lineLimit(1)
.truncationMode(.middle)
@@ -147,6 +152,7 @@ struct StatusAccountCard: View {
struct EmptyDataPanel: View {
var body: some View {
Text("common.empty.no-data")
+ .font(MenuMetrics.bodyFont)
.foregroundStyle(.secondary)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.vertical, MenuMetrics.loadingVerticalPadding)
@@ -188,7 +194,7 @@ struct QuotaLimitsSection: View {
VStack(alignment: .leading, spacing: 6) {
HStack(spacing: 8) {
Text(limit.title)
- .font(.caption.weight(.semibold))
+ .font(MenuMetrics.titleFont)
.foregroundStyle(.primary)
.lineLimit(1)
.truncationMode(.middle)
@@ -259,8 +265,7 @@ struct QuotaLimitsSection: View {
private func metadataCapsule(_ text: String, tint: Color = .green) -> some View {
Text(text)
- .font(.caption2.weight(.medium))
- .monospacedDigit()
+ .font(MenuMetrics.badgeFont)
.foregroundStyle(tint)
.numericTransition(value: text)
.lineLimit(1)
@@ -298,14 +303,14 @@ struct UpdatedAtRow: View {
}
.foregroundStyle(Color.codexLabel)
}
- .font(.caption2)
+ .font(MenuMetrics.bodyFont)
.animation(Metrics.statusAnimation, value: updatedAt)
Spacer()
if let updateMessage {
Text(updateMessage)
- .font(.caption2.monospacedDigit())
+ .font(MenuMetrics.bodyFont.monospacedDigit())
.foregroundStyle(Color.codexSecondaryLabel)
.lineLimit(1)
.numericTransition(value: updateMessage)
diff --git a/CodexBar/Views/Menu/QuotaRow.swift b/CodexBar/Views/Menu/QuotaRow.swift
index 8c70130..1d2fcdc 100644
--- a/CodexBar/Views/Menu/QuotaRow.swift
+++ b/CodexBar/Views/Menu/QuotaRow.swift
@@ -9,7 +9,7 @@ struct QuotaRow: View {
var body: some View {
HStack(alignment: .center, spacing: 0) {
Text(window.label)
- .font(.caption.weight(.semibold))
+ .font(MenuMetrics.bodyFont)
.lineLimit(1)
.minimumScaleFactor(Metrics.labelMinimumScaleFactor)
.allowsTightening(true)
@@ -22,7 +22,7 @@ struct QuotaRow: View {
.padding(.leading, Metrics.labelBarSpacing)
percentageValue
- .font(.caption.monospacedDigit().weight(.semibold))
+ .font(MenuMetrics.valueFont)
.lineLimit(1)
.frame(width: Metrics.percentWidth, alignment: .leading)
.padding(.leading, Metrics.barPercentSpacing)
@@ -30,7 +30,7 @@ struct QuotaRow: View {
Spacer(minLength: Metrics.percentResetSpacing)
Text(resetText)
- .font(.caption2.monospacedDigit())
+ .font(MenuMetrics.bodyFont.monospacedDigit())
.foregroundStyle(Color.codexSecondaryLabel)
.numericTransition(value: resetText, comparison: window.resetsAt?.timeIntervalSinceReferenceDate)
.lineLimit(1)
diff --git a/CodexBar/Views/Menu/TokenCountText.swift b/CodexBar/Views/Menu/TokenCountText.swift
index 9de0c6c..2ea4d0c 100644
--- a/CodexBar/Views/Menu/TokenCountText.swift
+++ b/CodexBar/Views/Menu/TokenCountText.swift
@@ -4,7 +4,7 @@ import SwiftUI
struct TokenCountText: View {
@Environment(\.contentAnimationsEnabled) private var allowsAnimations
let tokens: Int
- var font: Font = .caption.monospacedDigit().weight(.semibold)
+ var font: Font = MenuMetrics.valueFont
var body: some View {
Text(TokenCountFormatter.text(from: tokens))
diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swift
index 54a20d1..5fc34b9 100644
--- a/CodexBar/Views/Menu/UsageHeatmap.swift
+++ b/CodexBar/Views/Menu/UsageHeatmap.swift
@@ -82,7 +82,7 @@ struct UsageHeatmap: View {
}
.buttonStyle(ModeButtonStyle())
}
- .font(.caption2.weight(.medium))
+ .font(MenuMetrics.bodyFont)
.foregroundStyle(.secondary)
.fixedSize()
@@ -90,7 +90,7 @@ struct UsageHeatmap: View {
if let dateRangeText {
Text(dateRangeText)
- .font(.caption2.monospacedDigit())
+ .font(MenuMetrics.bodyFont.monospacedDigit())
.foregroundStyle(Color.codexSecondaryLabel)
.contentTransition(allowsAnimations ? .numericText() : .identity)
.animation(allowsAnimations ? .codexStatus : nil, value: dateRangeText)
diff --git a/CodexBar/Views/Menu/UsageSummaryView.swift b/CodexBar/Views/Menu/UsageSummaryView.swift
index 4150fd7..802bceb 100644
--- a/CodexBar/Views/Menu/UsageSummaryView.swift
+++ b/CodexBar/Views/Menu/UsageSummaryView.swift
@@ -105,7 +105,7 @@ struct UsageSummaryView: View {
.minimumScaleFactor(0.8)
} else {
Text(verbatim: "--")
- .font(.caption.monospacedDigit().weight(.semibold))
+ .font(MenuMetrics.valueFont)
}
}
}
@@ -113,7 +113,7 @@ struct UsageSummaryView: View {
private func textMetric(label: LocalizedStringResource, value: String) -> some View {
metric(label: label) {
Text(value)
- .font(.caption.monospacedDigit().weight(.semibold))
+ .font(MenuMetrics.valueFont)
.foregroundStyle(Color.codexLabel)
.numericTransition(value: value)
.lineLimit(1)
@@ -127,7 +127,7 @@ struct UsageSummaryView: View {
) -> some View {
VStack(alignment: .leading, spacing: 2) {
Text(label)
- .font(.caption2)
+ .font(MenuMetrics.bodyFont)
.foregroundStyle(.secondary)
.frame(maxWidth: .infinity, alignment: .center)
diff --git a/CodexBar/Views/Settings/AppSettingsView.swift b/CodexBar/Views/Settings/AppSettingsView.swift
index c66e585..61f6d12 100644
--- a/CodexBar/Views/Settings/AppSettingsView.swift
+++ b/CodexBar/Views/Settings/AppSettingsView.swift
@@ -64,6 +64,7 @@ struct AppSettingsView: View {
.offset(y: isTabContentSettled ? 0 : Metrics.tabContentInitialOffset)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
}
+ .font(SettingsRowMetrics.bodyFont)
.frame(width: Metrics.windowWidth)
.frame(maxHeight: .infinity, alignment: .top)
.liquidGlassSurface(
@@ -234,7 +235,7 @@ private extension AppSettingsView {
Text(tab.title)
.foregroundStyle(isSelected ? Color.primary : Color.secondary)
}
- .font(.subheadline.weight(.medium))
+ .font(SettingsRowMetrics.tabFont)
.frame(maxWidth: .infinity)
.padding(.vertical, Metrics.tabVerticalPadding)
.contentShape(shape)
@@ -447,6 +448,7 @@ private extension AppSettingsView {
.labelsHidden()
.pickerStyle(.menu)
.controlSize(.small)
+ .font(SettingsRowMetrics.controlFont.monospacedDigit())
.fixedSize(horizontal: true, vertical: false)
.transition(.opacity.combined(with: .move(edge: .trailing)))
}
@@ -637,7 +639,7 @@ private extension AppSettingsView {
if let caption {
SettingsIndentedRow(alignment: .top) {
Text(caption.message)
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(caption.isError ? Color.red : Color.codexSecondaryLabel)
.fixedSize(horizontal: false, vertical: true)
.numericTransition(value: caption.message)
@@ -649,6 +651,7 @@ private extension AppSettingsView {
SMAppService.openSystemSettingsLoginItems()
}
.controlSize(.small)
+ .font(SettingsRowMetrics.controlFont)
.fixedSize()
.transition(.opacity.combined(with: .move(edge: .trailing)))
}
@@ -727,7 +730,7 @@ private extension AppSettingsView {
} else if state.shouldShowSyncStatus(lastSyncText: lastSyncText) {
SettingsIndentedRow {
Text("sync.status.last-sync")
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
Spacer(minLength: 8)
@@ -744,7 +747,7 @@ private extension AppSettingsView {
.transition(.opacity)
} else if let lastSyncText {
Text(lastSyncText)
- .font(.caption.monospacedDigit())
+ .font(SettingsRowMetrics.captionFont.monospacedDigit())
.foregroundStyle(Color.codexSecondaryLabel)
.numericTransition(value: lastSyncText)
.lineLimit(1)
@@ -805,6 +808,7 @@ private extension AppSettingsView {
isShowingRebuildConfirmation = true
}
.controlSize(.small)
+ .font(SettingsRowMetrics.controlFont)
.frame(minWidth: RebuildLayoutMetrics.actionMinimumWidth)
.disabled(selectedRebuildDateKeys.isEmpty)
}
@@ -954,7 +958,7 @@ private extension AppSettingsView {
Spacer()
Text(status.text)
- .font(status.isVersionLabel ? .body.monospacedDigit() : .body)
+ .font(status.isVersionLabel ? SettingsRowMetrics.bodyFont.monospacedDigit() : SettingsRowMetrics.bodyFont)
.foregroundStyle(Color.codexSecondaryLabel)
.lineLimit(1)
.numericTransition(value: status.text)
diff --git a/CodexBar/Views/Settings/AutoResetOptionsView.swift b/CodexBar/Views/Settings/AutoResetOptionsView.swift
index 95bf1cd..825c344 100644
--- a/CodexBar/Views/Settings/AutoResetOptionsView.swift
+++ b/CodexBar/Views/Settings/AutoResetOptionsView.swift
@@ -7,7 +7,7 @@ struct AutoResetOptionsView: View {
var body: some View {
HStack(spacing: Metrics.controlSpacing) {
Text("auto-reset.lead-time.title")
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
Spacer(minLength: 8)
diff --git a/CodexBar/Views/Settings/CodexVersionSection.swift b/CodexBar/Views/Settings/CodexVersionSection.swift
index ddd7c33..2a5b2c8 100644
--- a/CodexBar/Views/Settings/CodexVersionSection.swift
+++ b/CodexBar/Views/Settings/CodexVersionSection.swift
@@ -19,6 +19,7 @@ struct CodexVersionSection: View {
.foregroundStyle(.tint)
Text("settings.codex.version.title")
+ .font(SettingsRowMetrics.titleFont)
reconnectButton
@@ -34,6 +35,7 @@ struct CodexVersionSection: View {
}
.padding(.leading, Metrics.childIndent)
}
+ .font(SettingsRowMetrics.bodyFont)
.onDisappear {
copiedPathResetTasks.values.forEach { $0.cancel() }
}
@@ -91,7 +93,7 @@ struct CodexVersionSection: View {
if let info = connectionInfo {
HStack(spacing: 12) {
Text("settings.codex.daemon.in-use")
- .font(.caption2.weight(.medium))
+ .font(SettingsRowMetrics.badgeFont)
.foregroundStyle(.green)
.padding(.horizontal, 6)
.padding(.vertical, 2)
@@ -128,7 +130,7 @@ struct CodexVersionSection: View {
VStack(alignment: .trailing, spacing: 3) {
Text(item.displayVersion)
- .font(hasVersion ? .body.monospacedDigit() : .body)
+ .font(hasVersion ? SettingsRowMetrics.bodyFont.monospacedDigit() : SettingsRowMetrics.bodyFont)
.foregroundStyle(Color(nsColor: hasVersion ? .secondaryLabelColor : .tertiaryLabelColor))
.lineLimit(1)
.numericTransition(value: item.displayVersion)
@@ -175,14 +177,14 @@ private struct CopyablePathText: View {
var body: some View {
ZStack(alignment: .trailing) {
Text(path)
- .font(.caption2)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
.lineLimit(1)
.truncationMode(.middle)
.opacity(isCopied ? 0 : 1)
Text("common.status.copied")
- .font(.caption2)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.green)
.lineLimit(1)
.opacity(isCopied ? 1 : 0)
diff --git a/CodexBar/Views/Settings/HotKeyRecorderRow.swift b/CodexBar/Views/Settings/HotKeyRecorderRow.swift
index 0595a7b..b90a5cd 100644
--- a/CodexBar/Views/Settings/HotKeyRecorderRow.swift
+++ b/CodexBar/Views/Settings/HotKeyRecorderRow.swift
@@ -15,6 +15,7 @@ struct HotKeyRecorderRow: View {
.foregroundStyle(.tint)
Text("settings.hotkey.title")
+ .font(SettingsRowMetrics.bodyFont)
Spacer()
@@ -25,7 +26,7 @@ struct HotKeyRecorderRow: View {
.frame(minWidth: Metrics.shortcutButtonMinWidth)
.contentShape(Rectangle())
}
- .font(.body.monospacedDigit())
+ .font(SettingsRowMetrics.bodyFont.monospacedDigit())
.buttonStyle(.bordered)
.controlSize(.small)
.disabled(!canStartRecording)
diff --git a/CodexBar/Views/Settings/KeepAliveOptionsView.swift b/CodexBar/Views/Settings/KeepAliveOptionsView.swift
index 5ee5f19..b1f5600 100644
--- a/CodexBar/Views/Settings/KeepAliveOptionsView.swift
+++ b/CodexBar/Views/Settings/KeepAliveOptionsView.swift
@@ -139,7 +139,7 @@ struct KeepAliveOptionsView: View {
VStack(spacing: 0) {
HStack(spacing: Metrics.controlSpacing) {
Text(title)
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
Spacer(minLength: 8)
@@ -150,7 +150,7 @@ struct KeepAliveOptionsView: View {
HStack(spacing: 0) {
Text(caption)
- .font(.caption2)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.tertiary)
Spacer(minLength: 0)
diff --git a/CodexBar/Views/Settings/MainPanelOptionsView.swift b/CodexBar/Views/Settings/MainPanelOptionsView.swift
index ffbc6ea..7ccd424 100644
--- a/CodexBar/Views/Settings/MainPanelOptionsView.swift
+++ b/CodexBar/Views/Settings/MainPanelOptionsView.swift
@@ -13,6 +13,7 @@ struct MainPanelLayoutSettingsRow: View {
.foregroundStyle(.tint)
Text("settings.main-panel.layout.title")
+ .font(SettingsRowMetrics.bodyFont)
Spacer()
@@ -100,7 +101,7 @@ struct MainPanelOptionsView: View {
.frame(width: Metrics.sectionIconWidth)
Text(section.title)
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
Spacer(minLength: 8)
diff --git a/CodexBar/Views/Settings/NotificationOptionsView.swift b/CodexBar/Views/Settings/NotificationOptionsView.swift
index d2ed11d..409940d 100644
--- a/CodexBar/Views/Settings/NotificationOptionsView.swift
+++ b/CodexBar/Views/Settings/NotificationOptionsView.swift
@@ -259,7 +259,7 @@ struct NotificationOptionsView: View {
) -> some View {
HStack(spacing: 10) {
Text(title)
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
Spacer(minLength: 8)
@@ -278,7 +278,7 @@ struct NotificationOptionsView: View {
private func captionRow(_ caption: LocalizedStringResource) -> some View {
HStack(spacing: 0) {
Text(caption)
- .font(.caption2)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.tertiary)
Spacer(minLength: 0)
@@ -315,7 +315,7 @@ struct NotificationOptionsView: View {
return VStack(spacing: 0) {
HStack(spacing: Metrics.notificationControlSpacing) {
Text(title)
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
.layoutPriority(1)
@@ -336,7 +336,7 @@ struct NotificationOptionsView: View {
if showsSoundControls {
HStack(spacing: Metrics.notificationControlSpacing) {
Text("settings.notifications.sound.title")
- .font(.caption2)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.tertiary)
Spacer(minLength: 8)
@@ -395,7 +395,7 @@ struct NotificationOptionsView: View {
}
} label: {
Text(selection.wrappedValue.localizedTitle)
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
.lineLimit(1)
.frame(maxWidth: .infinity, alignment: .trailing)
@@ -473,7 +473,7 @@ struct NotificationAuthorizationRow: View {
var body: some View {
SettingsIndentedRow {
Text("settings.notifications.system.permission-disabled")
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -483,6 +483,7 @@ struct NotificationAuthorizationRow: View {
settings.openSystemNotificationSettings()
}
.controlSize(.small)
+ .font(SettingsRowMetrics.controlFont)
.fixedSize()
}
}
diff --git a/CodexBar/Views/Settings/RebuildDatePicker.swift b/CodexBar/Views/Settings/RebuildDatePicker.swift
index d8d4e7d..6b66b4b 100644
--- a/CodexBar/Views/Settings/RebuildDatePicker.swift
+++ b/CodexBar/Views/Settings/RebuildDatePicker.swift
@@ -47,7 +47,7 @@ struct RebuildDatePicker: View {
Text("date-picker.select-range")
}
}
- .font(.caption.monospacedDigit().weight(.medium))
+ .font(SettingsRowMetrics.captionFont.monospacedDigit())
.foregroundStyle(Color.codexLabel)
.numericTransition(value: selection?.displayText)
.lineLimit(1)
@@ -96,8 +96,7 @@ struct RebuildDatePicker: View {
Spacer()
Text(monthTitle)
- .font(.system(.body, design: .rounded).weight(.semibold))
- .monospacedDigit()
+ .font(SettingsRowMetrics.titleFont.monospacedDigit())
.foregroundStyle(Color.codexLabel)
.numericTransition(value: monthTitle, comparison: displayedMonth.timeIntervalSinceReferenceDate)
@@ -113,7 +112,7 @@ struct RebuildDatePicker: View {
LazyVGrid(columns: Self.columns, spacing: 5) {
ForEach(weekdaySymbols.indices, id: \.self) { index in
Text(verbatim: weekdaySymbols[index])
- .font(.system(size: 10, weight: .medium))
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
.frame(width: Metrics.daySize, height: 18)
}
@@ -130,7 +129,7 @@ struct RebuildDatePicker: View {
Text("date-picker.select-start")
}
}
- .font(.caption2)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(.secondary)
.lineLimit(1)
.frame(height: 14)
@@ -189,7 +188,7 @@ struct RebuildDatePicker: View {
))
Text(String(day))
- .font(.system(size: 11, weight: isEndpoint ? .semibold : .regular))
+ .font(SettingsRowMetrics.controlFont.weight(isEndpoint ? .semibold : .regular).monospacedDigit())
.foregroundStyle(dayTextColor(
isSelectable: isSelectable,
isEndpoint: isEndpoint,
diff --git a/CodexBar/Views/Settings/SettingsIndentedRow.swift b/CodexBar/Views/Settings/SettingsIndentedRow.swift
index df7f8b4..4e6c50c 100644
--- a/CodexBar/Views/Settings/SettingsIndentedRow.swift
+++ b/CodexBar/Views/Settings/SettingsIndentedRow.swift
@@ -24,7 +24,7 @@ struct SettingsCaptionMessageRow: View {
var body: some View {
SettingsIndentedRow(alignment: .top) {
Text(message)
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.foregroundStyle(color)
.fixedSize(horizontal: false, vertical: true)
}
diff --git a/CodexBar/Views/Settings/SettingsToggleRow.swift b/CodexBar/Views/Settings/SettingsToggleRow.swift
index 9b8d0a8..23dfacd 100644
--- a/CodexBar/Views/Settings/SettingsToggleRow.swift
+++ b/CodexBar/Views/Settings/SettingsToggleRow.swift
@@ -1,7 +1,15 @@
+import AppKit
import SwiftUI
-/// 设置页行布局共享常量: 各行的图标列宽与行内间距必须一致才能对齐
+/// 设置页共享字体和布局, 按内容角色区分层级并保持各行对齐
enum SettingsRowMetrics {
+ static let tabFont = Font.subheadline.weight(.semibold)
+ static let titleFont = Font.body.weight(.semibold)
+ static let bodyFont = Font.body.weight(.regular)
+ static let captionFont = Font.caption.weight(.regular)
+ static let controlFont = Font.system(size: NSFont.smallSystemFontSize, weight: .regular)
+ static let badgeFont = Font.caption.weight(.medium)
+
static let iconWidth: CGFloat = 18
static let spacing: CGFloat = 10
static let optionsButtonSize: CGFloat = 22
@@ -66,6 +74,7 @@ struct SettingsOptionsPicker<Option: Hashable>: View {
.labelsHidden()
.pickerStyle(.menu)
.controlSize(.small)
+ .font(SettingsRowMetrics.controlFont.monospacedDigit())
.frame(width: width, alignment: alignment)
}
}
@@ -99,6 +108,7 @@ struct SettingsToggleRow<Accessory: View>: View {
.foregroundStyle(.tint)
Text(title)
+ .font(SettingsRowMetrics.bodyFont)
Spacer()
diff --git a/CodexBar/Views/Settings/TaskGlowOptionsView.swift b/CodexBar/Views/Settings/TaskGlowOptionsView.swift
index 9748d75..fb12c57 100644
--- a/CodexBar/Views/Settings/TaskGlowOptionsView.swift
+++ b/CodexBar/Views/Settings/TaskGlowOptionsView.swift
@@ -47,7 +47,7 @@ struct TaskGlowOptionsView: View {
))
}
}
- .font(.caption)
+ .font(SettingsRowMetrics.captionFont)
.controlSize(.small)
.padding(.horizontal, SettingsOptionsPanelMetrics.horizontalPadding)
.padding(.vertical, SettingsOptionsPanelMetrics.verticalPadding)
@@ -80,8 +80,7 @@ private struct TaskGlowBrightnessControl: View {
TaskGlowBrightnessSlider(value: $value)
.frame(width: 88, height: 22)
Text(value, format: .percent.precision(.fractionLength(0)))
- .font(.system(size: 10, weight: .medium, design: .rounded))
- .monospacedDigit()
+ .font(SettingsRowMetrics.captionFont.monospacedDigit())
.foregroundStyle(Color.codexSecondaryLabel)
.numericTransition(value: Int((value * 100).rounded()), comparison: value)
.frame(width: 32, alignment: .trailing)
@@ -197,7 +196,7 @@ private struct TaskGlowColorHexField: View {
.help("task-glow.color.preview-help")
Text(verbatim: "#")
- .font(.system(.caption, design: .monospaced))
+ .font(SettingsRowMetrics.captionFont.monospaced())
.foregroundStyle(.secondary)
.frame(width: 8)
@@ -243,7 +242,7 @@ private struct TaskGlowHexInput: NSViewRepresentable {
func makeNSView(context: Context) -> NSTextField {
let field = NSTextField()
field.controlSize = .small
- field.font = .monospacedSystemFont(ofSize: 11, weight: .regular)
+ field.font = .monospacedSystemFont(ofSize: NSFont.smallSystemFontSize, weight: .regular)
field.alignment = .center
field.bezelStyle = .roundedBezel
field.cell?.usesSingleLineMode = true