fix: further improvements to 10.14 dark mode

acheronfail · Jun 6, 2018 · 9af7f76 · 9af7f76
1 parent 7c41b97
commit 9af7f76
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Apptivator/AppDelegate.swift b/Apptivator/AppDelegate.swift
@@ -52,6 +52,7 @@ let ICON_OFF = setupMenuBarIcon(NSImage(named: NSImage.Name(stringLiteral: "icon
         enable(APState.shared.isEnabled)
         popoverViewController.reloadView()
 
+        #if !DEBUG
         // Check for accessibility permissions.
         if !UIElement.isProcessTrusted(withPrompt: true) {
             Log.info?.message("Application does not have Accessibility Permissions, requesting...")
@@ -65,6 +66,7 @@ let ICON_OFF = setupMenuBarIcon(NSImage(named: NSImage.Name(stringLiteral: "icon
             alert.alertStyle = .warning
             alert.runModal()
         }
+        #endif
 
         Log.info?.message("Sucessfully launched.")
     }

diff --git a/Apptivator/UI/APPopoverViewController.swift b/Apptivator/UI/APPopoverViewController.swift
@@ -71,16 +71,19 @@ class APPopoverViewController: NSViewController {
             showSequenceEditor(for: APState.shared.getEntry(at: index))
         }
     }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
         // Default to Aqua appearance (Apptivator in Aqua looks better than Vibrant Light).
         if !mojaveDarkModeSupported() {
-            self.view.appearance = NSAppearance(named: .aqua)
+            view.appearance = NSAppearance(named: .aqua)
         } else {
             // Otherwise, disable the button in macOS 10.14 and above.
             enableDarkMode.state = .off
             enableDarkMode.isEnabled = false
+            enableDarkMode.alphaValue = 0
+            boxWrapper.fillColor = NSColor.windowBackgroundColor
         }
 
         bannerImage.image?.isTemplate = true
@@ -111,6 +114,16 @@ class APPopoverViewController: NSViewController {
         }
     }
 
+    override func viewWillAppear() {
+        if #available(OSX 10.14, *) {
+            if let value = UserDefaults.standard.string(forKey: APPLE_INTERFACE_STYLE), value.lowercased() == "dark" {
+                view.appearance = NSAppearance(named: .darkAqua)
+            } else {
+                view.appearance = NSAppearance(named: .aqua)
+            }
+        }
+    }
+
     override func viewWillDisappear() {
         sequenceEditor?.slideOutAndRemove()
         APState.shared.saveToDisk()