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

UI work #6

Merged
merged 73 commits into from
Oct 27, 2023
Merged

UI work #6

merged 73 commits into from
Oct 27, 2023

Commits on Sep 28, 2023

  1. Add non-pump insulin; add new colors for SMBs and non-pump

    @dnzxy
    dnzxy committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    4cf0f20 View commit details
    Browse the repository at this point in the history

  2. Changed NS eventType name + description; shortened nonPump descriptipn

    @dnzxy
    dnzxy committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    1ebfca8 View commit details
    Browse the repository at this point in the history

  3. Capitalize 'insulin' for non-pump string; add localization to EN and GER

    @dnzxy
    dnzxy committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    d308026 View commit details
    Browse the repository at this point in the history

  4. Add localization 'Non-Pump'

    @dnzxy
    dnzxy committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    d810422 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of github.com:dnzxy/iAPS into nonpump-insulin

    @dnzxy
    dnzxy committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    4ee1b41 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. determineBolusEventType (#1)

    @bjorkert
    bjorkert committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    d069beb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:dnzxy/iAPS into nonpump-insulin

    @dnzxy
    dnzxy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    20dc8aa View commit details
    Browse the repository at this point in the history

  3. Rework history to sleeker UI w/ 3 tabs, swipe-to-delete, no dots

    @dnzxy
    dnzxy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    0563c99 View commit details
    Browse the repository at this point in the history

  4. Fix typos

    @dnzxy
    dnzxy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    6d29558 View commit details
    Browse the repository at this point in the history

  5. Try at home view with sleeker icons based on SF Symbols

    @dnzxy
    dnzxy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    0016a86 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. Added deletion functionality deletion alerts; long press to combine t… 

    …reatments WIP
    @dnzxy
    dnzxy committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    91443a1 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. Remove longpress stuff from previous fiddling around

    @dnzxy
    dnzxy committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    8a22d6d View commit details
    Browse the repository at this point in the history

  2. Fix typo

    @dnzxy
    dnzxy committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    1cd22ee View commit details
    Browse the repository at this point in the history

  3. Rework manual glucose dialog

    @dnzxy
    dnzxy committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    4ba465d View commit details
    Browse the repository at this point in the history

  4. Add FPU carb equivalent value to delete alert

    @dnzxy
    dnzxy committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    b48ca9e View commit details
    Browse the repository at this point in the history

  5. Fix faulty formatting of glucose value in warning

    @dnzxy
    dnzxy committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    8f48a36 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Add non-pump insulin entry dialog and logic

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    e00c9a4 View commit details
    Browse the repository at this point in the history

  2. Remove non-pump insulin view elements and logic from bolus module

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    db006ad View commit details
    Browse the repository at this point in the history

  3. Make button style uniform

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    547f845 View commit details
    Browse the repository at this point in the history

  4. Update bolus amount warning for better visuals

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    b1dfdd9 View commit details
    Browse the repository at this point in the history

  5. Add conditional 'No data.' message for history contents

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    20ea08f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' of github.com:dnzxy/iAPS into ui-work

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    d6f75ba View commit details
    Browse the repository at this point in the history

  7. Revert home view icon changes

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    b375ee0 View commit details
    Browse the repository at this point in the history

  8. Add wrongly removed 'Continue without bolusing' back in

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    ca72e1e View commit details
    Browse the repository at this point in the history

  9. Resert non-pump insulin amount on save

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    6af6300 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' of github.com:dnzxy/iAPS into ui-work

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    d6a2ee7 View commit details
    Browse the repository at this point in the history

  11. Fix setting non-pump insulin amount and manual glucose value to 0 on … 

    …save
    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    5f721e8 View commit details
    Browse the repository at this point in the history

  12. Shorten overly long navigation view title for carb entry

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    45022d2 View commit details
    Browse the repository at this point in the history

  13. Add filter for future meal entries; add variable types; shorten title

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    6fcd2da View commit details
    Browse the repository at this point in the history

  14. Fix weird text change for filter button

    @dnzxy
    dnzxy committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    5d49213 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Add combined treatments view and related setting; filter broken

    @dnzxy
    dnzxy committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    ce7a69e View commit details
    Browse the repository at this point in the history

  2. Change isCombined state and do not import settingsManager

    @dnzxy
    dnzxy committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    9c63ba7 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Remove filtering from history; colors for SMB and non-pump insulin

    @dnzxy
    dnzxy committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    90563a2 View commit details
    Browse the repository at this point in the history

  2. Add EN localization strings; change edited localization keys

    @dnzxy
    dnzxy committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    a2bbab8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of github.com:dnzxy/iAPS into ui-work

    @dnzxy
    dnzxy committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    6167b63 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. Fix issue where amount in modal was not reset on dismiss

    @dnzxy
    dnzxy committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    9ff112e View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Fix previous fix with isAmountUnconfirmed condition check

    @dnzxy
    dnzxy committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    e510eb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2023

  1. * Changed non-pump insulin and manual glucose button style and position 

    * Change setting placement: add new section and more descriptive text for history setting
    @dnzxy
    dnzxy committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    c7b88ad View commit details
    Browse the repository at this point in the history

  2. Fix faulty button wrapper function argument

    @dnzxy
    dnzxy committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    16cbb2f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of github.com:Artificial-Pancreas/iAPS into ui-work

    @dnzxy
    dnzxy committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    f816ed8 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Merge branch 'dev' into Crowdin

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    46d6f01 View commit details
    Browse the repository at this point in the history

  2. New translations localizable.strings (Dutch)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    3cda9ef View commit details
    Browse the repository at this point in the history

  3. New translations localizable.strings (French)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    fb67032 View commit details
    Browse the repository at this point in the history

  4. New translations localizable.strings (Spanish)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    30a57f8 View commit details
    Browse the repository at this point in the history

  5. New translations localizable.strings (Arabic)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    81121ac View commit details
    Browse the repository at this point in the history

  6. New translations localizable.strings (Danish)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    ccebbce View commit details
    Browse the repository at this point in the history

  7. New translations localizable.strings (German)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    895f2f0 View commit details
    Browse the repository at this point in the history

  8. New translations localizable.strings (Finnish)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    d9440be View commit details
    Browse the repository at this point in the history

  9. New translations localizable.strings (Hebrew)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    2795ce7 View commit details
    Browse the repository at this point in the history

  10. New translations localizable.strings (Italian)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    b7f2bba View commit details
    Browse the repository at this point in the history

  11. New translations localizable.strings (Polish)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    dc57a92 View commit details
    Browse the repository at this point in the history

  12. New translations localizable.strings (Portuguese)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    4074d34 View commit details
    Browse the repository at this point in the history

  13. New translations localizable.strings (Russian)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    bc15348 View commit details
    Browse the repository at this point in the history

  14. New translations localizable.strings (Slovak)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    c5a14ba View commit details
    Browse the repository at this point in the history

  15. New translations localizable.strings (Swedish)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    8ed6e8c View commit details
    Browse the repository at this point in the history

  16. New translations localizable.strings (Turkish)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    eb54579 View commit details
    Browse the repository at this point in the history

  17. New translations localizable.strings (Ukrainian)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    af434e9 View commit details
    Browse the repository at this point in the history

  18. New translations localizable.strings (Chinese Simplified)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    7340e62 View commit details
    Browse the repository at this point in the history

  19. New translations localizable.strings (Portuguese, Brazilian)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    fd7141a View commit details
    Browse the repository at this point in the history

  20. New translations localizable.strings (Norwegian Bokmal)

    @Jon-b-m
    Jon-b-m committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    72231c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2023

  1. New translations localizable.strings (Norwegian Bokmal)

    @Jon-b-m
    Jon-b-m committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    cce037f View commit details
    Browse the repository at this point in the history

  2. Fix merge conflicts brought in by Artificial-Pancreas#261; adapted to… 

    … proposed UI changes
    @dnzxy
    dnzxy committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    2dac90a View commit details
    Browse the repository at this point in the history

  3. New translations localizable.strings (Dutch)

    @Jon-b-m
    Jon-b-m committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    7cd6130 View commit details
    Browse the repository at this point in the history

  4. New translations localizable.strings (Russian)

    @Jon-b-m
    Jon-b-m committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    ce6d7de View commit details
    Browse the repository at this point in the history

  5. New translations localizable.strings (Russian)

    @Jon-b-m
    Jon-b-m committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    d11c091 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Crowdin' into crowdin_generated

    @Jon-b-m
    Jon-b-m committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    6e1d4b9 View commit details
    Browse the repository at this point in the history

  7. Crowdin updates

    @Jon-b-m
    Jon-b-m committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    e49f06c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'Crowdin' into dev

    @Jon-b-m
    Jon-b-m committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    9f48cc9 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2023

  1. Dexcom G7 SAGE 

    Upload activation and session start date to NS.
    @Jon-b-m
    Jon-b-m committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    331ee47 View commit details
    Browse the repository at this point in the history

  2. Force push Profiles and settings when using button

    @Jon-b-m
    Jon-b-m committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    4a39fba View commit details
    Browse the repository at this point in the history

  3. Add "non-pump insulin" as treatment type (Artificial-Pancreas#267) 

    Co-authored-by: Jonas Björkert <bjorkert@me.com>
    @dnzxy @bjorkert
    dnzxy and bjorkert committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    6011575 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of github.com:Artificial-Pancreas/iAPS into ui-work

    @dnzxy
    dnzxy committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    b99e043 View commit details
    Browse the repository at this point in the history

  5. Fix date issues for new entry dialogs: 

    * Reset date to now when opening entry dialog (non-pump insulin and glucose)
* Limit date to past values up to current for glucose entry (do not permit future glucose entries!)
    @dnzxy
    dnzxy committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    fd09966 View commit details
    Browse the repository at this point in the history