Rework glucose dialog #272

dnzxy · 2023-10-22T19:56:33Z

Refactor manual glucose entry from popup to sheet-based dialog
Adds delete dialog to glucose entries, i.e., streamlining it to how treatments are deleted
Small refactoring for DateTableStateModel: pass glucose object instead of index on deletion
Change "Add" button to proper button with text and icon above list

This dialog uses the same design/style and UX as the proposed non-pump insulin dialog of PR #271. It uses a sheet-based layout and adds a button above the list below the Picker element.

Side note: A big improvement over popovers is that iOS users are used to these sheet views from a navigation perspective and that they bring a better UX than popovers imho, e.g. a user can swipe-away-to-close these sheets.

This feature was inititally proposed through PR #236. Please see that PR for user feedback (about a dozen people have tested this) and test feedback. Many users requests a button with text and icon, so I added it back (it was removed from 236).

New Glucose Dialog

* Refactor manual glucose entry from popup to sheet-based dialog * Adds delete dialog to glucose entries, i.e., streamlining it to how treatments are deleted * Small refactoring for DateTableStateModel: pass glucose object instead of index on deletion * Change "Add" button to proper button with text and icon above list

Jon-b-m · 2023-10-25T21:16:53Z

I have 2 comments.

I suggest having the button on first row, instead of adding a new element to this Form. This enables us to also add a similar row to the list with treatments, as has been suggested elsewhere with a show future entries button.

.
Above is just a quick minute draft, but it looks OK in both light and dark mode.

The delete glucose doesn't need an alert. The Apple UX with dragging a red row the entire way to the left is enough as is.
I don't like the refactoring of delete glucose, as you're now using more code to perform same function. More clean and stringent and Apple-ish before.

dnzxy · 2023-10-26T08:03:07Z

Good morning @Jon-b-m , thanks for the feedback.

I suggest having the button on first row, instead of adding a new element to this Form. This enables us to also add a similar row to the list with treatments, as has been suggested elsewhere with a show future entries button.

I like this and will add this.

The delete glucose doesn't need an alert. The Apple UX with dragging a red row the entire way to the left is enough as is.

This is inconsistent behaviour throughout the different delete actions in history. Given that swiping (without authentication for glucose) can also be done by accident, I think we should do it here as well. It's just consistent, that iAPS asks for some kind of user confirmation before the user can delete any entry from the app's history, isn't it?

I don't like the refactoring of delete glucose, as you're now using more code to perform same function. More clean and stringent and Apple-ish before.

I don't really understand this comment. If we are using swipe-to-delete, we need a function to handle this. This function has been there before, it's deleteGlucose in DataTableRootView. Now, the added code in that function is only for the alert that pops up. This alert makes the operation of deleting a history entry (here, for glucose) consistent with deleting any other entry from history (i.e. treatment or carbs or FPUs).

Jon-b-m · 2023-10-26T12:05:17Z

Regarding the delete we already have swipe to delete. It's really clear as is. I pushed my suggestion to dev to make it easier for you. In fact probably better for you to close this particular PR, to avoid double work as it's already implemented in dev. The pop-up for glucose I can remove myself.

dnzxy · 2023-10-26T12:41:52Z

Regarding the delete we already have swipe to delete. It's really clear as is. I pushed my suggestion to dev to make it easier for you. In fact probably better for you to close this particular PR, to avoid double work as it's already implemented in dev. The pop-up for glucose I can remove myself.

Okay, I can pull in dev and fix this quickly so you don’t have to do it. Whichever you prefer.

* Pull in latest dev * Remove glucose deletion alert * Change button styling and layout: button now situated in header row of list * Add header row label "time" for the left "column" of the displayed text in list

dnzxy · 2023-10-26T17:37:32Z

@Jon-b-m the discussed changes are implemented now. Please see latest commit 48a4862 🚀

Reworked glucose list

Dark mode	Light mode

…s#272

Jon-b-m · 2023-10-26T22:53:16Z

The updated glucose design is already in dev. Please updated your PR and add just the new glucose form.

