theme is now detected in each update interval

fixes #72
iglance · Jan 25, 2020 · 2fc9762 · 2fc9762
1 parent 328d646
commit 2fc9762
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/iGlance/iGlance/AppDelegate.swift b/iGlance/iGlance/AppDelegate.swift
@@ -27,13 +27,8 @@
 import Cocoa
 import ServiceManagement
 
-enum InterfaceStyle: String {
-    case Dark, Light
-
-    init() {
-        let type = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") ?? "Light"
-        self = InterfaceStyle(rawValue: type)!
-    }
+func isDarkMode() -> Bool {
+    return UserDefaults.standard.string(forKey: "AppleInterfaceStyle") != nil ? true : false
 }
 
 extension NSColor {

diff --git a/iGlance/iGlance/Components/BatteryComponent.swift b/iGlance/iGlance/Components/BatteryComponent.swift
@@ -160,7 +160,7 @@ class BatteryComponent {
         // determine the color scheme and set the font color accordingly
         var batteryIconString: String?
         var fontColor: NSColor?
-        if InterfaceStyle() == InterfaceStyle.Dark {
+        if isDarkMode() {
             batteryIconString = "battery-icon-white"
             fontColor = NSColor.white
         } else {

diff --git a/iGlance/iGlance/Components/CpuUsageComponent.swift b/iGlance/iGlance/Components/CpuUsageComponent.swift
@@ -88,7 +88,7 @@ class CpuUsageComponent {
         myCpuMenuView.percentUser.stringValue = String(Int(cpuUser)) + "%"
         myCpuMenuView.percentIdle.stringValue = String(Int(cpuIdle)) + "%"
 
-        if InterfaceStyle() == InterfaceStyle.Dark {
+        if isDarkMode() {
             cpuImg = "menubar-label-cpu-white"
             pbImg = "progressbar-white"
         } else {

diff --git a/iGlance/iGlance/Components/MemUsageComponent.swift b/iGlance/iGlance/Components/MemUsageComponent.swift
@@ -90,7 +90,7 @@ class MemUsageComponent {
         let memTaken = memActive + memCompressed + memWired
         let totalMemUsage = Double(memTaken / System.physicalMemory()) * 100
 
-        if InterfaceStyle() == InterfaceStyle.Dark {
+        if isDarkMode() {
             memImg = "menubar-label-mem-white"
             pbIMG = "progressbar-white"
         } else {

diff --git a/iGlance/iGlance/Components/NetUsageComponent.swift b/iGlance/iGlance/Components/NetUsageComponent.swift
@@ -224,7 +224,7 @@ class NetUsageComponent {
             updateMenuText(down: getTotalDownloaded(), up: getTotalUploaded())
         }
 
-        if InterfaceStyle() == InterfaceStyle.Dark {
+        if isDarkMode() {
             bandIMG = "bandwidth-white"
             bandColor = NSColor.white
         } else {

diff --git a/iGlance/iGlance/Utils/MenuBarGraph.swift b/iGlance/iGlance/Utils/MenuBarGraph.swift
@@ -64,7 +64,7 @@ class MenuBarGraph {
         if drawBorder {
             // draw the border around the graph area
             let borderRect = NSRect(x: 6, y: 0, width: width-8, height: 18)
-            if InterfaceStyle() == InterfaceStyle.Dark {
+            if isDarkMode() {
                 NSColor.white.set()
             } else {
                 NSColor.black.set()