Fixed timer

planecore · Nov 21, 2018 · 1e15240 · 1e15240
1 parent 8fc6728
commit 1e15240
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/Auto Dark/AppDelegate.swift b/Auto Dark/AppDelegate.swift
@@ -30,7 +30,7 @@ import Cocoa
 class AppDelegate: NSObject, NSApplicationDelegate {
 
     @IBOutlet weak var window: NSWindow!
-
+        
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         // Insert code here to initialize your application
     }

diff --git a/Auto Dark/Info.plist b/Auto Dark/Info.plist
@@ -17,18 +17,18 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>3</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>LSUIElement</key>
+	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Matan Mashraki. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>LSUIElement</key>
-	<true/>
 </dict>
 </plist>
diff --git a/Auto Dark/ViewController.swift b/Auto Dark/ViewController.swift
@@ -70,6 +70,8 @@ class ViewController: NSObject {
     @IBOutlet weak var locationLabel: NSMenuItem!
     @IBOutlet weak var informationLabel: NSMenuItem!
     let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+    var timer: Timer?
+    var date: Date?
 
     override func awakeFromNib() {
         let icon = NSImage(named: "StatusIcon")
@@ -80,6 +82,12 @@ class ViewController: NSObject {
         if let loc = currentLocation {
             locationLabel.title = loc
         }
+        timer = Timer(fire: Date().addingTimeInterval(10), interval: 60, repeats: true) { (t) in
+            if let date = self.date, Date() > date {
+                self.getSunTimes()
+            }
+        }
+        RunLoop.main.add(timer!, forMode: .common)
         getSunTimes()
     }
 
@@ -111,12 +119,12 @@ class ViewController: NSObject {
                         nextRun = Solar(for: Calendar.current.date(byAdding: .day, value: 1, to: Date())!, coordinate: coord)?.sunrise
                     }
                     if let next = nextRun {
-                        let timer = Timer(fireAt: next, interval: 0, target: self, selector: #selector(self.getSunTimes), userInfo: nil, repeats: false)
-                        RunLoop.main.add(timer, forMode: RunLoop.Mode.common)
+                        self.date = next
                         let dateFormatter = DateFormatter()
-                        dateFormatter.dateFormat = "h:mm"
+                        dateFormatter.dateFormat = "H:mm"
                         self.informationLabel.title = (solar.isDaytime ? "Sunset: " : "Sunrise: ") + dateFormatter.string(from: next)
                     } else {
+                        self.date = nil
                         self.informationLabel.title = "Can't calculate auto dark mode at your location."
                     }
                 }