Commit graph

4115 commits

Author SHA1 Message Date
Milos Kozak c0d85e85a0 Merge branch 'dev' into iobfix 2019-07-15 15:52:02 +02:00
Milos Kozak b26b583f2b
Merge pull request #1867 from Paulusma/IA-in-BG-graph
Insulin Activity in bg graph
2019-07-15 15:27:04 +02:00
Milos Kozak 7ddf5dd5f6 make translation easier 2019-07-15 12:33:03 +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
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 106d30394c Included insulin activity on both primary and secondary graphs 2019-07-13 18:28:16 +02: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
Paulus d7cb84e693 Fixed handling of null profile 2019-07-13 10:26:15 +02:00
Milos Kozak 606122bae0 fix kotlin warnings 2019-07-13 10:09:57 +02:00
Paulus fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02: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
Paulus 4b5189403c #1851 initial commit 2019-07-05 12:12:19 +02:00
Johannes Mockenhaupt a17947ff12
RuffyScripter: reset unparsableMenuEncountered flag on command start. 2019-07-05 00:57:07 +02:00
Milos Kozak 6258d473b0 fix merge 2019-07-04 20:28:22 +01:00
Milos Kozak 61097b3ac6
Merge branch 'dev' into sdk28 2019-07-04 20:06:09 +01:00
AdrianLxM b274647f68
get last notification 2019-06-30 15:58:04 +02: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 d42794137f
call startForeground() 2019-06-30 15:38:04 +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
Milos Kozak 1512064c53 always run startForeground() 2019-06-29 12:49:29 +02:00
Milos Kozak df2ae1c52f start DummyService only if there is Notification ready 2019-06-29 10:59:10 +02:00
Milos Kozak 6ccf3788be fix dummy service start 2019-06-27 22:05:22 +02:00
Milos Kozak 8d9c18dd35
Merge pull request #1834 from MilosKozak/boluswizard
BolusWizard -> kt, code consolidation
2019-06-21 14:54:45 +02:00
Tebbe Ubben d014962fc8
Merge pull request #1843 from MilosKozak/foreground-service-fix
resolve dangling else and private constructor for singleton
2019-06-21 14:32:08 +02:00
AdrianLxM 45805ed410 BolusWizard privacy 2019-06-21 13:23:37 +02:00
Milos Kozak 7b15cfb395 fix comparing bolus size granularity 2019-06-21 11:41:50 +02:00
AdrianLxM f87b30771b
resolve dangling else and private constructor for singleton 2019-06-21 09:05:39 +02:00
Tebbe Ubben 412c06bd15
Merge pull request #1841 from MilosKozak/foreground-service-fix
Also show notification when no profile is set
2019-06-20 23:25:17 +02:00
Tebbe Ubben bbd26f047d Also show notification when no profile is set 2019-06-20 23:22:10 +02:00
Milos Kozak 66e2ce5180 don't call update if == null 2019-06-19 09:24:16 +02:00
Tebbe Ubben 5af80ceb02 Support for new Dexcom app 2019-06-19 01:38:55 +02:00
Milos Kozak af0d4f23b1 kotlin lint 2019-06-16 09:11:11 +02:00
Milos Kozak 09e4106182 BolusWizard -> kt, code consolidation 2019-06-16 09:00:47 +02:00
Johannes Mockenhaupt ab96e62ded
Incomplete TidepoolFragment with kotlin-android-extension. 2019-06-15 18:13:57 +02:00
Johannes Mockenhaupt 1b0d6ff413
Reflect name of Kotlin class. 2019-06-15 18:13:45 +02:00
Milos Kozak 89fef312c5
Merge pull request #1830 from andyrozman/bug_1828
Solution for bug 1828
2019-06-14 11:44:24 +02:00
Milos Kozak d9bd1c6c98 remove unneeded file 2019-06-14 10:53:13 +02:00
Milos Kozak 75c13cef8f bus observeOn, Tandem as manufacture 2019-06-14 10:52:41 +02:00
Andy Rozman 125fa5fef9 Fix for problem 1631, problem with issueing of super bolus. We now check what type of TBR pump has, if its absolute it calles tempBasalAbsolute or else tempBasalPercent method 2019-06-13 23:57:36 +01:00
Andy Rozman 1432ad81e6 Solution for bug 1828 - If suspend is called from Overview, it checks which TBR type is supported by default and
then starts correct TBR method...
2019-06-13 00:14:28 +01:00
Milos Kozak 9d90c36a94 process TBR correctly 2019-06-09 15:17:16 +02:00