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.

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

Merge dev into feat/dana #254

Merged
merged 73 commits into from
Jun 1, 2024
Merged

Merge dev into feat/dana #254

merged 73 commits into from
Jun 1, 2024

Conversation

MikePlante1
Copy link
Contributor

No description provided.

avouspierre and others added 30 commits May 14, 2024 17:11
The PR adds a “pump” icon and “add pump” label in the header of the main view.
minor updates about code.
Treatments: Carbs and Temp Targets - and also announcements
To make the Issues clearer to read
a icon is available to dismiss the keyboard.
“Add pump” button when pump has not been configured
LiveActivity.swift: widget URL string "Trio://"
Display the eventual Pump Statut Highlight Message in home view if state is warning or critical.

fix partially issue #207
Change statut to status variable and function
- Imroved structure and UX workflow when configuring Nightscout settings
- Added Connect, Upload, Fetch views with relevant settings per view
- Import settings and backfill glucose buttons kept in rootview since they are more frequently used
- Added footers for many sections to explain what the toggles actually do
- Loacalizaation needed for new textstrings. Just updated that with small changes in already existing strings
- One more click to reach the service, but
- Added chevron in settings list (for consistency)
- Added room for information/explainations of the setting in header/footer in the new view
- First draft to build on (maybe: rephrase header/footer, add connection status in navigation view, other relevant info etc)
Remove duplicate "Remote control" toggle from preferences
- Break up long strings in several text elements (enables re-use of some already existing translations)
- Change button text "Connect" to "Connect to Nightscout" in NightscoutConnectView
Update submodule G7SensorKit: update SHA to LoopKit, no change to code
- Footer text in 2 elements
- spelling error fix
 and Connect to Tidepool from ontapgesture text ->  Action button with blue text for consistency
- Sheet needed to be moved outside Form (Swift curiosity)
Add Tidepool navigation view (fix missing chevron)
dsnallfot and others added 27 commits May 25, 2024 23:36
* Extracted the FPU processing logic into a new helper function `processFPU`, which ensures that each carb equivalent is at least 1.0 grams by adjusting the interval if necessary.
* Added logic in new helper function`processFPU` to adjust the interval when the calculated carb equivalent is less than 1.0 grams.
* Adjusted spread over time by computing duration again so total carb equivalents remain consistent
* Refactored the main `storeCarbs` function to be more concise and easier to understand.
* Introduced detailed docstrings to explain the purpose and functionality of the `storeCarbs`, `processFPU`, and `calculateComputedDuration` functions.
- Fix mgdl->mmol rounding when using experimental slider
- Also rearrange sliders below % text in experimental view (Reusing @dnzxy ols iAPS PR 321)
- Reset all changed values/sliders to 0 if cancelling in edit view
. Additional commit regarding experimental slider in edit view  upcoming soon in part 2
- Experimental slider now available also in editPresetPopover view
- All conversion mgdl/mmol tested and seems to work correct
- You can switch between normal and experimental view freely while contemplating your edit
- Additional features and UI redesigned excluded from scope
- when entering edit mode. This way you can choose "normal" target/duration entries or use the slider to do your edits
When .onDisappear from the editPresetPopover back to root view behave the same way as .onAppear in root view when coming from home screen, that is:
- If ongoing override, populate settings with the ongoing override setting.
- If no ongoing override, populate settings with user defaults
And when entering edit by selecting edit on any override -> populate the settings in edit mode with that selected overrides settings as starting point for the edit

Refactor code based on  input from @avouspierre
- Change Profile Editor Slider Numbering Positioning (reuse @dnzxy old iAPS commit )
Refactor and optimize `storeCarbs` function to limit carb equivalents of FPU conversion to 1.0 grams
Enable editing of preset profile overrides
Enable editing of preset temp targets
Update(issue templates): More readable styling and expansion of questions
Remove unused Import Settings in JSON that cause errors decoding JSON
@bjornoleh
Copy link
Contributor

Merging this clean merge of dev into the Dana feature branch.

@bjornoleh bjornoleh merged commit 7b913a3 into feat/dana Jun 1, 2024
6 of 7 checks passed
@dnzxy dnzxy mentioned this pull request Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants