Skip to content

nate/fix/LOOP-1927/manual-glucose-entry #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nhamming merged 13 commits into from
Sep 22, 2020
Merged

nate/fix/LOOP-1927/manual-glucose-entry #256

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8a38b70
allow manual glucose entry without carb entry
nhamming Sep 16, 2020
0997628
the manual glucose entry displayed in the CGM pill is never overridden
nhamming Sep 16, 2020
f85bf26
Merge branch 'dev' into nate/fix/LOOP-1927/manual-glucose-entry
nhamming Sep 17, 2020
e45842d
manually entered glucose needs interpretation from the CGM manager to…
nhamming Sep 18, 2020
4f3e896
Merge branch 'dev' into nate/fix/LOOP-1927/manual-glucose-entry
nhamming Sep 18, 2020
85ff522
update to glucose icon display if manual glucose entry
nhamming Sep 18, 2020
7efb717
updating the display of a manual glucose entry within the CGM pill
nhamming Sep 21, 2020
188a34a
Merge branch 'dev' into nate/fix/LOOP-1927/manual-glucose-entry
nhamming Sep 22, 2020
fefdcb9
the status bar determines when it should adjust its layout for narrow…
nhamming Sep 22, 2020
2dce93d
updated tests
nhamming Sep 22, 2020
2d5d36a
clean up
nhamming Sep 22, 2020
51b99f0
added hardcoded glucose range categorization when feature is disabled
nhamming Sep 22, 2020
82056ff
DIY categorization glucose range for both manual and CGM values
nhamming Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LoopUI/ViewModel/CGMStatusHUDViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public class CGMStatusHUDViewModel {
}

glucoseValueTintColor = sensor?.glucoseValueType?.glucoseColor ?? .label
glucoseTrendTintColor = sensor?.glucoseValueType?.trendColor ?? .glucoseTintColor
glucoseTrendTintColor = isManualGlucose ? .destructive : sensor?.glucoseValueType?.trendColor ?? .glucoseTintColor
Copy link

@ps2 ps2 Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, when the sensor is in a warmup state, and the user enters a manual glucose value, there is not really any "error" that needs attending to. I guess this is a question for design/product. It seems like communicating the value as a manual entry is important, but painting it in error/warning colors when everything is operating as expected and user attention is not required is not great.

Copy link

@ps2 ps2 Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that when the CGM is failing in some way, we don't want to paint over the failing state with a manual glucose entry that makes everything look ok.

Copy link
Author

@nhamming nhamming Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ps2 yes, I'm working with Matt to determine all the possible states. Currently the known states include a red !, red or glucose colour +, and glucose colour <clock>, but we are still exploring.


self.isManualGlucose = isManualGlucose

Expand Down
6 changes: 4 additions & 2 deletions LoopUI/Views/GlucoseTrendHUDView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ public final class GlucoseTrendHUDView: BaseHUDView {
}

public func setManualGlucoseIcon(_ isManualGlucose: Bool) {
trendIcon.image = UIImage(systemName: "exclamationmark.circle.fill")
trendIcon.tintColor = .destructive
if isManualGlucose {
trendIcon.image = UIImage(systemName: "exclamationmark.circle.fill")
trendIcon.tintColor = .destructive
}
}
}