Skip to content

Commit

Permalink
Add toggle to hide slopes in alarms
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Allène committed Dec 3, 2023
1 parent 0eb9cd3 commit 5fbf2ed
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 8 deletions.
14 changes: 14 additions & 0 deletions xdrip/Extensions/UserDefaults.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ extension UserDefaults {
/// use the "standard" range of 70-180mg/dl to calculate the statistics?
case useStandardStatisticsRange = "useStandardStatisticsRange"

// Alarms settings

/// hide slope in alarms
case hideSlopeInAlarms = "hideSlopeInAlarms"

// Housekeeper settings

/// For how many days should we keep Readings, Treatments and Calibrations?
Expand Down Expand Up @@ -1013,6 +1018,15 @@ extension UserDefaults {
}
}

/// - show slopes in alarms
var showSlopeInAlarms: Bool {
get {
return !bool(forKey: Key.hideSlopeInAlarms.rawValue)
}
set {
set(!newValue, forKey: Key.hideSlopeInAlarms.rawValue)
}
}

// MARK: Sensor Countdown Settings

Expand Down
12 changes: 6 additions & 6 deletions xdrip/Managers/Alerts/AlertKind.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public enum AlertKind:Int, CaseIterable {
if lastBgReading.calculatedValue == 0.0 {return (false, nil, nil, nil)}
// now do the actual check if alert is applicable or not
if lastBgReading.calculatedValue.bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) < Double(currentAlertEntry.value).bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) {
return (true, lastBgReading.unitizedDeltaString(previousBgReading: lastButOneBgReading, showUnit: true, highGranularity: true, mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl), createAlertTitleForBgReadingAlerts(bgReading: lastBgReading, alertKind: self), nil)
return (true, lastBgReading.unitizedDeltaString(previousBgReading: lastButOneBgReading, showUnit: true, highGranularity: true, mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl), createAlertTitleForBgReadingAlerts(bgReading: lastBgReading, alertKind: self, showSlope: UserDefaults.standard.showSlopeInAlarms), nil)
} else {return (false, nil, nil, nil)}
} else {return (false, nil, nil, nil)}

Expand All @@ -211,7 +211,7 @@ public enum AlertKind:Int, CaseIterable {
if lastBgReading.calculatedValue == 0.0 {return (false, nil, nil, nil)}
// now do the actual check if alert is applicable or not
if lastBgReading.calculatedValue.bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) > Double(currentAlertEntry.value).bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl){
return (true, lastBgReading.unitizedDeltaString(previousBgReading: lastButOneBgReading, showUnit: true, highGranularity: true, mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl), createAlertTitleForBgReadingAlerts(bgReading: lastBgReading, alertKind: self), nil)
return (true, lastBgReading.unitizedDeltaString(previousBgReading: lastButOneBgReading, showUnit: true, highGranularity: true, mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl), createAlertTitleForBgReadingAlerts(bgReading: lastBgReading, alertKind: self, showSlope: UserDefaults.standard.showSlopeInAlarms), nil)
} else {return (false, nil, nil, nil)}
} else {return (false, nil, nil, nil)}

Expand All @@ -228,7 +228,7 @@ public enum AlertKind:Int, CaseIterable {
if lastBgReading.calculatedValue == 0.0 || lastButOneBgReading.calculatedValue == 0.0 {return (false, nil, nil, nil)}
// now do the actual check if alert is applicable or not
if lastButOneBgReading.calculatedValue.bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) - lastBgReading.calculatedValue.bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) > Double(currentAlertEntry.value).bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) {
return (true, lastBgReading.unitizedDeltaString(previousBgReading: lastButOneBgReading, showUnit: true, highGranularity: true, mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl), createAlertTitleForBgReadingAlerts(bgReading: lastBgReading, alertKind: self), nil)
return (true, lastBgReading.unitizedDeltaString(previousBgReading: lastButOneBgReading, showUnit: true, highGranularity: true, mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl), createAlertTitleForBgReadingAlerts(bgReading: lastBgReading, alertKind: self, showSlope: UserDefaults.standard.showSlopeInAlarms), nil)
} else {return (false, nil, nil, nil)}

} else {return (false, nil, nil, nil)}
Expand All @@ -248,7 +248,7 @@ public enum AlertKind:Int, CaseIterable {
if lastBgReading.calculatedValue == 0.0 || lastButOneBgReading.calculatedValue == 0.0 {return (false, nil, nil, nil)}
// now do the actual check if alert is applicable or not
if lastBgReading.calculatedValue.bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) - lastButOneBgReading.calculatedValue.bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) > Double(currentAlertEntry.value).bgValueRounded(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) {
return (true, lastBgReading.unitizedDeltaString(previousBgReading: lastButOneBgReading, showUnit: true, highGranularity: true, mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl), createAlertTitleForBgReadingAlerts(bgReading: lastBgReading, alertKind: self), nil)
return (true, lastBgReading.unitizedDeltaString(previousBgReading: lastButOneBgReading, showUnit: true, highGranularity: true, mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl), createAlertTitleForBgReadingAlerts(bgReading: lastBgReading, alertKind: self, showSlope: UserDefaults.standard.showSlopeInAlarms), nil)
} else {return (false, nil, nil, nil)}

} else {return (false, nil, nil, nil)}
Expand Down Expand Up @@ -445,7 +445,7 @@ public enum AlertKind:Int, CaseIterable {
}

