Fixing color scheme change for macOS Sonoma

DamascenoRafael · Sep 30, 2023 · 4e2a2ea · 4e2a2ea
1 parent f6e41d6
commit 4e2a2ea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/reminders-menubar/AppDelegate.swift b/reminders-menubar/AppDelegate.swift
@@ -40,7 +40,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         changeBehaviorToDismissIfNeeded()
         configurePopover()
-        configureAppColorScheme()
         configureMenuBarButton()
         configureKeyboardShortcut()
         configureDidCloseNotification()
@@ -55,11 +54,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
-    func configureAppColorScheme() {
-        let colorScheme = UserPreferences.shared.rmbColorScheme
-        NSApplication.shared.appearance = colorScheme.nsAppearance
-    }
-
     func updateMenuBarTodayCount(to todayCount: Int) {
         let buttonTitle = todayCount > 0 ? String(todayCount) : ""
         statusBarItem.button?.title = buttonTitle

diff --git a/reminders-menubar/Resources/RmbColorScheme.swift b/reminders-menubar/Resources/RmbColorScheme.swift
@@ -5,14 +5,14 @@ enum RmbColorScheme: String {
     case light
     case dark
 
-    var nsAppearance: NSAppearance? {
+    var colorScheme: ColorScheme? {
         switch self {
         case .system:
             return nil
         case .light:
-            return NSAppearance(named: .aqua)
+            return .light
         case .dark:
-            return NSAppearance(named: .darkAqua)
+            return .dark
         }
     }
 }
diff --git a/reminders-menubar/Views/ContentView.swift b/reminders-menubar/Views/ContentView.swift
@@ -55,6 +55,7 @@ struct ContentView: View {
             SettingsBarView()
         }
         .background(Color.rmbColor(for: .backgroundTheme, and: colorSchemeContrast).padding(-80))
+        .preferredColorScheme(userPreferences.rmbColorScheme.colorScheme)
     }
 }
 

diff --git a/reminders-menubar/Views/SettingsBarView/SettingsBarGearMenu.swift b/reminders-menubar/Views/SettingsBarView/SettingsBarGearMenu.swift
@@ -99,23 +99,23 @@ struct SettingsBarGearMenu: View {
     func appAppearanceMenu() -> some View {
         Menu {
             Button(action: {
-                changeColorScheme(to: .system)
+                userPreferences.rmbColorScheme = .system
             }) {
                 let isSelected = userPreferences.rmbColorScheme == .system
                 SelectableView(title: rmbLocalized(.appAppearanceColorSystemModeOptionButton),
                                isSelected: isSelected)
             }
 
             Button(action: {
-                changeColorScheme(to: .light)
+                userPreferences.rmbColorScheme = .light
             }) {
                 let isSelected = userPreferences.rmbColorScheme == .light
                 SelectableView(title: rmbLocalized(.appAppearanceColorLightModeOptionButton),
                                isSelected: isSelected)
             }
 
             Button(action: {
-                changeColorScheme(to: .dark)
+                userPreferences.rmbColorScheme = .dark
             }) {
                 let isSelected = userPreferences.rmbColorScheme == .dark
                 SelectableView(title: rmbLocalized(.appAppearanceColorDarkModeOptionButton),
@@ -217,11 +217,6 @@ struct SettingsBarGearMenu: View {
             Text(rmbLocalized(.preferredLanguageMenu))
         }
     }
-
-    func changeColorScheme(to rmbColorScheme: RmbColorScheme) {
-        userPreferences.rmbColorScheme = rmbColorScheme
-        AppDelegate.shared.configureAppColorScheme()
-    }
 }
 
 struct SettingsBarGearMenu_Previews: PreviewProvider {
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ struct ContentView: View { @@
                 SettingsBarView()
             }
             .background(Color.rmbColor(for: .backgroundTheme, and: colorSchemeContrast).padding(-80))
+            .preferredColorScheme(userPreferences.rmbColorScheme.colorScheme)
         }
     }
@@ Expand Down @@