mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove coloured objectives lines

This commit is contained in:
Paul Plant 2021-01-24 11:42:04 +01:00
parent 0748aabaf5
commit f32e76890e
5 changed files with 9 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xdrip/Constants/ConstantsGlucoseChart.swift
View File

@ -47,18 +47,12 @@ enum ConstantsGlucoseChart {
// objective/target range guidelines. Will use either standard gray or colored lines
// make use alpha components to make the perceived brightness of each line be the same to the user (otherwise red appears washed out)
/// color for urgent high and urgent low line, if showColoredObjectives is not enabled
/// color for urgent high and urgent low line
static let guidelineUrgentHighLow = UIColor.lightGray.withAlphaComponent(0.8)
/// color for urgent high and urgent low line, if showColoredObjectives is not enabled
/// color for urgent high and urgent low line
static let guidelineHighLow = UIColor.lightGray.withAlphaComponent(1)
/// color for urgent high and urgent low line, if showColoredObjectives is enabled
static let guidelineUrgentHighLowColor = UIColor.red.withAlphaComponent(0.8)
/// color for high and low line, if showColoredObjectives is enabled
static let guidelineHighLowColor = UIColor.yellow.withAlphaComponent(0.7)
/// color for target line
static let guidelineTargetColor = UIColor.green.withAlphaComponent(0.5)

13
xdrip/Extensions/UserDefaults.swift
View File

@ -44,8 +44,6 @@ extension UserDefaults {
case lowMarkValue = "lowMarkValue"
/// urgent low value
case urgentLowMarkValue = "urgentLowMarkValue"
/// master or follower
case showColoredObjectives = "showColoredObjectives"
/// show the target line or hide it?
case showTarget = "showTarget"
/// target value
@ -595,17 +593,6 @@ extension UserDefaults {
}
}
/// should the Guidelines be shown in color (yellow/red) on the graph?
@objc dynamic var showColoredObjectives: Bool {
// default value for bool in userdefaults is false, by default we want the guidelines to be shown in grey as per Nightscout
get {
return !bool(forKey: Key.showColoredObjectives.rawValue)
}
set {
set(!newValue, forKey: Key.showColoredObjectives.rawValue)
}
}
/// should the target line (always shown in green) be shown on the graph?
@objc dynamic var showTarget: Bool {
// default value for bool in userdefaults is false, by default we will hide the target line as it could confuse users

4
xdrip/Managers/Charts/GlucoseChartManager.swift
View File

@ -534,9 +534,9 @@ public final class GlucoseChartManager {
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: data().chartGuideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
// high/low/target guideline layer settings and styles
let urgentHighLowLineLayerSettings = ChartGuideLinesDottedLayerSettings(linesColor: UserDefaults.standard.showColoredObjectives ? ConstantsGlucoseChart.guidelineUrgentHighLowColor : ConstantsGlucoseChart.guidelineUrgentHighLow, linesWidth: UserDefaults.standard.useObjectives ? 1 : 0, dotWidth: 2, dotSpacing: 5)
let urgentHighLowLineLayerSettings = ChartGuideLinesDottedLayerSettings(linesColor: ConstantsGlucoseChart.guidelineUrgentHighLow, linesWidth: UserDefaults.standard.useObjectives ? 1 : 0, dotWidth: 2, dotSpacing: 5)
let highLowLineLayerSettings = ChartGuideLinesDottedLayerSettings(linesColor: UserDefaults.standard.showColoredObjectives ? ConstantsGlucoseChart.guidelineHighLowColor : ConstantsGlucoseChart.guidelineHighLow, linesWidth: UserDefaults.standard.useObjectives ? 1 : 0, dotWidth: 4, dotSpacing: 2)
let highLowLineLayerSettings = ChartGuideLinesDottedLayerSettings(linesColor: ConstantsGlucoseChart.guidelineHighLow, linesWidth: UserDefaults.standard.useObjectives ? 1 : 0, dotWidth: 4, dotSpacing: 2)
let targetLineLayerSettings = ChartGuideLinesDottedLayerSettings(linesColor: ConstantsGlucoseChart.guidelineTargetColor, linesWidth: UserDefaults.standard.useObjectives ? (UserDefaults.standard.showTarget ? 1 : 0) : 0, dotWidth: 4, dotSpacing: 0)

4
xdrip/Texts/TextsSettingsView.swift
View File

@ -78,10 +78,6 @@ class Texts_SettingsView {
return NSLocalizedString("settingsviews_urgentlowValue", tableName: filename, bundle: Bundle.main, value: "Urgent Low Value:", comment: "home screen settings, urgent low value")
}()
static let labelShowColoredObjectives: String = {
return NSLocalizedString("settingsviews_showcoloredobjectives", tableName: filename, bundle: Bundle.main, value: "Show Colored Lines?", comment: "home screen settings, show colored objectives lines")
}()
static let labelShowTarget: String = {
return NSLocalizedString("settingsviews_showtarget", tableName: filename, bundle: Bundle.main, value: "Show Target Line?", comment: "home screen settings, show target line")
}()

31
xdrip/View Controllers/SettingsNavigationController/SettingsViewController/SettingsViewModels/SettingsViewHomeScreenSettingsViewModel.swift
View File

@ -25,14 +25,11 @@ fileprivate enum Setting:Int, CaseIterable {
//use objectives in graph?
case useObjectives = 4
//show colored objective lines?
case showColoredObjectives = 5
//show target line?
case showTarget = 6
case showTarget = 5
//target value
case targetMarkValue = 7
case targetMarkValue = 6
}
@ -47,10 +44,7 @@ struct SettingsViewHomeScreenSettingsViewModel:SettingsViewModelProtocol {
case .useObjectives:
return UISwitch(isOn: UserDefaults.standard.useObjectives, action: {(isOn:Bool) in UserDefaults.standard.useObjectives = isOn})
case .showColoredObjectives:
return UISwitch(isOn: UserDefaults.standard.showColoredObjectives, action: {(isOn:Bool) in UserDefaults.standard.showColoredObjectives = isOn})
case .showTarget :
return UISwitch(isOn: UserDefaults.standard.showTarget, action: {(isOn:Bool) in UserDefaults.standard.showTarget = isOn})
@ -102,15 +96,6 @@ struct SettingsViewHomeScreenSettingsViewModel:SettingsViewModelProtocol {
UserDefaults.standard.useObjectives = true
}
})
case .showColoredObjectives:
return SettingsSelectedRowAction.callFunction(function: {
if UserDefaults.standard.showColoredObjectives {
UserDefaults.standard.showColoredObjectives = false
} else {
UserDefaults.standard.showColoredObjectives = true
}
})
case .showTarget:
return SettingsSelectedRowAction.callFunction(function: {
@ -138,7 +123,7 @@ struct SettingsViewHomeScreenSettingsViewModel:SettingsViewModelProtocol {
} else if UserDefaults.standard.useObjectives && !UserDefaults.standard.showTarget {
return Setting.allCases.count - 1
} else {
return Setting.allCases.count - 3
return Setting.allCases.count - 2
}
}
@ -162,9 +147,6 @@ struct SettingsViewHomeScreenSettingsViewModel:SettingsViewModelProtocol {
case .useObjectives:
return Texts_SettingsView.labelUseObjectives
case .showColoredObjectives:
return Texts_SettingsView.labelShowColoredObjectives
case .showTarget:
return Texts_SettingsView.labelShowTarget
@ -193,9 +175,6 @@ struct SettingsViewHomeScreenSettingsViewModel:SettingsViewModelProtocol {
case .useObjectives:
return UITableViewCell.AccessoryType.disclosureIndicator
case .showColoredObjectives:
return UITableViewCell.AccessoryType.disclosureIndicator
case .showTarget:
return UITableViewCell.AccessoryType.disclosureIndicator
@ -225,7 +204,7 @@ struct SettingsViewHomeScreenSettingsViewModel:SettingsViewModelProtocol {
case .targetMarkValue:
return UserDefaults.standard.targetMarkValueInUserChosenUnit.bgValuetoString(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl)
case .useObjectives, .showColoredObjectives, .showTarget:
case .useObjectives, .showTarget:
return nil
}