Skip to content

Commit

Permalink
Merge pull request loopandlearn#366 from loopandlearn/alert-missed-re…
Browse files Browse the repository at this point in the history
…ading-stepvalue

Alert missed reading stepvalue change
  • Loading branch information
marionbarker authored Jan 30, 2025
2 parents 011373f + 291e337 commit 51d3013
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions LoopFollow/Storage/UserDefaults.swift
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ class UserDefaultsRepository {


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 alertMissedReadingSnoozedTime = UserDefaultsValue<Date?>(key: "alertMissedReadingSnoozedTime", default: nil)
static let alertMissedReadingIsSnoozed = UserDefaultsValue<Bool>(key: "alertMissedReadingIsSnoozed", default: false)
Expand All @@ -308,7 +308,7 @@ class UserDefaultsRepository {


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 alertNotLoopingUseLimits = UserDefaultsValue<Bool>(key: "alertNotLoopingUseLimits", default: false)
static let alertNotLoopingLowerLimit = UserDefaultsValue<Float>(key: "alertNotLoopingBelowBG", default: 100.0)
Expand Down
8 changes: 4 additions & 4 deletions LoopFollow/ViewControllers/AlarmViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1661,8 +1661,8 @@ class AlarmViewController: FormViewController {
<<< StepperRow("alertMissedReading") { row in
row.title = "Time"
row.cell.stepper.stepValue = 5
row.cell.stepper.minimumValue = 10
row.cell.stepper.maximumValue = 120
row.cell.stepper.minimumValue = 11
row.cell.stepper.maximumValue = 121
row.value = Double(UserDefaultsRepository.alertMissedReading.value)
row.displayValueFor = { value in
guard let value = value else { return nil }
Expand Down Expand Up @@ -1805,8 +1805,8 @@ class AlarmViewController: FormViewController {
<<< StepperRow("alertNotLooping") { row in
row.title = "Time"
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.displayValueFor = { value in
guard let value = value else { return nil }
Expand Down
6 changes: 3 additions & 3 deletions LoopFollow/ViewControllers/MainViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
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
Expand Down

0 comments on commit 51d3013

Please sign in to comment.