// specifically for high, low, very high, very low because these need the same kind of alertTitle
fileprivate func createAlertTitleForBgReadingAlerts(bgReading:BgReading, alertKind:AlertKind) -> String {
fileprivate func createAlertTitleForBgReadingAlerts(bgReading:BgReading, alertKind:AlertKind, showSlope:Bool) -> String {
var returnValue:String = ""

// the start of the body, which says like "High Alert"
Expand All @@ -472,7 +472,7 @@ fileprivate func createAlertTitleForBgReadingAlerts(bgReading:BgReading, alertKi
returnValue = returnValue + " " + bgReading.calculatedValue.mgdlToMmolAndToString(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl)

// add slopeArrow
if !bgReading.hideSlope {
if showSlope && !bgReading.hideSlope {
returnValue = returnValue + " " + bgReading.slopeArrow()
}

Expand Down
4 changes: 4 additions & 0 deletions xdrip/Texts/TextsSettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,10 @@ class Texts_SettingsView {
return NSLocalizedString("volumeTestiOSSound", tableName: filename, bundle: Bundle.main, value: "Volume Test (Current iPhone Volume)", comment: "In Settings, Alerts section, there's an option to test the volume of ios sound, this is the title of the row")
}()

static let showSlopeInAlarms: String = {
return NSLocalizedString("showSlopeInAlarms", tableName: filename, bundle: Bundle.main, value: "Show Slope in Alarms", comment: "In Settings, Alerts section, there's an option to show the slopes in the alarms")
}()

static let volumeTestiOSSoundExplanation: String = {
return NSLocalizedString("volumeTestiOSSoundExplanation", tableName: filename, bundle: Bundle.main, value: "An alarm sound is now being played with the same volume that will be used for an Alarm Type with 'Override Mute' = Off\n\n(Also used always for Missed Reading alarms which use the iOS volume.)\n\nPress one of the volume buttons to stop the sound, then change the volume with the volume buttons to the desired volume and test again.", comment: "In Settings, Alerts section, there's an option to test the volume settings, this is text explaining the test when clicking the row - this is for ios sound volume test")
}()
Expand Down
21 changes: 19 additions & 2 deletions ...roller/SettingsViewController/SettingsViewModels/SettingsViewAlertSettingsViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ fileprivate enum Setting:Int, CaseIterable {
/// volume test for sound play in iOS notification
case volumeTestiOSSound = 3

/// show slope in alarms
case showSlopeInAlarms = 4

}

/// conforms to SettingsViewModelProtocol for all alert settings in the first sections screen
Expand Down Expand Up @@ -83,7 +86,11 @@ struct SettingsViewAlertSettingsViewModel:SettingsViewModelProtocol {

return SettingsSelectedRowAction.showInfoText(title: Texts_Common.warning, message: Texts_SettingsView.volumeTestiOSSoundExplanation, actionHandler: nil)

case .showSlopeInAlarms:
return .nothing

}

}

func storeRowReloadClosure(rowReloadClosure: ((Int) -> Void)) {}
Expand All @@ -97,7 +104,14 @@ struct SettingsViewAlertSettingsViewModel:SettingsViewModelProtocol {
}

func uiView(index: Int) -> UIView? {
return nil
guard let setting = Setting(rawValue: index) else { fatalError("Unexpected Section") }

switch setting {
case .showSlopeInAlarms:
return UISwitch(isOn: UserDefaults.standard.showSlopeInAlarms, action: {(isOn:Bool) in UserDefaults.standard.showSlopeInAlarms = isOn})
default:
return nil
}
}

func settingsRowText(index: Int) -> String {
Expand All @@ -115,6 +129,9 @@ struct SettingsViewAlertSettingsViewModel:SettingsViewModelProtocol {

case .volumeTestiOSSound:
return Texts_SettingsView.volumeTestiOSSound

case .showSlopeInAlarms:
return Texts_SettingsView.showSlopeInAlarms

}
}
Expand All @@ -129,7 +146,7 @@ struct SettingsViewAlertSettingsViewModel:SettingsViewModelProtocol {

return .disclosureIndicator

case .volumeTestSoundPlayer, .volumeTestiOSSound:
case .volumeTestSoundPlayer, .volumeTestiOSSound, .showSlopeInAlarms:

return .none

Expand Down

0 comments on commit 5fbf2ed

Please sign in to comment.