@sriinnu/runic 1.2.0 → 2.0.0

package/Sources/Runic/Views/Preferences/PreferencesCustomProvidersPane.swift

@@ -17,7 +17,7 @@ struct CustomProvidersPane: View {
                 // Header with add button
                 HStack {
                     Text("Custom API Providers")
-                        .font(.headline)
+                        .font(RunicFont.headline)
 
                     Spacer()
 
@@ -37,11 +37,11 @@ struct CustomProvidersPane: View {
                             .foregroundStyle(.secondary)
 
                         Text("No custom providers configured")
-                            .font(.headline)
+                            .font(RunicFont.headline)
                             .foregroundStyle(.secondary)
 
                         Text("Add a custom API provider to track usage from APIs not natively supported by Runic.")
-                            .font(.caption)
+                            .font(RunicFont.caption)
                             .foregroundStyle(.tertiary)
                             .multilineTextAlignment(.center)
                             .frame(maxWidth: 300)
@@ -56,9 +56,8 @@ struct CustomProvidersPane: View {
                             snapshot: self.store.customProviderSnapshots[provider.id],
                             onToggle: { enabled in self.toggleProvider(provider, enabled: enabled) },
                             onEdit: { self.editingProvider = provider },
-                            onDelete: { self.confirmDelete = provider }
-                        )
-                        .padding(.horizontal, PreferencesLayoutMetrics.paneHorizontal)
+                            onDelete: { self.confirmDelete = provider })
+                            .padding(.horizontal, PreferencesLayoutMetrics.paneHorizontal)
 
                         if provider.id != self.providers.last?.id {
                             Divider()
@@ -79,8 +78,7 @@ struct CustomProvidersPane: View {
                     self.addProvider(provider)
                     self.showingAddProvider = false
                 },
-                onCancel: { self.showingAddProvider = false }
-            )
+                onCancel: { self.showingAddProvider = false })
         }
         .sheet(item: self.$editingProvider) { provider in
             CustomProviderEditorView(
@@ -89,13 +87,12 @@ struct CustomProvidersPane: View {
                     self.updateProvider(updated)
                     self.editingProvider = nil
                 },
-                onCancel: { self.editingProvider = nil }
-            )
+                onCancel: { self.editingProvider = nil })
         }
         .alert("Delete Provider", isPresented: Binding(
             get: { self.confirmDelete != nil },
-            set: { if !$0 { self.confirmDelete = nil } }
-        )) {
+            set: { if !$0 { self.confirmDelete = nil } }))
+        {
             Button("Cancel", role: .cancel) { self.confirmDelete = nil }
             Button("Delete", role: .destructive) {
                 if let provider = self.confirmDelete {
@@ -165,40 +162,40 @@ private struct CustomProviderRow: View {
 
     var body: some View {
         HStack(spacing: RunicSpacing.sm) {
-            Image(systemName: provider.icon)
+            Image(systemName: self.provider.icon)
                 .font(.system(size: 24))
                 .foregroundStyle(self.iconColor)
                 .frame(width: 32, height: 32)
 
             VStack(alignment: .leading, spacing: 4) {
-                Text(provider.name)
-                    .font(.body)
+                Text(self.provider.name)
+                    .font(RunicFont.body)
                     .fontWeight(.medium)
 
                 if let snapshot = self.snapshot {
                     if let error = snapshot.error {
                         Text(error)
-                            .font(.caption)
+                            .font(RunicFont.caption)
                             .foregroundStyle(.red)
                     } else {
                         HStack(spacing: 4) {
                             if let quota = snapshot.usageData.quota, let used = snapshot.usageData.used {
                                 let percent = quota > 0 ? (used / quota) * 100 : 0
                                 Text("\(Int(percent))% used")
-                                    .font(.caption)
+                                    .font(RunicFont.caption)
                                     .foregroundStyle(.secondary)
                             }
                             Text("•")
-                                .font(.caption)
+                                .font(RunicFont.caption)
                                 .foregroundStyle(.tertiary)
                             Text("Updated \(snapshot.updatedAt.relativeDescription())")
-                                .font(.caption)
+                                .font(RunicFont.caption)
                                 .foregroundStyle(.tertiary)
                         }
                     }
                 } else {
                     Text("No data")
-                        .font(.caption)
+                        .font(RunicFont.caption)
                         .foregroundStyle(.tertiary)
                 }
             }
@@ -222,17 +219,16 @@ private struct CustomProviderRow: View {
 
                 Toggle("", isOn: Binding(
                     get: { self.provider.enabled },
-                    set: { self.onToggle($0) }
-                ))
-                .labelsHidden()
-                .toggleStyle(.switch)
+                    set: { self.onToggle($0) }))
+                    .labelsHidden()
+                    .toggleStyle(.switch)
             }
         }
         .padding(.vertical, RunicSpacing.sm)
     }
 
     private var iconColor: Color {
-        if !provider.enabled { return .secondary }
+        if !self.provider.enabled { return .secondary }
         if let colorHex = provider.colorHex, let nsColor = NSColor(hexString: colorHex) {
             return Color(nsColor: nsColor)
         }
@@ -242,8 +238,8 @@ private struct CustomProviderRow: View {
 
 // MARK: - Helper Extensions
 
-private extension Date {
-    func relativeDescription() -> String {
+extension Date {
+    fileprivate func relativeDescription() -> String {
         let now = Date()
         let interval = now.timeIntervalSince(self)
         if interval < 60 { return "just now" }
@@ -253,8 +249,8 @@ private extension Date {
     }
 }
 
-private extension NSColor {
-    convenience init?(hexString: String) {
+extension NSColor {
+    fileprivate convenience init?(hexString: String) {
         var hex = hexString.trimmingCharacters(in: .whitespacesAndNewlines)
         if hex.hasPrefix("#") { hex.removeFirst() }
         guard hex.count == 6 else { return nil }
@@ -267,7 +263,6 @@ private extension NSColor {
     }
 }
 
-
 // MARK: - Custom Provider Editor View (Simplified)
 
 @MainActor
@@ -283,39 +278,43 @@ private struct CustomProviderEditorView: View {
 
     var body: some View {
         VStack {
-            Text(provider == nil ? "Add Custom Provider" : "Edit Provider")
-                .font(.headline)
+            Text(self.provider == nil ? "Add Custom Provider" : "Edit Provider")
+                .font(RunicFont.headline)
                 .padding()
             Form {
-                TextField("Provider Name", text: $name)
-                TextField("Icon (SF Symbol)", text: $icon)
-                SecureField("API Token", text: $apiToken)
-                TextField("Usage Endpoint URL", text: $usageEndpointURL)
+                TextField("Provider Name", text: self.$name)
+                TextField("Icon (SF Symbol)", text: self.$icon)
+                SecureField("API Token", text: self.$apiToken)
+                TextField("Usage Endpoint URL", text: self.$usageEndpointURL)
             }
             .padding()
             HStack {
-                Button("Cancel") { onCancel() }
-                Button(provider == nil ? "Add" : "Save") {
+                Button("Cancel") { self.onCancel() }
+                Button(self.provider == nil ? "Add" : "Save") {
                     // Simplified save logic
-                    onSave(CustomProviderConfig(
-                        id: provider?.id ?? UUID().uuidString,
-                        name: name,
-                        icon: icon,
-                        enabled: provider?.enabled ?? true,
-                        auth: AuthConfig(type: .bearer, headerName: "Authorization", tokenKeychain: "custom-\(name)"),
-                        endpoints: EndpointConfig(usage: UsageEndpoint(url: usageEndpointURL, mapping: ResponseMapping()))
-                    ))
+                    self.onSave(CustomProviderConfig(
+                        id: self.provider?.id ?? UUID().uuidString,
+                        name: self.name,
+                        icon: self.icon,
+                        enabled: self.provider?.enabled ?? true,
+                        auth: AuthConfig(
+                            type: .bearer,
+                            headerName: "Authorization",
+                            tokenKeychain: "custom-\(self.name)"),
+                        endpoints: EndpointConfig(usage: UsageEndpoint(
+                            url: self.usageEndpointURL,
+                            mapping: ResponseMapping()))))
                 }
-                .disabled(name.isEmpty || apiToken.isEmpty || usageEndpointURL.isEmpty)
+                .disabled(self.name.isEmpty || self.apiToken.isEmpty || self.usageEndpointURL.isEmpty)
             }
             .padding()
         }
         .frame(width: 500, height: 400)
         .onAppear {
             if let p = provider {
-                name = p.name
-                icon = p.icon
-                usageEndpointURL = p.endpoints.usage?.url ?? ""
+                self.name = p.name
+                self.icon = p.icon
+                self.usageEndpointURL = p.endpoints.usage?.url ?? ""
             }
         }
     }

package/Sources/Runic/Views/Preferences/PreferencesDebugPane.swift

@@ -128,7 +128,7 @@ struct DebugPane: View {
                 ZStack(alignment: .topLeading) {
                     ScrollView {
                         Text(self.displayedLog)
-                            .font(.system(.footnote, design: .monospaced))
+                            .font(RunicFont.footnote)
                             .textSelection(.enabled)
                             .frame(maxWidth: .infinity, alignment: .leading)
                             .padding(RunicSpacing.xs)
@@ -160,7 +160,7 @@ struct DebugPane: View {
 
                 ScrollView {
                     Text(self.fetchAttemptsText(for: self.currentFetchProvider))
-                        .font(.system(.footnote, design: .monospaced))
+                        .font(RunicFont.footnote)
                         .textSelection(.enabled)
                         .frame(maxWidth: .infinity, alignment: .leading)
                         .padding(RunicSpacing.xs)
@@ -185,7 +185,7 @@ struct DebugPane: View {
                     Text(self.store.openAIDashboardCookieImportDebugLog?.isEmpty == false
                         ? (self.store.openAIDashboardCookieImportDebugLog ?? "")
                         : "No log yet. Enable \"Access OpenAI via web\" in General to run an import.")
-                        .font(.system(.footnote, design: .monospaced))
+                        .font(RunicFont.footnote)
                         .textSelection(.enabled)
                         .frame(maxWidth: .infinity, alignment: .leading)
                         .padding(RunicSpacing.xs)
@@ -212,7 +212,7 @@ struct DebugPane: View {
 
                     if let status = self.costCacheStatus {
                         Text(status)
-                            .font(.footnote)
+                            .font(RunicFont.footnote)
                             .foregroundStyle(.tertiary)
                     }
                 }
@@ -313,12 +313,12 @@ struct DebugPane: View {
 
                 VStack(alignment: .leading, spacing: RunicSpacing.xs) {
                     Text("Effective PATH")
-                        .font(.callout.weight(.semibold))
+                        .font(RunicFont.callout.weight(.semibold))
                     ScrollView {
                         Text(self.store.pathDebugInfo.effectivePATH.isEmpty
                             ? "Unavailable"
                             : self.store.pathDebugInfo.effectivePATH)
-                            .font(.system(.footnote, design: .monospaced))
+                            .font(RunicFont.footnote)
                             .textSelection(.enabled)
                             .frame(maxWidth: .infinity, alignment: .leading)
                             .padding(RunicSpacing.xs)
@@ -331,10 +331,10 @@ struct DebugPane: View {
                 if let loginPATH = self.store.pathDebugInfo.loginShellPATH {
                     VStack(alignment: .leading, spacing: RunicSpacing.xs) {
                         Text("Login shell PATH (startup capture)")
-                            .font(.callout.weight(.semibold))
+                            .font(RunicFont.callout.weight(.semibold))
                         ScrollView {
                             Text(loginPATH)
-                                .font(.system(.footnote, design: .monospaced))
+                                .font(RunicFont.footnote)
                                 .textSelection(.enabled)
                                 .frame(maxWidth: .infinity, alignment: .leading)
                                 .padding(RunicSpacing.xs)
@@ -405,9 +405,9 @@ struct DebugPane: View {
     private func binaryRow(title: String, value: String?) -> some View {
         VStack(alignment: .leading, spacing: RunicSpacing.xs) {
             Text(title)
-                .font(.callout.weight(.semibold))
+                .font(RunicFont.callout.weight(.semibold))
             Text(value ?? "Not found")
-                .font(.system(.footnote, design: .monospaced))
+                .font(RunicFont.footnote)
                 .foregroundStyle(value == nil ? .secondary : .primary)
         }
     }

package/Sources/Runic/Views/Preferences/PreferencesGeneralPane.swift

@@ -23,18 +23,18 @@ struct GeneralPane: View {
                     VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
                         Toggle(isOn: self.$settings.costUsageEnabled) {
                             Text("Show cost summary")
-                                .font(.body)
+                                .font(RunicFont.body)
                         }
                         .toggleStyle(.checkbox)
 
                         Text("Reads local usage logs. Shows today + last 30 days cost in the menu.")
-                            .font(.footnote)
+                            .font(RunicFont.footnote)
                             .foregroundStyle(.tertiary)
                             .fixedSize(horizontal: false, vertical: true)
 
                         if self.settings.costUsageEnabled {
                             Text("Auto-refresh: hourly · Timeout: 10m")
-                                .font(.footnote)
+                                .font(RunicFont.footnote)
                                 .foregroundStyle(.tertiary)
 
                             self.costStatusLine(provider: .claude)
@@ -45,12 +45,12 @@ struct GeneralPane: View {
                     VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
                         Toggle(isOn: self.$settings.openAIWebAccessEnabled) {
                             Text("Access OpenAI via web")
-                                .font(.body)
+                                .font(RunicFont.body)
                         }
                         .toggleStyle(.checkbox)
 
                         Text("Imports browser cookies for dashboard extras (credits history, code review).")
-                            .font(.footnote)
+                            .font(RunicFont.footnote)
                             .foregroundStyle(.tertiary)
                             .fixedSize(horizontal: false, vertical: true)
                     }
@@ -84,7 +84,7 @@ struct GeneralPane: View {
                 VStack(alignment: .leading, spacing: RunicSpacing.sm) {
                     VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
                         Text("Menu refresh rate")
-                            .font(.body)
+                            .font(RunicFont.body)
 
                         Picker("", selection: self.$settings.refreshFrequency) {
                             ForEach(RefreshFrequency.allCases) { option in
@@ -94,13 +94,13 @@ struct GeneralPane: View {
                         .pickerStyle(.segmented)
 
                         Text("How often to automatically refresh usage data.")
-                            .font(.footnote)
+                            .font(RunicFont.footnote)
                             .foregroundStyle(.tertiary)
                     }
 
                     VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
                         Text("Chart style")
-                            .font(.body)
+                            .font(RunicFont.body)
 
                         Picker("", selection: self.$settings.chartStyle) {
                             Text("Line").tag(ChartStyle.line)
@@ -111,13 +111,13 @@ struct GeneralPane: View {
                         .frame(maxWidth: 360)
 
                         Text("Visual style for usage charts and graphs.")
-                            .font(.footnote)
+                            .font(RunicFont.footnote)
                             .foregroundStyle(.tertiary)
                     }
 
                     VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
                         Text("Number format")
-                            .font(.body)
+                            .font(RunicFont.body)
 
                         Picker("", selection: self.$settings.numberFormat) {
                             Text("Abbreviated (45.2K)").tag(NumberFormat.abbreviated)
@@ -127,13 +127,13 @@ struct GeneralPane: View {
                         .frame(maxWidth: 360)
 
                         Text("How to display large numbers in the UI.")
-                            .font(.footnote)
+                            .font(RunicFont.footnote)
                             .foregroundStyle(.tertiary)
                     }
 
                     VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
                         Text("Date format")
-                            .font(.body)
+                            .font(RunicFont.body)
 
                         Picker("", selection: self.$settings.dateFormat) {
                             Text("Relative (2h ago)").tag(DateFormat.relative)
@@ -143,13 +143,13 @@ struct GeneralPane: View {
                         .frame(maxWidth: 360)
 
                         Text("How to display timestamps throughout the app.")
-                            .font(.footnote)
+                            .font(RunicFont.footnote)
                             .foregroundStyle(.tertiary)
                     }
 
                     VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
                         Text("Theme")
-                            .font(.body)
+                            .font(RunicFont.body)
 
                         Picker("", selection: self.$settings.theme) {
                             Text("System").tag(Theme.system)
@@ -160,7 +160,26 @@ struct GeneralPane: View {
                         .frame(maxWidth: 360)
 
                         Text("App appearance (requires restart).")
-                            .font(.footnote)
+                            .font(RunicFont.footnote)
+                            .foregroundStyle(.tertiary)
+                    }
+
+                    VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
+                        Text("Font")
+                            .font(RunicFont.body)
+
+                        Picker("", selection: self.$settings.selectedFontFamily) {
+                            ForEach(RunicFontChoice.availableChoices()) { choice in
+                                Text(choice.displayName)
+                                    .font(choice.previewFont)
+                                    .tag(choice.id)
+                            }
+                        }
+                        .pickerStyle(.menu)
+                        .frame(maxWidth: 360)
+
+                        Text("Drop .ttf/.otf files in Resources/Fonts to add more.")
+                            .font(RunicFont.footnote)
                             .foregroundStyle(.tertiary)
                     }
                 }
@@ -186,7 +205,7 @@ struct GeneralPane: View {
 
         guard provider == .claude || provider == .codex else {
             return Text("\(name): unsupported")
-                .font(.footnote)
+                .font(RunicFont.footnote)
                 .foregroundStyle(.tertiary)
         }
 
@@ -200,20 +219,20 @@ struct GeneralPane: View {
                 return formatter.string(from: seconds).map { " (\($0))" } ?? ""
             }()
             return Text("\(name): fetching…\(elapsed)")
-                .font(.footnote)
+                .font(RunicFont.footnote)
                 .foregroundStyle(.tertiary)
         }
         if let snapshot = self.store.tokenSnapshot(for: provider) {
             let updated = UsageFormatter.updatedString(from: snapshot.updatedAt)
             let cost = snapshot.last30DaysCostUSD.map { UsageFormatter.usdString($0) } ?? "—"
             return Text("\(name): \(updated) · 30d \(cost)")
-                .font(.footnote)
+                .font(RunicFont.footnote)
                 .foregroundStyle(.tertiary)
         }
         if let error = self.store.tokenError(for: provider), !error.isEmpty {
             let truncated = UsageFormatter.truncatedSingleLine(error, max: 120)
             return Text("\(name): \(truncated)")
-                .font(.footnote)
+                .font(RunicFont.footnote)
                 .foregroundStyle(.tertiary)
         }
         if let lastAttempt = self.store.tokenLastAttemptAt(for: provider) {
@@ -221,11 +240,11 @@ struct GeneralPane: View {
             rel.unitsStyle = .abbreviated
             let when = rel.localizedString(for: lastAttempt, relativeTo: Date())
             return Text("\(name): last attempt \(when)")
-                .font(.footnote)
+                .font(RunicFont.footnote)
                 .foregroundStyle(.tertiary)
         }
         return Text("\(name): no data yet")
-            .font(.footnote)
+            .font(RunicFont.footnote)
             .foregroundStyle(.tertiary)
     }
 }

package/Sources/Runic/Views/Preferences/PreferencesHelpPane.swift

@@ -7,22 +7,22 @@ struct HelpPane: View {
         PreferencesPane {
             SettingsSection(contentSpacing: PreferencesLayoutMetrics.sectionSpacing) {
                 Text("Menu refresh")
-                    .font(.caption)
+                    .font(RunicFont.caption)
                     .foregroundStyle(.secondary)
                     .textCase(.uppercase)
 
                 Text("Use Ping now in the menu to update usage without closing the panel.")
-                    .font(.body)
+                    .font(RunicFont.body)
                     .foregroundStyle(.secondary)
                     .fixedSize(horizontal: false, vertical: true)
 
                 Text("Auto-refresh cadence and safety rules live in Performance > Refresh & Safety.")
-                    .font(.body)
+                    .font(RunicFont.body)
                     .foregroundStyle(.secondary)
                     .fixedSize(horizontal: false, vertical: true)
 
                 Text("Manual mode avoids background refreshes that may touch tokens.")
-                    .font(.body)
+                    .font(RunicFont.body)
                     .foregroundStyle(.secondary)
                     .fixedSize(horizontal: false, vertical: true)
             }
@@ -31,17 +31,17 @@ struct HelpPane: View {
 
             SettingsSection(contentSpacing: PreferencesLayoutMetrics.sectionSpacing) {
                 Text("Data sources")
-                    .font(.caption)
+                    .font(RunicFont.caption)
                     .foregroundStyle(.secondary)
                     .textCase(.uppercase)
 
                 Text("Runic reads local logs or browser cookies depending on provider settings.")
-                    .font(.body)
+                    .font(RunicFont.body)
                     .foregroundStyle(.secondary)
                     .fixedSize(horizontal: false, vertical: true)
 
                 Text("Open Providers to review each source and add credentials.")
-                    .font(.body)
+                    .font(RunicFont.body)
                     .foregroundStyle(.secondary)
                     .fixedSize(horizontal: false, vertical: true)
             }