6.8.6

alin23 · Jan 7, 2025 · 03d8486 · 03d8486
1 parent 2020ddb
commit 03d8486
Show file tree

Hide file tree

Showing 63 changed files with 1,242 additions and 1,180 deletions.
diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg
@@ -3,8 +3,8 @@ Lunar/Resources/eddsa_priv:d079018c2b1c003c9e239ea8f8cc999b7d98adfd0616911ba0263
 Lunar/Modes/SensorMode.swift:63d6565bb8194d89abaa7998c640d3aebe8aa33edcaf687c0f5d385c5ad5f0eb
 Lunar/Modes/SyncMode.swift:99587e6a44dfd3620f154a34ac83e0a9c0fedc82b778c6cad71bbeacb437864e
 Lunar/Modes/LocationMode.swift:bef485a1eb39359f19a37599c2fa55fc3a2f448295570f20c7b4e65984a63ec1
-Lunar/Data/Pro.swift:f73924de8fef717a3527b83807e80fad2ea2a2fab00b3d2925136d711611e3dd
+Lunar/Data/Pro.swift:264f73e4c8434017bfdc070d073e8b52d3b2bbe6559ad9a18bda2def311a6ac8
 Lunar/Modes/ClockMode.swift:d012d1b6cd91d0527ca6d6d00fd5b7742c3671855fba5d43ab31b6413d8afc84
 Lunar/DDC/DDC2.h:2413c548ce3cc1681316b52486b66769529ae244ec5c76a160cdc190e7236f61
 Lunar/DDC/DDC2.c:8488fdfb13ca9525e44db616c773eb67f1f1d52dcf83115d7666b0d79bbeef5a
-Lunar/required.swift:d494636f0448a4e0da33d4fd376dfd9f6b1f35c108c9ffec903cbf4ec4f51acf
+Lunar/required.swift:bf18286738d3041622a65ea257fafba0bb47670101b6257cb01a9096c09c7ccb
diff --git a/Lunar.xcodeproj/project.pbxproj b/Lunar.xcodeproj/project.pbxproj
@@ -1339,7 +1339,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6.8.5;
+				CURRENT_PROJECT_VERSION = 6.8.6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
@@ -1371,7 +1371,7 @@
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 6.8.5;
+				MARKETING_VERSION = 6.8.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CODE_SIGN_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = fyi.lunar.Lunar;
@@ -1404,7 +1404,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6.8.5;
+				CURRENT_PROJECT_VERSION = 6.8.6;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = RDDXV84A73;
@@ -1435,7 +1435,7 @@
 				);
 				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 6.8.5;
+				MARKETING_VERSION = 6.8.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = fyi.lunar.Lunar;

diff --git a/Lunar/Controllers/ALSInstallViewController.swift b/Lunar/Controllers/ALSInstallViewController.swift
@@ -168,6 +168,28 @@ final class ALSInstallViewController: NSViewController {
         }
     }
 
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        mainAsyncAfter(ms: 100) { [weak self] in
+            self?.devices = getDevices()
+            log.debug("Available sensor devices: \(self?.devices ?? [])")
+        }
+
+        view.wantsLayer = true
+        view.radius = 12.0.ns
+        view.bg = darkMauve
+        progressBar?.appearance = NSAppearance(named: .vibrantDark)
+
+        installButton?.bgColor = lunarYellow
+        installButton?.radius = 10.ns
+        installButton?.frame = NSRect(origin: installButton.frame.origin, size: CGSize(width: installButton.frame.width, height: 30))
+        installButton?.attributedTitle = "Start".withAttribute(.textColor(mauve))
+        operationDescription =
+            "Your WiFi credentials will be programmed into the sensor firmware so it can connect to your local network and send lux values when requested."
+                .attributedString
+    }
+
     func setPins() {
         switch boardID {
         case "sparkfun_esp32s2_thing_plus":
@@ -311,27 +333,6 @@ final class ALSInstallViewController: NSViewController {
         }
     }
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        mainAsyncAfter(ms: 100) { [weak self] in
-            self?.devices = getDevices()
-            log.debug("Available sensor devices: \(self?.devices ?? [])")
-        }
-
-        view.wantsLayer = true
-        view.radius = 12.0.ns
-        view.bg = darkMauve
-        progressBar?.appearance = NSAppearance(named: .vibrantDark)
-
-        installButton?.bgColor = lunarYellow
-        installButton?.radius = 10.ns
-        installButton?.frame = NSRect(origin: installButton.frame.origin, size: CGSize(width: installButton.frame.width, height: 30))
-        installButton?.attributedTitle = "Start".withAttribute(.textColor(mauve))
-        operationDescription =
-            "Your WiFi credentials will be programmed into the sensor firmware so it can connect to your local network and send lux values when requested."
-                .attributedString
-    }
 }
 
 // MARK: NSControlTextEditingDelegate

diff --git a/Lunar/Controllers/ColorsPopoverController.swift b/Lunar/Controllers/ColorsPopoverController.swift
@@ -12,16 +12,16 @@ final class ColorsPopoverController: NSViewController {
 // MARK: - ColorsButton
 
 final class ColorsButton: PopoverButton<ColorsPopoverController> {
+    override var popoverKey: String {
+        "colors"
+    }
+
     weak var display: Display? {
         didSet {
             popoverController?.display = display
         }
     }
 
-    override var popoverKey: String {
-        "colors"
-    }
-
     override func mouseDown(with event: NSEvent) {
         popoverController?.display = display
         super.mouseDown(with: event)

diff --git a/Lunar/Controllers/ConfigurationViewController.swift b/Lunar/Controllers/ConfigurationViewController.swift
@@ -160,6 +160,16 @@ final class ConfigurationViewController: NSViewController {
         }
     }
 
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        settingsController = parent?.parent as? SettingsPageController
+        setup()
+    }
+
+    override func wantsScrollEventsForSwipeTracking(on axis: NSEvent.GestureAxis) -> Bool {
+        axis == .horizontal
+    }
+
     func showRelevantSettings(_ adaptiveMode: AdaptiveModeKey) {
         let locationMode = adaptiveMode == .location
         let sensorMode = adaptiveMode == .sensor
@@ -422,13 +432,4 @@ final class ConfigurationViewController: NSViewController {
         listenForAdaptiveModeChange()
     }
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        settingsController = parent?.parent as? SettingsPageController
-        setup()
-    }
-
-    override func wantsScrollEventsForSwipeTracking(on axis: NSEvent.GestureAxis) -> Bool {
-        axis == .horizontal
-    }
 }