Repository navigation
Dashboard: show calories left inside the Today ring - #2
Merged
Merged
Conversation
The Today card showed eaten / target, leaving you to work out what was left. The ring's empty centre now shows the calories left, or how far over once you pass the target. It only reads "over" once that rounds to at least 1, so a fraction of a calorie past the target shows "0 left". Fixes #1
The ring rounded the difference, while "eaten / target" rounds each
value, so they could disagree by 1: 1000.4 of 1894.6 showed
"1000 / 1895" but 894 left. Round each value first, ties to even as
`{:.0}` does, so the ring always matches.
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What and why
The dashboard's Today card showed
eaten / target, so seeing what was left meant doing the subtraction yourself. The empty centre of the ring now shows it at a glance:Eaten and target are each rounded before subtracting, the same way the figures beside the ring are, so the number always matches them, in kcal or kJ. Checked in the web preview at phone width: the label sits in the exact centre of the ring, and a five-digit kJ value (51px) still fits inside it (71px).
Fixes #1
Checklist
cargo fmt,cargo clippy --all-targets -- -D warningsandcargo testpass (plus the wasm32 check)