Commit graph

264 commits

Author SHA1 Message Date
Milos Kozak
76439777b0 Better bolus wizard warning 2019-07-25 23:32:00 +02:00
Milos Kozak
75baa473f1 fix carbtime in BolusWizard 2019-07-25 21:45:54 +02:00
Milos Kozak
09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Milos Kozak
51bc5d3618 Merge branch 'dev' into medtronic_andy_merge 2019-07-25 13:40:37 +02:00
Milos Kozak
f778e0ac0d fix code after merge 2019-07-23 13:32:21 +02:00
Milos Kozak
e02681ac31
Merge branch 'dev' into automation 2019-07-23 13:13:26 +02:00
Milos Kozak
ae7332df2d cleanup 2019-07-23 00:26:59 +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
e539dbc112 fix tests, use location form service 2019-07-22 16:58:25 +02:00
Milos Kozak
c3b90275aa relocate trigger dummy objects 2019-07-22 16:28:53 +02:00
Milos Kozak
12f436c681 hide ok button on wrong input 2019-07-22 13:58:50 +02:00
Milos Kozak
d25f6f07b0 migrate to kotlin, remove butterknife, code claeanup 2019-07-18 23:49:59 +02:00
Milos Kozak
1b937bfe08 fix passcode generation 2019-07-17 21:16:36 +02:00
Milos Kozak
1c8aae9757 fix tests 2019-07-16 22:35:46 +02:00
Milos Kozak
58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Milos Kozak
67b06f51fe remove loop from actions 2019-07-16 17:05:51 +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
Milos Kozak
72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph 2019-07-14 19:44:01 +02:00
Milos Kozak
9d15ea608e static version in OpenDatasetMessage 2019-07-14 17:13:07 +01:00
Johannes Mockenhaupt
9ee6194ce3
Use OKDialog, ErrorHelper in place of MessageDialog. 2019-07-14 17:18:53 +02:00
Milos Kozak
d7a28bf713 Session test 2019-07-14 16:11:27 +01:00
Milos Kozak
beb4e004bf better null checks 2019-07-14 15:01:12 +01:00
Paulus
2a4e9e2cc6 Changed scale factor so IA is always displayed at same scale (even if only selected option) 2019-07-13 17:54:27 +02:00
Paulus
d528e800f6 Fixed code so IA is also correctly displayed in ssecondary if it is the only selected option. 2019-07-13 17:46:57 +02:00
Milos Kozak
968bccaacc Merge branch 'dev' into tidepool 2019-07-13 17:45:34 +02:00
Paulus
96d20d835f Modified string resources, included IA on both primary and secondary graph 2019-07-13 17:03:04 +02:00
Andy Rozman
0b1ef81d40 Updated files that had only formating changes and removed lcoal files. 2019-07-13 12:26:42 +01:00
Paulus
d7cb84e693 Fixed handling of null profile 2019-07-13 10:26:15 +02:00
Andy Rozman
a5a36332f3 Prepared for PR 2019-07-12 19:29:36 +01:00
Paulus
fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02:00
Milos Kozak
f5c22a33ff icons 2019-07-11 18:56:50 +01:00
Milos Kozak
4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Paulus
4ff9206dad #1851 included code from fra-orolo, now using color identifier for activity and line is optional in graph 2019-07-09 11:42:40 +02: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
Paulus
4b5189403c #1851 initial commit 2019-07-05 12:12:19 +02:00
Milos Kozak
9706f68be2 automation -> jetpack 2019-07-05 00:21:31 +01:00
Milos Kozak
c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak
61097b3ac6
Merge branch 'dev' into sdk28 2019-07-04 20:06:09 +01:00
AdrianLxM
1282e3ed9e
Get Singleton Notification 2019-06-30 15:57:04 +02:00
Milos Kozak
323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
AdrianLxM
bdf0b0e07d
Make updateNotification public 2019-06-30 15:36:30 +02:00
AdrianLxM
3dc5c61984
DummyService has nonNull notification 2019-06-30 14:12:40 +02:00
AdrianLxM
b2c46b67b6
Always create Notification 2019-06-30 14:07:41 +02:00
Milos Kozak
e86094a250 updateGui to Rx 2019-06-30 01:05:33 +02:00
Andy Rozman
f544f19a02 - Small fix in case that saved date is invalid (shouldn't be) 2019-06-29 21:02:51 +01:00