 polscm32
|
a9142c5d4a
pull in latest dev and solve merge conflicts
|
%!s(int64=2) %!d(string=hai) anos |
 Deniz Cengiz
|
2e16d7d724
Add Timezone Offset Indicator (#323)
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
9a53c86c15
Merge branch 'test' into superBolus
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
e8f3ce196c
solve merge conflicts
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
0307258e84
add changing of state.screenHours based on picker choose
|
%!s(int64=2) %!d(string=hai) anos |
 Jon Mårtensson
|
7c19bd9c26
Display Eventual BG
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
2158d52e9b
Setting for displaying/not displaying predictions
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
a44d2814b9
Merge remote-tracking branch 'upstream/dev' into superBolus_test
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
70ceb0dd72
Add SF-symbol for Back
|
%!s(int64=2) %!d(string=hai) anos |
 Jon B Mårtensson
|
d6f817543e
Update Bolus View and Meal View
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
6b2c920da6
Merge remote-tracking branch 'upstream/alpha' into superBolus_experimentell
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
a96d220026
Add Eventual Glucose
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
ec02ba749d
Add Predictions to both bolus views.
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
25686ca373
Chart for predictions
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
7e2d861de1
Merge remote-tracking branch 'upstream/dev' into superBolus
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
fd5e02d7f5
Nother back button commit
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
e4fa50b5ae
Merge remote-tracking branch 'upstream/dev' into superBolus
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
420e83c3f7
Missing
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
1c01051ca0
Add Back button
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
36bda22ad1
get sure that either fatty meal toggle or super bolus can be enabled, but not both at the same time
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
0c25f711cc
small layout fixed for popup when super bolus is enabled
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
5018e215da
fix calc for super bolus and add info in popup when super bolus is ticked/chosen
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
10d85396dc
add calculation for superbolus in BolusStateModel and toggle in AlternativeBolusCalcRootView
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
9904fbb6cd
Don't use glucoseStorage
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
d424817348
Only display "Continue without bolus" when insulin amount <= 0
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
79f8d69919
Structure the pop-up
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
1f9312b14d
Add Edit Meals also for the default Bolus View
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
8d0fc7d050
Simpler UI. New bolus calc.
|
%!s(int64=2) %!d(string=hai) anos |
 dsnallfot
|
b0a7bf42e7
Fix for deletion of previous entered carbs when entering addcarbs view through add meal button in bolus view (#297)
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
8a1fae698a
A hack to make it appear as not saved until you enact or tap "Save"
|
%!s(int64=2) %!d(string=hai) anos |
