Commit graph

1507 commits

Author SHA1 Message Date
Milos Kozak e374cdfa98 Merge branch 'dev' into newdb 2021-02-11 12:01:12 +01:00
Milos Kozak 6e4effae55
Merge pull request #276 from Philoul/Graph_Scale
Secondary graphs : replace Activity by -BGI and align curves scales if same units
2021-02-11 11:48:01 +01:00
Milos Kozak 7b4a30865a UserEntry logging 2021-02-09 17:57:28 +01:00
Philoul 4f52358516 Change color for BGI curve
I choose light blue because calculated from insulin but it could be anything else...
2021-02-06 14:51:38 +01:00
Milos Kozak e16d661183 OverviewFragment -> jetpack 2021-02-04 12:03:34 +01:00
Milos Kozak ee6cd22d24 MedtronicFragment -> jetpack 2021-02-03 23:02:14 +01:00
Milos Kozak 99185f3d1f EditQuickWizardDialog -> jetpack 2021-02-01 20:36:58 +01:00
Milos Kozak acf3b23bf7 cleanup 2021-02-01 15:24:48 +01:00
Philoul 71af958fca Replace Activity by -BGI in secondary graphs
Align scales (IOB / Absolute) and (deviation / -BGI) if selected in the same graph
2021-01-30 21:27:22 +01:00
parapenT1sta cd0f4d3b74
Update exam.xml 2021-01-30 12:30:43 +00:00
parapenT1sta 1befbb278e
Update exam.xml 2021-01-30 11:55:34 +00:00
parapenT1sta 59995419d4
fix double space 2021-01-30 11:54:24 +00:00
Milos Kozak aeec33eb9e FoodFragment -> jetpack 2021-01-25 11:35:36 +01:00
Milos Kozak 21095233dc HistoryBrowseActivity -> jetpack 2021-01-24 14:44:11 +01:00
Milos Kozak bcc573202c CarbsDialog -> jetpack 2021-01-21 17:03:05 +01:00
Milos Kozak 157642649e ProfileSwitchDialog -> jetpack 2021-01-21 16:38:42 +01:00
Andy Rozman a7daa83955 - little fix displaying values for special Bolus/Basal steps
- added YpsoPump to Virtual Pumps
2021-01-20 23:49:10 +00:00
Milos Kozak e26ae1af7d asking for permissions refactor 2021-01-18 22:47:55 +01:00
Milos Kozak 65a39d91be refactor import/export to create DaggerAppCompatActivityWithResult 2021-01-18 17:36:18 +01:00
Milos Kozak 23d649a0d8
Merge branch 'dev' into dev 2021-01-10 20:41:36 +01:00
Milos Kozak e3ee5eeb1a
Merge pull request #214 from nightscout/soft-force-upload-only
Rename upload only key and description
2021-01-10 20:26:30 +01:00
AdrianLxM 68be654fd4 Rename upload only key and description
This renames the key that people that have disabled it in the past will actively have to re-enable it.
Adds extra warning that it is dangerous to disable it.
2021-01-10 19:56:44 +01:00
Milos Kozak c5afc6daca
Merge pull request #211 from nightscout/dana/fix-menu-crash-plus-i18n
fix menu crash and make graph label translatable
2021-01-10 19:50:25 +01:00
AdrianLxM 301c44627f fix menu crash and make graph label translatable 2021-01-10 04:10:21 +01:00
parapenT1sta 50dcf7d8bb
Update strings.xml 2021-01-09 21:56:31 +00:00
parapenT1sta e8be0fbd79
Update strings.xml 2021-01-09 16:48:17 +00:00
Milos Kozak 48084ff7bf add keys to crash report 2021-01-08 18:55:01 +01:00
xJoe 2b52dbda80
Correction xDrip -> xDrip+ 2021-01-08 18:21:36 +01:00
Milos Kozak c847a5a340 add warning to ns_upload_only 2021-01-08 14:20:18 +01:00
Milos Kozak 5d53029b54
Merge pull request #181 from xJoe/dev
Status lights battery
2021-01-07 10:29:09 +01:00
Milos Kozak 2524fc705d
Update app/src/main/res/values/strings.xml
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
2021-01-07 10:28:27 +01:00
xJoe 27cd727643
Status lights battery
added "pump" as there is also sensor battery as of AAPS 2.8
2021-01-03 18:07:41 +01:00
Milos Kozak cac28dd01f trying to fix crowdin 2021-01-03 11:37:31 +01:00
Milos Kozak bd218a58a2 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-01-03 11:32:47 +01:00
Milos Kozak e5902b73c7 trying to fix crowdin 2021-01-03 11:32:37 +01:00
xJoe 9e286b789a
Update strings.xml 2021-01-03 10:50:08 +01:00
Milos Kozak 815cbbd21d
Merge pull request #150 from CapnGrumpy/master
Update exam.xml
2020-12-29 18:36:53 +01:00
Milos Kozak a97b6149ca code cleanup 2020-12-29 18:36:03 +01:00
Matthew Gray 40871717bc
Update exam.xml
Consistency in use of I:C and not using 'Topic'.
2020-12-29 13:39:56 +00:00
Milos Kozak 6ed733f8cf Objectives correction 2020-12-28 22:59:45 +01:00
Milos Kozak 52c6d762f5 Merge branch 'dev' into objectives 2020-12-28 18:40:10 +01:00
Milos Kozak c8f7dae2c8 Bolus advisor 2020-12-28 16:42:00 +01:00
Philoul b4710b4936 Merge remote-tracking branch 'Nightscout/dev' into LoopDialog 2020-12-27 13:18:04 +01:00
Philoul cefdaa471d Replace Loop Menu by Loop Dialog 2020-12-26 17:40:16 +01:00
Bart Sopers b783364e81 Fix string resources 2020-12-25 19:36:38 +01:00
Bart Sopers 00b67713b8 Improve string for Omnipod in Setup Wizard 2020-12-25 19:10:02 +01:00
Milos Kozak 3c32583d8c ProfileHelper layout buttons fix 2020-12-25 14:42:39 +01:00
Milos Kozak 03c59d6e19 SMS: report pump unreachable 2020-12-25 12:06:54 +01:00
Milos Kozak 3be91d83f6
Merge pull request #129 from Philoul/TempTargetButtons
TT Dialog Add 5 buttons for quick selection of TempTarget's type
2020-12-23 20:55:34 +01:00
Milos Kozak 46c35880e9
Merge branch 'objectives' into master 2020-12-21 21:48:06 +01:00