diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5f581d..b3aed39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,10 +17,10 @@ jobs:
steps:
- name: Check out repository
- uses: actions/checkout@v4
+ uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
- name: Select Xcode
- uses: maxim-lobanov/setup-xcode@v1
+ uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
with:
xcode-version: latest-stable
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f2f3d47..3732cdf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,13 +27,13 @@ jobs:
steps:
- name: Check out repository
- uses: actions/checkout@v4
+ uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
with:
fetch-depth: 0
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
- name: Select Xcode
- uses: maxim-lobanov/setup-xcode@v1
+ uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
with:
xcode-version: latest-stable
@@ -68,7 +68,7 @@ jobs:
security create-keychain -p "${KEYCHAIN_PASSWORD}" "${KEYCHAIN_PATH}"
security set-keychain-settings -lut 21600 "${KEYCHAIN_PATH}"
security unlock-keychain -p "${KEYCHAIN_PASSWORD}" "${KEYCHAIN_PATH}"
- security import "${CERT_PATH}" -P "${P12_PASSWORD}" -A -t cert -f pkcs12 -k "${KEYCHAIN_PATH}"
+ security import "${CERT_PATH}" -P "${P12_PASSWORD}" -t cert -f pkcs12 -k "${KEYCHAIN_PATH}" -T /usr/bin/codesign -T /usr/bin/xcodebuild -T /usr/bin/security
security list-keychains -d user -s "${KEYCHAIN_PATH}" $(security list-keychains -d user | tr -d '"')
security set-key-partition-list -S apple-tool:,apple: -s -k "${KEYCHAIN_PASSWORD}" "${KEYCHAIN_PATH}"
@@ -152,7 +152,7 @@ jobs:
} >> "${GITHUB_ENV}"
- name: Upload release artifacts
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: core-monitor-release
path: |
diff --git a/App-Info.plist b/App-Info.plist
index 1649fbe..d2cf7ee 100644
--- a/App-Info.plist
+++ b/App-Info.plist
@@ -29,7 +29,7 @@
SMPrivilegedExecutables
ventaphobia.smc-helper
- anchor apple generic and identifier "ventaphobia.smc-helper" and certificate leaf[subject.OU] = "6VDP675K4L"
+ anchor apple generic and identifier "ventaphobia.smc-helper" and certificate leaf[subject.OU] = "6VDP675K4L" and certificate leaf[field.1.2.840.113635.100.6.1.13] exists and certificate 1[field.1.2.840.113635.100.6.2.6] exists
diff --git a/Core-Monitor.xcodeproj/project.pbxproj b/Core-Monitor.xcodeproj/project.pbxproj
index 2fef475..fac27dc 100644
--- a/Core-Monitor.xcodeproj/project.pbxproj
+++ b/Core-Monitor.xcodeproj/project.pbxproj
@@ -44,7 +44,7 @@
/* Begin PBXFileReference section */
33D1932E6B3C54A956AF5F6C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
353B02D12F640A0700A65F2C /* Core-Monitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Core-Monitor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
- 35F039AB2F64444D004CB9F8 /* smc-helper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "smc-helper"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 35F039AB2F64444D004CB9F8 /* smc-helper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = "smc-helper"; path = "ventaphobia.smc-helper"; sourceTree = BUILT_PRODUCTS_DIR; };
7381A6E72B87236C00C0DE01 /* CustomFanPresetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomFanPresetTests.swift; sourceTree = ""; };
8D6F3C76B69FEDB140682676 /* AlertEngineTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AlertEngineTests.swift; sourceTree = ""; };
E5B12BED2CCB8BBEC03C227F /* Core-MonitorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Core-MonitorTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -456,7 +456,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 14080;
+ CURRENT_PROJECT_VERSION = 15000;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 6VDP675K4L;
ENABLE_APP_SANDBOX = NO;
@@ -473,7 +473,7 @@
"@executable_path/../Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 14.08;
+ MARKETING_VERSION = 15;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "CoreTools.Core-Monitor";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -484,7 +484,6 @@
RUNTIME_EXCEPTION_ALLOW_UNSIGNED_EXECUTABLE_MEMORY = NO;
RUNTIME_EXCEPTION_DEBUGGING_TOOL = NO;
RUNTIME_EXCEPTION_DISABLE_EXECUTABLE_PAGE_PROTECTION = NO;
- RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
@@ -505,7 +504,7 @@
CODE_SIGN_ENTITLEMENTS = "Core-Monitor-WeatherKit.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 14080;
+ CURRENT_PROJECT_VERSION = 15000;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 6VDP675K4L;
ENABLE_APP_SANDBOX = NO;
@@ -522,7 +521,7 @@
"@executable_path/../Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 14.08;
+ MARKETING_VERSION = 15;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "$(CORE_MONITOR_APP_BUNDLE_IDENTIFIER)";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -532,7 +531,6 @@
RUNTIME_EXCEPTION_ALLOW_UNSIGNED_EXECUTABLE_MEMORY = NO;
RUNTIME_EXCEPTION_DEBUGGING_TOOL = NO;
RUNTIME_EXCEPTION_DISABLE_EXECUTABLE_PAGE_PROTECTION = NO;
- RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
diff --git a/Core-Monitor/AppLocaleSettings.swift b/Core-Monitor/AppLocaleSettings.swift
index c275e90..9f43900 100644
--- a/Core-Monitor/AppLocaleSettings.swift
+++ b/Core-Monitor/AppLocaleSettings.swift
@@ -99,8 +99,7 @@ struct LocalizationSettingsCard: View {
}
var body: some View {
- DarkCard(padding: 18) {
- VStack(alignment: .leading, spacing: 16) {
+ VStack(alignment: .leading, spacing: 16) {
HStack(alignment: .top, spacing: 16) {
VStack(alignment: .leading, spacing: 4) {
Text("Language & Locale")
@@ -172,7 +171,8 @@ struct LocalizationSettingsCard: View {
.foregroundStyle(Color.bdAccent)
}
}
- }
+ .padding(18)
+ .background(.regularMaterial, in: RoundedRectangle(cornerRadius: 18))
}
private func quickPickLabel(for identifier: String) -> some View {
diff --git a/Core-Monitor/ContentView.swift b/Core-Monitor/ContentView.swift
index 48de6d8..b712a3d 100644
--- a/Core-Monitor/ContentView.swift
+++ b/Core-Monitor/ContentView.swift
@@ -1,2809 +1,1033 @@
-import SwiftUI
-import Darwin
-import AVFoundation
-import Combine
import AppKit
+import SwiftUI
-// MARK: - App-wide mode state
-final class AppModeState: ObservableObject {
- @Published var isBasicMode: Bool {
- didSet { UserDefaults.standard.set(isBasicMode, forKey: "basicMode") }
- }
- init() { isBasicMode = UserDefaults.standard.bool(forKey: "basicMode") }
-}
-
-@MainActor
-final class AppAppearanceSettings: ObservableObject {
- static let shared = AppAppearanceSettings()
- private static let defaultSurfaceOpacity = 1.0
-
- @Published var surfaceOpacity: Double {
- didSet {
- UserDefaults.standard.set(surfaceOpacity, forKey: Self.surfaceOpacityKey)
- }
- }
-
- private static let surfaceOpacityKey = "coremonitor.surfaceOpacity"
-
- private init() {
- if let stored = UserDefaults.standard.object(forKey: Self.surfaceOpacityKey) as? Double {
- surfaceOpacity = min(max(stored, 0.0), 1.0)
- } else {
- surfaceOpacity = Self.defaultSurfaceOpacity
- }
- }
-}
-
-// MARK: - Colours (BetterDisplay-matched dark palette)
extension Color {
- static let bdSidebar = Color(red: 0.16, green: 0.17, blue: 0.22).opacity(0.90)
- static let bdContent = Color.clear
- static let bdCard = Color(red: 0.24, green: 0.25, blue: 0.31).opacity(0.78)
- static let bdDivider = Color.white.opacity(0.08)
- static let bdAccent = Color(red: 0.39, green: 0.66, blue: 1.00)
- static let bdSelected = Color(red: 0.22, green: 0.40, blue: 0.90)
- static let bdShellShadow = Color.black.opacity(0.14)
- static let bdSidebarStroke = Color.white.opacity(0.16)
- static let bdSidebarInner = Color.white.opacity(0.05)
+ static var bdAccent: Color { .accentColor }
+ static var bdDivider: Color { Color(nsColor: .separatorColor) }
+ static var bdSelected: Color { Color(nsColor: .selectedContentBackgroundColor) }
+ static var bdSidebar: Color { Color(nsColor: .controlBackgroundColor) }
+ static var bdContent: Color { Color(nsColor: .windowBackgroundColor) }
+ static var bdCard: Color { Color(nsColor: .controlBackgroundColor) }
+ static var bdShellShadow: Color { .clear }
+ static var bdSidebarStroke: Color { Color(nsColor: .separatorColor) }
+ static var bdSidebarInner: Color { Color(nsColor: .controlBackgroundColor) }
}
struct CoreMonBackdrop: View {
var body: some View {
- ZStack {
- LinearGradient(
- colors: [
- Color(red: 0.31, green: 0.31, blue: 0.34),
- Color(red: 0.29, green: 0.29, blue: 0.32)
- ],
- startPoint: .top,
- endPoint: .bottom
- )
- }
- .ignoresSafeArea()
+ Color(nsColor: .windowBackgroundColor)
+ .ignoresSafeArea()
}
}
-struct CoreMonWindowShell: View {
- @ViewBuilder let content: () -> Content
-
- var body: some View {
- ZStack {
- RoundedRectangle(cornerRadius: 34, style: .continuous)
- .fill(
- LinearGradient(
- colors: [
- Color(red: 0.16, green: 0.10, blue: 0.53),
- Color(red: 0.11, green: 0.16, blue: 0.46)
- ],
- startPoint: .top,
- endPoint: .bottom
- )
- )
-
- RoundedRectangle(cornerRadius: 34, style: .continuous)
- .stroke(Color.white.opacity(0.14), lineWidth: 1)
-
- RoundedRectangle(cornerRadius: 34, style: .continuous)
- .fill(
- LinearGradient(
- colors: [
- Color(red: 0.24, green: 0.26, blue: 0.33).opacity(0.98),
- Color(red: 0.17, green: 0.19, blue: 0.27).opacity(0.99),
- Color(red: 0.12, green: 0.13, blue: 0.21)
- ],
- startPoint: .topLeading,
- endPoint: .bottomTrailing
- )
- )
- .padding(1)
+enum SidebarItem: String, CaseIterable, Identifiable, Hashable {
+ case overview = "Overview"
+ case thermals = "Thermals"
+ case memory = "Memory"
+ case fans = "Fans"
+ case battery = "Battery"
+ case system = "System"
+ case touchBar = "Touch Bar"
+ case help = "Help"
+ case about = "About"
- VStack(spacing: 0) {
- LinearGradient(
- colors: [Color.white.opacity(0.08), Color.clear],
- startPoint: .top,
- endPoint: .bottom
- )
- .frame(height: 1)
- Spacer()
- }
+ var id: String { rawValue }
- content()
- .padding(24)
+ var icon: String {
+ switch self {
+ case .overview: return "gauge.medium"
+ case .thermals: return "thermometer.medium"
+ case .memory: return "memorychip"
+ case .fans: return "fanblades"
+ case .battery: return "battery.75"
+ case .system: return "gearshape"
+ case .touchBar: return "rectangle.3.group"
+ case .help: return "questionmark.circle"
+ case .about: return "info.circle"
}
- .shadow(color: .black.opacity(0.34), radius: 24, y: 14)
}
-}
-struct CoreMonGlassBackground: View {
- @ObservedObject private var appearanceSettings = AppAppearanceSettings.shared
- var cornerRadius: CGFloat = 24
- var tintOpacity: Double = 0.18
- var strokeOpacity: Double = 0.14
- var shadowRadius: CGFloat = 10
- var fillColor: Color = .bdCard
-
- var body: some View {
- ZStack {
- VisualEffectView(
- material: .underWindowBackground,
- blendingMode: .behindWindow,
- opacity: appearanceSettings.surfaceOpacity
- )
- fillColor.opacity((0.025 * appearanceSettings.surfaceOpacity) + (tintOpacity * 0.006 * appearanceSettings.surfaceOpacity))
+ var subtitle: String {
+ switch self {
+ case .overview: return "Live readings and device status"
+ case .thermals: return "Temperature sensors and SMC state"
+ case .memory: return "Unified memory pressure and process usage"
+ case .fans: return "Cooling mode, helper state, and fan speed"
+ case .battery: return "Battery health, charge, and power"
+ case .system: return "Startup, privacy, and menu bar behavior"
+ case .touchBar: return "Touch Bar layout and presentation"
+ case .help: return "Common tasks and support notes"
+ case .about: return "Version, model, and language"
}
- .clipShape(RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
- .overlay(
- RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
- .stroke(Color.white.opacity(strokeOpacity * appearanceSettings.surfaceOpacity), lineWidth: 1)
- )
- .shadow(color: Color.bdShellShadow.opacity(appearanceSettings.surfaceOpacity), radius: shadowRadius, y: 8)
}
}
-private struct SidebarShellBackground: View {
- @ObservedObject private var appearanceSettings = AppAppearanceSettings.shared
- var body: some View {
- ZStack {
- RoundedRectangle(cornerRadius: 27, style: .continuous)
- .fill(Color.bdSidebar.opacity(0.03 * appearanceSettings.surfaceOpacity))
-
- VisualEffectView(
- material: .sidebar,
- blendingMode: .behindWindow,
- opacity: appearanceSettings.surfaceOpacity
- )
- .clipShape(RoundedRectangle(cornerRadius: 27, style: .continuous))
+struct ContentView: View {
+ @ObservedObject var systemMonitor: SystemMonitor
+ @ObservedObject var fanController: FanController
+ @ObservedObject var startupManager: StartupManager
+ @ObservedObject private var dashboardNavigationRouter = DashboardNavigationRouter.shared
- RoundedRectangle(cornerRadius: 27, style: .continuous)
- .stroke(Color.white.opacity(0.05 * appearanceSettings.surfaceOpacity), lineWidth: 1)
+ @State private var sidebarSelection: SidebarItem? = .overview
- RoundedRectangle(cornerRadius: 27, style: .continuous)
- .stroke(Color.white.opacity(0.01 * appearanceSettings.surfaceOpacity), lineWidth: 1)
- .padding(1)
- }
+ private var selectedItem: SidebarItem {
+ sidebarSelection ?? .overview
}
-}
-
-struct CoreMonGlassPanel: View {
- var cornerRadius: CGFloat = 28
- var tintOpacity: Double = 0.18
- var strokeOpacity: Double = 0.2
- var shadowRadius: CGFloat = 18
- var contentPadding: CGFloat = 18
- @ViewBuilder let content: () -> Content
var body: some View {
- ZStack {
- CoreMonGlassBackground(
- cornerRadius: cornerRadius,
- tintOpacity: tintOpacity,
- strokeOpacity: strokeOpacity,
- shadowRadius: shadowRadius,
- fillColor: cornerRadius > 24 ? .bdSidebar : .bdCard
+ NavigationSplitView {
+ List(selection: $sidebarSelection) {
+ Section("Monitoring") {
+ sidebarLink(.overview)
+ sidebarLink(.thermals)
+ sidebarLink(.memory)
+ sidebarLink(.fans)
+ if systemMonitor.snapshot.batteryInfo.hasBattery {
+ sidebarLink(.battery)
+ }
+ }
+
+ Section("Settings") {
+ sidebarLink(.system)
+ sidebarLink(.touchBar)
+ }
+
+ Section("Support") {
+ sidebarLink(.help)
+ sidebarLink(.about)
+ }
+ }
+ .listStyle(.sidebar)
+ .navigationTitle("Core Monitor")
+ .navigationSplitViewColumnWidth(min: 190, ideal: 220, max: 280)
+ } detail: {
+ NativeDashboardDetail(
+ selection: selectedItem,
+ systemMonitor: systemMonitor,
+ fanController: fanController,
+ startupManager: startupManager
)
- content()
- .padding(contentPadding)
+ }
+ .navigationSplitViewStyle(.balanced)
+ .frame(minWidth: 900, minHeight: 640)
+ .onAppear {
+ systemMonitor.setBasicMode(false)
+ systemMonitor.setInteractiveMonitoringEnabled(true, reason: "dashboard")
+ applyPendingDashboardRouteIfNeeded()
+ syncDashboardSampling()
+ }
+ .onChange(of: sidebarSelection) { _ in
+ syncDashboardSampling()
+ }
+ .onChange(of: dashboardNavigationRouter.route) { _ in
+ applyPendingDashboardRouteIfNeeded()
+ syncDashboardSampling()
+ }
+ .onDisappear {
+ systemMonitor.setInteractiveMonitoringEnabled(false, reason: "dashboard")
+ systemMonitor.setDetailedSamplingEnabled(false, reason: "dashboard.detail")
}
}
-}
-// MARK: - Copy-on-click
-private struct CopyOnTap: ViewModifier {
- let text: String
- @State private var flashed = false
- func body(content: Content) -> some View {
- content
- .contentShape(Rectangle())
- .overlay {
- Rectangle()
- .fill(Color.white.opacity(flashed ? 0.045 : 0))
- .allowsHitTesting(false)
- }
- .animation(.easeOut(duration: 0.14), value: flashed)
- .onTapGesture {
- NSPasteboard.general.clearContents()
- NSPasteboard.general.setString(text, forType: .string)
- flashed = true
- DispatchQueue.main.asyncAfter(deadline: .now() + 0.14) { flashed = false }
- }
+ private func sidebarLink(_ item: SidebarItem) -> some View {
+ NavigationLink(value: item) {
+ Label(item.rawValue, systemImage: item.icon)
+ }
}
-}
-private extension View {
- func copyOnTap(_ text: String) -> some View { modifier(CopyOnTap(text: text)) }
-}
-private struct SoftPressButtonStyle: ButtonStyle {
- func makeBody(configuration: Configuration) -> some View {
- configuration.label
- .scaleEffect(configuration.isPressed ? 0.985 : 1.0)
- .overlay {
- Rectangle()
- .fill(Color.white.opacity(configuration.isPressed ? 0.05 : 0))
- .allowsHitTesting(false)
- }
- .animation(.interactiveSpring(response: 0.22, dampingFraction: 0.86), value: configuration.isPressed)
+ private func applyPendingDashboardRouteIfNeeded() {
+ guard let route = dashboardNavigationRouter.route,
+ let selection = dashboardNavigationRouter.consume(route) else {
+ return
+ }
+ sidebarSelection = selection
}
-}
-// MARK: - Dark card (BetterDisplay style)
-struct DarkCard: View {
- var padding: CGFloat = 14
- @ViewBuilder let content: () -> Content
- var body: some View {
- content()
- .padding(padding)
- .background(
- CoreMonGlassBackground(
- cornerRadius: 18,
- tintOpacity: 0.11,
- strokeOpacity: 0.14,
- shadowRadius: 10
- )
- )
+ private func syncDashboardSampling() {
+ systemMonitor.setDetailedSamplingEnabled(
+ DashboardProcessSamplingPolicy.requiresDetailedSampling(
+ isBasicMode: false,
+ selection: selectedItem
+ ),
+ reason: "dashboard.detail"
+ )
}
}
-// MARK: - Gauge ring
-private struct GaugeRing: View {
- let value: Double
- let color: Color
- var lineWidth: CGFloat = 4
- var size: CGFloat = 44
- var body: some View {
- ZStack {
- Circle().stroke(color.opacity(0.18), lineWidth: lineWidth)
- Circle()
- .trim(from: 0, to: value)
- .stroke(color, style: StrokeStyle(lineWidth: lineWidth, lineCap: .round))
- .rotationEffect(.degrees(-90))
- .animation(.easeInOut(duration: 0.5), value: value)
- }
- .frame(width: size, height: size)
- }
-}
+private struct NativeDashboardDetail: View {
+ let selection: SidebarItem
+ @ObservedObject var systemMonitor: SystemMonitor
+ @ObservedObject var fanController: FanController
+ @ObservedObject var startupManager: StartupManager
-// MARK: - Sparkline
-private struct Sparkline: View {
- let values: [Double]
- let color: Color
- var height: CGFloat = 26
var body: some View {
- GeometryReader { geo in
- if values.count > 1 {
- let w = geo.size.width, h = geo.size.height
- let step = w / CGFloat(values.count - 1)
- Path { p in
- for (i, v) in values.enumerated() {
- let pt = CGPoint(x: CGFloat(i) * step, y: h - (CGFloat(v) / 100) * h)
- if i == 0 { p.move(to: pt) } else { p.addLine(to: pt) }
- }
- }
- .stroke(color, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, lineJoin: .round))
- Path { p in
- p.move(to: CGPoint(x: 0, y: h))
- for (i, v) in values.enumerated() {
- p.addLine(to: CGPoint(x: CGFloat(i) * step, y: h - (CGFloat(v) / 100) * h))
- }
- p.addLine(to: CGPoint(x: w, y: h)); p.closeSubpath()
+ VStack(spacing: 0) {
+ NativePageHeader(selection: selection, systemMonitor: systemMonitor)
+ Divider()
+
+ ScrollView {
+ VStack(alignment: .leading, spacing: 20) {
+ page
}
- .fill(LinearGradient(colors: [color.opacity(0.20), .clear], startPoint: .top, endPoint: .bottom))
+ .frame(maxWidth: 780, alignment: .leading)
+ .padding(24)
}
+ .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+ }
+ .background(Color(nsColor: .windowBackgroundColor))
+ .navigationTitle(selection.rawValue)
+ }
+
+ @ViewBuilder
+ private var page: some View {
+ let snapshot = systemMonitor.snapshot
+ switch selection {
+ case .overview:
+ NativeOverviewPage(systemMonitor: systemMonitor, snapshot: snapshot)
+ case .thermals:
+ NativeThermalsPage(snapshot: snapshot)
+ case .memory:
+ NativeMemoryPage(snapshot: snapshot)
+ case .fans:
+ NativeFansPage(fanController: fanController, snapshot: snapshot)
+ case .battery:
+ NativeBatteryPage(snapshot: snapshot)
+ case .system:
+ NativeSystemPage(systemMonitor: systemMonitor, startupManager: startupManager)
+ case .touchBar:
+ NativeTouchBarPage()
+ case .help:
+ NativeHelpPage()
+ case .about:
+ NativeAboutPage()
}
- .frame(height: height).clipped()
}
}
-// MARK: - Metric tile
-private struct MetricTile: View {
- let label: String
- let value: String
- let unit: String
- let color: Color
- var gauge: Double = 0
- var history: [Double] = []
- var badgeText: String?
- var badgeColor: Color?
+private struct NativePageHeader: View {
+ let selection: SidebarItem
+ @ObservedObject var systemMonitor: SystemMonitor
+
var body: some View {
- VStack(alignment: .leading, spacing: 0) {
- HStack(alignment: .top) {
- VStack(alignment: .leading, spacing: 4) {
- HStack(spacing: 8) {
- Text(label)
- .font(.system(size: 13, weight: .semibold))
- .foregroundStyle(Color.white.opacity(0.72))
- if let badgeText, let badgeColor {
- Text(badgeText.uppercased())
- .font(.system(size: 9, weight: .bold))
- .foregroundStyle(badgeColor)
- .padding(.horizontal, 7)
- .padding(.vertical, 4)
- .background(badgeColor.opacity(0.16))
- .clipShape(Capsule())
- }
- }
- HStack(alignment: .lastTextBaseline, spacing: 5) {
- Text(value)
- .font(.system(size: 36, weight: .bold, design: .rounded))
- .foregroundStyle(color)
- .cmNumericTextTransition()
- Text(unit)
- .font(.system(size: 14, weight: .bold, design: .rounded))
- .foregroundStyle(color.opacity(0.65))
- }
- }
- Spacer(minLength: 10)
- GaugeRing(value: gauge, color: color, lineWidth: 5, size: 70)
+ HStack(alignment: .firstTextBaseline, spacing: 16) {
+ VStack(alignment: .leading, spacing: 4) {
+ Text(selection.rawValue)
+ .font(.largeTitle)
+ .fontWeight(.semibold)
+ Text(selection.subtitle)
+ .font(.callout)
+ .foregroundStyle(.secondary)
}
- if !history.isEmpty {
- Sparkline(values: history, color: color, height: 28)
- .padding(.top, 12)
+
+ Spacer()
+
+ TimelineView(.periodic(from: .now, by: 1)) { context in
+ let health = systemMonitor.snapshotHealth(now: context.date)
+ VStack(alignment: .trailing, spacing: 3) {
+ Text(health.statusLabel)
+ .font(.callout)
+ .fontWeight(.semibold)
+ Text(health.ageDescription)
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
}
}
- .padding(.horizontal, 20)
- .padding(.top, 18)
- .padding(.bottom, 14)
- .frame(minHeight: 132, alignment: .topLeading)
- .background(
- CoreMonGlassBackground(
- cornerRadius: 22,
- tintOpacity: 0.14,
- strokeOpacity: 0.18,
- shadowRadius: 12
- )
- )
- .copyOnTap("\(value)\(unit)")
+ .padding(.horizontal, 24)
+ .padding(.vertical, 18)
}
}
-private struct MonitoringTrendSection: View {
+private struct NativeOverviewPage: View {
@ObservedObject var systemMonitor: SystemMonitor
- @State private var selectedRange: MonitoringTrendRange = .fiveMinutes
+ let snapshot: SystemMonitorSnapshot
var body: some View {
- VStack(alignment: .leading, spacing: 14) {
- HStack(alignment: .top, spacing: 12) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Load & Thermal Trends")
- .font(.system(size: 18, weight: .bold))
- Text("Recent CPU, GPU, fan, power, memory, network, and swap history without leaving the dashboard.")
- .font(.system(size: 12, weight: .medium))
- .foregroundStyle(.secondary)
- }
- Spacer()
- Picker("Range", selection: $selectedRange) {
- ForEach(MonitoringTrendRange.allCases) { range in
- Text(range.title).tag(range)
- }
- }
- .pickerStyle(.segmented)
- .frame(width: 180)
+ TimelineView(.periodic(from: .now, by: 1)) { context in
+ let health = systemMonitor.snapshotHealth(now: context.date)
+
+ NativeSettingsSection("Monitoring") {
+ NativeValueRow("Status", value: health.statusLabel, detail: "\(health.ageDescription). \(health.cadenceDescription).")
+ NativeDivider()
+ NativeValueRow("Sample Time", value: sampleTime(snapshot.sampledAt))
+ NativeDivider()
+ NativeValueRow("SMC Access", value: snapshot.hasSMCAccess ? "Available" : "Unavailable", detail: snapshot.lastError)
}
+ }
- LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())], spacing: 12) {
- MonitoringTrendCard(
- title: "CPU Temp",
- unit: "°C",
- color: .orange,
- summary: systemMonitor.cpuTemperatureTrend.summary(for: selectedRange),
- values: systemMonitor.cpuTemperatureTrend.values(for: selectedRange),
- rangeTitle: selectedRange.title,
- formatter: { "\(Int($0.rounded()))" }
- )
- MonitoringTrendCard(
- title: "GPU Temp",
- unit: "°C",
- color: Color(red: 0.98, green: 0.58, blue: 0.28),
- summary: systemMonitor.gpuTemperatureTrend.summary(for: selectedRange),
- values: systemMonitor.gpuTemperatureTrend.values(for: selectedRange),
- rangeTitle: selectedRange.title,
- formatter: { "\(Int($0.rounded()))" }
- )
- MonitoringTrendCard(
- title: "Primary Fan",
- unit: " RPM",
- color: Color.bdAccent,
- summary: systemMonitor.primaryFanSpeedTrend.summary(for: selectedRange),
- values: systemMonitor.primaryFanSpeedTrend.values(for: selectedRange),
- rangeTitle: selectedRange.title,
- formatter: { "\(Int($0.rounded()))" }
- )
- MonitoringTrendCard(
- title: "System Power",
- unit: " W",
- color: .purple,
- summary: systemMonitor.totalPowerTrend.summary(for: selectedRange),
- values: systemMonitor.totalPowerTrend.values(for: selectedRange),
- rangeTitle: selectedRange.title,
- formatter: { String(format: "%.1f", $0) }
- )
- MonitoringTrendCard(
- title: "Download",
- unit: "",
- color: Color(red: 0.36, green: 0.77, blue: 1.0),
- summary: systemMonitor.networkDownloadTrend.summary(for: selectedRange),
- values: systemMonitor.networkDownloadTrend.values(for: selectedRange),
- rangeTitle: selectedRange.title,
- formatter: { NetworkThroughputFormatter.compactRate(bytesPerSecond: $0) }
- )
- MonitoringTrendCard(
- title: "Upload",
- unit: "",
- color: Color(red: 0.46, green: 0.90, blue: 0.66),
- summary: systemMonitor.networkUploadTrend.summary(for: selectedRange),
- values: systemMonitor.networkUploadTrend.values(for: selectedRange),
- rangeTitle: selectedRange.title,
- formatter: { NetworkThroughputFormatter.compactRate(bytesPerSecond: $0) }
- )
- MonitoringTrendCard(
- title: "Memory Use",
- unit: "%",
- color: .green,
- summary: systemMonitor.memoryUsageTrend.summary(for: selectedRange),
- values: systemMonitor.memoryUsageTrend.values(for: selectedRange),
- rangeTitle: selectedRange.title,
- formatter: { "\(Int($0.rounded()))" }
- )
- MonitoringTrendCard(
- title: "Swap Used",
- unit: " GB",
- color: Color(red: 0.97, green: 0.42, blue: 0.72),
- summary: systemMonitor.swapUsedTrend.summary(for: selectedRange),
- values: systemMonitor.swapUsedTrend.values(for: selectedRange),
- rangeTitle: selectedRange.title,
- formatter: { String(format: "%.1f", $0) }
- )
+ NativeSettingsSection("Processor and Memory") {
+ NativeProgressRow("CPU Load", value: percentString(snapshot.cpuUsagePercent), fraction: snapshot.cpuUsagePercent / 100)
+ if let performance = snapshot.performanceCoreUsagePercent {
+ NativeDivider()
+ NativeProgressRow("Performance Cores", value: percentString(performance), fraction: performance / 100)
}
+ if let efficiency = snapshot.efficiencyCoreUsagePercent {
+ NativeDivider()
+ NativeProgressRow("Efficiency Cores", value: percentString(efficiency), fraction: efficiency / 100)
+ }
+ NativeDivider()
+ NativeProgressRow(
+ "Memory",
+ value: "\(gbString(snapshot.memoryUsedGB)) of \(gbString(snapshot.totalMemoryGB))",
+ fraction: snapshot.memoryUsagePercent / 100
+ )
+ }
+
+ NativeSettingsSection("Temperature, Power, and Storage") {
+ NativeValueRow("CPU Temperature", value: temperatureString(snapshot.cpuTemperature))
+ NativeDivider()
+ NativeValueRow("GPU Temperature", value: temperatureString(snapshot.gpuTemperature))
+ if let watts = snapshot.totalSystemWatts {
+ NativeDivider()
+ NativeValueRow("System Power", value: String(format: "%.1f W", abs(watts)))
+ }
+ NativeDivider()
+ NativeProgressRow(
+ "Storage",
+ value: "\(gbString(snapshot.diskStats.usedGB)) of \(gbString(snapshot.diskStats.totalGB))",
+ fraction: snapshot.diskStats.usagePercent / 100
+ )
+ }
+
+ NativeSettingsSection("Network") {
+ NativeValueRow("Download", value: NetworkThroughputFormatter.compactRate(bytesPerSecond: snapshot.networkStats.downloadBytesPerSec))
+ NativeDivider()
+ NativeValueRow("Upload", value: NetworkThroughputFormatter.compactRate(bytesPerSecond: snapshot.networkStats.uploadBytesPerSec))
}
}
}
-private struct MonitoringTrendCard: View {
- let title: String
- let unit: String
- let color: Color
- let summary: MonitoringTrendSummary?
- let values: [Double]
- let rangeTitle: String
- let formatter: (Double) -> String
+private struct NativeThermalsPage: View {
+ let snapshot: SystemMonitorSnapshot
var body: some View {
- VStack(alignment: .leading, spacing: 14) {
- HStack(alignment: .top) {
- VStack(alignment: .leading, spacing: 4) {
- Text(title)
- .font(.system(size: 13, weight: .semibold))
- .foregroundStyle(Color.white.opacity(0.72))
- if let summary {
- HStack(alignment: .lastTextBaseline, spacing: 5) {
- Text(formatter(summary.latest))
- .font(.system(size: 30, weight: .bold, design: .rounded))
- .foregroundStyle(color)
- .cmNumericTextTransition()
- Text(unit)
- .font(.system(size: 13, weight: .bold, design: .rounded))
- .foregroundStyle(color.opacity(0.68))
- }
- } else {
- Text("Collecting…")
- .font(.system(size: 22, weight: .bold, design: .rounded))
- .foregroundStyle(.secondary)
- }
- }
- Spacer()
- Text(rangeTitle)
- .font(.system(size: 10, weight: .bold))
- .foregroundStyle(color)
- .padding(.horizontal, 8)
- .padding(.vertical, 5)
- .background(color.opacity(0.16))
- .clipShape(Capsule())
- }
-
- if let summary {
- MonitoringTrendChart(values: values, color: color)
- .frame(height: 84)
- HStack(spacing: 10) {
- MonitoringTrendMiniStat(label: "Min", value: formatter(summary.minimum) + unit)
- MonitoringTrendMiniStat(label: "Max", value: formatter(summary.maximum) + unit)
- MonitoringTrendMiniStat(label: "Avg", value: formatter(summary.average) + unit)
- Spacer(minLength: 0)
- Text(deltaLabel(summary.delta))
- .font(.system(size: 11, weight: .bold, design: .monospaced))
- .foregroundStyle(color.opacity(0.85))
- .padding(.horizontal, 8)
- .padding(.vertical, 5)
- .background(color.opacity(0.12))
- .clipShape(Capsule())
- }
+ NativeSettingsSection("Thermal State") {
+ NativeValueRow("macOS Thermal Pressure", value: thermalStateTitle(snapshot.thermalState), detail: thermalStateDetail(snapshot.thermalState))
+ NativeDivider()
+ NativeValueRow("CPU Temperature", value: temperatureString(snapshot.cpuTemperature))
+ NativeDivider()
+ NativeValueRow("GPU Temperature", value: temperatureString(snapshot.gpuTemperature))
+ NativeDivider()
+ NativeValueRow("SSD Temperature", value: temperatureString(snapshot.ssdTemperature))
+ }
+
+ NativeSettingsSection("Fan Sensors") {
+ if snapshot.fanSpeeds.isEmpty {
+ NativeEmptyMessage("No fan sensor readings are available.")
} else {
- VStack(alignment: .leading, spacing: 8) {
- RoundedRectangle(cornerRadius: 14, style: .continuous)
- .fill(Color.white.opacity(0.05))
- .frame(height: 84)
- Text("Trend history fills in after a few live samples.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
+ ForEach(Array(snapshot.fanSpeeds.enumerated()), id: \.offset) { index, rpm in
+ NativeValueRow("Fan \(index + 1)", value: "\(rpm) RPM")
+ if index != snapshot.fanSpeeds.indices.last {
+ NativeDivider()
+ }
}
}
}
- .padding(.horizontal, 20)
- .padding(.top, 18)
- .padding(.bottom, 16)
- .background(
- CoreMonGlassBackground(
- cornerRadius: 22,
- tintOpacity: 0.14,
- strokeOpacity: 0.18,
- shadowRadius: 12
- )
- )
- }
- private func deltaLabel(_ delta: Double) -> String {
- let sign = delta > 0 ? "+" : ""
- return "\(sign)\(formatter(delta))\(unit)"
+ NativeSettingsSection("SMC") {
+ NativeValueRow("Access", value: snapshot.hasSMCAccess ? "Available" : "Unavailable", detail: snapshot.lastError)
+ }
}
}
-private struct MonitoringTrendMiniStat: View {
- let label: String
- let value: String
+private struct NativeMemoryPage: View {
+ @ObservedObject private var privacySettings = PrivacySettings.shared
+ let snapshot: SystemMonitorSnapshot
var body: some View {
- VStack(alignment: .leading, spacing: 4) {
- Text(label)
- .font(.system(size: 9, weight: .bold))
+ NativeSettingsSection("Memory") {
+ NativeProgressRow("Usage", value: percentString(snapshot.memoryUsagePercent), fraction: snapshot.memoryUsagePercent / 100)
+ NativeDivider()
+ NativeValueRow("Pressure", value: memoryPressureTitle(snapshot.memoryPressure))
+ NativeDivider()
+ NativeValueRow("App Memory", value: gbString(snapshot.appMemoryGB))
+ NativeDivider()
+ NativeValueRow("Wired Memory", value: gbString(snapshot.wiredMemoryGB))
+ NativeDivider()
+ NativeValueRow("Compressed", value: gbString(snapshot.compressedMemoryGB))
+ NativeDivider()
+ NativeValueRow("Free", value: gbString(snapshot.freeMemoryGB))
+ }
+
+ NativeSettingsSection("Process Privacy") {
+ Toggle("Show app names in process tables", isOn: $privacySettings.processInsightsEnabled)
+ .toggleStyle(.switch)
+ Text(privacySettings.processInsightsEnabled
+ ? "Process names are shown locally to help explain spikes."
+ : "Process usage is still sampled locally, but names are hidden in this interface.")
+ .font(.footnote)
.foregroundStyle(.secondary)
- Text(value)
- .font(.system(size: 11, weight: .bold, design: .monospaced))
- .foregroundStyle(.white.opacity(0.82))
- .cmNumericTextTransition()
+ }
+
+ NativeSettingsSection("Top CPU Processes") {
+ NativeProcessTable(processes: snapshot.topProcesses.topCPU, showNames: privacySettings.processInsightsEnabled)
+ }
+
+ NativeSettingsSection("Top Memory Processes") {
+ NativeProcessTable(processes: snapshot.topProcesses.topMemory, showNames: privacySettings.processInsightsEnabled)
}
}
}
-private struct MonitoringTrendChart: View {
- let values: [Double]
- let color: Color
+private struct NativeFansPage: View {
+ @ObservedObject var fanController: FanController
+ @ObservedObject private var helperManager = SMCHelperManager.shared
+ let snapshot: SystemMonitorSnapshot
var body: some View {
- GeometryReader { geo in
- let chartValues = resolvedValues
- let step = geo.size.width / CGFloat(max(chartValues.count - 1, 1))
- let lowerBound = chartValues.min() ?? 0
- let upperBound = chartValues.max() ?? 0
- let span = max(upperBound - lowerBound, 0.001)
-
- ZStack {
- RoundedRectangle(cornerRadius: 14, style: .continuous)
- .fill(Color.white.opacity(0.04))
-
- Path { path in
- for (index, value) in chartValues.enumerated() {
- let point = CGPoint(
- x: CGFloat(index) * step,
- y: yPosition(for: value, in: geo.size.height, lowerBound: lowerBound, span: span)
- )
- if index == 0 {
- path.move(to: point)
- } else {
- path.addLine(to: point)
- }
- }
- }
- .stroke(color, style: StrokeStyle(lineWidth: 2.2, lineCap: .round, lineJoin: .round))
-
- Path { path in
- path.move(to: CGPoint(x: 0, y: geo.size.height))
- for (index, value) in chartValues.enumerated() {
- path.addLine(to: CGPoint(
- x: CGFloat(index) * step,
- y: yPosition(for: value, in: geo.size.height, lowerBound: lowerBound, span: span)
- ))
- }
- path.addLine(to: CGPoint(x: geo.size.width, y: geo.size.height))
- path.closeSubpath()
+ NativeSettingsSection("Cooling") {
+ Picker("Mode", selection: fanModeBinding) {
+ ForEach(FanControlMode.quickModes, id: \.rawValue) { mode in
+ Text(mode.nativeTitle).tag(mode.rawValue)
}
- .fill(
- LinearGradient(
- colors: [color.opacity(0.25), color.opacity(0.03)],
- startPoint: .top,
- endPoint: .bottom
- )
- )
}
- }
- .clipped()
- }
+ .pickerStyle(.menu)
- private var resolvedValues: [Double] {
- guard let first = values.first else { return [0, 0] }
- return values.count == 1 ? [first, first] : values
- }
+ Text(fanController.statusMessage)
+ .font(.footnote)
+ .foregroundStyle(.secondary)
- private func yPosition(for value: Double, in height: CGFloat, lowerBound: Double, span: Double) -> CGFloat {
- let normalized = (value - lowerBound) / span
- return height - (CGFloat(normalized) * height)
- }
-}
+ if fanController.mode == .manual {
+ NativeDivider()
+ VStack(alignment: .leading, spacing: 8) {
+ LabeledContent("Target Speed", value: "\(fanController.manualSpeed) RPM")
+ Slider(value: manualSpeedBinding, in: Double(fanController.minSpeed)...Double(fanController.maxSpeed), step: 50)
+ }
+ }
-private struct MonitoringStatusCard: View {
- @ObservedObject var systemMonitor: SystemMonitor
+ if fanController.mode == .smart {
+ NativeDivider()
+ VStack(alignment: .leading, spacing: 8) {
+ LabeledContent("Aggressiveness", value: String(format: "%.1f", fanController.autoAggressiveness))
+ Slider(value: autoAggressivenessBinding, in: 0...3, step: 0.1)
+ LabeledContent("Maximum Speed", value: "\(fanController.autoMaxSpeed) RPM")
+ Slider(value: autoMaxSpeedBinding, in: Double(fanController.minSpeed)...Double(fanController.maxSpeed), step: 50)
+ }
+ }
- var body: some View {
- TimelineView(.periodic(from: .now, by: 1)) { context in
- let health = systemMonitor.snapshotHealth(now: context.date)
+ NativeDivider()
+ HStack {
+ Button("Restore Automatic") {
+ fanController.resetToSystemAutomatic()
+ fanController.setMode(.automatic)
+ }
+ Button("Calibrate") {
+ fanController.calibrateFanControl()
+ }
+ .disabled(fanController.isCalibrating)
+ }
+ }
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 12) {
- HStack(alignment: .top, spacing: 12) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Monitoring Status")
- .font(.system(size: 13, weight: .semibold))
- Text(health.ageDescription)
- .font(.system(size: 18, weight: .bold, design: .rounded))
- .foregroundStyle(statusColor(for: health))
- .cmNumericTextTransition()
- }
-
- Spacer(minLength: 12)
-
- Text(health.statusLabel.uppercased())
- .font(.system(size: 10, weight: .bold))
- .foregroundStyle(statusColor(for: health))
- .padding(.horizontal, 10)
- .padding(.vertical, 6)
- .background(statusColor(for: health).opacity(0.14))
- .clipShape(Capsule())
+ NativeSettingsSection("Fan Readings") {
+ if snapshot.fanSpeeds.isEmpty {
+ NativeEmptyMessage("No fan readings are available on this Mac.")
+ } else {
+ ForEach(Array(snapshot.fanSpeeds.enumerated()), id: \.offset) { index, rpm in
+ NativeValueRow("Fan \(index + 1)", value: "\(rpm) RPM", detail: fanRangeText(index: index, snapshot: snapshot))
+ if index != snapshot.fanSpeeds.indices.last {
+ NativeDivider()
}
+ }
+ }
+ }
- Text(detailText(for: health))
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
-
- HStack(spacing: 10) {
- statusMeta(label: "Sensor cadence", value: MonitoringSnapshotHealth.compactDurationDescription(systemMonitor.activeMonitoringInterval), color: Color.bdAccent)
- statusMeta(label: "Process detail", value: MonitoringSnapshotHealth.compactDurationDescription(systemMonitor.activitySamplingInterval), color: .green)
- statusMeta(label: "SMC", value: systemMonitor.hasSMCAccess ? "Ready" : "Limited", color: systemMonitor.hasSMCAccess ? .green : .orange)
- }
+ NativeSettingsSection("Privileged Helper") {
+ NativeValueRow("Installation", value: helperManager.isInstalled ? "Installed" : "Not Installed")
+ NativeDivider()
+ NativeValueRow("Connection", value: helperManager.connectionState.title, detail: helperManager.statusMessage)
+ NativeDivider()
+ HStack {
+ Button(helperManager.isInstalled ? "Repair Helper" : "Install Helper") {
+ helperManager.installFromApp(forceReinstall: helperManager.isInstalled)
+ }
+ Button("Check Connection") {
+ helperManager.refreshDiagnostics()
}
}
}
}
- private func detailText(for health: MonitoringSnapshotHealth) -> String {
- switch health.freshness {
- case .waiting:
- return "Core Monitor is warming up the local sensor pipeline and will publish live readings as soon as the first sample completes."
- case .live:
- return "The dashboard is receiving fresh sensor data on the active cadence. Higher-churn process detail only speeds up on the Memory surface to keep idle overhead lower elsewhere."
- case .delayed:
- return "The latest sample is slightly behind the active cadence, so values may briefly lag while the Mac is under load or waking from sleep."
- case .stale:
- return "The latest sample is well behind the expected cadence. If this persists, reopen the dashboard or check helper and SMC health from the System tab."
+ private var fanModeBinding: Binding {
+ Binding {
+ fanController.mode.rawValue
+ } set: { rawValue in
+ if let mode = FanControlMode(rawValue: rawValue) {
+ fanController.setMode(mode)
+ }
}
}
- private func statusColor(for health: MonitoringSnapshotHealth) -> Color {
- switch health.freshness {
- case .waiting:
- return Color.bdAccent
- case .live:
- return .green
- case .delayed:
- return .orange
- case .stale:
- return .red
+ private var manualSpeedBinding: Binding {
+ Binding {
+ Double(fanController.manualSpeed)
+ } set: { value in
+ fanController.setManualSpeed(Int(value.rounded()))
}
}
- private func statusMeta(label: String, value: String, color: Color) -> some View {
- VStack(alignment: .leading, spacing: 4) {
- Text(label)
- .font(.system(size: 9, weight: .bold))
- .foregroundStyle(.secondary)
- Text(value)
- .font(.system(size: 11, weight: .bold, design: .monospaced))
- .foregroundStyle(color)
- .cmNumericTextTransition()
+ private var autoAggressivenessBinding: Binding {
+ Binding {
+ fanController.autoAggressiveness
+ } set: { value in
+ fanController.setAutoAggressiveness(value)
}
- .frame(maxWidth: .infinity, alignment: .leading)
}
-}
-// MARK: - Compact row
-private struct CompactRow: View {
- let icon: String; let label: String; let value: String; let color: Color
- var body: some View {
- HStack(spacing: 10) {
- Image(systemName: icon)
- .font(.system(size: 12, weight: .semibold))
- .foregroundStyle(color).frame(width: 20)
- Text(label).font(.system(size: 12, weight: .medium)).foregroundStyle(.primary)
- Spacer()
- Text(value)
- .font(.system(size: 13, weight: .semibold, design: .monospaced))
- .foregroundStyle(color)
- .cmNumericTextTransition()
+ private var autoMaxSpeedBinding: Binding {
+ Binding {
+ Double(fanController.autoMaxSpeed)
+ } set: { value in
+ fanController.setAutoMaxSpeed(Int(value.rounded()))
}
- .padding(.vertical, 5)
- .copyOnTap("\(label): \(value)")
}
}
-// MARK: - Fan bar
-private struct FanBar: View {
- let index: Int; let rpm: Int; let minRPM: Int; let maxRPM: Int
- private var fraction: Double {
- guard maxRPM > minRPM else { return 0 }
- return max(0, min(1, Double(rpm - minRPM) / Double(maxRPM - minRPM)))
- }
- private var rpmColor: Color { fraction > 0.8 ? .red : fraction > 0.5 ? .orange : .green }
+private struct NativeBatteryPage: View {
+ let snapshot: SystemMonitorSnapshot
+
var body: some View {
- VStack(alignment: .leading, spacing: 6) {
- HStack {
- Label("Fan \(index + 1)", systemImage: "fanblades.fill")
- .font(.system(size: 11, weight: .medium)).foregroundStyle(.secondary)
- Spacer()
- Text("\(rpm) RPM")
- .font(.system(size: 13, weight: .bold, design: .monospaced)).foregroundStyle(rpmColor)
- .cmNumericTextTransition()
+ if snapshot.batteryInfo.hasBattery == false {
+ NativeSettingsSection("Battery") {
+ NativeEmptyMessage("This Mac does not report an internal battery.")
}
- GeometryReader { geo in
- ZStack(alignment: .leading) {
- Capsule().fill(Color.white.opacity(0.08)).frame(height: 5)
- Capsule().fill(rpmColor)
- .frame(width: max(0, geo.size.width * fraction), height: 5)
- .animation(.spring(duration: 0.5), value: fraction)
+ } else {
+ NativeSettingsSection("Charge") {
+ NativeProgressRow(
+ "Battery Level",
+ value: "\(snapshot.batteryInfo.chargePercent ?? 0)%",
+ fraction: Double(snapshot.batteryInfo.chargePercent ?? 0) / 100
+ )
+ NativeDivider()
+ NativeValueRow("Power State", value: BatteryDetailFormatter.powerStateDescription(for: snapshot.batteryInfo))
+ if let runtime = BatteryDetailFormatter.runtimeDescription(for: snapshot.batteryInfo) {
+ NativeDivider()
+ NativeValueRow(snapshot.batteryInfo.isCharging ? "Time to Full" : "Time Remaining", value: runtime)
}
- }.frame(height: 5)
+ }
+
+ NativeSettingsSection("Health") {
+ NativeValueRow("Health", value: snapshot.batteryInfo.healthPercent.map { "\($0)%" } ?? "Unavailable")
+ NativeDivider()
+ NativeValueRow("Cycle Count", value: snapshot.batteryInfo.cycleCount.map(String.init) ?? "Unavailable")
+ NativeDivider()
+ NativeValueRow("Temperature", value: BatteryDetailFormatter.temperatureDescription(snapshot.batteryInfo.temperatureC) ?? "Unavailable")
+ NativeDivider()
+ NativeValueRow("Voltage", value: BatteryDetailFormatter.voltageDescription(snapshot.batteryInfo.voltageV) ?? "Unavailable")
+ NativeDivider()
+ NativeValueRow("Current", value: BatteryDetailFormatter.amperageDescription(snapshot.batteryInfo.amperageA) ?? "Unavailable")
+ }
}
- .copyOnTap("\(rpm) RPM")
}
}
-// MARK: - Battery bar
-private struct BatteryBar: View {
- let info: BatteryInfo
- private var chargeColor: Color {
- let p = info.chargePercent ?? 100
- if p < 15 { return .red }; if p < 40 { return .orange }
- return info.isCharging ? Color.bdAccent : .green
- }
+private struct NativeSystemPage: View {
+ @ObservedObject var systemMonitor: SystemMonitor
+ @ObservedObject var startupManager: StartupManager
+ @ObservedObject private var privacySettings = PrivacySettings.shared
+ @ObservedObject private var menuBarSettings = MenuBarSettings.shared
+
var body: some View {
- DarkCard(padding: 14) {
- HStack(spacing: 14) {
- ZStack(alignment: .leading) {
- RoundedRectangle(cornerRadius: 4).stroke(Color.white.opacity(0.25), lineWidth: 1.5).frame(width: 44, height: 22)
- RoundedRectangle(cornerRadius: 3).fill(chargeColor)
- .frame(width: max(0, 40 * Double(info.chargePercent ?? 0) / 100), height: 18).padding(.leading, 2)
- RoundedRectangle(cornerRadius: 1.5).fill(Color.white.opacity(0.25)).frame(width: 3, height: 10).offset(x: 46)
- }.frame(width: 52)
- VStack(alignment: .leading, spacing: 4) {
- HStack(spacing: 6) {
- Text("\(info.chargePercent ?? 0)%")
- .font(.system(size: 18, weight: .bold, design: .rounded)).foregroundStyle(chargeColor)
- if info.isCharging { Image(systemName: "bolt.fill").font(.system(size: 11)).foregroundStyle(.yellow) }
- Text(info.isCharging ? "Charging" : info.isPluggedIn ? "AC Power" : "On Battery")
- .font(.system(size: 11, weight: .medium)).foregroundStyle(.secondary)
- }
- HStack(spacing: 6) {
- if let w = info.powerWatts { pill(String(format: "%.1f W", abs(w))) }
- if let h = info.healthPercent { pill("Health \(h)%") }
- if let c = info.cycleCount { pill("\(c) cycles") }
- }
- }
- Spacer()
- if let temp = info.temperatureC {
- VStack(spacing: 2) {
- Text(String(format: "%.0f°", temp)).font(.system(size: 16, weight: .bold, design: .rounded)).foregroundStyle(.secondary)
- Text("Batt").font(.system(size: 9)).foregroundStyle(.tertiary)
- }
+ let launchSummary = LaunchAtLoginStatusSummary.make(status: startupManager.state, errorMessage: startupManager.errorMessage)
+
+ NativeSettingsSection("Launch at Login") {
+ Toggle("Open Core Monitor when you sign in", isOn: launchBinding)
+ .toggleStyle(.switch)
+ NativeDivider()
+ NativeValueRow("Status", value: launchSummary.badge, detail: launchSummary.detail)
+ if launchSummary.action == .openSystemSettings {
+ NativeDivider()
+ Button(launchSummary.actionTitle ?? "Open Login Items") {
+ startupManager.openLoginItemsSettings()
}
}
}
- }
- private func pill(_ t: String) -> some View {
- Text(t).font(.system(size: 10, weight: .medium)).foregroundStyle(.secondary)
- .padding(.horizontal, 7).padding(.vertical, 3)
- .background(Color.white.opacity(0.08)).clipShape(Capsule())
- }
-}
-private struct FanHelperStatusCard: View {
- @ObservedObject private var helperManager = SMCHelperManager.shared
- let hasFans: Bool
- let currentMode: FanControlMode
+ NativeSettingsSection("Privacy") {
+ Toggle("Show app names in process views", isOn: $privacySettings.processInsightsEnabled)
+ .toggleStyle(.switch)
+ Text("Hardware readings stay local. App names are optional and only used to explain CPU and memory activity.")
+ .font(.footnote)
+ .foregroundStyle(.secondary)
+ }
- private var helperIsRequiredNow: Bool {
- currentMode.requiresPrivilegedHelper
- }
+ NativeSettingsSection("Menu Bar") {
+ Picker("Preset", selection: menuBarPresetBinding) {
+ ForEach(MenuBarVisibilityPreset.allCases, id: \.title) { preset in
+ Text(preset.title).tag(preset.title)
+ }
+ }
+ .pickerStyle(.menu)
+
+ if let warning = menuBarSettings.lastWarning {
+ Text(warning)
+ .font(.footnote)
+ .foregroundStyle(.secondary)
+ }
- private var statusColor: Color {
- if helperIsRequiredNow == false {
- switch helperManager.connectionState {
- case .reachable where hasFans:
- return .green
- case .checking, .reachable, .unknown, .missing, .unreachable:
- return .secondary
+ NativeDivider()
+
+ ForEach(MenuBarItemKind.allCases, id: \.defaultsKey) { kind in
+ Toggle(kind.title, isOn: Binding {
+ menuBarSettings.isEnabled(kind)
+ } set: { enabled in
+ menuBarSettings.setEnabled(enabled, for: kind)
+ })
+ .toggleStyle(.switch)
}
}
- switch helperManager.connectionState {
- case .reachable where hasFans:
- return .green
- case .checking:
- return Color.bdAccent
- case .unreachable:
- return .orange
- case .reachable, .unknown:
- return helperManager.isInstalled ? .green : .orange
- case .missing:
- return .orange
+ NativeSettingsSection("System Levels") {
+ NativeProgressRow("Volume", value: percentString(Double(systemMonitor.snapshot.currentVolume) * 100), fraction: Double(systemMonitor.snapshot.currentVolume))
+ NativeDivider()
+ NativeProgressRow("Brightness", value: percentString(Double(systemMonitor.snapshot.currentBrightness) * 100), fraction: Double(systemMonitor.snapshot.currentBrightness))
+ NativeDivider()
+ NativeValueRow("Thermal Pressure", value: thermalStateTitle(systemMonitor.snapshot.thermalState))
}
}
- private var statusLabel: String {
- if helperIsRequiredNow == false {
- switch helperManager.connectionState {
- case .reachable where hasFans:
- return "Ready Later"
- case .checking:
- return "Checking"
- case .reachable, .unknown, .missing, .unreachable:
- return "Optional"
- }
+ private var launchBinding: Binding {
+ Binding {
+ startupManager.isEnabled
+ } set: { enabled in
+ startupManager.setEnabled(enabled)
}
+ }
- switch helperManager.connectionState {
- case .checking:
- return "Checking"
- case .unreachable:
- return "Connection Failed"
- case .reachable:
- return hasFans ? "Ready" : "No Fans"
- case .unknown where helperManager.isInstalled:
- return hasFans ? "Installed" : "No Fans"
- case .unknown:
- return "Install Required"
- case .missing:
- return "Install Required"
+ private var menuBarPresetBinding: Binding {
+ Binding {
+ (menuBarSettings.activePreset ?? MenuBarSettings.defaultPreset).title
+ } set: { title in
+ guard let preset = MenuBarVisibilityPreset.allCases.first(where: { $0.title == title }) else { return }
+ menuBarSettings.applyPreset(preset)
}
}
+}
+
+private struct NativeTouchBarPage: View {
+ @ObservedObject private var settings = TouchBarCustomizationSettings.shared
var body: some View {
- DarkCard(padding: 14) {
- VStack(alignment: .leading, spacing: 10) {
- HStack(alignment: .top, spacing: 10) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Privileged Helper")
- .font(.system(size: 12, weight: .semibold))
- Text(helperDescription)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
- }
- Spacer(minLength: 12)
- if helperManager.isInstalled {
- Text(statusLabel)
- .font(.system(size: 10, weight: .bold, design: .rounded))
- .foregroundStyle(statusColor)
- .padding(.horizontal, 10)
- .padding(.vertical, 6)
- .background(statusColor.opacity(0.12))
- .clipShape(Capsule())
- } else {
- Button(helperButtonTitle) {
- helperManager.installFromApp(forceReinstall: helperManager.connectionState == .unreachable)
- }
- .buttonStyle(.borderedProminent)
- .controlSize(.small)
- }
- }
-
- if let statusMessage = helperManager.statusMessage, !statusMessage.isEmpty {
- Text(statusMessage)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(statusMessageColor)
- .fixedSize(horizontal: false, vertical: true)
+ NativeSettingsSection("Presentation") {
+ Picker("Hardware Touch Bar", selection: presentationModeBinding) {
+ ForEach(TouchBarPresentationMode.allCases) { mode in
+ Text(mode.title).tag(mode.rawValue)
}
-
- Text(hasFans
- ? "Core Monitor only writes RPM targets inside each fan's reported minimum and maximum range. Use System Auto any time, and quitting the app now also returns fans to macOS automatic control."
- : "This Mac did not expose any controllable fans, so monitoring will work but fan control will stay unavailable.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
}
- }
- .onAppear {
- helperManager.refreshDiagnostics()
- }
- }
-
- private var helperDescription: String {
- if helperManager.connectionState == .unreachable {
- return helperManager.isInstalled
- ? "Installed, but the XPC service rejected or could not reach this app build. Reinstall the helper from this exact app build, then recheck."
- : "Core Monitor found an incomplete or stale helper install state. Repair the helper from this exact app build before switching into Smart, Manual, or other managed fan profiles."
- }
+ .pickerStyle(.segmented)
- if helperIsRequiredNow == false {
- if helperManager.connectionState == .reachable {
- return "The helper is ready if you switch back into a managed fan mode later. System-owned cooling is active right now."
+ Picker("Theme", selection: themeBinding) {
+ ForEach(TouchBarTheme.allCases) { theme in
+ Text(theme.displayName).tag(theme)
+ }
}
- return "System mode keeps the firmware fan curve in charge right now. Install or repair the helper before switching into Smart, Manual, or other managed fan profiles."
- }
+ .pickerStyle(.segmented)
- if helperManager.connectionState == .checking {
- return "Installed. Verifying the local privileged helper before enabling managed fan modes."
- }
- if helperManager.isInstalled {
- return "Installed. Smart, Manual, Custom, and fixed fan profiles can talk to the local privileged helper on supported Macs."
- }
- return "Required for Smart, Balanced, Performance, Max, Manual, and Custom fan control. Monitoring works without it."
- }
-
- private var statusMessageColor: Color {
- if helperManager.statusMessage == "Privileged helper installed. Fan control is ready." {
- return .green
+ NativeValueRow(
+ "Estimated Width",
+ value: "\(Int(settings.estimatedWidth.rounded())) pt",
+ detail: settings.widthOverflow > 0 ? "This layout exceeds the recommended Touch Bar width." : nil
+ )
}
- return helperIsRequiredNow ? .orange : .secondary
- }
-
- private var helperButtonTitle: String {
- helperManager.connectionState == .unreachable ? "Repair Helper" : "Install Helper"
- }
-}
-private struct HelperDiagnosticsSupportCard: View {
- @ObservedObject private var helperManager = SMCHelperManager.shared
- @ObservedObject private var menuBarSettings = MenuBarSettings.shared
- @ObservedObject var startupManager: StartupManager
-
- @State private var exportMessage: String?
-
- var body: some View {
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 12) {
- HStack(alignment: .top, spacing: 12) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Helper Diagnostics")
- .font(.system(size: 13, weight: .semibold))
- Text(summaryText)
- .font(.system(size: 11, weight: .medium))
+ NativeSettingsSection("Presets") {
+ ForEach(TouchBarPreset.all) { preset in
+ HStack {
+ VStack(alignment: .leading, spacing: 2) {
+ Text(preset.title)
+ Text(preset.subtitle)
+ .font(.footnote)
.foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
}
-
- Spacer(minLength: 12)
-
- Text(connectionLabel)
- .font(.system(size: 10, weight: .bold, design: .rounded))
- .foregroundStyle(connectionColor)
- .padding(.horizontal, 10)
- .padding(.vertical, 6)
- .background(connectionColor.opacity(0.12))
- .clipShape(Capsule())
- }
-
- HStack(spacing: 8) {
- if primaryActionTitle == "Install Helper" || primaryActionTitle == "Reinstall Helper" {
- Button(primaryActionTitle, action: performPrimaryAction)
- .buttonStyle(.borderedProminent)
- .controlSize(.small)
- } else {
- Button(primaryActionTitle, action: performPrimaryAction)
- .buttonStyle(.bordered)
- .controlSize(.small)
+ Spacer()
+ Button(settings.activePreset == preset ? "Selected" : "Use") {
+ settings.applyPreset(preset)
}
-
- Button("Export Report", action: exportReport)
- .buttonStyle(.bordered)
- .controlSize(.small)
- }
-
- Text("The report captures app signing, helper install state, connectivity, launch-at-login approval, and menu bar reachability so support issues can be triaged without guessing.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
-
- if let helperStatusMessage = helperManager.statusMessage, helperStatusMessage.isEmpty == false {
- Text(helperStatusMessage)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(helperStatusColor)
- .fixedSize(horizontal: false, vertical: true)
+ .disabled(settings.activePreset == preset)
}
-
- if let exportMessage, exportMessage.isEmpty == false {
- Text(exportMessage)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(exportMessage.localizedCaseInsensitiveContains("could not") ? .orange : .green)
- .fixedSize(horizontal: false, vertical: true)
+ if preset.id != TouchBarPreset.all.last?.id {
+ NativeDivider()
}
}
- }
- .onAppear {
- helperManager.refreshDiagnostics()
- }
- }
-
- private var primaryActionTitle: String {
- if helperManager.isInstalled {
- return helperManager.connectionState == .unreachable ? "Reinstall Helper" : "Recheck Helper"
- }
- return "Install Helper"
- }
-
- private var connectionLabel: String {
- switch helperManager.connectionState {
- case .missing:
- return "Missing"
- case .unknown:
- return helperManager.isInstalled ? "Pending Check" : "Missing"
- case .checking:
- return "Checking"
- case .reachable:
- return "Reachable"
- case .unreachable:
- return "Needs Attention"
- }
- }
-
- private var connectionColor: Color {
- switch helperManager.connectionState {
- case .reachable:
- return .green
- case .checking:
- return Color.bdAccent
- case .missing, .unknown:
- return .orange
- case .unreachable:
- return .red
- }
- }
-
- private var helperStatusColor: Color {
- helperManager.connectionState == .reachable ? .green : .orange
- }
-
- private var summaryText: String {
- switch helperManager.connectionState {
- case .reachable:
- return "The helper responded to the latest trust check. Managed fan modes should be available on supported Macs."
- case .checking:
- return "Core Monitor is verifying the local helper before trusting it for fan writes."
- case .unreachable:
- return helperManager.isInstalled
- ? "The helper is installed but this build could not establish a trusted XPC connection. Reinstall from this exact app build, then recheck if needed."
- : "Core Monitor detected an incomplete or stale helper install. Repair the helper from this exact app build, then recheck if needed."
- case .unknown:
- return helperManager.isInstalled
- ? "The helper exists, but Core Monitor has not finished a fresh health probe yet."
- : "Monitoring already works. Install the helper only if you want managed or manual fan control."
- case .missing:
- return "Monitoring already works. Install the helper only if you want managed or manual fan control."
- }
- }
-
- private func performPrimaryAction() {
- exportMessage = nil
- if helperManager.connectionState == .unreachable {
- helperManager.installFromApp(forceReinstall: true)
- return
- }
-
- if helperManager.isInstalled {
- helperManager.refreshStatus()
- helperManager.refreshDiagnostics()
- } else {
- helperManager.installFromApp()
- }
- }
-
- private func exportReport() {
- do {
- let savedURL = try HelperDiagnosticsExporter.exportReport(
- helperManager: helperManager,
- startupManager: startupManager,
- menuBarSettings: menuBarSettings
- )
-
- guard let savedURL else {
- exportMessage = nil
- return
+ NativeDivider()
+ Button("Restore Defaults") {
+ settings.restoreDefaults()
}
-
- exportMessage = "Saved helper diagnostics to \(savedURL.lastPathComponent)."
- } catch {
- exportMessage = "Could not export helper diagnostics: \(error.localizedDescription)"
}
- }
-}
-
-private struct DashboardShortcutCard: View {
- @ObservedObject private var shortcutManager = DashboardShortcutManager.shared
- var body: some View {
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 12) {
- HStack(alignment: .top, spacing: 12) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Dashboard Shortcut")
- .font(.system(size: 13, weight: .semibold))
- Text(summaryText)
- .font(.system(size: 11, weight: .medium))
+ NativeSettingsSection("Active Items") {
+ ForEach(Array(settings.items.enumerated()), id: \.element.id) { index, item in
+ HStack(alignment: .center, spacing: 12) {
+ VStack(alignment: .leading, spacing: 2) {
+ Text(item.title)
+ Text(item.subtitle)
+ .font(.footnote)
.foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
- }
-
- Spacer(minLength: 12)
-
- Text(shortcutManager.isEnabled ? "Enabled" : "Off")
- .font(.system(size: 10, weight: .bold, design: .rounded))
- .foregroundStyle(statusColor)
- .padding(.horizontal, 10)
- .padding(.vertical, 6)
- .background(statusColor.opacity(0.12))
- .clipShape(Capsule())
- }
-
- HStack(spacing: 10) {
- Text(DashboardShortcutConfiguration.displayLabel.uppercased())
- .font(.system(size: 10, weight: .bold))
- .foregroundStyle(shortcutManager.isEnabled ? Color.bdAccent : .secondary)
- .padding(.horizontal, 10)
- .padding(.vertical, 6)
- .background((shortcutManager.isEnabled ? Color.bdAccent : Color.white).opacity(0.12))
- .clipShape(Capsule())
-
- Spacer(minLength: 12)
-
- Text("Enable global shortcut")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
-
- Toggle("", isOn: Binding(
- get: { shortcutManager.isEnabled },
- set: { shortcutManager.setEnabled($0) }
- ))
- .toggleStyle(.switch)
- .tint(Color.bdAccent)
- }
-
- Text("Use \(DashboardShortcutConfiguration.displayLabel) to bring Core Monitor to the front even if macOS has hidden the menu bar items. The same shortcut also appears in the app menu while Core Monitor is active.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
-
- if let registrationError = shortcutManager.registrationError, registrationError.isEmpty == false {
- Text(registrationError)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.orange)
- .fixedSize(horizontal: false, vertical: true)
- }
- }
- }
- }
-
- private var summaryText: String {
- if shortcutManager.isEnabled {
- return "A global shortcut can open the dashboard from anywhere without depending on menu bar visibility or reopen behavior."
- }
- return "Turn this on if you want a reliable way to summon the dashboard when menu bar visibility or app activation gets in the way."
- }
-
- private var statusColor: Color {
- shortcutManager.isEnabled ? Color.bdAccent : .secondary
- }
-}
-
-// MARK: - Fan control panel
-private struct FanControlPanel: View {
- struct Snapshot { var fanSpeeds: [Int] = []; var fanMinSpeeds: [Int] = []; var fanMaxSpeeds: [Int] = [] }
- @ObservedObject var fanController: FanController
- let snapshot: Snapshot
- @State private var showCustomEditor = false
-
- var body: some View {
- VStack(spacing: 10) {
- FanHelperStatusCard(
- hasFans: snapshot.fanSpeeds.isEmpty == false,
- currentMode: fanController.mode
- )
- ScrollView(.horizontal, showsIndicators: false) {
- HStack(spacing: 8) {
- ForEach(FanControlMode.quickModes, id: \.self) { mode in
- Button { fanController.setMode(mode) } label: {
- HStack(spacing: 5) {
- Image(systemName: modeIcon(mode)).font(.system(size: 11, weight: .semibold))
- Text(mode.shortTitle).font(.system(size: 12, weight: .semibold, design: .rounded))
- }
- .padding(.horizontal, 14).padding(.vertical, 8)
- .background(fanController.mode == mode ? Color.bdAccent.opacity(0.22) : Color.white.opacity(0.06))
- .foregroundStyle(fanController.mode == mode ? Color.bdAccent : .secondary)
- .clipShape(Capsule())
- .overlay(Capsule().strokeBorder(
- fanController.mode == mode ? Color.bdAccent.opacity(0.5) : Color.clear, lineWidth: 1))
- }
- .buttonStyle(SoftPressButtonStyle())
- .animation(.spring(duration: 0.2), value: fanController.mode)
+ .lineLimit(2)
}
- }.padding(.horizontal, 1)
- }
- FanModeGuidanceCard(mode: fanController.mode, hasFans: snapshot.fanSpeeds.isEmpty == false)
- if fanController.mode.usesManualSlider {
- DarkCard(padding: 14) {
- VStack(spacing: 8) {
- HStack {
- Label("Target Speed", systemImage: "slider.horizontal.3")
- .font(.system(size: 12, weight: .medium)).foregroundStyle(.secondary)
- Spacer()
- Text("\(fanController.manualSpeed) RPM")
- .font(.system(size: 14, weight: .bold, design: .monospaced)).foregroundStyle(Color.bdAccent)
- .cmNumericTextTransition()
- }
- Slider(value: Binding(get: { Double(fanController.manualSpeed) },
- set: { fanController.setManualSpeed(Int($0)) }),
- in: Double(fanController.minSpeed)...Double(fanController.maxSpeed), step: 50)
- .tint(Color.bdAccent)
+ Spacer()
+ Button {
+ settings.moveUp(item)
+ } label: {
+ Image(systemName: "chevron.up")
}
- }
- } else if fanController.mode == .smart {
- DarkCard(padding: 14) {
- VStack(spacing: 8) {
- HStack {
- Label("Aggressiveness", systemImage: "bolt.shield.fill")
- .font(.system(size: 12, weight: .medium)).foregroundStyle(.secondary)
- Spacer()
- Text(String(format: "%.1f×", fanController.autoAggressiveness))
- .font(.system(size: 14, weight: .bold, design: .monospaced)).foregroundStyle(.green)
- }
- Slider(value: Binding(get: { fanController.autoAggressiveness },
- set: { fanController.setAutoAggressiveness($0) }),
- in: 0...3, step: 0.1).tint(.green)
+ .help("Move Up")
+ .disabled(index == 0)
+
+ Button {
+ settings.moveDown(item)
+ } label: {
+ Image(systemName: "chevron.down")
}
- }
- } else if fanController.mode == .custom {
- DarkCard(padding: 14) {
- VStack(alignment: .leading, spacing: 10) {
- HStack(alignment: .firstTextBaseline) {
- Label("Custom Preset", systemImage: "curlybraces.square.fill")
- .font(.system(size: 12, weight: .semibold))
- .foregroundStyle(Color.bdAccent)
- Spacer()
- }
-
- Text(fanController.customPresetStatus)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .textSelection(.enabled)
+ .help("Move Down")
+ .disabled(index == settings.items.count - 1)
- Text(fanController.customPresetFilePath)
- .font(.system(size: 10, weight: .regular, design: .monospaced))
- .foregroundStyle(Color.white.opacity(0.45))
- .lineLimit(2)
- .textSelection(.enabled)
-
- let preset = fanController.currentCustomPresetDraft()
- HStack(spacing: 10) {
- fanSummaryPill(preset.sensor.title)
- fanSummaryPill("\(preset.sortedPoints.count) points")
- fanSummaryPill(String(format: "%.1fs", preset.updateIntervalSeconds ?? 2.0))
- }
-
- FanCurvePreview(
- preset: preset,
- showsAxisLabels: false,
- minimumHeight: nil
- )
- .frame(height: 150)
-
- if let error = fanController.customPresetLastError, !error.isEmpty {
- Text(error)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.orange)
- .fixedSize(horizontal: false, vertical: true)
- }
-
- HStack(spacing: 8) {
- Button {
- showCustomEditor = true
- } label: {
- Label("Edit Curve", systemImage: "slider.horizontal.below.rectangle")
- .font(.system(size: 12, weight: .medium))
- .frame(maxWidth: .infinity)
- }
- .buttonStyle(SoftPressButtonStyle())
- }
+ Button {
+ settings.remove(item)
+ } label: {
+ Image(systemName: "minus.circle")
}
+ .help("Remove")
+ .disabled(settings.items.count <= 1)
}
- }
- if !snapshot.fanSpeeds.isEmpty {
- DarkCard(padding: 14) {
- VStack(spacing: 12) {
- ForEach(snapshot.fanSpeeds.indices, id: \.self) { i in
- FanBar(index: i, rpm: snapshot.fanSpeeds[i],
- minRPM: i < snapshot.fanMinSpeeds.count ? snapshot.fanMinSpeeds[i] : 1000,
- maxRPM: i < snapshot.fanMaxSpeeds.count ? snapshot.fanMaxSpeeds[i] : 6500)
- }
- }
+ if index != settings.items.indices.last {
+ NativeDivider()
}
}
- Button { fanController.resetToSystemAutomatic() } label: {
- Label("Reset to System Auto", systemImage: "arrow.counterclockwise")
- .font(.system(size: 12, weight: .medium)).foregroundStyle(.secondary)
- .frame(maxWidth: .infinity).padding(.vertical, 9)
- .background(Color.white.opacity(0.06))
- .clipShape(RoundedRectangle(cornerRadius: 9, style: .continuous))
- }
- .buttonStyle(SoftPressButtonStyle())
-
- Button { fanController.calibrateFanControl() } label: {
- HStack(spacing: 8) {
- if fanController.isCalibrating {
- ProgressView()
- .scaleEffect(0.62)
- .frame(width: 12, height: 12)
- } else {
- Image(systemName: "magnifyingglass")
- }
- Text(fanController.isCalibrating ? fanController.calibrationStatus : "Scan Fan Keys")
- .lineLimit(1)
- .minimumScaleFactor(0.8)
- }
- .font(.system(size: 12, weight: .medium))
- .foregroundStyle(fanController.isCalibrating ? Color.bdAccent : .secondary)
- .frame(maxWidth: .infinity)
- .padding(.vertical, 9)
- .background(Color.white.opacity(0.06))
- .clipShape(RoundedRectangle(cornerRadius: 9, style: .continuous))
- }
- .buttonStyle(SoftPressButtonStyle())
- .disabled(fanController.isCalibrating)
-
- Text("Fan key scans are diagnostic only. They confirm which fan-related SMC keys respond on this Mac; they do not calibrate RPM accuracy or guarantee every preset is safe.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .frame(maxWidth: .infinity, alignment: .leading)
+ }
- if !fanController.calibrationStatus.isEmpty, fanController.calibrationStatus != "No fan key scan run yet." {
- Text(fanController.calibrationStatus)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .lineLimit(2)
- .frame(maxWidth: .infinity, alignment: .leading)
+ NativeSettingsSection("Built-In Widgets") {
+ ForEach(TouchBarWidgetKind.allCases) { kind in
+ Toggle(kind.title, isOn: Binding {
+ settings.contains(kind)
+ } set: { _ in
+ settings.toggle(kind)
+ })
+ .toggleStyle(.switch)
}
}
- .sheet(isPresented: $showCustomEditor) {
- CustomFanPresetEditorSheet(fanController: fanController)
- }
}
- private func modeIcon(_ mode: FanControlMode) -> String {
- switch mode {
- case .smart: return "bolt.shield.fill"
- case .silent: return "cpu"
- case .balanced: return "dial.medium"
- case .performance: return "speedometer"
- case .max: return "tornado"
- case .manual: return "slider.horizontal.3"
- case .custom: return "curlybraces.square.fill"
- case .automatic: return "cpu"
+ private var presentationModeBinding: Binding {
+ Binding {
+ settings.presentationMode.rawValue
+ } set: { rawValue in
+ settings.presentationMode = TouchBarPresentationMode(rawValue: rawValue) ?? .app
}
}
- private func fanSummaryPill(_ text: String) -> some View {
- Text(text)
- .font(.system(size: 10, weight: .semibold))
- .foregroundStyle(Color.bdAccent)
- .padding(.horizontal, 8)
- .padding(.vertical, 5)
- .background(Color.bdAccent.opacity(0.14))
- .clipShape(Capsule())
- }
-}
-
-// MARK: - Sidebar items
-enum SidebarItem: String, CaseIterable, Identifiable {
- case overview="Overview", thermals="Thermals", memory="Memory", fans="Fans"
- case battery="Battery"
- case system="System", touchBar="Touch Bar", help="Help", about="About"
- var id: String { rawValue }
- var icon: String {
- switch self {
- case .overview: return "gauge.medium"; case .thermals: return "thermometer.medium"
- case .memory: return "memorychip"; case .fans: return "fanblades.fill"
- case .battery: return "battery.75"; case .system: return "gearshape"
- case .touchBar: return "rectangle.3.group"
- case .help: return "questionmark.circle"
- case .about: return "info.circle"
+ private var themeBinding: Binding {
+ Binding {
+ settings.theme
+ } set: { theme in
+ settings.theme = theme
}
}
}
-// MARK: - Sidebar row
-private struct SidebarRow: View {
- @ObservedObject private var appearanceSettings = AppAppearanceSettings.shared
- let item: SidebarItem; let isSelected: Bool
+private struct NativeHelpPage: View {
var body: some View {
- HStack(spacing: 10) {
- Image(systemName: item.icon)
- .font(.system(size: 13, weight: .semibold))
- .foregroundStyle(isSelected ? Color.white.opacity(0.96) : Color.white.opacity(0.58))
- .frame(width: 20, alignment: .center)
- .scaleEffect(isSelected ? 1.04 : 1.0)
- Text(item.rawValue)
- .font(.system(size: 13, weight: isSelected ? .semibold : .medium))
- .foregroundStyle(isSelected ? Color.white.opacity(0.98) : Color.white.opacity(0.72))
- Spacer()
+ NativeSettingsSection("Monitoring") {
+ NativeHelpRow("Open the dashboard from the menu bar item or the application menu.")
+ NativeDivider()
+ NativeHelpRow("Detailed process sampling is enabled only while the Memory page is open.")
+ NativeDivider()
+ NativeHelpRow("SMC access is required for fan speed and temperature readings on supported Macs.")
}
- .padding(.horizontal, 14).padding(.vertical, 9)
- .offset(x: isSelected ? 2 : 0)
- .background(backgroundFill)
- .overlay {
- if isSelected {
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .stroke(Color.white.opacity(0.03 * appearanceSettings.surfaceOpacity), lineWidth: 1)
- }
- }
- .contentShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
- .animation(.interactiveSpring(response: 0.24, dampingFraction: 0.82), value: isSelected)
- }
- @ViewBuilder
- private var backgroundFill: some View {
- if isSelected {
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .fill(Color.bdSelected.opacity(0.18 * appearanceSettings.surfaceOpacity))
- } else {
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .fill(Color.clear)
+ NativeSettingsSection("Fan Control") {
+ NativeHelpRow("Use System Automatic when you want macOS to own cooling.")
+ NativeDivider()
+ NativeHelpRow("Managed cooling modes may request administrator approval to install the privileged helper.")
+ NativeDivider()
+ NativeHelpRow("Restore Automatic before quitting if you want to hand fan control back immediately.")
}
- }
-}
-// MARK: - Sidebar
-private struct Sidebar: View {
- @ObservedObject private var appearanceSettings = AppAppearanceSettings.shared
- @Binding var selection: SidebarItem
- let hasBattery: Bool
- let modeState: AppModeState
-
- var visibleItems: [SidebarItem] {
- var items: [SidebarItem] = [.overview, .thermals, .memory, .fans]
- if hasBattery {
- items.append(.battery)
- }
- items.append(contentsOf: [.system, .touchBar, .help, .about])
- return items
- }
-
- var body: some View {
- VStack(alignment: .leading, spacing: 0) {
- ScrollView(.vertical, showsIndicators: false) {
- VStack(spacing: 5) {
- ForEach(visibleItems) { item in
- Button {
- selection = item
- } label: {
- SidebarRow(item: item, isSelected: selection == item)
- }
- .buttonStyle(SoftPressButtonStyle())
- }
- }
- .padding(.horizontal, 10)
- .padding(.top, 34)
- .padding(.bottom, 10)
- }
-
- Spacer()
-
- Rectangle()
- .fill(Color.white.opacity(0.03 * appearanceSettings.surfaceOpacity))
- .frame(height: 1)
- .padding(.horizontal, 10)
-
- Button { modeState.isBasicMode = true } label: {
- Label("Basic Mode", systemImage: "square.grid.2x2.fill")
- .font(.system(size: 12, weight: .medium))
- .foregroundStyle(.white.opacity(0.72))
- .frame(maxWidth: .infinity, alignment: .leading)
- .padding(.horizontal, 14).padding(.vertical, 9)
- }
- .buttonStyle(SoftPressButtonStyle())
- .padding(.horizontal, 10)
- .padding(.top, 14)
-
- Button { NSApp.terminate(nil) } label: {
- Label("Quit Core Monitor", systemImage: "power")
- .font(.system(size: 12, weight: .semibold))
- .foregroundStyle(.red.opacity(0.92))
- .frame(maxWidth: .infinity, alignment: .leading)
- .padding(.horizontal, 14)
- .padding(.vertical, 9)
- .background(Color.red.opacity(0.12))
- .clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
- .overlay(
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .stroke(Color.red.opacity(0.16), lineWidth: 1)
- )
- }
- .buttonStyle(SoftPressButtonStyle())
- .padding(.horizontal, 10)
- .padding(.top, 8)
- .padding(.bottom, 14)
- }
- .frame(width: 228)
- .frame(maxHeight: .infinity)
- .background {
- ZStack {
- VisualEffectView(
- material: .underWindowBackground,
- blendingMode: .behindWindow,
- opacity: appearanceSettings.surfaceOpacity
- )
- Color.bdSidebar.opacity(0.015 * appearanceSettings.surfaceOpacity)
- }
+ NativeSettingsSection("Privacy") {
+ NativeHelpRow("Hardware metrics stay on this Mac.")
+ NativeDivider()
+ NativeHelpRow("Process names are hidden until you enable them in System settings.")
}
}
}
-// MARK: - DetailPane
-private struct DetailPane: View {
- @Binding var selection: SidebarItem
- let snapshot: SystemMonitorSnapshot
- let fanController: FanController; let systemMonitor: SystemMonitor
- let startupManager: StartupManager
-
- @ViewBuilder
- private var selectedContent: some View {
- switch selection {
- case .overview: overviewContent
- case .thermals: thermalsContent
- case .memory: memoryContent
- case .fans: fansContent
- case .battery: batteryContent
- case .system: systemContent
- case .touchBar: touchBarContent
- case .help: HelpView()
- case .about: aboutContent
- }
- }
+private struct NativeAboutPage: View {
+ @AppStorage(AppLocaleStore.localeOverrideKey) private var localeOverrideIdentifier = AppLocaleStore.systemLocaleValue
var body: some View {
- Group {
- if selection == .help {
- selectedContent
- .frame(maxWidth: .infinity, maxHeight: .infinity)
- } else {
- ScrollView(.vertical, showsIndicators: false) {
- VStack(alignment: .leading, spacing: 18) {
- selectedContent
- .id(selection)
- Spacer(minLength: 24)
- }
- .padding(.top, 28)
- .padding(.leading, 24)
- .padding(.trailing, 24)
- .padding(.bottom, 24)
- }
- .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
- }
- }
- }
-
- // MARK: Overview
- private var overviewContent: some View {
- VStack(alignment: .leading, spacing: 18) {
- header("Overview", subtitle: hostModelName())
- MonitoringDashboardStrip(systemMonitor: systemMonitor, fanController: fanController)
- MonitoringStatusCard(systemMonitor: systemMonitor)
- LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())], spacing: 12) {
- MetricTile(label: "CPU Load", value: "\(Int(snapshot.cpuUsagePercent.rounded()))", unit: "%",
- color: cpuColor, gauge: snapshot.cpuUsagePercent / 100, history: systemMonitor.cpuHistory)
- if let pUsage = snapshot.performanceCoreUsagePercent {
- MetricTile(label: "P-Core Load (\(SystemMonitor.performanceCoreCount()) cores)",
- value: "\(Int(pUsage.rounded()))", unit: "%",
- color: loadColor(pUsage), gauge: pUsage / 100)
- }
- if let eUsage = snapshot.efficiencyCoreUsagePercent {
- MetricTile(label: "E-Core Load (\(SystemMonitor.efficiencyCoreCount()) cores)",
- value: "\(Int(eUsage.rounded()))", unit: "%",
- color: loadColor(eUsage), gauge: eUsage / 100)
- }
- MetricTile(label: "Memory", value: "\(Int(snapshot.memoryUsagePercent.rounded()))", unit: "%",
- color: memColor, gauge: snapshot.memoryUsagePercent / 100, history: systemMonitor.memHistory)
- if let t = snapshot.cpuTemperature {
- MetricTile(label: "CPU Temp", value: "\(Int(t.rounded()))", unit: "°C",
- color: tempColor(t), gauge: min(t, 110) / 110, history: systemMonitor.cpuTempHistory)
- }
- if let rpm = snapshot.fanSpeeds.first, rpm > 0 {
- MetricTile(label: "Fan", value: "\(rpm)", unit: " RPM", color: Color.bdAccent)
- }
- if let w = snapshot.totalSystemWatts {
- MetricTile(label: "Power", value: String(format: "%.1f", abs(w)), unit: " W", color: .purple)
- }
- MetricTile(
- label: "Download",
- value: NetworkThroughputFormatter.compactRate(bytesPerSecond: snapshot.networkStats.downloadBytesPerSec),
- unit: "",
- color: Color(red: 0.36, green: 0.77, blue: 1.0)
- )
- MetricTile(
- label: "Upload",
- value: NetworkThroughputFormatter.compactRate(bytesPerSecond: snapshot.networkStats.uploadBytesPerSec),
- unit: "",
- color: Color(red: 0.46, green: 0.90, blue: 0.66)
- )
- if snapshot.batteryInfo.hasBattery {
- MetricTile(label: "Battery", value: "\(snapshot.batteryInfo.chargePercent ?? 0)", unit: "%",
- color: battColor, gauge: battFrac)
+ NativeSettingsSection("Core Monitor") {
+ HStack(spacing: 14) {
+ Image(nsImage: NSImage(named: "AppIcon") ?? NSApp.applicationIconImage)
+ .resizable()
+ .frame(width: 52, height: 52)
+ .cornerRadius(10)
+ VStack(alignment: .leading, spacing: 3) {
+ Text("Core Monitor")
+ .font(.title3)
+ .fontWeight(.semibold)
+ Text("Version \(AppVersion.current)")
+ .foregroundStyle(.secondary)
}
}
- MonitoringTrendSection(systemMonitor: systemMonitor)
+ NativeDivider()
+ NativeValueRow("Mac", value: MacModelRegistry.displayName(for: SystemMonitor.hostModelIdentifier()))
+ NativeDivider()
+ NativeValueRow("Model Identifier", value: SystemMonitor.hostModelIdentifier())
}
- }
- private var thermalsContent: some View {
- VStack(alignment: .leading, spacing: 18) {
- header("Thermals", subtitle: "CPU & GPU temperature sensors")
- LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())], spacing: 12) {
- if let t = snapshot.cpuTemperature {
- MetricTile(label: "CPU Temp", value: "\(Int(t.rounded()))", unit: "°C",
- color: tempColor(t), gauge: min(t, 110) / 110, history: systemMonitor.cpuTempHistory)
+ NativeSettingsSection("Language") {
+ Picker("Language", selection: $localeOverrideIdentifier) {
+ Text("System Default").tag(AppLocaleStore.systemLocaleValue)
+ ForEach(AppLocaleStore.supportedLocaleIdentifiers, id: \.self) { identifier in
+ Text(AppLocaleStore.optionLabel(for: identifier)).tag(identifier)
}
- if let t = snapshot.gpuTemperature {
- MetricTile(label: "GPU Temp", value: "\(Int(t.rounded()))", unit: "°C",
- color: tempColor(t), gauge: min(t, 110) / 110)
- }
- }
- if snapshot.cpuTemperature == nil && snapshot.gpuTemperature == nil {
- emptyState(icon: "thermometer.slash", message: "No thermal sensors available.\nSMC access is required.")
}
+ .pickerStyle(.menu)
+ Text(AppLocaleStore.selectionSummary(for: localeOverrideIdentifier))
+ .font(.footnote)
+ .foregroundStyle(.secondary)
}
- }
- private var memoryContent: some View {
- VStack(alignment: .leading, spacing: 18) {
- header("Memory", subtitle: "Unified memory pressure and usage")
- LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())], spacing: 12) {
- MetricTile(label: "Usage", value: "\(Int(snapshot.memoryUsagePercent.rounded()))", unit: "%",
- color: memColor, gauge: snapshot.memoryUsagePercent / 100, history: systemMonitor.memHistory)
- MetricTile(label: "Used", value: String(format: "%.1f", snapshot.memoryUsedGB), unit: " GB",
- color: memColor, gauge: snapshot.memoryUsedGB / max(1, snapshot.totalMemoryGB))
- }
- DarkCard(padding: 16) {
- VStack(spacing: 0) {
- CompactRow(icon: "memorychip", label: "Total", value: String(format: "%.0f GB", snapshot.totalMemoryGB), color: .secondary)
- rowDivider
- CompactRow(icon: "chart.bar.fill", label: "Pressure", value: pressureLabel, color: pressureColor)
- if let w = snapshot.totalSystemWatts {
- rowDivider
- CompactRow(icon: "bolt.fill", label: "System Power", value: String(format: "%.1f W", abs(w)), color: .purple)
- }
- }
+ NativeSettingsSection("Application") {
+ Button("Quit Core Monitor") {
+ NSApp.terminate(nil)
}
- TopMemoryProcessesPanel(systemMonitor: systemMonitor, snapshot: snapshot.topProcesses)
}
}
+}
- private var fansContent: some View {
- VStack(alignment: .leading, spacing: 18) {
- header("Fans", subtitle: fanController.statusMessage)
- FanControlPanel(fanController: fanController,
- snapshot: FanControlPanel.Snapshot(fanSpeeds: snapshot.fanSpeeds,
- fanMinSpeeds: snapshot.fanMinSpeeds,
- fanMaxSpeeds: snapshot.fanMaxSpeeds))
- }
- }
+private struct NativeSettingsSection: View {
+ private let title: String
+ private let content: Content
- private var batteryContent: some View {
- VStack(alignment: .leading, spacing: 18) {
- header("Battery", subtitle: "Power and health information")
- BatteryBar(info: snapshot.batteryInfo)
- DarkCard(padding: 16) {
- VStack(spacing: 0) {
- CompactRow(icon: "battery.100", label: "Charge", value: "\(snapshot.batteryInfo.chargePercent ?? 0)%", color: battColor)
- if let h = snapshot.batteryInfo.healthPercent {
- rowDivider
- CompactRow(icon: "heart.fill", label: "Health", value: "\(h)%", color: h > 80 ? .green : h > 60 ? .orange : .red)
- }
- if let c = snapshot.batteryInfo.cycleCount {
- rowDivider
- CompactRow(icon: "arrow.2.circlepath", label: "Cycles", value: "\(c)", color: .secondary)
- }
- if let w = snapshot.batteryInfo.powerWatts {
- rowDivider
- CompactRow(icon: "bolt.fill", label: "Power", value: String(format: "%.1f W", abs(w)), color: .yellow)
- }
- }
- }
- DarkCard(padding: 16) {
- VStack(spacing: 0) {
- CompactRow(
- icon: "powerplug.fill",
- label: "Status",
- value: BatteryDetailFormatter.powerStateDescription(for: snapshot.batteryInfo),
- color: snapshot.batteryInfo.isCharging ? .yellow : snapshot.batteryInfo.isPluggedIn ? .green : Color.bdAccent
- )
- if let source = BatteryDetailFormatter.sourceDescription(for: snapshot.batteryInfo) {
- rowDivider
- CompactRow(icon: "cable.connector", label: "Source", value: source, color: .secondary)
- }
- if let runtime = BatteryDetailFormatter.runtimeDescription(for: snapshot.batteryInfo) {
- rowDivider
- CompactRow(
- icon: "clock.fill",
- label: snapshot.batteryInfo.isCharging ? "Time to Full" : "Time Remaining",
- value: runtime,
- color: Color.bdAccent
- )
- }
- if let temperature = BatteryDetailFormatter.temperatureDescription(snapshot.batteryInfo.temperatureC) {
- rowDivider
- CompactRow(
- icon: "thermometer.medium",
- label: "Temperature",
- value: temperature,
- color: tempColor(snapshot.batteryInfo.temperatureC ?? 0)
- )
- }
- if let voltage = BatteryDetailFormatter.voltageDescription(snapshot.batteryInfo.voltageV) {
- rowDivider
- CompactRow(icon: "bolt.fill", label: "Voltage", value: voltage, color: .yellow)
- }
- if let amperage = BatteryDetailFormatter.amperageDescription(snapshot.batteryInfo.amperageA) {
- rowDivider
- CompactRow(
- icon: "waveform.path.ecg",
- label: "Current",
- value: amperage,
- color: snapshot.batteryInfo.isCharging ? .green : .orange
- )
- }
- }
- }
- }
+ init(_ title: String, @ViewBuilder content: () -> Content) {
+ self.title = title
+ self.content = content()
}
- private var systemContent: some View {
- VStack(alignment: .leading, spacing: 18) {
- header("System", subtitle: "Controls and startup")
- SystemStatusBoard(systemMonitor: systemMonitor, fanController: fanController)
- HelperDiagnosticsSupportCard(startupManager: startupManager)
- DarkCard(padding: 16) {
- PrivacyControlsSectionContent()
- }
- DarkCard(padding: 16) {
- VStack(spacing: 8) {
- levelRow(label: "Volume", icon: snapshot.currentVolume < 0.01 ? "speaker.slash.fill" : "speaker.wave.2.fill",
- fraction: Double(snapshot.currentVolume), color: .yellow)
- Rectangle().fill(Color.bdDivider).frame(height: 1)
- levelRow(label: "Brightness", icon: "sun.max.fill",
- fraction: Double(snapshot.currentBrightness), color: Color.bdAccent)
+ var body: some View {
+ VStack(alignment: .leading, spacing: 8) {
+ Text(title)
+ .font(.headline)
+ GroupBox {
+ VStack(alignment: .leading, spacing: 10) {
+ content
}
+ .frame(maxWidth: .infinity, alignment: .leading)
}
- MenuBarSettingsCard(
- snapshot: .init(
- cpuUsagePercent: snapshot.cpuUsagePercent,
- fanSpeeds: snapshot.fanSpeeds,
- memoryUsagePercent: snapshot.memoryUsagePercent,
- networkDownloadBytesPerSecond: snapshot.networkStats.downloadBytesPerSec,
- networkUploadBytesPerSecond: snapshot.networkStats.uploadBytesPerSec,
- diskUsagePercent: snapshot.diskStats.usagePercent,
- cpuTemperature: snapshot.cpuTemperature
- )
- )
- DashboardShortcutCard()
- LaunchAtLoginSection(startupManager: startupManager)
}
}
+}
- private var touchBarContent: some View {
- VStack(alignment: .leading, spacing: 18) {
- header("Touch Bar", subtitle: "Widgets and layout control")
- TouchBarCustomizationPanel()
- }
- }
+private struct NativeValueRow: View {
+ let title: String
+ let value: String
+ let detail: String?
- private var aboutContent: some View {
- VStack(alignment: .leading, spacing: 22) {
- header("About", subtitle: "App details, language, and experiments")
- BetterDisplayInspiredHero()
- LocalizationSettingsCard()
- AboutDetailsPanel()
- EasterEggLabCard()
- }
+ init(_ title: String, value: String, detail: String? = nil) {
+ self.title = title
+ self.value = value
+ self.detail = detail
}
- // MARK: Sub-helpers
- private func header(_ title: String, subtitle: String = "") -> some View {
+ var body: some View {
VStack(alignment: .leading, spacing: 4) {
- Text(title).font(.system(size: 22, weight: .bold))
- if !subtitle.isEmpty {
- Text(subtitle).font(.system(size: 13, weight: .medium)).foregroundStyle(.secondary)
+ LabeledContent(title) {
+ Text(value)
+ .monospacedDigit()
+ .multilineTextAlignment(.trailing)
+ }
+ if let detail, detail.isEmpty == false {
+ Text(detail)
+ .font(.footnote)
+ .foregroundStyle(.secondary)
}
}
}
+}
- private func emptyState(icon: String, message: String) -> some View {
- DarkCard(padding: 32) {
- VStack(spacing: 10) {
- Image(systemName: icon).font(.system(size: 28)).foregroundStyle(.tertiary)
- Text(message).font(.system(size: 12)).foregroundStyle(.secondary).multilineTextAlignment(.center)
- }.frame(maxWidth: .infinity)
- }
- }
+private struct NativeProgressRow: View {
+ let title: String
+ let value: String
+ let fraction: Double
- private var rowDivider: some View {
- Rectangle().fill(Color.bdDivider).frame(height: 1).padding(.vertical, 4)
+ init(_ title: String, value: String, fraction: Double) {
+ self.title = title
+ self.value = value
+ self.fraction = clampedFraction(fraction)
}
- private func levelRow(label: String, icon: String, fraction: Double, color: Color) -> some View {
- HStack(spacing: 0) {
- Image(systemName: icon).font(.system(size: 13, weight: .semibold)).foregroundStyle(color).frame(width: 20)
- VStack(alignment: .leading, spacing: 5) {
- HStack {
- Text(label).font(.system(size: 12, weight: .medium)).foregroundStyle(.primary)
- Spacer()
- Text("\(Int((fraction * 100).rounded()))%").font(.system(size: 12, weight: .bold, design: .monospaced)).foregroundStyle(color)
- }
- GeometryReader { geo in
- ZStack(alignment: .leading) {
- Capsule().fill(Color.white.opacity(0.08)).frame(height: 5)
- Capsule().fill(color).frame(width: max(0, geo.size.width * fraction), height: 5)
- .animation(.spring(duration: 0.4), value: fraction)
- }
- }.frame(height: 5)
+ var body: some View {
+ VStack(alignment: .leading, spacing: 7) {
+ LabeledContent(title) {
+ Text(value)
+ .monospacedDigit()
}
+ ProgressView(value: fraction)
+ .controlSize(.small)
}
- .padding(.vertical, 4)
- .copyOnTap("\(label): \(Int((fraction * 100).rounded()))%")
- }
-
- // MARK: Colour helpers
- private var cpuColor: Color { snapshot.cpuUsagePercent > 80 ? .red : snapshot.cpuUsagePercent > 50 ? .orange : .green }
- private var memColor: Color { switch snapshot.memoryPressure { case .green: return .green; case .yellow: return .orange; case .red: return .red } }
- private var pressureColor: Color { memColor }
- private var pressureLabel: String { switch snapshot.memoryPressure { case .green: return "Normal"; case .yellow: return "Elevated"; case .red: return "Critical" } }
- private var battFrac: Double { Double(snapshot.batteryInfo.chargePercent ?? 0) / 100 }
- private var battColor: Color {
- let p = snapshot.batteryInfo.chargePercent ?? 100
- return p < 20 ? .red : p < 40 ? .orange : snapshot.batteryInfo.isCharging ? Color.bdAccent : .green
- }
- private func loadColor(_ usage: Double) -> Color { usage > 80 ? .red : usage > 50 ? .orange : .green }
- private func tempColor(_ t: Double) -> Color { t > 90 ? .red : t > 70 ? .orange : .green }
- private func hostModelName() -> String {
- MacModelRegistry.displayName(for: SystemMonitor.hostModelIdentifier())
}
}
-private struct AboutDetailsPanel: View {
- @ObservedObject private var appearanceSettings = AppAppearanceSettings.shared
+private struct NativeProcessTable: View {
+ let processes: [ProcessActivity]
+ let showNames: Bool
var body: some View {
- DarkCard(padding: 18) {
- VStack(alignment: .leading, spacing: 16) {
- HStack(alignment: .top) {
- VStack(alignment: .leading, spacing: 4) {
- Text("App details")
- .font(.system(size: 18, weight: .bold))
- Text("Version, identity and global surface appearance.")
- .font(.system(size: 12, weight: .medium))
- .foregroundStyle(.secondary)
- }
- Spacer()
- VStack(alignment: .trailing, spacing: 4) {
- Text(AppVersion.current)
- .font(.system(size: 14, weight: .bold, design: .monospaced))
- Text(Bundle.main.bundleIdentifier ?? "com.coremonitor.app")
- .font(.system(size: 10, weight: .medium, design: .monospaced))
- .foregroundStyle(.secondary)
- }
+ if processes.isEmpty {
+ NativeEmptyMessage("No process samples are available yet.")
+ } else {
+ Table(processes) {
+ TableColumn("Process") { process in
+ Text(showNames ? process.name : "Private Process")
}
-
- VStack(alignment: .leading, spacing: 8) {
- HStack {
- Label("Global Transparency", systemImage: "circle.lefthalf.filled")
- .font(.system(size: 12, weight: .semibold))
- Spacer()
- Text("\(Int((appearanceSettings.surfaceOpacity * 100).rounded()))%")
- .font(.system(size: 12, weight: .bold, design: .monospaced))
- .foregroundStyle(Color.bdAccent)
- }
- Slider(value: $appearanceSettings.surfaceOpacity, in: 0.0...1.0, step: 0.01)
- .tint(Color.bdAccent)
- Text("Changes dashboard and card translucency across the app.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
+ TableColumn("PID") { process in
+ Text("\(process.pid)")
+ .monospacedDigit()
}
-
- HStack(spacing: 10) {
- aboutPill("Core Monitor")
- aboutPill("macOS Dashboard")
- aboutPill("Build \(AppVersion.current)")
+ TableColumn("CPU") { process in
+ Text(percentString(process.cpuPercent))
+ .monospacedDigit()
}
- }
- }
- }
-
- private func aboutPill(_ title: String) -> some View {
- Text(title)
- .font(.system(size: 10, weight: .semibold))
- .foregroundStyle(.secondary)
- .padding(.horizontal, 10)
- .padding(.vertical, 5)
- .background(Color.white.opacity(0.06))
- .clipShape(Capsule())
- }
-}
-
-private struct TouchBarPreviewStrip: View {
- @ObservedObject private var settings = TouchBarCustomizationSettings.shared
-
- var body: some View {
- ScrollView(.horizontal, showsIndicators: false) {
- HStack(spacing: TB.groupGap) {
- ForEach(settings.items) { item in
- TouchBarWidgetPreview(item: item, theme: settings.theme)
- .frame(width: item.estimatedWidth, height: TB.stripH)
- .id("\(item.id)-\(settings.theme.id)")
+ TableColumn("Memory") { process in
+ Text(byteString(process.memoryBytes))
+ .monospacedDigit()
}
}
- .padding(.horizontal, 2)
- .padding(.vertical, 2)
+ .frame(minHeight: 180)
}
- .frame(height: TB.stripH + 6)
- .background(Color.black.opacity(0.94))
- .clipShape(RoundedRectangle(cornerRadius: 7, style: .continuous))
}
}
-private struct TouchBarWidgetPreview: View {
- let item: TouchBarItemConfiguration
- let theme: TouchBarTheme
-
- var body: some View {
- Image(nsImage: renderPreview())
- .interpolation(.none)
- .antialiased(true)
- .frame(width: item.estimatedWidth, height: TB.stripH)
- }
-
- private func renderPreview() -> NSImage {
- let renderSize = NSSize(width: item.estimatedWidth, height: TB.stripH)
- let snapshot = TouchBarPreviewFixture.snapshot
- let weatherState = WeatherState.loaded(TouchBarPreviewFixture.weather)
-
- guard let touchBarItem = TouchBarItemFactory.makeTouchBarItem(for: item, theme: theme) else {
- return NSImage(size: renderSize)
- }
-
- if let widgetItem = touchBarItem as? PKWidgetTouchBarItem,
- let widget = widgetItem.widget {
- PKCoreMonWidgetState.apply(
- theme: theme,
- weatherState: weatherState,
- snapshot: snapshot,
- clockTitle: TouchBarPreviewFixture.clockTitle,
- clockSubtitle: TouchBarPreviewFixture.clockSubtitle,
- to: widget
- )
- }
-
- let sourceView = touchBarItem.viewController?.view ?? touchBarItem.view
- let renderBounds = NSRect(origin: .zero, size: renderSize)
-
- guard let sourceView else {
- return NSImage(size: renderSize)
- }
-
- sourceView.frame = renderBounds
- sourceView.layoutSubtreeIfNeeded()
-
- guard let bitmap = sourceView.bitmapImageRepForCachingDisplay(in: renderBounds) else {
- return NSImage(size: renderSize)
- }
+private struct NativeHelpRow: View {
+ let text: String
- sourceView.cacheDisplay(in: renderBounds, to: bitmap)
- let image = NSImage(size: renderSize)
- image.addRepresentation(bitmap)
- return image
+ init(_ text: String) {
+ self.text = text
}
-}
-
-private enum TouchBarPreviewFixture {
- static let weather = WeatherSnapshot(
- locationName: "Cupertino",
- symbolName: "cloud.bolt.rain.fill",
- temperature: 22,
- condition: "Partly Cloudy",
- nextRainSummary: "Rain likely at 4:00 PM (40%)",
- high: 26,
- low: 18,
- feelsLike: 21,
- humidity: 63,
- updatedAt: Date()
- )
-
- static let snapshot = TouchBarSystemSnapshot(
- memPct: 13,
- ssdPct: 27,
- cpuPct: 45,
- cpuTempC: 45,
- brightness: 0.72,
- batPct: 62,
- batCharging: false,
- netUpKBs: 13,
- netDownMBs: 1.6,
- fps: 0,
- wifiName: "",
- detailedClockTitle: "9:20",
- detailedClockSubtitle: "Apr 11th",
- memoryPressure: .green
- )
-
- static let clockTitle = "9:20"
- static let clockSubtitle = "Apr 11th"
-}
-
-private struct TouchBarWidgetRow: View {
- @ObservedObject private var settings = TouchBarCustomizationSettings.shared
- let kind: TouchBarWidgetKind
-
- var isEnabled: Bool { settings.contains(kind) }
var body: some View {
- HStack(spacing: 12) {
- Button {
- settings.toggle(kind)
- } label: {
- Image(systemName: isEnabled ? "checkmark.circle.fill" : "circle")
- .font(.system(size: 16, weight: .semibold))
- .foregroundStyle(isEnabled ? Color.bdAccent : .secondary)
- }
- .buttonStyle(SoftPressButtonStyle())
-
- VStack(alignment: .leading, spacing: 3) {
- Text(kind.title)
- .font(.system(size: 13, weight: .semibold))
- Text(kind.subtitle)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- }
-
- Spacer()
-
- Text("\(Int(kind.estimatedWidth)) pt")
- .font(.system(size: 11, weight: .bold, design: .monospaced))
- .foregroundStyle(.secondary)
- }
- .padding(.vertical, 4)
+ Text(text)
+ .fixedSize(horizontal: false, vertical: true)
}
}
-private struct TouchBarConfiguredItemRow: View {
- @ObservedObject private var settings = TouchBarCustomizationSettings.shared
- let item: TouchBarItemConfiguration
-
- var body: some View {
- HStack(spacing: 12) {
- Image(systemName: leadingSymbol)
- .font(.system(size: 14, weight: .semibold))
- .foregroundStyle(Color.bdAccent)
- .frame(width: 18)
-
- VStack(alignment: .leading, spacing: 3) {
- Text(item.title)
- .font(.system(size: 13, weight: .semibold))
- Text(item.subtitle)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- .lineLimit(1)
- }
-
- Spacer()
-
- Text("\(Int(item.estimatedWidth)) pt")
- .font(.system(size: 11, weight: .bold, design: .monospaced))
- .foregroundStyle(.secondary)
+private struct NativeEmptyMessage: View {
+ let text: String
- HStack(spacing: 6) {
- Button {
- settings.moveUp(item)
- } label: {
- Image(systemName: "arrow.up")
- .font(.system(size: 11, weight: .bold))
- .frame(width: 28, height: 28)
- }
- .buttonStyle(SoftPressButtonStyle())
- .background(Color.white.opacity(0.06))
- .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
-
- Button {
- settings.moveDown(item)
- } label: {
- Image(systemName: "arrow.down")
- .font(.system(size: 11, weight: .bold))
- .frame(width: 28, height: 28)
- }
- .buttonStyle(SoftPressButtonStyle())
- .background(Color.white.opacity(0.06))
- .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
-
- Button {
- settings.remove(item)
- } label: {
- Image(systemName: "trash")
- .font(.system(size: 11, weight: .bold))
- .frame(width: 28, height: 28)
- }
- .buttonStyle(SoftPressButtonStyle())
- .background(Color.red.opacity(0.14))
- .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
- }
- }
- .padding(.vertical, 4)
+ init(_ text: String) {
+ self.text = text
}
- private var leadingSymbol: String {
- switch item {
- case .builtIn:
- return "square.grid.2x2"
- case .pinnedApp:
- return "app.fill"
- case .pinnedFolder:
- return "folder.fill"
- case .customWidget:
- return "terminal.fill"
- }
+ var body: some View {
+ Text(text)
+ .foregroundStyle(.secondary)
+ .fixedSize(horizontal: false, vertical: true)
}
}
-private struct TouchBarCustomizationPanel: View {
- @StateObject private var settings = TouchBarCustomizationSettings.shared
- @ObservedObject private var weatherLocationAccess = WeatherLocationAccessController.shared
- @Environment(\.colorScheme) private var colorScheme
- @State private var weatherAttribution: WeatherAttributionSnapshot?
- @State private var weatherAttributionError: String?
- @State private var customTitle = ""
- @State private var customSymbol = "terminal.fill"
- @State private var customCommand = ""
- @State private var customWidth = 96.0
-
- private var widthFraction: Double {
- min(max(settings.estimatedWidth / TouchBarCustomizationSettings.recommendedTouchBarWidth, 0), 1)
- }
-
- private var widthColor: Color {
- settings.widthOverflow > 0 ? .orange : .green
- }
-
+private struct NativeDivider: View {
var body: some View {
- VStack(alignment: .leading, spacing: 16) {
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 14) {
- Text("Presentation")
- .font(.system(size: 14, weight: .bold))
-
- Picker("Touch Bar Mode", selection: $settings.presentationMode) {
- ForEach(TouchBarPresentationMode.allCases) { mode in
- Text(mode.title).tag(mode)
- }
- }
- .pickerStyle(.segmented)
-
- Text(settings.presentationMode.subtitle)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
-
- if settings.presentationMode == .system {
- Text("You're still editing Core-Monitor's custom Touch Bar layout, but the hardware Touch Bar is showing the standard macOS strip. Press Command-Shift-6 to return to the system Touch Bar, or switch back to Core-Monitor mode to apply these items live.")
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(.orange)
- }
-
- Divider()
- .overlay(Color.bdDivider)
-
- Text(settings.presentationMode == .app ? "Live layout preview" : "Core-Monitor layout preview")
- .font(.system(size: 14, weight: .bold))
- TouchBarPreviewStrip()
-
- VStack(alignment: .leading, spacing: 6) {
- HStack {
- Text("Estimated width")
- .font(.system(size: 12, weight: .semibold))
- Spacer()
- Text("\(Int(settings.estimatedWidth.rounded())) / \(Int(TouchBarCustomizationSettings.recommendedTouchBarWidth)) pt")
- .font(.system(size: 12, weight: .bold, design: .monospaced))
- .foregroundStyle(widthColor)
- }
-
- GeometryReader { geo in
- ZStack(alignment: .leading) {
- Capsule().fill(Color.white.opacity(0.08))
- Capsule().fill(widthColor)
- .frame(width: geo.size.width * widthFraction)
- }
- }
- .frame(height: 8)
-
- if settings.widthOverflow > 0 {
- Text("The active widget stack is wider than a full Touch Bar. Trim or reorder widgets to avoid clipping.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.orange)
- }
- }
- }
- }
-
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 10) {
- Text("Active Items")
- .font(.system(size: 14, weight: .bold))
- ForEach(settings.items) { item in
- TouchBarConfiguredItemRow(item: item)
- if item.id != settings.items.last?.id {
- Rectangle()
- .fill(Color.bdDivider)
- .frame(height: 1)
- }
- }
- }
- }
-
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 12) {
- HStack(spacing: 12) {
- VStack(alignment: .leading, spacing: 3) {
- Text("Presets")
- .font(.system(size: 14, weight: .bold))
- Text(settings.activePreset?.title ?? "Custom layout")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- }
-
- Spacer()
-
- Button("Restore Defaults") {
- settings.restoreDefaults()
- }
- .buttonStyle(SoftPressButtonStyle())
- }
-
- ForEach(TouchBarPreset.all) { preset in
- let isActive = settings.activePreset == preset
- Button {
- settings.applyPreset(preset)
- } label: {
- HStack(spacing: 12) {
- VStack(alignment: .leading, spacing: 3) {
- Text(preset.title)
- .font(.system(size: 13, weight: .semibold))
- Text(preset.subtitle)
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
- }
- Spacer()
- if preset == TouchBarCustomizationSettings.defaultPreset {
- Text("DEFAULT")
- .font(.system(size: 9, weight: .bold))
- .foregroundStyle(.secondary)
- .padding(.horizontal, 7)
- .padding(.vertical, 4)
- .background(Color.white.opacity(0.06))
- .clipShape(Capsule())
- }
- if isActive {
- Label("Active", systemImage: "checkmark.circle.fill")
- .font(.system(size: 10, weight: .bold))
- .foregroundStyle(Color.bdAccent)
- }
- Text(preset.theme.displayName)
- .font(.system(size: 10, weight: .bold))
- .foregroundStyle(.secondary)
- .padding(.horizontal, 8)
- .padding(.vertical, 4)
- .background(Color.white.opacity(0.06))
- .clipShape(Capsule())
- }
- .frame(maxWidth: .infinity, alignment: .leading)
- .padding(.vertical, 6)
- .padding(.horizontal, 10)
- .background(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
- .fill(isActive ? Color.bdAccent.opacity(0.12) : Color.white.opacity(0.02))
- )
- }
- .buttonStyle(SoftPressButtonStyle())
- }
-
- if settings.widthOverflow > 0 {
- VStack(alignment: .leading, spacing: 8) {
- Text("This layout is too wide for a full Touch Bar. Use a narrower preset to avoid clipped widgets.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
-
- Button("Use Compact Preset") {
- settings.applyPreset(.compact)
- }
- .buttonStyle(SoftPressButtonStyle())
- }
- .padding(.top, 4)
- }
- }
- }
-
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 14) {
- Text("Theme")
- .font(.system(size: 14, weight: .bold))
- Picker("Theme", selection: $settings.theme) {
- ForEach(TouchBarTheme.allCases) { theme in
- Text(theme.displayName).tag(theme)
- }
- }
- .pickerStyle(.segmented)
-
- Text("Weather uses Apple WeatherKit in WeatherKit-enabled builds. Allow location access for Core Monitor so the live weather widget can show accurate conditions and rain timing.")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.secondary)
-
- WeatherLocationAccessSection(controller: weatherLocationAccess)
-
- if let attribution = weatherAttribution {
- VStack(alignment: .leading, spacing: 10) {
- AsyncImage(url: attribution.markURL) { image in
- image
- .resizable()
- .interpolation(.high)
- .scaledToFit()
- } placeholder: {
- RoundedRectangle(cornerRadius: 6, style: .continuous)
- .fill(Color.white.opacity(0.06))
- .overlay(
- ProgressView()
- .scaleEffect(0.7)
- )
- }
- .frame(maxWidth: 164, minHeight: 24, maxHeight: 26, alignment: .leading)
-
- if let legalText = attribution.legalText, !legalText.isEmpty {
- Text(legalText)
- .font(.system(size: 10, weight: .medium))
- .foregroundStyle(.secondary)
- }
-
- Link(destination: attribution.legalPageURL) {
- Label("Open \(attribution.serviceName) legal attribution", systemImage: "arrow.up.right.square")
- .font(.system(size: 11, weight: .semibold))
- }
- }
- } else if let weatherAttributionError {
- Text(weatherAttributionError)
- .font(.system(size: 10, weight: .medium))
- .foregroundStyle(.secondary)
- }
- }
- }
-
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 12) {
- Text("Pinned Items")
- .font(.system(size: 14, weight: .bold))
-
- HStack(spacing: 10) {
- Button("Pin Applications") {
- let panel = NSOpenPanel()
- panel.title = "Choose Applications"
- panel.allowedContentTypes = [.application]
- panel.allowsMultipleSelection = true
- panel.canChooseDirectories = false
- panel.canChooseFiles = true
- if panel.runModal() == .OK {
- settings.addPinnedApps(urls: panel.urls)
- }
- }
- .buttonStyle(SoftPressButtonStyle())
-
- Button("Pin Folders") {
- let panel = NSOpenPanel()
- panel.title = "Choose Folders"
- panel.allowsMultipleSelection = true
- panel.canChooseDirectories = true
- panel.canChooseFiles = false
- if panel.runModal() == .OK {
- settings.addPinnedFolders(urls: panel.urls)
- }
- }
- .buttonStyle(SoftPressButtonStyle())
- }
-
- VStack(alignment: .leading, spacing: 10) {
- Text("Custom Widget")
- .font(.system(size: 12, weight: .semibold))
-
- TextField("Title", text: $customTitle)
- .textFieldStyle(.roundedBorder)
- TextField("SF Symbol", text: $customSymbol)
- .textFieldStyle(.roundedBorder)
- TextField("Shell Command", text: $customCommand)
- .textFieldStyle(.roundedBorder)
-
- VStack(alignment: .leading, spacing: 6) {
- HStack {
- Text("Width")
- .font(.system(size: 11, weight: .semibold))
- Spacer()
- Text("\(Int(customWidth.rounded())) pt")
- .font(.system(size: 11, weight: .bold, design: .monospaced))
- .foregroundStyle(.secondary)
- }
- Slider(value: $customWidth, in: 72...220, step: 4)
- .tint(Color.bdAccent)
- }
-
- Button("Add Custom Widget") {
- settings.addCustomWidget(
- title: customTitle,
- symbolName: customSymbol,
- command: customCommand,
- width: customWidth
- )
- customTitle = ""
- customSymbol = "terminal.fill"
- customCommand = ""
- customWidth = 96
- }
- .buttonStyle(SoftPressButtonStyle())
- }
- }
- }
-
- DarkCard(padding: 16) {
- VStack(alignment: .leading, spacing: 10) {
- Text("Built-In Widgets")
- .font(.system(size: 14, weight: .bold))
- ForEach(TouchBarWidgetKind.allCases) { kind in
- TouchBarWidgetRow(kind: kind)
- if kind != TouchBarWidgetKind.allCases.last {
- Rectangle()
- .fill(Color.bdDivider)
- .frame(height: 1)
- }
- }
- }
- }
- }
- .task(id: colorScheme) {
- guard #available(macOS 13.0, *) else { return }
- guard WeatherKitCapability.isEnabled() else {
- weatherAttribution = nil
- weatherAttributionError = "Weather attribution is unavailable because this build is not signed with the WeatherKit entitlement."
- return
- }
- do {
- weatherAttribution = try await loadWeatherAttribution(isDarkAppearance: colorScheme == .dark)
- weatherAttributionError = nil
- } catch {
- weatherAttribution = nil
- weatherAttributionError = "Weather attribution is unavailable until the current app signature includes WeatherKit."
- }
- }
+ Divider()
}
}
-private struct BetterDisplayInspiredHero: View {
- @State private var revealBackdrop = false
- @State private var showLogo = false
- @State private var logoScale: CGFloat = 2.9
- @State private var logoOffsetY: CGFloat = -34
- @State private var logoBlur: CGFloat = 8
- @State private var logoOpacity = 0.0
-
- var body: some View {
- CoreMonGlassPanel(cornerRadius: 26, tintOpacity: 0.12, strokeOpacity: 0.16, shadowRadius: 14, contentPadding: 28) {
- VStack(spacing: 18) {
- ZStack {
- if revealBackdrop {
- heroLogo
- .transition(.opacity)
- }
- }
- .frame(height: 360)
-
- VStack(spacing: 6) {
- Text("Core Monitor")
- .font(.system(size: 22, weight: .bold))
- Text("Thermals, fans, and live hardware readings.")
- .font(.system(size: 12, weight: .medium))
- .foregroundStyle(.secondary)
- }
- }
- }
- .task {
- guard !showLogo else { return }
- revealBackdrop = false
- showLogo = false
- logoScale = 2.9
- logoOffsetY = -34
- logoBlur = 8
- logoOpacity = 0
-
- try? await Task.sleep(nanoseconds: 120_000_000)
- withAnimation(.easeOut(duration: 0.16)) {
- revealBackdrop = true
- }
-
- showLogo = true
- withAnimation(.interactiveSpring(response: 0.82, dampingFraction: 0.82, blendDuration: 0.16)) {
- logoScale = 1
- logoOffsetY = 0
- logoBlur = 0
- logoOpacity = 1
- }
+private extension FanControlMode {
+ var nativeTitle: String {
+ switch self {
+ case .smart: return "Smart"
+ case .silent: return "System"
+ case .balanced: return "Balanced"
+ case .performance: return "Performance"
+ case .max: return "Maximum"
+ case .manual: return "Manual"
+ case .custom: return "Custom"
+ case .automatic: return "System Automatic"
}
}
-
- private var heroLogo: some View {
- Image(nsImage: NSImage(named: "AppIcon") ?? NSApp.applicationIconImage)
- .resizable()
- .interpolation(.high)
- .frame(width: 370, height: 370)
- .shadow(color: .black.opacity(0.18), radius: 14, y: 10)
- .scaleEffect(showLogo ? logoScale : 2.8)
- .offset(y: showLogo ? logoOffsetY : -18)
- .blur(radius: showLogo ? logoBlur : 12)
- .opacity(showLogo ? logoOpacity : 0)
- }
}
-// MARK: - Basic mode
-struct BasicModeView: View {
- @ObservedObject var systemMonitor: SystemMonitor
- @ObservedObject var fanController: FanController
- @ObservedObject var modeState: AppModeState
-
- var body: some View {
- VStack(spacing: 0) {
- basicHeader; Rectangle().fill(Color.bdDivider).frame(height: 1)
- basicMetrics; Rectangle().fill(Color.bdDivider).frame(height: 1)
- basicFans; Spacer(); basicFooter
- }
- .background {
- VisualEffectView(material: .underWindowBackground, blendingMode: .behindWindow)
- .ignoresSafeArea()
+private extension SMCHelperManager.ConnectionState {
+ var title: String {
+ switch self {
+ case .missing: return "Missing"
+ case .unknown: return "Unknown"
+ case .checking: return "Checking"
+ case .reachable: return "Reachable"
+ case .unreachable: return "Unavailable"
}
- .overlay {
- RoundedRectangle(cornerRadius: 0, style: .continuous)
- .stroke(Color.white.opacity(0.06), lineWidth: 0.5)
- .ignoresSafeArea()
- }
- .preferredColorScheme(.dark)
- }
-
- private var basicHeader: some View {
- HStack {
- Label("Core Monitor", systemImage: "fanblades.fill")
- .font(.system(size: 12, weight: .bold)).foregroundStyle(.primary)
- Spacer()
- HStack(spacing: 8) {
- Button { withAnimation(.spring(duration: 0.2)) { modeState.isBasicMode = false } } label: {
- Text("Full UI").font(.system(size: 11, weight: .semibold))
- .padding(.horizontal, 10).padding(.vertical, 4)
- .background(Color.white.opacity(0.08)).clipShape(Capsule())
- }
- .buttonStyle(SoftPressButtonStyle())
-
- Button { NSApp.terminate(nil) } label: {
- Label("Quit", systemImage: "power")
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(.red.opacity(0.92))
- .padding(.horizontal, 10)
- .padding(.vertical, 4)
- .background(Color.red.opacity(0.12))
- .clipShape(Capsule())
- }
- .buttonStyle(SoftPressButtonStyle())
- }
- }.padding(.horizontal, 16).padding(.vertical, 12)
- }
-
- private var basicMetrics: some View {
- HStack(spacing: 0) {
- basicCell("CPU", "\(Int(systemMonitor.cpuUsagePercent.rounded()))%",
- systemMonitor.cpuTemperature.map { String(format: "%.0f°C", $0) })
- if let pUsage = systemMonitor.performanceCoreUsagePercent {
- Rectangle().fill(Color.bdDivider).frame(width: 1)
- basicCell("P", "\(Int(pUsage.rounded()))%",
- "\(SystemMonitor.performanceCoreCount()) cores")
- }
- if let eUsage = systemMonitor.efficiencyCoreUsagePercent {
- Rectangle().fill(Color.bdDivider).frame(width: 1)
- basicCell("E", "\(Int(eUsage.rounded()))%",
- "\(SystemMonitor.efficiencyCoreCount()) cores")
- }
- Rectangle().fill(Color.bdDivider).frame(width: 1)
- basicCell("MEM", "\(Int(systemMonitor.memoryUsagePercent.rounded()))%",
- String(format: "%.1f/%.0f GB", systemMonitor.memoryUsedGB, systemMonitor.totalMemoryGB))
- if systemMonitor.batteryInfo.hasBattery {
- Rectangle().fill(Color.bdDivider).frame(width: 1)
- basicCell("BAT", "\(systemMonitor.batteryInfo.chargePercent ?? 0)%",
- systemMonitor.batteryInfo.isCharging ? "Charging" : nil)
- }
- }.frame(maxWidth: .infinity)
}
+}
- private func basicCell(_ l: String, _ v: String, _ sub: String?) -> some View {
- VStack(spacing: 4) {
- Text(l).font(.system(size: 9, weight: .bold)).foregroundStyle(.secondary)
- Text(v).font(.system(size: 24, weight: .bold, design: .rounded)).cmNumericTextTransition()
- if let sub { Text(sub).font(.system(size: 9)).foregroundStyle(.secondary) }
- }.frame(maxWidth: .infinity).padding(.vertical, 16).copyOnTap("\(l): \(v)")
- }
+private func percentString(_ value: Double) -> String {
+ "\(Int(value.rounded()))%"
+}
- private var basicFans: some View {
- VStack(spacing: 8) {
- if let rpm = systemMonitor.fanSpeeds.first {
- HStack {
- Label("Fan", systemImage: "fanblades.fill").font(.system(size: 10, weight: .bold)).foregroundStyle(.secondary)
- Spacer()
- Text("\(rpm) RPM").font(.system(size: 14, weight: .bold, design: .monospaced)).cmNumericTextTransition()
- }.padding(.horizontal, 16).padding(.top, 12)
- }
- HStack(spacing: 10) {
- basicFanBtn("System Auto", icon: "cpu", active: fanController.mode == .automatic) { fanController.setMode(.automatic) }
- basicFanBtn("Boost", icon: "tornado", active: fanController.mode == .max) { fanController.setMode(.max) }
- }.padding(.horizontal, 16)
- Button { fanController.setMode(.smart) } label: {
- Label("Smart", systemImage: "bolt.shield.fill").font(.system(size: 12, weight: .semibold))
- .foregroundStyle(fanController.mode == .smart ? Color.bdAccent : .secondary)
- .frame(maxWidth: .infinity).padding(.vertical, 8)
- .background(fanController.mode == .smart ? Color.bdAccent.opacity(0.15) : Color.white.opacity(0.06))
- .clipShape(RoundedRectangle(cornerRadius: 9, style: .continuous))
- }.buttonStyle(SoftPressButtonStyle()).padding(.horizontal, 16).padding(.bottom, 12)
- }
- }
+private func temperatureString(_ value: Double?) -> String {
+ guard let value else { return "Unavailable" }
+ return "\(Int(value.rounded())) °C"
+}
- private func basicFanBtn(_ t: String, icon: String, active: Bool, action: @escaping () -> Void) -> some View {
- Button(action: action) {
- VStack(spacing: 5) {
- Image(systemName: icon).font(.system(size: 18, weight: .light)).foregroundStyle(active ? Color.bdAccent : .secondary)
- Text(t).font(.system(size: 11, weight: .semibold)).foregroundStyle(active ? Color.bdAccent : .secondary)
- }.frame(maxWidth: .infinity).padding(.vertical, 14)
- .background(active ? Color.bdAccent.opacity(0.15) : Color.white.opacity(0.06))
- .clipShape(RoundedRectangle(cornerRadius: 10, style: .continuous))
- }.buttonStyle(SoftPressButtonStyle())
- }
-
- private var basicFooter: some View {
- HStack {
- Circle().fill(systemMonitor.hasSMCAccess ? Color.green : .secondary).frame(width: 5, height: 5)
- Text(systemMonitor.hasSMCAccess ? "SMC OK" : "No SMC").font(.system(size: 9)).foregroundStyle(.secondary)
- Spacer()
- }.padding(.horizontal, 16).padding(.vertical, 8)
+private func gbString(_ value: Double) -> String {
+ guard value > 0 else { return "0 GB" }
+ if value >= 10 {
+ return String(format: "%.0f GB", value)
}
+ return String(format: "%.1f GB", value)
}
-// MARK: - VisualEffectView (NSVisualEffectView wrapper)
-struct VisualEffectView: NSViewRepresentable {
- let material: NSVisualEffectView.Material
- let blendingMode: NSVisualEffectView.BlendingMode
- var opacity: Double = 1.0
- func makeNSView(context: Context) -> NSVisualEffectView {
- let v = NSVisualEffectView()
- v.material = material
- v.blendingMode = blendingMode
- v.state = .active
- v.alphaValue = opacity
- return v
- }
- func updateNSView(_ nsView: NSVisualEffectView, context: Context) {
- nsView.material = material
- nsView.blendingMode = blendingMode
- nsView.state = .active
- nsView.alphaValue = opacity
- }
+private func byteString(_ value: UInt64) -> String {
+ ByteCountFormatter.string(fromByteCount: Int64(min(value, UInt64(Int64.max))), countStyle: .memory)
}
-// MARK: - ContentView
-struct ContentView: View {
- @StateObject private var appearanceSettings = AppAppearanceSettings.shared
- @ObservedObject var systemMonitor: SystemMonitor
- @ObservedObject var fanController: FanController
- @ObservedObject var startupManager: StartupManager
- @ObservedObject private var dashboardNavigationRouter = DashboardNavigationRouter.shared
+private func sampleTime(_ date: Date) -> String {
+ guard date != .distantPast else { return "Waiting" }
+ return date.formatted(date: .omitted, time: .standard)
+}
- @StateObject private var modeState = AppModeState()
- @State private var sidebarSelection: SidebarItem = .overview
+private func clampedFraction(_ value: Double) -> Double {
+ min(max(value, 0), 1)
+}
- var body: some View {
- Group {
- if modeState.isBasicMode {
- BasicModeView(systemMonitor: systemMonitor, fanController: fanController, modeState: modeState)
- } else {
- fullDashboard
- }
- }
- .onChange(of: modeState.isBasicMode) {
- systemMonitor.setBasicMode($0)
- syncDashboardSampling()
- }
- .onAppear {
- systemMonitor.setBasicMode(modeState.isBasicMode)
- systemMonitor.setInteractiveMonitoringEnabled(true, reason: "dashboard")
- applyPendingDashboardRouteIfNeeded()
- syncDashboardSampling()
- }
- .onChange(of: sidebarSelection) { _ in
- syncDashboardSampling()
- }
- .onChange(of: dashboardNavigationRouter.route) { _ in
- applyPendingDashboardRouteIfNeeded()
- syncDashboardSampling()
- }
- .onDisappear {
- systemMonitor.setInteractiveMonitoringEnabled(false, reason: "dashboard")
- }
+private func memoryPressureTitle(_ pressure: MemoryPressureLevel) -> String {
+ switch pressure {
+ case .green: return "Normal"
+ case .yellow: return "Elevated"
+ case .red: return "Critical"
}
+}
- private var fullDashboard: some View {
- HStack(spacing: 0) {
- Sidebar(
- selection: $sidebarSelection,
- hasBattery: systemMonitor.snapshot.batteryInfo.hasBattery,
- modeState: modeState
- )
- DetailPane(
- selection: $sidebarSelection,
- snapshot: systemMonitor.snapshot,
- fanController: fanController, systemMonitor: systemMonitor,
- startupManager: startupManager
- )
- .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
- }
- .padding(.horizontal, 10)
- .padding(.top, 0)
- .padding(.bottom, 10)
- .background {
- ZStack {
- VisualEffectView(
- material: .underWindowBackground,
- blendingMode: .behindWindow,
- opacity: appearanceSettings.surfaceOpacity
- )
- .ignoresSafeArea()
- Color(red: 0.24, green: 0.25, blue: 0.31)
- .opacity(0.008 * appearanceSettings.surfaceOpacity)
- .ignoresSafeArea()
- }
- }
- .preferredColorScheme(.dark)
- .welcomeGuide()
+private func thermalStateTitle(_ state: ProcessInfo.ThermalState) -> String {
+ switch state {
+ case .nominal: return "Nominal"
+ case .fair: return "Fair"
+ case .serious: return "Serious"
+ case .critical: return "Critical"
+ @unknown default: return "Unknown"
}
+}
- private func applyPendingDashboardRouteIfNeeded() {
- guard let route = dashboardNavigationRouter.route,
- let selection = dashboardNavigationRouter.consume(route) else {
- return
- }
-
- if modeState.isBasicMode {
- modeState.isBasicMode = false
- }
- sidebarSelection = selection
+private func thermalStateDetail(_ state: ProcessInfo.ThermalState) -> String? {
+ switch state {
+ case .nominal: return "The system is operating normally."
+ case .fair: return "macOS is beginning to manage thermal load."
+ case .serious: return "Performance may be reduced to manage heat."
+ case .critical: return "macOS is applying strong thermal protection."
+ @unknown default: return nil
}
+}
- private func syncDashboardSampling() {
- systemMonitor.setDetailedSamplingEnabled(
- DashboardProcessSamplingPolicy.requiresDetailedSampling(
- isBasicMode: modeState.isBasicMode,
- selection: sidebarSelection
- ),
- reason: "dashboard.detail"
- )
+private func fanRangeText(index: Int, snapshot: SystemMonitorSnapshot) -> String? {
+ let minSpeed = snapshot.fanMinSpeeds.indices.contains(index) ? snapshot.fanMinSpeeds[index] : nil
+ let maxSpeed = snapshot.fanMaxSpeeds.indices.contains(index) ? snapshot.fanMaxSpeeds[index] : nil
+
+ switch (minSpeed, maxSpeed) {
+ case let (minSpeed?, maxSpeed?):
+ return "Range \(minSpeed)-\(maxSpeed) RPM"
+ case let (minSpeed?, nil):
+ return "Minimum \(minSpeed) RPM"
+ case let (nil, maxSpeed?):
+ return "Maximum \(maxSpeed) RPM"
+ default:
+ return nil
}
}
diff --git a/Core-Monitor/Core_MonitorApp.swift b/Core-Monitor/Core_MonitorApp.swift
index cd9f886..8868384 100644
--- a/Core-Monitor/Core_MonitorApp.swift
+++ b/Core-Monitor/Core_MonitorApp.swift
@@ -33,6 +33,35 @@ enum CoreMonitorSingleInstancePolicy {
}
}
+struct CoreMonitorDashboardHandoffRequest: Equatable {
+ private static let bundleIdentifierKey = "bundleIdentifier"
+ private static let targetProcessIdentifierKey = "targetProcessIdentifier"
+
+ let bundleIdentifier: String
+ let targetProcessIdentifier: pid_t
+
+ var userInfo: [AnyHashable: Any] {
+ [
+ Self.bundleIdentifierKey: bundleIdentifier,
+ Self.targetProcessIdentifierKey: NSNumber(value: targetProcessIdentifier)
+ ]
+ }
+
+ static func accepts(
+ userInfo: [AnyHashable: Any]?,
+ expectedBundleIdentifier: String,
+ currentProcessIdentifier: pid_t
+ ) -> Bool {
+ guard let requestedBundleIdentifier = userInfo?[bundleIdentifierKey] as? String,
+ requestedBundleIdentifier == expectedBundleIdentifier,
+ let requestedPID = userInfo?[targetProcessIdentifierKey] as? NSNumber else {
+ return false
+ }
+
+ return requestedPID.int32Value == currentProcessIdentifier
+ }
+}
+
struct CoreMonitorLaunchEnvironment {
static func shouldHandleDuplicateLaunch(environment: [String: String] = ProcessInfo.processInfo.environment) -> Bool {
environment["XCTestConfigurationFilePath"] == nil
@@ -122,16 +151,17 @@ private final class DashboardWindowController: NSWindowController, NSWindowDeleg
window.title = "Core Monitor"
window.isReleasedWhenClosed = false
window.delegate = self
- window.isMovableByWindowBackground = true
- window.isOpaque = false
- window.backgroundColor = .clear
+ window.isMovableByWindowBackground = false
+ window.isOpaque = true
+ window.backgroundColor = .windowBackgroundColor
window.hasShadow = true
window.collectionBehavior = [.managed, .fullScreenPrimary]
- window.styleMask.insert(.fullSizeContentView)
- window.titleVisibility = .hidden
- window.titlebarAppearsTransparent = true
+ window.styleMask = [.titled, .closable, .miniaturizable, .resizable]
+ window.titleVisibility = .visible
+ window.titlebarAppearsTransparent = false
window.minSize = DashboardWindowLayout.minimumContentSize
- window.titlebarSeparatorStyle = .none
+ window.titlebarSeparatorStyle = .automatic
+ window.toolbarStyle = .automatic
if DashboardWindowLayout.shouldResetFrame(windowFrame: window.frame, visibleFrame: window.screen?.visibleFrame ?? NSScreen.main?.visibleFrame) {
window.setContentSize(DashboardWindowLayout.targetContentSize(for: window.screen?.visibleFrame ?? NSScreen.main?.visibleFrame))
@@ -334,16 +364,6 @@ final class CoreMonitorApplicationDelegate: NSObject, NSApplicationDelegate {
openHelpItem.target = self
appMenu.addItem(openHelpItem)
- let reopenWelcomeGuideItem = NSMenuItem(
- title: "Show Welcome Guide",
- action: #selector(reopenWelcomeGuideFromMenu(_:)),
- keyEquivalent: ""
- )
- reopenWelcomeGuideItem.target = self
- appMenu.addItem(reopenWelcomeGuideItem)
-
- appMenu.addItem(.separator())
-
let quitMenuItem = NSMenuItem(
title: "Quit \(appName)",
action: #selector(quitApplication(_:)),
@@ -365,11 +385,14 @@ final class CoreMonitorApplicationDelegate: NSObject, NSApplicationDelegate {
distributedDashboardRequestObserver = DistributedNotificationCenter.default().addObserver(
forName: Self.openDashboardRequestNotification,
- object: nil,
+ object: bundleIdentifier,
queue: .main
) { [weak self] notification in
- let requestedBundleIdentifier = notification.userInfo?["bundleIdentifier"] as? String
- guard requestedBundleIdentifier == nil || requestedBundleIdentifier == bundleIdentifier else {
+ guard CoreMonitorDashboardHandoffRequest.accepts(
+ userInfo: notification.userInfo,
+ expectedBundleIdentifier: bundleIdentifier,
+ currentProcessIdentifier: ProcessInfo.processInfo.processIdentifier
+ ) else {
return
}
Task { @MainActor [weak self] in
@@ -475,10 +498,15 @@ final class CoreMonitorApplicationDelegate: NSObject, NSApplicationDelegate {
return false
}
+ let request = CoreMonitorDashboardHandoffRequest(
+ bundleIdentifier: bundleIdentifier,
+ targetProcessIdentifier: target.processIdentifier
+ )
+
DistributedNotificationCenter.default().postNotificationName(
Self.openDashboardRequestNotification,
- object: nil,
- userInfo: ["bundleIdentifier": bundleIdentifier],
+ object: bundleIdentifier,
+ userInfo: request.userInfo,
deliverImmediately: true
)
_ = targetApplication.activate(options: [.activateAllWindows, .activateIgnoringOtherApps])
diff --git a/Core-Monitor/EasterEggLab.swift b/Core-Monitor/EasterEggLab.swift
index c67d8e1..169a87e 100644
--- a/Core-Monitor/EasterEggLab.swift
+++ b/Core-Monitor/EasterEggLab.swift
@@ -10,8 +10,7 @@ struct EasterEggLabCard: View {
@AppStorage(KernelPanicPreferences.bestScoreKey) private var bestScore = 0
var body: some View {
- DarkCard(padding: 18) {
- VStack(alignment: .leading, spacing: 16) {
+ VStack(alignment: .leading, spacing: 16) {
HStack(alignment: .top, spacing: 16) {
VStack(alignment: .leading, spacing: 4) {
Text("Weird Easter Eggs")
@@ -49,6 +48,7 @@ struct EasterEggLabCard: View {
KernelPanicArcade()
}
}
- }
+ .padding(18)
+ .background(.regularMaterial, in: RoundedRectangle(cornerRadius: 18))
}
}
diff --git a/Core-Monitor/FanCurveEditorView.swift b/Core-Monitor/FanCurveEditorView.swift
index 5a46629..a2487b9 100644
--- a/Core-Monitor/FanCurveEditorView.swift
+++ b/Core-Monitor/FanCurveEditorView.swift
@@ -7,14 +7,7 @@ private struct FanCurveCard: View {
var body: some View {
content()
.padding(16)
- .background(
- CoreMonGlassBackground(
- cornerRadius: 18,
- tintOpacity: 0.12,
- strokeOpacity: 0.14,
- shadowRadius: 10
- )
- )
+ .background(.regularMaterial, in: RoundedRectangle(cornerRadius: 18))
}
}
diff --git a/Core-Monitor/FanModeGuidanceCard.swift b/Core-Monitor/FanModeGuidanceCard.swift
index dad071d..c57ef6b 100644
--- a/Core-Monitor/FanModeGuidanceCard.swift
+++ b/Core-Monitor/FanModeGuidanceCard.swift
@@ -69,14 +69,7 @@ struct FanModeGuidanceCard: View {
}
}
.padding(14)
- .background(
- CoreMonGlassBackground(
- cornerRadius: 18,
- tintOpacity: 0.12,
- strokeOpacity: 0.14,
- shadowRadius: 10
- )
- )
+ .background(.regularMaterial, in: RoundedRectangle(cornerRadius: 18))
}
private var ownershipLabel: String {
diff --git a/Core-Monitor/HelpView.swift b/Core-Monitor/HelpView.swift
index 6ba3bcd..488dfb7 100644
--- a/Core-Monitor/HelpView.swift
+++ b/Core-Monitor/HelpView.swift
@@ -242,8 +242,7 @@ struct HelpView: View {
}
.preferredColorScheme(.dark)
.background(
- VisualEffectView(material: .underWindowBackground, blendingMode: .behindWindow)
- .ignoresSafeArea()
+ .regularMaterial
)
}
@@ -397,13 +396,12 @@ private struct HelpCard