Commit graph

10103 commits

Author SHA1 Message Date
Milos Kozak
52c6d762f5 Merge branch 'dev' into objectives 2020-12-28 18:40:10 +01:00
Milos Kozak
a8631866da 2.7.3-dev 2020-12-28 16:55:51 +01:00
Milos Kozak
e59fa702ec Merge branch 'wizard' into dev 2020-12-28 16:42:43 +01:00
Milos Kozak
c8f7dae2c8 Bolus advisor 2020-12-28 16:42:00 +01:00
Milos Kozak
b2047b7810 code style 2020-12-28 12:21:31 +01:00
Milos Kozak
ce8fbc5580 fix typo in LocalAlertUtils 2020-12-27 21:46:13 +01:00
Milos Kozak
4238e9cab3
Merge pull request #144 from Philoul/LoopDialog
Replace Loop Menu by a dialog
2020-12-27 20:55:58 +01:00
Philoul
01062c4755 Use Jetpack instead of Kotlin 2020-12-27 16:20:32 +01:00
Philoul
08ab436d90 Add Closed / LGS / Open switching in Loop paragraph 2020-12-27 15:32:12 +01:00
Philoul
b4710b4936 Merge remote-tracking branch 'Nightscout/dev' into LoopDialog 2020-12-27 13:18:04 +01:00
Philoul
f74ca3b424 Remove old code 2020-12-26 22:54:14 +01:00
Milos Kozak
4705dee032
Merge pull request #137 from Philoul/IncreaseHeightUpperRows
Increase height of Compact Tab and Profile/TT row
2020-12-26 22:13:52 +01:00
Milos Kozak
3d525d4df8
Merge pull request #142 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Rework RL scan and add option to remove RL
2020-12-26 22:07:53 +01:00
Bart Sopers
46f4b6da44 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-26 20:48:17 +01:00
Bart Sopers
f5dbf7d7c9 Handle empty RileyLink name correctly 2020-12-26 20:47:33 +01:00
Philoul
329e5af94f Update "Loop header" 2020-12-26 18:26:46 +01:00
Bart Sopers
7aa76d011d Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-26 18:24:23 +01:00
Bart Sopers
051e811571 Remove callbacks when scanning finished in RileyLink selection 2020-12-26 18:24:00 +01:00
Bart Sopers
00469a71f5 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-26 18:03:50 +01:00
Bart Sopers
12ea97aa6f Nit in RileyLink selection 2020-12-26 18:03:23 +01:00
Bart Sopers
abb380b219 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-26 17:53:28 +01:00
Bart Sopers
b9c7dbc1ea RL scan improvements 2020-12-26 17:53:01 +01:00
Philoul
cefdaa471d Replace Loop Menu by Loop Dialog 2020-12-26 17:40:16 +01:00
Bart Sopers
14ff65f121 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-26 13:56:55 +01:00
Bart Sopers
1dbde54344 Order RileyLink string resources 2020-12-26 13:56:34 +01:00
Bart Sopers
81835d564e Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-26 13:48:40 +01:00
Bart Sopers
4ab0eab4a8 Also store and show RileyLink name 2020-12-26 13:47:55 +01:00
Bart Sopers
7ad84bbdec Revert "Update version for Omnipod"
This reverts commit 302622bf69.
2020-12-25 19:38:45 +01:00
bartsopers
e9e6f962d3
Merge pull request #53 from AAPS-Omnipod/omnipod_eros_dev_rework_rl_scan
Rework RL Scan & Add option to remove RL
2020-12-25 19:37: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
Bart Sopers
fcd3276e47 Rework RileyLink scan and add option to remove RileyLink 2020-12-25 18:43:51 +01:00
Philoul
363fe638af Second verion (only increase a little bit Compact height) 2020-12-25 17:05:41 +01:00
Philoul
33e13748ca Merge remote-tracking branch 'Nightscout/dev' into IncreaseHeightUpperRows 2020-12-25 16:48:23 +01:00
Philoul
47fe4d83be First draft 2020-12-25 16:47:42 +01:00
Bart Sopers
302622bf69 Update version for Omnipod
This reverts commit 55cc46c475.
2020-12-25 15:05:01 +01:00
Milos Kozak
3c32583d8c ProfileHelper layout buttons fix 2020-12-25 14:42:39 +01:00
Milos Kozak
d035e13203
Merge pull request #141 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Bugfixes and improvements in RileyLink selection, code cleanup in RileyLinkStatusFragmentGeneral
2020-12-25 14:33:05 +01:00
Bart Sopers
256500e159 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-25 12:59:38 +01:00
bartsopers
2eebaddb1a
Merge pull request #52 from AAPS-Omnipod/omnipod_eros_dev_rl_scan_fixes
RL scan fixes
2020-12-25 12:59:01 +01:00
Bart Sopers
bc04f8137f Code cleanup in RileyLinkStatusGeneralFragment 2020-12-25 12:57:28 +01:00
Milos Kozak
03c59d6e19 SMS: report pump unreachable 2020-12-25 12:06:54 +01:00
Milos Kozak
4bf1f13ebc
Merge pull request #139 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Display connected RileyLink name
2020-12-25 10:46:27 +01:00
Milos Kozak
68a7c70e23
Merge pull request #117 from Philoul/ShortClick
Short Click menu added in overview
2020-12-25 10:44:21 +01:00
Bart Sopers
33297ae4cf Remove redundant code and improve comment 2020-12-25 02:17:43 +01:00
Bart Sopers
f596348d85 Workarounds for some bugs in RL scanning UI 2020-12-25 02:05:37 +01:00
Bart Sopers
792eae5278 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-24 22:26:01 +01:00
Bart Sopers
1e3ea8f74f Show connected RileyLink name 2020-12-24 22:25:25 +01:00
Philoul
124b8c07b1 Switch Short and long click functions
Short Click View Profile
Long Click Profile Switch Dialog
2020-12-24 18:03:18 +01:00
Philoul
554b14e9ef Increase height of Compact Tab and Profile/TT row 2020-12-24 11:06:50 +01:00