More reliable dark mode detection on macOS 10.15.

weisJ · Apr 20, 2020 · 61c2b49 · 61c2b49
1 parent da8813a
commit 61c2b49
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/macos/build.gradle.kts b/macos/build.gradle.kts
@@ -31,7 +31,7 @@ library {
         compileTask.get().apply {
             dependsOn(macPath)
             compilerArgs.addAll("-x", "objective-c++")
-            compilerArgs.addAll("-mmacosx-version-min=10.10")
+            compilerArgs.addAll("-mmacosx-version-min=10.14")
             compilerArgs.addJavaFrameworks()
             source.from(
                 file("src/main/objectiveCpp/DarkMode.mm")

diff --git a/macos/src/main/java/com/github/weisj/darkmode/platform/macos/MacOSThemeMonitorService.java b/macos/src/main/java/com/github/weisj/darkmode/platform/macos/MacOSThemeMonitorService.java
@@ -5,7 +5,7 @@
 
 public class MacOSThemeMonitorService implements ThemeMonitorService {
 
-    private static final boolean loaded = SystemInfo.isMacOSYosemite && MacOSNative.loadLibrary();
+    private static final boolean loaded = SystemInfo.isMacOSMojave && MacOSNative.loadLibrary();
 
     @Override
     public boolean isDarkThemeEnabled() {

diff --git a/macos/src/main/objectiveCpp/DarkMode.mm b/macos/src/main/objectiveCpp/DarkMode.mm
@@ -97,10 +97,9 @@ - (void)notificationEvent:(NSNotification *)notification {
 Java_com_github_weisj_darkmode_platform_macos_MacOSNative_isDarkThemeEnabled(JNIEnv *env, jclass obj) {
 JNF_COCOA_ENTER(env);
     if(@available(macOS 10.14, *)) {
-        NSString *interfaceStyle = [[NSUserDefaults standardUserDefaults] stringForKey:KEY_APPLE_INTERFACE_STYLE];
-        // interfaceStyle can be nil (light mode) or "Dark" (dark mode).
-        BOOL isDark = [VALUE_DARK caseInsensitiveCompare:interfaceStyle] == NSOrderedSame;
-        return (jboolean) isDark;
+        NSAppearanceName appearanceName = [[NSApp effectiveAppearance]
+                                           bestMatchFromAppearanceWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
+        return (jboolean) [appearanceName isEqualToString:NSAppearanceNameDarkAqua];
     } else {
         return (jboolean) NO;
     }