Commit graph

374 commits

Author SHA1 Message Date
Milos Kozak
80962e33d7 allow to ignore profileswitch events 2017-06-20 19:52:46 +02:00
Milos Kozak
e90812634b work from old autosens branch 2017-06-16 14:37:43 +02:00
Milos Kozak
fb7af2f317 ns alarm setting in xml 2017-06-15 21:33:45 +02:00
Milos Kozak
b41a942d11 update supported NS & NSclient versions 2017-06-12 09:30:04 +02:00
Milos Kozak
77659e20e7 ns alarms & getBasal fix 2017-06-11 17:22:54 +02:00
Milos Kozak
17f59df597 gui tweaking, pump battery event 2017-06-06 08:21:11 +02:00
Milos Kozak
7c7638a7a1 extract color resources 2017-06-05 15:34:22 +02:00
Milos Kozak
e0a6db22a2 run rendering calculations on background 2017-06-05 15:16:07 +02:00
Milos Kozak
b40cf99201 gui tweaking 2017-06-03 22:43:35 +02:00
Milos Kozak
d365fcd6a4 fix bugs & design tweaking 2017-06-02 23:25:11 +02:00
Milos Kozak
f267c85377 it compiles now with profiles 2017-06-02 10:25:49 +02:00
Milos Kozak
f5f7d28cc1 temp basal dialog design 2017-05-30 18:10:05 +02:00
Milos Kozak
650b792099 mark selected tab in treatments 2017-05-26 10:05:42 +02:00
Milos Kozak
5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +02:00
Milos Kozak
86af9eab3d stop extended bolus in actions 2017-05-24 20:37:58 +02:00
Milos Kozak
2ae30fe9b4 temptarget design 2017-05-24 19:42:23 +02:00
Milos Kozak
bb9c68fd4d Merge remote-tracking branch 'origin/dev' into history 2017-05-24 19:18:30 +02:00
Milos Kozak
f936580734 Russsian language 2017-05-24 18:46:19 +02:00
Milos Kozak
5208f23661 Temptargets under treatments 2017-05-23 23:56:53 +02:00
Milos Kozak
771fbdc303 sync of treatments, tempbasals, extended tested and working 2017-05-23 22:59:06 +02:00
Milos Kozak
8db1bd5ae5 tempbasal ns sync 2017-05-23 20:15:14 +02:00
Milos Kozak
6394421017 boluses working 2017-05-22 22:10:56 +02:00
Milos Kozak
6cd046459a original treatmens plugin removed, temp basals working 2017-05-22 20:58:05 +02:00
Milos Kozak
3330c6a3fd Merge branch 'dev' into history 2017-05-21 16:46:13 +02:00
Milos Kozak
462849af12 russian language entry 2017-05-21 10:06:34 +02:00
Milos Kozak
3ee9bf5ff7 Merge branch 'dev' into history 2017-05-16 15:15:32 +02:00
Milos Kozak
86c975e9d6 Add Italian language 2017-05-16 13:39:24 +02:00
Milos Kozak
45477f96ee Merge pull request #243 from AdrianLxM/xdripstatusline
basal and bolus step in DanaR Fragment
2017-05-16 13:28:39 +02:00
AdrianLxM
572e726678 basal and bolus step in DanaR Fragment 2017-05-16 13:10:02 +02:00
Milos Kozak
4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak
e005d6bd69 Merge branch 'dev' into history 2017-05-12 13:05:57 +02:00
Milos Kozak
df424ea5ff overview buttons 2017-05-12 11:06:33 +02:00
Milos Kozak
51d52f6b3d Merge branch 'DanaRv2' into history 2017-05-10 21:53:31 +02:00
Milos Kozak
5b25d28f42 Merge branch 'dev' into DanaRv2 2017-05-10 14:05:43 +02:00
AdrianLxM
298d7a7d9c Merge branch 'dev' into xdripstatusline 2017-05-09 23:26:31 +02:00
AdrianLxM
1fa3a2a697 bgi on watch status (optional) 2017-05-09 23:23:37 +02:00
Milos Kozak
554fb51a75 profile layout 2017-05-09 19:06:59 +02:00
Milos Kozak
84a6554e07 smaller font size on careportal buttons 2017-05-09 18:36:13 +02:00
Milos Kozak
09fea02ed2 Allow to disable NS upload while client is connected 2017-05-09 16:24:53 +02:00
Milos Kozak
0048366dcf fix conflict 2017-05-09 10:14:21 +02:00
AdrianLxM
67f21537ea send status to xDrip 2017-05-06 15:18:19 +02:00
Milos Kozak
352a2a7475 deviations graph 2017-05-04 19:51:58 +02:00
Milos Kozak
289ad394ce Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-03 22:30:12 +02:00
Milos Kozak
573256d7d4 catch missing sms permission 2017-05-03 18:30:18 +02:00
AdrianLxM
9cef4c5a01 typo insuin->insulin 2017-05-01 18:09:53 +02:00
Milos Kozak
0f1c2bb193 DanaRv2 1st rev 2017-04-30 21:08:00 +02:00
Milos Kozak
2cb6e275c0 allign design of status pills 2017-04-30 13:17:59 +02:00
Milos Kozak
4dd9281276 remove actionbar 2017-04-29 20:16:50 +02:00
Milos Kozak
974e5e0098 pump fragment redesign 2017-04-29 18:11:15 +02:00
Milos Kozak
f641d40722 virtual pump layout 2017-04-29 17:48:45 +02:00
Milos Kozak
3552d6aa40 bg value colored 2017-04-27 21:26:53 +02:00
Milos Kozak
5ef034b4fc cob display 2017-04-26 23:45:40 +02:00
Milos Kozak
a07a8755b1 IOB graph 2017-04-24 13:17:14 +02:00
Milos Kozak
1f2967e866 superbolus must be explicitly enabled 2017-04-22 11:08:57 +02:00
Milos Kozak
20f99dffe2 basals rendering redesign 2017-04-22 10:09:54 +02:00
Milos Kozak
90a55966b1 Fast Acting Insulin Prolonged 2017-04-21 15:36:49 +02:00
Milos Kozak
25491fbac6 Insulin interface 2017-04-21 11:45:25 +02:00
Milos Kozak
04ae55ac63 exit app after import settings 2017-04-16 13:27:01 +02:00
Milos Kozak
402768cb87 1.33 app start logging optional 2017-04-14 15:33:39 +02:00
Milos Kozak
2413fae0a9 1.32 superbolus & trend contribution in wizard 2017-04-14 14:50:18 +02:00
Milos Kozak
c5245ae5fd SMS suspend/resume loop 2017-04-06 21:22:27 +02:00
Milos Kozak
a02da220c9 CS translations 2017-04-05 22:04:55 +02:00
Milos Kozak
f596050239 loop suspend menu 2017-04-05 21:39:39 +02:00
Milos Kozak
d6f31820d9 request battery optimalization whitelisting 2017-03-31 09:21:40 +02:00
Milos Kozak
a4f302ee4a show if pump is suspended 2017-03-24 12:05:12 +01:00
Milos Kozak
e8edf9eb54 Glimp support 2017-03-21 19:11:39 +01:00
Milos Kozak
de9dbf9243 CS translations 2017-03-04 20:55:13 +01:00
Milos Kozak
b0c828c93e nsclient build variant 2017-02-23 20:00:33 +01:00
Milos Kozak
15d6de4701 age from product flavor to prefs 2017-02-22 20:29:41 +01:00
Milos Kozak
87ad140eb5 SMS logging and resource refactor 2017-02-22 14:11:05 +01:00
Milos Kozak
34ed92f8aa fix displaying delta when not available 2017-02-21 10:00:08 +01:00
AdrianLxM
98edfc57e0 dismiss bolus progress via events 2017-02-20 14:49:38 +01:00
Milos Kozak
6200584268 hours to fetch fixed 2017-02-20 09:46:55 +01:00
Milos Kozak
5f4eb1e4c4 pump status tweaking 2017-02-19 19:15:14 +01:00
Milos Kozak
9303bd61fd Merge branch 'dev' into nsclient 2017-02-19 09:41:16 +01:00
AdrianLxM
d113d39916 wear setting to show detailed IOB 2017-02-18 18:13:13 +01:00
Milos Kozak
29b4f0063b better handling readonly permission 2017-02-17 22:12:35 +01:00
Milos Kozak
14e37246c2 nsclient gui and pausing tweaking 2017-02-17 18:14:33 +01:00
Milos Kozak
31364ff07b ignore dbaccess if nsclient not enabled 2017-02-17 16:41:28 +01:00
Milos Kozak
8a374f1b35 Shared preferences cleanup 2017-02-17 16:16:20 +01:00
Milos Kozak
3216ff636a preference keys to strings 2017-02-17 13:43:17 +01:00
Milos Kozak
71112a90e2 internal nsclient 2017-02-17 13:18:36 +01:00
Milos Kozak
a75c62be35 show notification when aproaching daily limit 2017-02-14 19:47:45 +01:00
Milos Kozak
2e4aec9916 settings password protected 2017-02-14 19:16:34 +01:00
Milos Kozak
8001796f4b virtual pump status upload optional 2017-02-14 15:41:30 +01:00
Milos Kozak
f9ee3c547a translations 2017-02-13 21:05:57 +01:00
Milos Kozak
c6b3fe9883 Merge pull request #178 from AdrianLxM/wear-bolus5
Wear Bolus
2017-02-13 18:13:36 +01:00
Milos Kozak
1f3aee091e manual invoke of loop in separate thread 2017-02-12 22:02:42 +01:00
Milos Kozak
4e3cc65d5d handling pump suspend, show pump actions on overview 2017-02-12 19:51:13 +01:00
Milos Kozak
351a624b83 small string change 2017-02-12 13:48:03 +01:00
AdrianLxM
1f5dd4750a CPP dismiss info when focus is lost 2017-02-11 22:20:29 +01:00
AdrianLxM
6c5028b4be CPP dismiss info when focus is lost 2017-02-11 22:18:28 +01:00
AdrianLxM
638b9c263c Merge pull request #61 from MilosKozak/dev
Dev
2017-02-11 02:55:14 +01:00
Milos Kozak
40d166cb7d CS translations 2017-02-10 21:39:51 +01:00
Milos Kozak
2e40c7b605 sms calibrations 2017-02-10 21:20:55 +01:00
Milos Kozak
8db3f258cd xdrip calibration 2017-02-10 16:53:39 +01:00
AdrianLxM
8ece312b6a Merge pull request #60 from MilosKozak/dev
Dev
2017-02-09 23:47:12 +01:00
Milos Kozak
715d15b51f CS translations 2017-02-09 22:44:42 +01:00
Milos Kozak
90061c6f25 Show log 2017-02-09 22:29:21 +01:00
Milos Kozak
8a2846c516 Merge branch 'dev' into dev 2017-02-09 17:01:05 +01:00
Milos Kozak
7f123e4208 warn on wrong entered sms phone number 2017-02-09 16:14:09 +01:00
LadyViktoria
7fc6de17c1 Add prefernces.json changes 2 2017-02-09 10:41:02 +01:00
LadyViktoria
886c1ea359 Add prefernces.json changes 2017-02-09 09:36:51 +01:00
AdrianLxM
bf7a96b3e7 bolus progress dialog without activity context 2017-02-09 03:15:13 +01:00
AdrianLxM
650111d1b7 wear event for bolus requests to show card early on 2017-02-07 11:09:16 +01:00
viktoria
b0a9d74b49 Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
	app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java
	app/src/main/res/values/strings.xml
