Просмотр исходного кода

Adjust step values and min/max limits for missed reading and not looping alerts

Jonas Björkert 1 год назад
Родитель
Сommit
291e33756d

+ 2 - 2
LoopFollow/Storage/UserDefaults.swift

@@ -291,7 +291,7 @@ class UserDefaultsRepository {
     
     
     
     
     static let alertMissedReadingActive = UserDefaultsValue<Bool>(key: "alertMissedReadingActive", default: false)
     static let alertMissedReadingActive = UserDefaultsValue<Bool>(key: "alertMissedReadingActive", default: false)
-    static let alertMissedReading = UserDefaultsValue<Int>(key: "alertMissedReading", default: 30)
+    static let alertMissedReading = UserDefaultsValue<Int>(key: "alertMissedReading", default: 31)
     static let alertMissedReadingSnooze = UserDefaultsValue<Int>(key: "alertMissedReadingSnooze", default: 30)
     static let alertMissedReadingSnooze = UserDefaultsValue<Int>(key: "alertMissedReadingSnooze", default: 30)
     static let alertMissedReadingSnoozedTime = UserDefaultsValue<Date?>(key: "alertMissedReadingSnoozedTime", default: nil)
     static let alertMissedReadingSnoozedTime = UserDefaultsValue<Date?>(key: "alertMissedReadingSnoozedTime", default: nil)
     static let alertMissedReadingIsSnoozed = UserDefaultsValue<Bool>(key: "alertMissedReadingIsSnoozed", default: false)
     static let alertMissedReadingIsSnoozed = UserDefaultsValue<Bool>(key: "alertMissedReadingIsSnoozed", default: false)
@@ -308,7 +308,7 @@ class UserDefaultsRepository {
     
     
     
     
     static let alertNotLoopingActive = UserDefaultsValue<Bool>(key: "alertNotLoopingActive", default: false)
     static let alertNotLoopingActive = UserDefaultsValue<Bool>(key: "alertNotLoopingActive", default: false)
-    static let alertNotLooping = UserDefaultsValue<Int>(key: "alertNotLooping", default: 30)
+    static let alertNotLooping = UserDefaultsValue<Int>(key: "alertNotLooping", default: 31)
     static let alertNotLoopingSnooze = UserDefaultsValue<Int>(key: "alertNotLoopingSnooze", default: 30)
     static let alertNotLoopingSnooze = UserDefaultsValue<Int>(key: "alertNotLoopingSnooze", default: 30)
     static let alertNotLoopingUseLimits = UserDefaultsValue<Bool>(key: "alertNotLoopingUseLimits", default: false)
     static let alertNotLoopingUseLimits = UserDefaultsValue<Bool>(key: "alertNotLoopingUseLimits", default: false)
     static let alertNotLoopingLowerLimit = UserDefaultsValue<Float>(key: "alertNotLoopingBelowBG", default: 100.0)
     static let alertNotLoopingLowerLimit = UserDefaultsValue<Float>(key: "alertNotLoopingBelowBG", default: 100.0)

+ 5 - 5
LoopFollow/ViewControllers/AlarmViewController.swift

@@ -1660,9 +1660,9 @@ class AlarmViewController: FormViewController {
 
 
         <<< StepperRow("alertMissedReading") { row in
         <<< StepperRow("alertMissedReading") { row in
             row.title = "Time"
             row.title = "Time"
-            row.cell.stepper.stepValue = 1
-            row.cell.stepper.minimumValue = 10
-            row.cell.stepper.maximumValue = 120
+            row.cell.stepper.stepValue = 5
+            row.cell.stepper.minimumValue = 11
+            row.cell.stepper.maximumValue = 121
             row.value = Double(UserDefaultsRepository.alertMissedReading.value)
             row.value = Double(UserDefaultsRepository.alertMissedReading.value)
             row.displayValueFor = { value in
             row.displayValueFor = { value in
                 guard let value = value else { return nil }
                 guard let value = value else { return nil }
@@ -1805,8 +1805,8 @@ class AlarmViewController: FormViewController {
         <<< StepperRow("alertNotLooping") { row in
         <<< StepperRow("alertNotLooping") { row in
             row.title = "Time"
             row.title = "Time"
             row.cell.stepper.stepValue = 5
             row.cell.stepper.stepValue = 5
-            row.cell.stepper.minimumValue = 15
-            row.cell.stepper.maximumValue = 60
+            row.cell.stepper.minimumValue = 16
+            row.cell.stepper.maximumValue = 61
             row.value = Double(UserDefaultsRepository.alertNotLooping.value)
             row.value = Double(UserDefaultsRepository.alertNotLooping.value)
             row.displayValueFor = { value in
             row.displayValueFor = { value in
                 guard let value = value else { return nil }
                 guard let value = value else { return nil }

+ 3 - 3
LoopFollow/ViewControllers/MainViewController.swift

@@ -153,9 +153,9 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
             UserDefaultsRepository.backgroundRefresh.value = true
             UserDefaultsRepository.backgroundRefresh.value = true
         }
         }
 
 
-        // Ensure alertNotLooping has a minimum value of 15.
-        if UserDefaultsRepository.alertNotLooping.value < 15 {
-            UserDefaultsRepository.alertNotLooping.value = 15
+        // Ensure alertNotLooping has a minimum value of 16.
+        if UserDefaultsRepository.alertNotLooping.value < 16 {
+            UserDefaultsRepository.alertNotLooping.value = 16
         }
         }
 
 
         // Synchronize info types to ensure arrays are the correct size
         // Synchronize info types to ensure arrays are the correct size