Skip to content

Fix Decodex App dark mode #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yvette-carlisle merged 1 commit into from
May 29, 2026
Merged

Fix Decodex App dark mode #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/decodex-app/Sources/DecodexApp/AccountPanelView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2344,7 +2344,7 @@ struct OperatorFlowMetricView: View {
private var valueTint: Color {
metric.value > 0
? metric.tint
: PanelPalette.secondaryText(colorScheme).opacity(colorScheme == .dark ? 0.64 : 0.72)
: PanelPalette.primaryText(colorScheme).opacity(colorScheme == .dark ? 0.76 : 0.66)
}
}

Expand Down
36 changes: 36 additions & 0 deletions apps/decodex-app/Sources/DecodexApp/DecodexApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,39 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
}
}

@MainActor
final class AppAppearanceStore: ObservableObject {
@Published private(set) var colorScheme = AppAppearanceStore.currentColorScheme()
private var observation: NSKeyValueObservation?

init() {
colorScheme = Self.currentColorScheme()
observation = NSApp.observe(\.effectiveAppearance, options: [.new]) { [weak self] _, _ in
Task { @MainActor in
self?.colorScheme = Self.currentColorScheme()
}
}
}

private static func currentColorScheme() -> ColorScheme {
let darkAppearances: [NSAppearance.Name] = [
.darkAqua,
.vibrantDark,
.accessibilityHighContrastDarkAqua,
.accessibilityHighContrastVibrantDark,
]
let lightAppearances: [NSAppearance.Name] = [
.aqua,
.vibrantLight,
.accessibilityHighContrastAqua,
.accessibilityHighContrastVibrantLight,
]
let match = NSApp.effectiveAppearance.bestMatch(from: darkAppearances + lightAppearances)

return darkAppearances.contains { $0 == match } ? .dark : .light
}
}

enum AppAssets {
static let statusBarIcon: NSImage = {
let image = NSImage(named: "StatusBarIcon")
Expand All @@ -29,6 +62,7 @@ final class LoginWindowState: ObservableObject {
@main
struct DecodexApp: App {
@NSApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate
@StateObject private var appAppearance = AppAppearanceStore()
@StateObject private var store: AccountStore
@StateObject private var loginWindowState = LoginWindowState()

Expand Down Expand Up @@ -59,6 +93,8 @@ struct DecodexApp: App {
@ViewBuilder
private var menuBarContent: some View {
let content = AccountPanelView(store: store, loginWindowState: loginWindowState)
.environment(\.colorScheme, appAppearance.colorScheme)
.preferredColorScheme(appAppearance.colorScheme)
.task {
await store.refreshIfNeeded()
store.startOperatorSnapshotStream()
Expand Down