Skip to content
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

Jump to bottom

LOOP-1485: add temporary correction range instructional screen + editor #13

Merged
merged 38 commits into from
Jul 9, 2020
Merged

LOOP-1485: add temporary correction range instructional screen + editor #13

merged 38 commits into from
Jul 9, 2020

Conversation

novalegra
Copy link
Contributor

This PR adds an instructional screen for temporary correction ranges, in addition to an editor for the setting that is configurable based on whether it's being used modally or as part of the prescription flow

Anna added 30 commits July 1, 2020 07:25
Add delegate
28c0916
Add correction range editor
2c67693
Add educational screen
6515313
Add correction range override editor
5c3ccc4
Call step completion delegate when done
8d823e4
Merge branch 'LOOP-1484-CR' into LOOP-1485-temp-cr
e37d939
Add correction range override info screen
d512942
Save workout range as well
9ba3927
Move flow button into setup service, and add setting delegate
fa1d0bf
Merge branch 'LOOP-1484-CR' into LOOP-1485-temp-cr
0198d99
Fix button jumping bug
e7726cf
Merge branch 'LOOP-1484-CR' into LOOP-1485-temp-cr
94c198f
Clear screen stack if resetting
82933e3
Merge branch 'novalegra/LOOP-1484' into LOOP-1485-temp-cr
e719dff
Use prescription instead of view model to vend settings
a27fd30
Use TherapySettings instead of LoopSettings
41b36a1
Merge remote-tracking branch 'origin/novalegra/LOOP-1484' into LOOP-1…
5508179 
…484-CR
PR feedback
fe28d53
Merge branch 'LOOP-1484-CR' into LOOP-1485-temp-cr
8349362
Update based on PR
f0adf19
More PR feedback
89ab963
Merge branch 'LOOP-1484-CR' into LOOP-1485-temp-cr
eff80e9
PR changes
107f81e
Use secondary color if in dark mode, else blue gray
3d2c379
Merge branch 'LOOP-1484-CR' into LOOP-1485-temp-cr
1f0413a
Make titles appear at correct time
cb9b2d6
Change coloring to .secondary
e85a9a4
Hack to prevent jumping
01a76f9
Merge branch 'LOOP-1484-CR' into LOOP-1485-temp-cr
aa0405e
Add jumping hack
45e3393
@novalegra novalegra marked this pull request as ready for review July 8, 2020 23:35
@novalegra novalegra requested review from ps2 and rickpasetto July 8, 2020 23:35
rickpasetto
rickpasetto approved these changes Jul 9, 2020
View reviewed changes
Copy link
Contributor

@rickpasetto rickpasetto left a comment

Choose a reason for hiding this comment

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

LGTM 🌮 !

@novalegra novalegra merged commit 2e0406a into dev Jul 9, 2020
@novalegra novalegra deleted the novalegra/LOOP-1485 branch July 9, 2020 21:59
ps2 pushed a commit that referenced this pull request Jul 26, 2023
@gestrich
Remote PR Set #3 (#13)
7a8a196 
* Remote handling rearchitecture

* Rename method

* Update names

* Remove Remote 2.0 parts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rickpasetto rickpasetto rickpasetto approved these changes

@ps2 ps2 Awaiting requested review from ps2

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@novalegra @rickpasetto