dnzxy · 2023-10-27T05:09:44Z

If you take a look at my commit, I pulled in latest dev already but changed the colors and the icon to be consistent with PR #271 and added back the unit to specifc rows.

Many users had suggested they need button texts with any (+) button, so it stays „Glucose (+)“ here and the units are back with the glucose values.

It’s current dev, just updated 😊😊

Jon-b-m · 2023-10-27T11:29:31Z

Please don't make changes to newly committed dev commits in this PR, as this makes it hard for me to merge.

It makes no sense to have a button coloured grey (you don't see this anywhere in iAPS or in any other app).
It makes no sense to show unit for every row (you normally never see this in a proper data table). Here's an example for from Apple (very similar to my example):

Conclusion: please keep the dev changes!

dnzxy · 2023-10-27T11:42:18Z

Thanks for hinting me at the button color, that was my mistake. I thought I had changed that, oversight on my part.

It makes sense to show it, as we need a text-label for a button. Users have demanded that.
For comparison, this is xDrip4iOS, it shows unit labels per row. In my personal opinion, this makes sense.

…ed `Color.gray` color

Jon-b-m · 2023-10-27T11:47:22Z

xdrip would look cleaner with a unit header instead, but this is not xdrip.

dnzxy · 2023-10-27T11:56:49Z

Okay. I reverted it with one last change I hope you can accept: I made it so, that the unit text is also part of the button, so the finger of the user has a larger surface area to tap in order to open the dialog. Looks like this:

Dark mode	Light mode

Is it okay like so? This essentially adds:

New dialog for glucose entry
Button extended to include text with ⊕ icon

Jon-b-m · 2023-10-27T12:01:30Z

Again it's already in dev 🙂. you don't need to change this dev UI. Also why are you displaying unit in blue? Used dev as base fro your PR, please. Just remove the pop-up in this PR.

dnzxy · 2023-10-27T12:06:07Z

My push did not go through, my bad, sorry Jon.

Again it's already in dev 🙂. you don't need to change this dev UI. Also why are you displaying unit in blue? Used dev as base fro your PR, please. Just remove the pop-up in this PR.

Dev is the base for this PR. I don't really understand the issue, sorry. I've pulled it in various times now.

This PR builds upon dev, as all PR we push to dev do. It slightly changes a few things:

The popup is removed
The new entry dialog is added
The unit is now blue, because it is IN the button so that clickable surface area for the button is bigger than just a tiny ⊕ symbol. For the users like me with clumsy fingers.
The deletion is just changed slightly to make use of the item glucose instead of the offset index, because that will be needed once I start working on the 3 tab layout thing. If it really bothers you that this is in here, I can remove it now and add it back later; it will be needed for the other stuff.

Jon-b-m · 2023-10-27T12:17:44Z

Sorry, but I would like for you to JUST remove the poop-up in this PR. Don't change anything else, please. Because then I can merge it instantly.

Jon-b-m · 2023-10-27T12:40:55Z

Almost there! But you sneaked in a few other changes not needed:

Delete the @published var manualGlucoseDate = Date() you added. Not needed.
Remove the debug about Health. It's in the wrong place. Doesn't belong here.
The // Reset amount to 0 for next entry. manualGlucose = 0 is also not needed. here. It's looks heavy-handed

Jon-b-m · 2023-10-27T13:00:43Z

More comments;

Remove the
.disabled(state.manualGlucose < limitLow || state.manualGlucose > limitHigh)

And instead add a
.disabled(state.manualGlucose <= 0)

* Add back in reasonable glucose limits: 1.6/40 mmol / 15/720 mg/dl * Clean up input sanitation to still clear dialog but in a nicer way

* Add sheet (new View) for adding manual glucose * Use glucose meter limits for manual glucose (0.8 - 40 mmol/l)

@dnzxy

* Sync translated strings * Clarify label (cherry picked from commit 344f359a91a677c522a7116068029a9f401f1422) * Calender Events * Get IOB and COB for Calender events from CoreData. * If loop older than 15 minutes display a 🚫 * Respectg Max Bolus setting when adding insulin. Diable buttons when over Max Bolus. Use Max Bolus also for adding insulin wihout bolusing (cherry picked from commit cbeb5a08db0061a0518a9a3c6037300e0aa346d6) * 😵 (cherry picked from commit 91d4fc79e70985e608287493b28336b97b44a49d) * Update APSManager.swift Spelling: succeded -> succeeded * Update Bolus Alerts. Allow 3 X Max Bolus for non-pump insulin, but add alert when over Max Bolus. Localize (tested in Swedish) * Crowdin updates (Artificial-Pancreas#224) * Minutes ago fix for G7 sensors. (cherry picked from commit 0605328a02dd4598770fadafff4f566b6b8f5174) * Dutch (Artificial-Pancreas#230) * Change permissions required for calendar in iOS 17+ (Artificial-Pancreas#234) * Change permissions required for calendar in iOS 17+ * Fix compile issue in Xcode 14 (Artificial-Pancreas#235) * Improve the update of the date of Glucose View Header. * Import Profile Settings from Nightcsout (Artificial-Pancreas#238) Import Basal settings, carb ratios, sensitivities and glucose targets from Nightscout manually when tapping "Import Settings from Nightcsout"in the iAPS Nightscout settings. co-author @dnzxy * Clean * Face-ID for import (cherry picked from commit c31995dd5635b106b56adffae359125bd4fb5624) * Revert "Face-ID for import" This reverts commit ff36ad3. * Import DIA from NS. (cherry picked from commit a6d9fa4dbd7e678fcea1b9bf2a542d56f914206b) * Oops. Bad typo! * Save Autotuned basal rates as normal basal rates and to pump. * Button in Autotune settings. Hidden at the very bottom. * Hard limit of 55 for insulinPeakTime to avoid endless logs and errors in oref0 * adjust min/max insulinPeakTime depending on type of insulin. * Save imported settings also to pump (basals). (cherry picked from commit 7fc8aa56d0b31374ef6b1671ee7353fbbc784b0c) * Update error message etc. * Import errors (cherry picked from commit 207f6e7508a789f6c51799ad7809ecf7ddf6a3ba) * Localize Autotune settings * Upload preferences and settings. * Upload preferences when changed or when tapping button. * Upload the iAPS specific settings when changed or when tapping button (FreeAPSSettings). * Fix to only upload the profiles, settings and preferences when actually changed and not every time you exit settings. * Clean * New Crowdin updates (Artificial-Pancreas#246) * Make button prominent (cherry picked from commit ceb34e4b1561e12610aa3200d2bca90d483f3d24) * New strings * Validate also CR and ISF on import. Don't allow 0 or lower vallues (cherry picked from commit aecd32067559c21a0f34cb63e221b9c4e0afde99) * Don't allow DIA of 0 or lower * More logging * Allow DASH pumps to have 0U/h basal entries upon import, but total basal insulin (24h) still needs to be over 0U. Don't allow other pumps to have 0U/h entries upon import. * Fix healthkit issue for Insulin treatment Fix the healthKit sync when stopped before the end Artificial-Pancreas#231 Fix the 0U basal in healthKit Artificial-Pancreas#149 * Add carbs shortcuts Add shortcuts to add carbs with a specific date and fat/protein information. * Update Crowdin configuration file * New missing strings G7 * Merge pull request Artificial-Pancreas#252 from Artificial-Pancreas/crowdin_generated New Crowdin updates * ISSUE-257 | Fix typo in 'Last loop was more than' message * Allow looping when HIGH (Artificial-Pancreas#259) **Allow looping when HIGH** * Allow lflat glucose when CGM readings are HIGH (but disable SM and high temps) for IOB computations etc. * Display HIGH when CGM reading is HIGH. * Display real glucose when entering capillary glucose. * Allow (capillary readings over HIGH for normal looping. * Display in Enacted pop-up. * Display warning in same pop-up * Disable SMB and high temps in oref2 code when reading is HIGH (potential invalid CGM reading). * Manual glucose updates (Artificial-Pancreas#261) * Display manual glucose entries in iAPS similar to Nightscout and xDrip. * Upload to NIghtscout when created. * Delete from Nightcsout when deleted in iAPS. * Change colour of FPUs to work with the Nightscout format of manual glucose entries. * Remove amounts of carb equivalents in Chart to make view less busy. This is a temporary fix until removed entirely when we have Fat and Protein models instead. * Make pop-up for new glucose cleaner and more prominent. Using both layers and shadow. This is a work in progress and in the future the oref0 info alerts will be replaced with same pop-ups, with images and charts etc. * Make glucose data table cleaner. Remove IDs and add when manual instead. * Fix rounding issue with manaul glucose entries. * Add missing localization for G7 Manager * Save Manual Glucose entries to Health (cherry picked from commit e02f4bc3d84c00c5b3674b6b901e93ab1cae62d4) * Add string (cherry picked from commit a261b6a0f6f4a6fe4c403e21255f7c42a555dced) * New translations localizable.strings (Dutch) * New translations localizable.strings (French) * New translations localizable.strings (Spanish) * New translations localizable.strings (Arabic) * New translations localizable.strings (Danish) * New translations localizable.strings (German) * New translations localizable.strings (Finnish) * New translations localizable.strings (Hebrew) * New translations localizable.strings (Italian) * New translations localizable.strings (Polish) * New translations localizable.strings (Portuguese) * New translations localizable.strings (Russian) * New translations localizable.strings (Slovak) * New translations localizable.strings (Swedish) * New translations localizable.strings (Turkish) * New translations localizable.strings (Ukrainian) * New translations localizable.strings (Chinese Simplified) * New translations localizable.strings (Portuguese, Brazilian) * New translations localizable.strings (Norwegian Bokmal) * Manual Glucose. Use rounded corners (after feedback) * New translations localizable.strings (Norwegian Bokmal) * New translations localizable.strings (Dutch) * New translations localizable.strings (Russian) * New translations localizable.strings (Russian) * Dexcom G7 SAGE Upload activation and session start date to NS. * Force push Profiles and settings when using button * Add "non-pump insulin" as treatment type (Artificial-Pancreas#267) Co-authored-by: Jonas Björkert <bjorkert@me.com> * Decrease opacity for temp basals in darkmode (Artificial-Pancreas#268) * Add non-pump insulin dialog * New entry dialog to add non-pump insulin in history view * Removes `Add bolus without actually bolusing` functionality from the bolus entry dialog * New dialog adds ability to back-date insulin entries * Backdating is limited to past dates up to current date * Danish Crowdin updates (Artificial-Pancreas#270) * Upload when exiting settings, not just when using "Close button" Fix for issue Artificial-Pancreas#260 * Ony upload profiles when changed, fix. (cherry picked from commit dbb832b) * Fix run script for branch name and commit ID to work with Xcode 15 (Artificial-Pancreas#274) * BuildBranch fix for Xcode 15 - remove BuildBranch from Info.plist - new Run script: get branch name and commit ID, replaces previous run script - output to branch.txt - use seven characters for the short commit reference, in line with GitHub - run script early in build phases - add branch.txt to FreeAPS project under FreeAPS/Resources - add branch.txt to .gitignore - read branch information from branch.txt also for upload of statistics in APSManager.swift * Display build number like TestFlight (build number in brackets) Previous style: iAPS v2.2.5 - 12 Changed to: iAPS 2.2.5 (12) * Display Remote commands (Artificial-Pancreas#279) Display remote commands from Nightscout in MainChart. Bolus, Temp basal, Open loop, Closed loop, Pump suspend, Pump resume. * Layout fix for remotes. * Layout of glucose data table Make first row cleaner * Add changes after PR revision * Change button style and add a header row to list * Add conditional filtering for future entries * Add filter button that changes text * Make button size for header row consistent with PR Artificial-Pancreas#272 * Streamline navigation views (Artificial-Pancreas#269) * Streamline home view navigation views: * Add title to carb entry view, as it was missing * Streamlines all buttons (centered alignment, same size) for all coming-from-home-view dialogs/views * Some changes after PR discussion * Change navigation title style from `.automatic` to `.inline` for all views accessible from home screen * Save screen space by moving (i) icon in bolus entry next to `Insulin recommended` * Change color styling for (i) icon in bolus entry * Revert info icon in bolus entry view back to speech bubble style" * Use sheet instead of pop-up for manual glucose (Artificial-Pancreas#272) * Add sheet (new View) for adding manual glucose * Use glucose meter limits for manual glucose (0.8 - 40 mmol/l) * Prevent Nightscout collisions from occurring when a transmitter ID is recycled (Artificial-Pancreas#285) * Update DexcomSourceG5.swift Generate unique _id value to prevent Mongo collisions in Nightscout * Update DexcomSourceG6.swift Generate unique _id value to prevent Mongo collisions in Nightscout * Symbols mixed up. * Style changes for treatments header row buttons by Jon * Typo which prevented change of imported DIA setting * Remove openaps setting insulin curve, becuse this now is a duplicate setting found also in pumpManagerUI settings * Added other SF Symbols, changed text to "Add". * Fix future entries condition * Invert default to false (Jon initially said this to be default) * Add comment to describe default * Fix condition for treatment list data population * Revert back to initial calendar SF Symbols * Refactor Healthkit manager for Insulin Refactor the code to sync with HK to be less battery drain. Limit to 100 last data. * fix Blood glucose ID with Nightscout Fix Artificial-Pancreas#280 with checking the compliance of ID as uuid. Not perfect (lost data in NS) but avoid the 500 error. Fix for G7 sensor. * Fixes for deletion and localization * Removed unnecessary NSLocalizedString wrappers * Remove obsolete `.alert()` that was blocking FPU and carb deletion alert * Always display warning when over maxBolus * update version * UI. Clean up and chnge order of items * revert background * Implement alternative Bolus calculator (Artificial-Pancreas#286) *New alternative bolus calc and toggle function in bolus calculator settings to switch between bolus calculators * add options for fatty meals in bolus calc config settings and apply a custom override factor * fix problem with DecimalTextFields which throw error UIViewAlertForUnsatisfiableConstraints * Fix settings for new alternative bolus calc * Use 1 maximumFractionDigit when mmol/l * Refactor Bolus Calc. More to come. * Update bolus recommedation (run a loop) every time opened, to update carbs, COB etc. * Get carbRatio from Suggestion, like the other variables. Skip the loop, which sometimes didnt retrieve the CR (donät know why yet). * Change labels (Artificial-Pancreas#289) * All occurances of "Non-Pump" or "nonPump" in texts and code changed to "External" * Removed label "Automatic" for SMBs in history * Use fresh suggestion for both bolus calculators. Fresh as in updated every relevant oref variable, like COB, IOB etc. * Bug fix for saved profiles regarding SMB and UAM basal minutes * Small fixes for new bolus calc (Artificial-Pancreas#290) * update enact bolus button description when amount exceeds maxBolus and fix insulin unit description * reimplement continue without bolus button, delete unnecessary code in BolusStateModel * refactor code and let add insulin button be disabled if maxBolus is exceeded * remove unused variable * Don't run the algo twice in a row Reduce the delay * Edit Meal entries from Boluse View (go back and forth). Not working with the waiter's notepad yet, but can be fixed later, as it's not that important in this reagard. (cherry picked from commit 3f5c93370ac27c5065bad5e14c64e2f2b5ee0318) * Refactor. Use CoreData. Clean up (needs nore) * Only use the CoreData data when needed * Change labels (Artificial-Pancreas#289) * All occurances of "Non-Pump" or "nonPump" in texts and code changed to "External" * Removed label "Automatic" for SMBs in history * Bug fix for saved profiles regarding SMB and UAM basal minutes * fix typo in addGlucoseView in DataTableRootView which leads to save button always beeing disabled (Artificial-Pancreas#295) * Fix deletion of fpus in NS. Still exessive, though. * Fix update of calc * Fix update and add config of UI * Config overlay colour * Alternate Bolus Calculator and Edit of Meals * Implement new Bolus Calculator, by @polscm32, in Swift. * Refactor the new calculator above and the UI/UX of the new Bolus View * Add Feature: Edit the Meals from the Bolus View . Go from the Carbs View <--> Bolus View . * Make button more descriptive * Make button more descriptive * Update Label * Update Label * A hack t0 make it appear as not saved until you enact or tap "Save" * A hack to make it appear as not saved until you enact or tap "Save" * Round to nearest increment * Fix for deletion of previous entered carbs when entering addcarbs view through add meal button in bolus view (Artificial-Pancreas#297) * Fix for deletion of previous entered carbs when entering addcarbs view through add meal button in bolus view (Artificial-Pancreas#297) (cherry picked from commit b0a7bf4) * Simpler UI. New bolus calc. * Simpler UI. New bolus calc. * Add Edit Meals also for the default Bolus View * Add Edit Meals also for the default Bolus View * Add Edit Meals also for the default Bolus View * Structure the pop-up * Structure the pop-up * Streamline the default calc * Streamline the default calc * Update version * New Localized Strings for the Bolus Views * New localized String * Only display "Continue without bolus" when insulin amount <= 0 * Act according to the "Skip bolus after carbs" setting * Don't use glucoseStorage * Fix Nightscout uploads being held back for FSL users (Artificial-Pancreas#300) * Fix for bug after commit f039dc3. Carbs not uploaded to Apple Health … …due to wrong id in func (Artificial-Pancreas#301) * Fix for deletion of previous entered carbs when entering addcarbs view through add meal button in bolus view * Fix for bug after commit f039dc3. Carbs not uploaded to Apple Health due to wrong id in func * Crowdin translations * Reduce clutter. Make more roome in Carbs View (needs more work). Button removed. Move some of settings to UI/UX Section. * Revert label (since already transleted) * Structure settings a bit * Mover more settings... * Move dynamic ISF settings out from "OpenAPS" to "Extra Features" section * Crowdin updates (Artificial-Pancreas#302) Swedish and Dutch * Crowdin updates (Artificial-Pancreas#302) (Artificial-Pancreas#303) Swedish and Dutch * Title * Display "Comtine without boluse" as intended * Add Back button * Missing * Crowdin updates (Artificial-Pancreas#304) German and Italian * Nother back button commit * Make sure to later always fetch latest entry * New meal view (Artificial-Pancreas#308) Working draft. * New wording * Chart for predictions * New Meal view and bolus views (Artificial-Pancreas#310) * Chart for predictions Bolus view * A bit cleaner Carbs View with better presets summary * Back button and view meal entries in Bolus views * Add Predictions to both bolus views. Prevent force unwrapping of nil values. * Save the standing or lying Chart setting. * Save the standing or lying Chart setting. * Add Eventual Glucose * Use same buttons in both bolus views * Display Eventual Gluose better Wait for new suggestion * Revert axis change * Config * New strings * Update version * Typo * Typo * Crowdin updates (Artificial-Pancreas#307) * Localizations * Update Bolus View and Meal View Meal View * Make presets UX/UI a bit cleaner (still far from perfect now) * Make a summary for all presets and other entries used * Make the important buttons blue and white (similar to Loop). * Prevent inadvertently changing the date of entry. Now you need to tap twice to change. Also allow for + - of 10 minute increments (also similar to Loop) with small button. Bolus View * Display all of the glucose predictions in bolus view * Display the future Eventual Glucose (end time depends on your DIA) * Whilst waiting for the recommendation (including predictions) allow a manual bolus entry. * Make the "Enact bolus" button blue, like in Loop. * Allow to add end edit a meal also when you have Skip Bolus setting on. Bolus->Carbs->Bolus sequence is now allowed. * Crowdin updates (Artificial-Pancreas#311) * Fix types * Crowdin Italian translations (Artificial-Pancreas#313) * Change slider numbering position and add spacing Artificial-Pancreas#291 (Artificial-Pancreas#316) * Update build_iAPS.yml (Artificial-Pancreas#318) Trying latest Xcode version * New translations localizable.string (Swedish) (Artificial-Pancreas#315) * New strings * Change temp target slider number position consistent with Artificial-Pancreas#291 (Artificial-Pancreas#321) * Bolus from watch (Artificial-Pancreas#326) Use same calculator on Watch as on iPhone app. * New string * Begin work for profile presets for watch app: * Add new option under Settings > Devices > Watch to select between Temp Targets and Profiles * Add new view PresetProfile for watch * Add new conditional logic for the watch home view middle button, depending on selected setting * Add some preliminary logic; untested and work in progress! * Change default watch setting to preset; add preview * Refactored presets view; added logic to en-/disable --------- Co-authored-by: Jon B Mårtensson <53905247+Jon-b-m@users.noreply.github.com> Co-authored-by: Jon Mårtensson <jon.m@live.se> Co-authored-by: Liroy van Hoewijk <4643445+LiroyvH@users.noreply.github.com> Co-authored-by: Andreas Stokholm <andreas@stokholm.me> Co-authored-by: Pierre L <pn.lagarde@gmail.com> Co-authored-by: Eugene Bashmakov <eugene.bashmakov@gmail.com> Co-authored-by: Deniz Cengiz <48965855+dnzxy@users.noreply.github.com> Co-authored-by: Jonas Björkert <bjorkert@me.com> Co-authored-by: dnzxy <d.c.cengiz@googlemail.com> Co-authored-by: bjornoleh <63544115+bjornoleh@users.noreply.github.com> Co-authored-by: polscm32 <107251660+polscm32@users.noreply.github.com> Co-authored-by: dsnallfot <72826201+dsnallfot@users.noreply.github.com> Co-authored-by: sethgagnon <597958+sethgagnon@users.noreply.github.com>

This ports Artificial-Pancreas/iAPS#272 into Open-iAPS. This is part of #47 Co-Authored-By: Deniz Cengiz <48965855+dnzxy@users.noreply.github.com>

dnzxy mentioned this pull request Oct 22, 2023

UI/UX improvements: Reworked History and Manual Glucose Dialog, added Non-Pump Insulin Entry, Various other Additions #236

Closed

dnzxy mentioned this pull request Oct 26, 2023

Add non-pump insulin dialog #271

Merged

Add changes after PR revisions

48a4862

* Pull in latest dev * Remove glucose deletion alert * Change button styling and layout: button now situated in header row of list * Add header row label "time" for the left "column" of the displayed text in list

dnzxy added a commit to dnzxy/iAPS that referenced this pull request Oct 26, 2023

Make button size for header row consistent with PR Artificial-Pancrea…

6da2995

…s#272

dnzxy mentioned this pull request Oct 27, 2023

Rework history layout and delete alerts #273

Merged

dnzxy and others added 2 commits October 27, 2023 13:43

Fix button color to use Color.accentColor instead of wrongly commit…

b09080f

…ed `Color.gray` color

Merge branch 'dev' into rework-glucose-dialog

0d2bb0e

Remove unit from list; add unit as button text

f3573bc

Revert all additions other than removing popup and adding entry dialog

e3f18cb

dnzxy added 2 commits October 27, 2023 14:48

Remove lines from Jons comment

222c363

Remove unnecessary empty line

468662a

dnzxy added 2 commits October 27, 2023 15:02

Remove hardcoded limits and only validate negative numbers

f459559

Some changes

fbd7587

* Add back in reasonable glucose limits: 1.6/40 mmol / 15/720 mg/dl * Clean up input sanitation to still clear dialog but in a nicer way

dnzxy added 2 commits October 27, 2023 15:43

Fix typo for glucose limit unit

547217d

Change limits to 0.8/40 <-> 14/720 mg/dl

12b9016

Jon-b-m merged commit d5144f2 into Artificial-Pancreas:dev Oct 27, 2023

dnzxy deleted the rework-glucose-dialog branch October 27, 2023 15:42

mountrcg pushed a commit to mountrcg/iAPS that referenced this pull request Oct 27, 2023

Use sheet instead of pop-up for manual glucose (Artificial-Pancreas#272)

d2dad5c

* Add sheet (new View) for adding manual glucose * Use glucose meter limits for manual glucose (0.8 - 40 mmol/l)

bjornoleh mentioned this pull request Apr 4, 2024

Log external insulin retrospectively nightscout/Trio#47

Closed

BrianWieder added a commit to nightscout/Trio that referenced this pull request May 1, 2024

Rework glucose dialog

2fe7d9e

This ports Artificial-Pancreas/iAPS#272 into Open-iAPS. This is part of #47 Co-Authored-By: Deniz Cengiz <48965855+dnzxy@users.noreply.github.com>

This was referenced May 1, 2024

Rework glucose dialog nightscout/Trio#139

Closed

Rework History Sheet nightscout/Trio#140

Merged

BrianWieder added a commit to nightscout/Trio that referenced this pull request May 3, 2024

Rework glucose dialog

a52f2d6

This ports Artificial-Pancreas/iAPS#272 into Open-iAPS. This is part of #47 Co-Authored-By: Deniz Cengiz <48965855+dnzxy@users.noreply.github.com>

BrianWieder added a commit to nightscout/Trio that referenced this pull request May 6, 2024

Rework glucose dialog

dddcd87

This ports Artificial-Pancreas/iAPS#272 into Open-iAPS. This is part of #47 Co-Authored-By: Deniz Cengiz <48965855+dnzxy@users.noreply.github.com>

BrianWieder added a commit to nightscout/Trio that referenced this pull request May 10, 2024

Rework glucose dialog

8daf101

This ports Artificial-Pancreas/iAPS#272 into Open-iAPS. This is part of #47 Co-Authored-By: Deniz Cengiz <48965855+dnzxy@users.noreply.github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rework glucose dialog #272

Rework glucose dialog #272

dnzxy commented Oct 22, 2023 •

edited

Loading

Jon-b-m commented Oct 25, 2023 •

edited

Loading

dnzxy commented Oct 26, 2023 •

edited

Loading

Jon-b-m commented Oct 26, 2023

dnzxy commented Oct 26, 2023

dnzxy commented Oct 26, 2023

Jon-b-m commented Oct 26, 2023

dnzxy commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023 •

edited

Loading

dnzxy commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023

dnzxy commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023

dnzxy commented Oct 27, 2023 •

edited

Loading

Jon-b-m commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023 •

edited

Loading

Rework glucose dialog #272

Rework glucose dialog #272

Conversation

dnzxy commented Oct 22, 2023 • edited Loading

Jon-b-m commented Oct 25, 2023 • edited Loading

dnzxy commented Oct 26, 2023 • edited Loading

Jon-b-m commented Oct 26, 2023

dnzxy commented Oct 26, 2023

dnzxy commented Oct 26, 2023

Reworked glucose list

Jon-b-m commented Oct 26, 2023

dnzxy commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023 • edited Loading

dnzxy commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023

dnzxy commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023

dnzxy commented Oct 27, 2023 • edited Loading

My push did not go through, my bad, sorry Jon.

Jon-b-m commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023

Jon-b-m commented Oct 27, 2023 • edited Loading

dnzxy commented Oct 22, 2023 •

edited

Loading

Jon-b-m commented Oct 25, 2023 •

edited

Loading

dnzxy commented Oct 26, 2023 •

edited

Loading

Jon-b-m commented Oct 27, 2023 •

edited

Loading

dnzxy commented Oct 27, 2023 •

edited

Loading

Jon-b-m commented Oct 27, 2023 •

edited

Loading