Fixed Dark Mode not changing when Mac's on sleep

planecore · Feb 2, 2019 · b0827d7 · b0827d7
1 parent f23c7af
commit b0827d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Auto Dark/Info.plist b/Auto Dark/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.3</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

diff --git a/Auto Dark/LocationManager.swift b/Auto Dark/LocationManager.swift
@@ -29,7 +29,7 @@ import CoreLocation
 
 class LocationManager: NSObject, CLLocationManagerDelegate, DarkManager {
 
-    private var locationManager: CLLocationManager!
+    var locationManager: CLLocationManager!
     var delegate: ViewControllerDelegate?
     var next: DarkDate?
     var pref: ScheduleMode
@@ -64,10 +64,10 @@ class LocationManager: NSObject, CLLocationManagerDelegate, DarkManager {
         } else {
             locationManager = CLLocationManager()
             locationManager.delegate = self
-            locationManager.desiredAccuracy = kCLLocationAccuracyKilometer
+            locationManager.desiredAccuracy = kCLLocationAccuracyThreeKilometers
             locationManager.requestLocation()
             if pref == .location, CLLocationManager.locationServicesEnabled() {
-                locationManager.startUpdatingLocation()
+                locationManager.startMonitoringSignificantLocationChanges()
             } else {
                 self.delegate?.setInformationLabel(string: "Authorize Auto Dark to detect your location in System Preferences.")
             }

diff --git a/Auto Dark/ViewController.swift b/Auto Dark/ViewController.swift
@@ -107,6 +107,9 @@ class ViewController: NSObject, ViewControllerDelegate {
 
     func setDarkManager() {
         timer?.invalidate()
+        if let manager = darkManager as? LocationManager, manager.locationManager != nil {
+            manager.locationManager.stopMonitoringSignificantLocationChanges()
+        }
         if let stringMode = UserDefaults.standard.string(forKey: "mode") {
             mode = ScheduleMode(rawValue: stringMode)!
         }
@@ -125,6 +128,8 @@ class ViewController: NSObject, ViewControllerDelegate {
             if let date = self.date?.date, Date() > date {
                 DarkMode.toggle(force: self.date!.dark)
                 self.darkManager?.calculateNextDate()
+            } else if self.date?.dark == DarkMode.isEnabled {
+                DarkMode.toggle(force: !self.date!.dark)
             }
         }
         RunLoop.main.add(timer!, forMode: .common)