Commit graph

679 commits

Author SHA1 Message Date
Milos Kozak 8f3c4e25c5 DanaRFragment -> kotlin 2019-08-07 15:50:37 +02:00
Milos Kozak d2c01501a8 ConfigBuilderFragment -> kotlin 2019-08-06 20:46:35 +02:00
Milos Kozak c1a1cc3108 ProfileViewerDialog -> kotlin 2019-08-06 01:19:24 +02:00
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Milos Kozak 47ed0acec2 ChooseTriggerDialog to kotlin 2019-07-23 00:04:44 +02:00
Milos Kozak 063c27fb89 ChooseActionDialog to kotlin 2019-07-22 22:47:26 +02:00
Milos Kozak a809c0ac35 ActionListAdapter to kotlin 2019-07-22 21:41:42 +02:00
Milos Kozak c3b90275aa relocate trigger dummy objects 2019-07-22 16:28:53 +02:00
Milos Kozak d25f6f07b0 migrate to kotlin, remove butterknife, code claeanup 2019-07-18 23:49:59 +02:00
Milos Kozak 58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Andy Rozman f0cc3d4ab2
Merge pull request #5 from jotomo/mdt-dialogs
Mdt dialogs
2019-07-14 20:18:40 +01:00
Milos Kozak c4ba821dc1
Merge branch 'dev' into automation 2019-07-14 20:00:42 +02:00
Milos Kozak 8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge 2019-07-14 19:50:07 +02:00
Johannes Mockenhaupt 9ee6194ce3
Use OKDialog, ErrorHelper in place of MessageDialog. 2019-07-14 17:18:53 +02:00
Milos Kozak 0710a03479 jetpack 2019-07-13 21:27:26 +02:00
Andy Rozman 675dcc1b5b Fixes:
- removed unneeded classes and xml
- some fixes: MedtronicUtil, using different method to determine if pump driver is selected
2019-07-13 19:15:44 +01:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Andy Rozman 7aa4716870 - changed all ui files to conform to androidx classes/implementation 2019-07-05 16:04:54 +01:00
Andy Rozman 992f69daaa medtronic-0.12.0-SNAPSHOT
- Merge branch 'dev' into medtronic_andy
2019-07-05 14:18:28 +01:00
Milos Kozak c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak 323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
Milos Kozak 7d6ed94491 Scrollview 2019-06-07 15:40:05 +02:00
Milos Kozak 5dbdd5e437 layout improvement 2019-06-06 23:25:21 +02:00
Milos Kozak 8ea5968f4d reset time button 2019-06-05 00:22:57 +02:00
Milos Kozak 048ea4d489 Tidepool test UI 2019-06-03 00:03:06 +02:00
Milos Kozak 9a76f3386d androidx transition 2019-05-16 13:57:37 +02:00
Milos Kozak e679f5eaff ActionNotification 2019-04-21 16:17:25 +02:00
Milos Kozak 27783fe33e TriggerIob, more fixes 2019-04-19 09:20:59 +02:00
Milos Kozak 4ae7efc75f Merge branch 'dev' into automation 2019-04-16 21:08:08 +02:00
Andy Rozman ad17c66b1b Merge branch 'dev' into medtronic_andy 2019-04-10 17:05:56 +01:00
Milos Kozak e7d7a37aeb LINT: input type 2019-04-08 18:13:47 +02:00
Milos Kozak 3b1d96ecc9 LINT: xml 2019-04-08 17:03:18 +02:00
Milos Kozak a339e0cf28 LINT: xml 2019-04-08 16:39:41 +02:00
Milos Kozak 190b9408bd fixed package name 2019-04-08 15:38:20 +02:00
Andy Rozman 8bf284f86d - Changes made in CGMS
- Finished support for Bolus history mapping
- fixed 20 crashalytics errors
2019-04-07 22:27:18 +01:00
Milos Kozak 5a555cdfba AutomationPlugin:processActions and some tweaking 2019-03-31 21:54:31 +02:00
Andy Rozman bd3529e650 Merge branch 'dev' into medtronic_andy 2019-03-31 20:03:49 +01:00
Nico Schmitz 236349a063 Bugfixes. Add remove icon for actions. 2019-03-26 23:28:46 +01:00
Nico Schmitz 97a7a75c86 work on automation plugin
- implement clone() methods for actions and triggers
- add AutomationEventTest
- improve ui
2019-03-26 00:06:37 +01:00
Nico Schmitz fc7e65c4d1 Update to recent upstream/dev 2019-03-22 23:08:13 +01:00
Nico Schmitz f017b7a7a2 Work on automation plugin.
- Remove unused imports
- Add icons for actions and triggers
2019-03-21 23:38:56 +01:00
Nico Schmitz 6dc87db73e Improve EditEventDialog 2019-03-21 00:38:06 +01:00
Nico Schmitz c074ec36c4 Implement temp target dialog for automation action 2019-03-20 00:39:00 +01:00
Milos Kozak 381ae67829
Merge pull request #1420 from tanja3981/improvement/#1269
[2.0] Improvement: Allow some objectives to go back.
2019-03-19 23:42:38 +01:00
Nico Schmitz 91e4b01f10 Display actions and merge recent upstream/dev
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
Andy Rozman 8594525d2c Merge branch 'dev' into ench_1455_custom_actions 2019-03-08 23:49:56 +00:00
Tanja Schmidt a5d1905be8 Allow some objectives to go back. 2019-03-06 19:03:42 +01:00
Andy Rozman 011aaf5336 Moved medtronic to correct package 2019-03-02 20:39:14 +00:00
Andy Rozman f7395c7a2c Changes after merge, compilable, but medtronic is still in old structure. 2019-03-02 20:24:53 +00:00
Andy Rozman 289902633e Merge branch 'dev' into medtronic_andy 2019-03-02 18:20:37 +00:00