Przeglądaj źródła

dark theme and small adjustments

Jonas Björkert 1 rok temu
rodzic
commit
0e203dd771

+ 2 - 2
LoopFollow/Alarm/AlarmCondition/OverrideEndCondition.swift

@@ -8,9 +8,9 @@ struct OverrideEndCondition: AlarmCondition {
     static let type: AlarmType = .overrideEnd
     init() {}
 
-    func evaluate(alarm _: Alarm, data: AlarmData, now _: Date) -> Bool {
+    func evaluate(alarm _: Alarm, data: AlarmData, now: Date) -> Bool {
         guard let endTS = data.latestOverrideEnd, endTS > 0 else { return false }
-        guard Date().timeIntervalSince1970 - endTS <= 15 * 60 else { return false }
+        guard now.timeIntervalSince1970 - endTS <= 15 * 60 else { return false }
 
         let last = Storage.shared.lastOverrideEndNotified.value ?? 0
         guard endTS > last else { return false }

+ 2 - 2
LoopFollow/Alarm/AlarmCondition/OverrideStartCondition.swift

@@ -8,10 +8,10 @@ struct OverrideStartCondition: AlarmCondition {
     static let type: AlarmType = .overrideStart
     init() {}
 
-    func evaluate(alarm _: Alarm, data: AlarmData, now _: Date) -> Bool {
+    func evaluate(alarm _: Alarm, data: AlarmData, now: Date) -> Bool {
         guard let startTS = data.latestOverrideStart, startTS > 0 else { return false }
 
-        let recent = Date().timeIntervalSince1970 - startTS <= 15 * 60
+        let recent = now.timeIntervalSince1970 - startTS <= 15 * 60
         guard recent else { return false }
 
         let lastNotified = Storage.shared.lastOverrideStartNotified.value ?? 0

+ 2 - 2
LoopFollow/Alarm/AlarmCondition/TempTargetEndCondition.swift

@@ -9,9 +9,9 @@ struct TempTargetEndCondition: AlarmCondition {
     static let type: AlarmType = .tempTargetEnd
     init() {}
 
-    func evaluate(alarm _: Alarm, data: AlarmData, now _: Date) -> Bool {
+    func evaluate(alarm _: Alarm, data: AlarmData, now: Date) -> Bool {
         guard let endTS = data.latestTempTargetEnd, endTS > 0 else { return false }
-        guard Date().timeIntervalSince1970 - endTS <= 15 * 60 else { return false }
+        guard now.timeIntervalSince1970 - endTS <= 15 * 60 else { return false }
 
         let last = Storage.shared.lastTempTargetEndNotified.value ?? 0
         guard endTS > last else { return false }

+ 2 - 2
LoopFollow/Alarm/AlarmCondition/TempTargetStartCondition.swift

@@ -9,9 +9,9 @@ struct TempTargetStartCondition: AlarmCondition {
     static let type: AlarmType = .tempTargetStart
     init() {}
 
-    func evaluate(alarm _: Alarm, data: AlarmData, now _: Date) -> Bool {
+    func evaluate(alarm _: Alarm, data: AlarmData, now: Date) -> Bool {
         guard let startTS = data.latestTempTargetStart, startTS > 0 else { return false }
-        guard Date().timeIntervalSince1970 - startTS <= 15 * 60 else { return false }
+        guard now.timeIntervalSince1970 - startTS <= 15 * 60 else { return false }
 
         let last = Storage.shared.lastTempTargetStartNotified.value ?? 0
         guard startTS > last else { return false }

+ 1 - 0
LoopFollow/Alarm/AlarmEditing/AlarmEditor.swift

@@ -33,6 +33,7 @@ struct AlarmEditor: View {
                     }
                 }
         }
+        .preferredColorScheme(UserDefaultsRepository.forceDarkMode.value ? .dark : nil)
     }
 
     @ViewBuilder

+ 1 - 0
LoopFollow/Alarm/AlarmListView.swift

@@ -41,6 +41,7 @@ struct AddAlarmSheet: View {
                 }
             }
         }
+        .preferredColorScheme(UserDefaultsRepository.forceDarkMode.value ? .dark : nil)
     }
 }