2017-02-02 19:00:17 +01:00
AdrianLxM
bd75015a58 Correct error for tempbasals 2017-02-01 14:38:55 +01:00
LadyViktoria
1f3b425c44 Remove careportal_temptarget string 2017-01-31 20:28:32 +01:00
Milos Kozak
762b561abb CS translations 2017-01-29 21:15:05 +01:00
Milos Kozak
d6a22be184 remove absorption rate from everywhere 2017-01-29 20:19:02 +01:00
Milos Kozak
3f90ad6a5c sync profile to pump 2017-01-28 23:45:14 +01:00
viktoria
c64d45b758 Merged MilosKozak/dev into dev
Conflicts:
	app/src/main/res/values/strings.xml
2017-01-28 22:35:54 +01:00
Milos Kozak
b9b9e21dcb fix merge conflicts 2017-01-28 21:37:51 +01:00
Milos Kozak
538e8fd2fa better detect & display old pump firmware 2017-01-28 20:48:32 +01:00
LadyViktoria
4d4630ca1a Add prefernces.json rename some Strings to match OpenAPS docs 2017-01-27 09:56:32 +01:00
LadyViktoria
f510b0a8cc Add prefernces.json errer message translations
attention the characters are limited.
maybe its caused by old libs
com.android.support:appcompat-v7:23.4.0
'com.android.support:support-v4:23.4.0
2017-01-27 09:52:16 +01:00
LadyViktoria
1d2f98abf4 Add prefernces.json remove openapsama_skip_neutral_temps 2017-01-26 15:32:44 +01:00
viktoria
74cfa08b81 Change some Prefernces names to match names in OpenAPS docs 2017-01-26 00:35:46 +01:00
viktoria
88d6178a1b Add prefernces.json small fix 2017-01-25 22:20:56 +01:00
viktoria
9d2b645d8c Add prefernces.json default values 2017-01-25 22:11:17 +01:00
viktoria
fd6432f808 Add prefernces.json put hyperlink and warning there 2017-01-25 20:41:33 +01:00
viktoria
8e095fefaf Add prefernces.json layout changes 2017-01-25 20:20:39 +01:00
viktoria
0838ede6a3 Add prefernces.json change secondary text color to white 2017-01-25 20:19:53 +01:00
LadyViktoria
b898fc044e Add prefernces.json to advanced settings 2017-01-25 15:18:01 +01:00
Milos Kozak
044547b594 Merge pull request #143 from AdrianLxM/deltasx
Settings for deltas
2017-01-24 10:59:10 +01:00
AdrianLxM
950b638e50 Advanced Settings 2017-01-24 10:28:42 +01:00
AdrianLxM
3a43858948 Settings for deltas 2017-01-24 02:21:25 +01:00
viktoria
bd588af1ba DanaR Stats small Layout fixes 2017-01-23 21:52:24 +01:00
AdrianLxM
f418152059 sorten tab titles active 2017-01-21 23:48:05 +01:00
AdrianLxM
ea78dd5bc1 Shorten tabs first 2017-01-21 19:44:58 +01:00
AdrianLxM
50b7e619fc Preference switches for Autosens 2017-01-21 01:35:15 +01:00
Milos Kozak
ea37d9eaa8 Merge pull request #131 from AdrianLxM/tempt-pill
Tempt pill
2017-01-21 00:11:07 +01:00
viktoria
2d966c9feb DanaR Stats some improvements 2017-01-20 03:13:41 +01:00
AdrianLxM
0c11f78ed3 cleanup after merge 2017-01-19 21:15:08 +01:00
LadyViktoria
1597f74bd0 Merge branch 'dev' into danarstats 2017-01-19 20:52:01 +01:00
Milos Kozak
2754e23c08 CS translations 2017-01-19 19:52:14 +01:00
Milos Kozak
c701b5d125 waiting for pump message 2017-01-19 19:21:25 +01:00
Milos Kozak
f8feaf565b show how is value hard limited 2017-01-19 18:40:08 +01:00
viktoria
9ba24b4ffd DanaR Stats Beautify 2017-01-18 03:08:19 +01:00
Milos Kozak
0e21b67a42 fix merge conflicts 2017-01-17 18:00:44 +01:00
Milos Kozak
7c90dfe03c confirm dialog on removing temptarget 2017-01-16 23:54:46 +01:00
Milos Kozak
61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
Milos Kozak
61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01:00
Milos Kozak
1b53cde2bf plain temptarget plugin 2017-01-13 21:14:04 +01:00
Milos Kozak
74afdb6874 Merge branch 'dev' into AMA 2017-01-09 17:34:49 +01:00
Milos Kozak
26a76217bf Greek language 2017-01-09 17:23:56 +01:00
Milos Kozak
68a127d804 make autosens configurable in settings, determinebasaladapter refactoring 2017-01-08 14:21:29 +01:00
Milos Kozak
6621c2f610 log script debug in fragment 2017-01-08 00:27:13 +01:00
Milos Kozak
9c93d3ad7d log autosens input data in fragment 2017-01-08 00:07:18 +01:00
Milos Kozak
25a3b678e9 most new AMA code added 2017-01-06 22:42:37 +01:00