Commit graph

872 commits

Author SHA1 Message Date
Milos Kozak 5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +02:00
Milos Kozak 87993c6163 return functionality of faking by extended boluses 2017-05-25 17:26:05 +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 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 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 8c5ce7290d more work on treatments fragment 2017-05-16 17:48:58 +02:00
Milos Kozak 3ee9bf5ff7 Merge branch 'dev' into history 2017-05-16 15:15:32 +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 6fff6f63a4 bolus dialog redesign 2017-05-16 12:09:32 +02:00
Milos Kozak 4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak 704ad383e9 careportal layout part1 2017-05-15 21:10:43 +02:00
Milos Kozak c6830baf8f Merge branch 'dev' into history 2017-05-12 16:35:07 +02:00
Milos Kozak abdc1022bf merge bolus & basal into one plugin 2017-05-12 16:27:33 +02:00
AdrianLxM c88b8eaa9a make buttons scrollable for small heights 2017-05-12 15:26:16 +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 b782a5b8dc Merge branch 'dev' into history 2017-05-12 00:39:20 +02:00
Milos Kozak a0d31b2118 rename identical functions 2017-05-11 18:54:50 +02:00
Milos Kozak 7e99ce416a move buttons back to bottom 2017-05-11 10:59:05 +02:00
Milos Kozak 5b25d28f42 Merge branch 'dev' into DanaRv2 2017-05-10 14:05:43 +02:00
Milos Kozak d313df0d19 removing treatments 2017-05-09 20:47:02 +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 b30d79c4cb fix conflicts 2017-05-09 10:46:04 +02:00
Milos Kozak 8d3be5e958 colors on danar fragment 2017-05-08 23:19:11 +02:00
Milos Kozak 05d9f16031 hide label too 2017-05-04 23:22:16 +02:00
Milos Kozak 344144d88a pump status equal size 2017-05-04 21:11:51 +02:00
Milos Kozak aabcee8ea7 fix conflicts 2017-05-04 19:53:45 +02:00
Milos Kozak 352a2a7475 deviations graph 2017-05-04 19:51:58 +02:00
Milos Kozak 070867af28 menu on top 2017-05-04 19:13:56 +02:00
AdrianLxM 0069f320f8 config builder smallscreen 2017-04-30 21:57:55 +02:00
AdrianLxM 5dc07012d2 overview smallscreen 2017-04-30 21:34:30 +02:00
AdrianLxM d8fb53de69 Making dialogs scrollable 2017-04-30 20:54:35 +02:00
Milos Kozak 3279c297dc equal weight 2017-04-30 13:22:16 +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 5ef034b4fc cob display 2017-04-26 23:45:40 +02:00
Milos Kozak 7534f54f19 trend in wizard off by default 2017-04-24 19:24:53 +02:00
Milos Kozak a07a8755b1 IOB graph 2017-04-24 13:17:14 +02:00
Milos Kozak b8a8bed6c5 remove butterknife at all, remove unused code, overview graph optimalization 2017-04-23 13:45:49 +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 55a2df470e insulin activity graph 2017-04-21 18:34:40 +02:00
Milos Kozak 7f122f7497 show dia in insulin plugin 2017-04-21 16:13:53 +02:00
Milos Kozak 90a55966b1 Fast Acting Insulin Prolonged 2017-04-21 15:36:49 +02:00
Milos Kozak 17771434aa upgrade travis & plugin packages 2017-04-21 12:15:08 +02:00
Milos Kozak 25491fbac6 Insulin interface 2017-04-21 11:45:25 +02:00
Milos Kozak 2413fae0a9 1.32 superbolus & trend contribution in wizard 2017-04-14 14:50:18 +02:00
Milos Kozak e25fb9845d hide unneeded labels in nsclient mode 2017-02-23 23:32:26 +01:00
AdrianLxM 686e16de8d scrollview match parent in width 2017-02-20 13:31:47 +01:00
AdrianLxM 1f464bdae0 Merge remote-tracking branch 'milosremote/dev' into adridev 2017-02-20 13:11:35 +01:00
AdrianLxM 18e2dcffcf make things scrollable 2017-02-20 13:10:07 +01:00
Milos Kozak 5f4eb1e4c4 pump status tweaking 2017-02-19 19:15:14 +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 71112a90e2 internal nsclient 2017-02-17 13:18:36 +01:00
Milos Kozak dda95dc275 allow to remove treatments from GUI 2017-02-14 21:13:13 +01:00
Milos Kozak 2e4aec9916 settings password protected 2017-02-14 19:16:34 +01:00
Milos Kozak e00045155e prefill bg value in careportal dialog 2017-02-14 15:09:22 +01:00
viktoria 0d02f42714 use validation lib in cpp - layout fixes & longer snackbar duration 2017-02-12 19:51:56 +01:00
AdrianLxM 2e6d754c86 mmol/l fix 2017-02-11 22:26:16 +01:00
AdrianLxM 1f5dd4750a CPP dismiss info when focus is lost 2017-02-11 22:20:29 +01:00
viktoria 7877235972 Merged branch dev into dev 2017-02-11 00:16:55 +01:00
viktoria 279c67bb70 use validation lib in cpp - add snackbar 2017-02-11 00:16:25 +01:00
LadyViktoria 48a158b036 use validation lib in cpp - better event handling 2017-02-10 17:29:59 +01:00
Milos Kozak 8db3f258cd xdrip calibration 2017-02-10 16:53:39 +01:00
LadyViktoria 80de9c0cd8 use validation lib in cpp 2017-02-10 11:34:05 +01:00
Milos Kozak ed7dd48612 remove TODOs 2017-02-09 20:18:22 +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 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
viktoria bd588af1ba DanaR Stats small Layout fixes 2017-01-23 21:52:24 +01:00
Milos Kozak 53f9b30b3e temp target display update 2017-01-21 11:22:03 +01:00
Milos Kozak ea37d9eaa8 Merge pull request #131 from AdrianLxM/tempt-pill
Tempt pill
2017-01-21 00:11:07 +01:00
viktoria 33bb7d80a6 DanaR Stats small fixes and move Listeners 2017-01-20 16:45:01 +01:00
viktoria 722976f6b0 DanaR Stats beautify layout and add some listeners 2017-01-20 14:51:16 +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
AdrianLxM 6c3a07cc62 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev 2017-01-19 20:47:53 +01:00
Milos Kozak c701b5d125 waiting for pump message 2017-01-19 19:21:25 +01:00
viktoria b70e895b95 DanaR Stats fixes 2017-01-18 04:31:47 +01:00
viktoria 9ba24b4ffd DanaR Stats Beautify 2017-01-18 03:08:19 +01:00
viktoria 678fbedcbf Merge branch 'dev'
Conflicts:
	app/src/main/res/values/strings.xml
2017-01-18 03:03:58 +01:00
AdrianLxM d36a515d45 temp target overview 2017-01-17 21:32:30 +01:00
Milos Kozak 0e21b67a42 fix merge conflicts 2017-01-17 18:00:44 +01:00
Milos Kozak 218190e92f support for removing temp targets from GUI 2017-01-16 23:23:20 +01:00
Milos Kozak eaa16402a7 show running temp target on overview 2017-01-16 20:47:57 +01:00
Milos Kozak 61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
viktoria e851d15aff DanaR Stats Activity 2017-01-16 13:23:41 +01:00
Milos Kozak 61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01:00
Milos Kozak 458bee4538 display temptargets 2017-01-13 23:43:17 +01:00
Milos Kozak 1b53cde2bf plain temptarget plugin 2017-01-13 21:14:04 +01:00
Milos Kozak e9b900d74a show predictions in graph 2017-01-08 23:10:27 +01:00
Milos Kozak e71b478941 show both deltas on overview 2017-01-08 12:04:42 +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 3dfac49b82 duplicate MA -> AMA 2017-01-03 21:15:40 +01:00
Milos Kozak 4408146f23 disable entering basals in profiles only if pump is not tempbasal capable 2017-01-01 14:34:57 +01:00
Milos Kozak ef2e7b1a62 show basal line only if pump is tempbasal capable 2017-01-01 14:19:35 +01:00
Milos Kozak 38a9c94258 Local Profile 2016-12-31 20:10:36 +01:00
Milos Kozak 2e6c168adc TimeListEdit most work done 2016-12-31 13:11:32 +01:00
Milos Kozak e1c2e4c492 TimeListEdit initial work 2016-12-30 16:43:43 +01:00
Milos Kozak b2be49e631 simple profile layout 2016-12-29 22:40:30 +01:00
Milos Kozak 0059266791 loop status font size 2016-12-29 14:23:05 +01:00
Milos Kozak c06d25b235 more rearrangements 2016-12-29 00:12:52 +01:00
Milos Kozak f127e7bec1 better allign bg arrows 2016-12-28 23:48:43 +01:00
AdrianLxM d70c9673d5 average delta 2016-12-28 22:39:40 +01:00
Milos Kozak fdb252b62d show direction next to BG 2016-12-27 20:41:28 +01:00
Milos Kozak 3bd7568d34 dismiss button not hardcoded 2016-12-24 23:56:47 +01:00
Milos Kozak 052ac47595 Better profile handling 2016-12-24 23:53:17 +01:00
AdrianLxM e1dc624a47 fully remove mm640g 2016-12-10 22:58:31 +01:00
Milos Kozak 4103e4bf4a allow set profile to pump from simpleprofile plugin 2016-12-09 12:40:15 +01:00
Milos Kozak abfb832a10 basic notification functionality 2016-12-05 15:20:44 +01:00
AdrianLxM 896503918c wear extract strings 2016-11-29 15:01:00 +01:00
AdrianLxM 12e78656b7 wear settings 2016-11-24 16:23:31 +01:00
AdrianLxM c633904e8c wear fragment and reset button 2016-11-24 16:23:31 +01:00
AdrianLxM 513b2966c9 CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
AdrianLxM 74ea6c4011 CPP working 2016-11-14 18:19:17 +01:00
AdrianLxM c2d1fdb39e CPP edit base basal gui - without function yet 2016-11-14 18:19:17 +01:00
AdrianLxM dba81ede2a calculation for isf and ic. Tooltips. 2016-11-14 18:19:17 +01:00
AdrianLxM 3fe7c7a0fa CPP shiftfix and base profile view 2016-11-14 18:19:17 +01:00
AdrianLxM 2c5b20a721 CPP html-ify and send to pump button 2016-11-14 18:19:17 +01:00
AdrianLxM a57a864c24 CPP icons 2016-11-14 18:19:17 +01:00
AdrianLxM 4dbb20b8c5 CPP small redesign 2016-11-14 18:19:17 +01:00
AdrianLxM f815f7fce6 CPP ic and isf data 2016-11-14 18:19:17 +01:00
AdrianLxM 8c93925865 CPP simple representation string 2016-11-14 18:19:17 +01:00
AdrianLxM 364b3d6710 CPP percentage and shift working on hard coded basal rate 2016-11-14 18:19:17 +01:00
AdrianLxM be556cf388 CPP copy simple profile 2016-11-14 18:19:17 +01:00
AdrianLxM d94136bc95 overview dymanic height 2016-11-12 20:39:11 +01:00
AdrianLxM 1568f77229 fill preset buttons 2016-11-11 16:24:00 +01:00
AdrianLxM a6d5d68938 fill action 2016-11-11 00:56:15 +01:00
AdrianLxM 7b4b4f7cfc Overview profile redesign 2016-11-10 23:20:23 +01:00
AdrianLxM 4ee87d1cca basal profile on overview 2016-11-10 21:03:26 +01:00
AdrianLxM ede982c8c5 Update danar_history_item.xml 2016-11-08 06:08:12 +01:00
Milos Kozak 45ffc18d25 move set temp and set extended buttons to actions 2016-11-05 20:12:58 +01:00
Milos Kozak 3ac9811d9a Actions page & offline profile switch 2016-11-05 15:46:11 +01:00
Milos Kozak 861c24fc45 distinguish between meal and correction bulus 2016-10-25 23:33:02 +02:00
Milos Kozak 6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00
Milos Kozak 5ec339e987 fix BolusProgessDialog size on Android 6 2016-10-11 23:49:26 +02:00
ecorman 83c4214710 Reduce width, + sign was not visible 2016-09-12 00:34:31 +02:00
Milos Kozak 05831c75a6 SMS LOOP commands 2016-09-10 15:33:00 +02:00
Milos Kozak bdeb7d6061 Merge pull request #30 from slavidex/patch-11
too long
2016-09-09 13:08:37 +02:00
Radoslav Radev 829beb5c8f too long 2016-09-09 07:54:16 +03:00
ecorman fcdd07a182 Reduce size to better fit screen 2016-09-08 23:18:15 +02:00
Milos Kozak 3fb84636db fix objectives import/export 2016-08-13 11:30:43 +02:00
Milos Kozak ebee1cdeca scrollview in careportal dialog 2016-08-11 15:36:59 +02:00
Milos Kozak 267e0220c0 overview scroll, determinebasal fix 2016-08-08 14:47:24 +02:00
Milos Kozak ff2e9a82bc fix some crashes 2016-08-07 13:07:13 +02:00
Milos Kozak b711648bee plugins refactoring 2016-08-05 23:54:03 +02:00
Milos Kozak 7cc0fb593d IOB display & upload fix 2016-08-05 00:32:48 +02:00
Milos Kozak b42644de39 objectives finalization, some todos 2016-08-04 23:38:43 +02:00
Milos Kozak a7d3dca752 Bolusing dialog 2016-08-04 09:17:26 +02:00
Milos Kozak 61e8ffeebd DanaR history loader 2016-07-27 17:49:56 +02:00
Milos Kozak 82a16efcc2 bolus wizard full functionality 2016-07-16 22:37:10 +02:00
Milos Kozak cd86476d6a design of virtual pump 2016-07-15 21:06:39 +02:00
Milos Kozak 7f661b7fa6 danar profile dia&car configurable in preferences 2016-07-15 20:56:07 +02:00
Milos Kozak 90fee59e8a sms communicator: remote bolus, status 2016-07-14 23:29:21 +02:00
Milos Kozak b81cf8341b MM640g base interface code 2016-07-13 15:56:27 +02:00
Milos Kozak 8681dc5122 overview status update 2016-07-13 14:56:11 +02:00
Milos Kozak 272262b115 SMSCommunicator plugin 2016-07-13 13:54:40 +02:00
Milos Kozak f7715a3409 xml reformating, some code cleaning 2016-07-11 17:49:09 +02:00
Milos Kozak 3127870770 DanaR as profile source 2016-07-11 14:04:57 +02:00
Milos Kozak 143d347841 most danar code there 2016-07-10 15:05:13 +02:00
Milos Kozak dc3eb80d52 basic danar comm 2016-07-08 00:17:02 +02:00
Milos Kozak 690fd06c01 Agreement 2016-07-07 18:04:36 +02:00
Milos Kozak ba015f1140 DanaR service 2016-07-07 10:34:20 +02:00
Milos Kozak 0b19cae903 smaller buttons on careportal 2016-07-07 01:11:24 +02:00
Milos Kozak 6ca5517aef switch + and - in dialogs 2016-07-06 11:11:12 +02:00
Milos Kozak 9f8d7d3dca configbuilder fragment translations 2016-07-03 13:56:57 +02:00
Milos Kozak 2b01b2a10b combobolus dialog plus/minus buttons 2016-07-03 13:46:49 +02:00
Milos Kozak 07b01cd8d0 some missing translations 2016-07-03 13:35:02 +02:00
Milos Kozak 5cad7f1cb4 temp basal dialog plus/minus buttons 2016-07-03 13:25:23 +02:00
Milos Kozak 7459acfc34 finished CZ translation 2016-07-03 11:04:24 +02:00
Milos Kozak ea4eef88ed 1st round of CZ translation 2016-07-03 01:02:35 +02:00
Milos Kozak 92f4c37fac careportal 2016-07-02 23:58:57 +02:00
Milos Kozak f3c15aca75 plus minus controls 2016-06-28 11:19:27 +02:00
Milos Kozak caa4f3402e split iob in wizard dialog, fixies for no data in app 2016-06-27 23:34:33 +02:00
Milos Kozak a3d32fcb44 objectives fragment complete 2016-06-27 18:48:48 +02:00
Milos Kozak a4bdebdedf detect ns versions 2016-06-26 14:56:43 +02:00
Milos Kozak 2f16c9b998 open loop mode & notification 2016-06-26 11:43:26 +02:00
Milos Kozak 5dfddfdfee fix counting and displaying iob 2016-06-25 15:00:42 +02:00
viktoria f90138ea54 Add border Buttons 2016-06-25 00:09:52 +02:00
Milos Kozak 270503fe74 Merge pull request #2 from LadyViktoria/master
Material Design and Buttons
2016-06-24 23:36:01 +02:00
viktoria 4eaa2c6f1d Material Design and Buttons 2016-06-24 23:20:38 +02:00
Milos Kozak 35ff53dbb4 iob & basal on overview tab 2016-06-24 23:17:46 +02:00
Milos Kozak 120341b706 devicestatus, lot of gui and internal improvements, temp&extended in db only 2016-06-24 17:16:17 +02:00
Milos Kozak 91b36a8528 work on tempbasals 2016-06-22 18:08:21 +02:00
Milos Kozak edddfed004 add source selection xdrip/nsclient 2016-06-21 00:34:36 +02:00
Milos Kozak fdf09b9daf extended bolus dialog 2016-06-20 22:55:49 +02:00
Milos Kozak 7cb0e0e588 manual tempbasal dialog 2016-06-20 20:45:55 +02:00
Milos Kozak 5ac31bd0ca menu, preferences, treatment&wizard buttons, ns upload 2016-06-19 20:06:00 +02:00
Milos Kozak aa97722283 loop & safety fragment 2016-06-19 13:17:16 +02:00
Milos Kozak d69701a092 SimpleProfile plugin, ConfigBuilder GUI improvements 2016-06-16 19:22:58 +02:00
Milos Kozak ddb1868018 Constrains interface 2016-06-15 21:47:26 +02:00
Milos Kozak 26724ecbda ConfigBuilder most work done 2016-06-14 23:45:55 +02:00
Milos Kozak b8eca8a802 rename profileviewer -> nsprofileviewer 2016-06-14 13:01:37 +02:00
Milos Kozak f424c9c642 ConfigBuilder fragment formating 2016-06-13 22:59:31 +02:00
Milos Kozak 32bfea8d18 base ConfigBuilder plugin 2016-06-13 22:53:41 +02:00
Milos Kozak b310310511 GUI improvements 2016-06-12 13:30:34 +02:00
Milos Kozak a66ece9af5 Lowsuspend finished 2016-06-12 10:53:19 +02:00
Milos Kozak 74dcbb1864 glucoseReading fix 2016-06-11 22:46:47 +02:00
Milos Kozak 54a25aa1ed remove static debug texts 2016-06-11 22:30:08 +02:00
Milos Kozak a8ab671d78 OpenApsMA invoke 2016-06-11 22:21:44 +02:00
Milos Kozak 68b5570d35 VirtualPump 2016-06-11 20:45:40 +02:00
Milos Kozak a5088584a2 OpenAPS MA initial work 2016-06-10 18:50:46 +02:00
Milos Kozak 891c5dd4d7 show units in profile 2016-06-09 09:21:33 +02:00
Milos Kozak 45cceddfcc basic graph on everview fragment 2016-06-09 00:01:28 +02:00
Milos Kozak 3b883dee31 basic overview fragment + some gui fixes 2016-06-07 23:36:22 +02:00
Milos Kozak 701e6a2055 receive BGs from xDrip and NSClient 2016-06-07 21:48:17 +02:00
Milos Kozak bd47fb8624 button refresh treatments from nightscout 2016-06-06 12:17:37 +02:00
Milos Kozak 627ce66852 TempBasals & some IOB adjustments 2016-06-06 10:42:46 +02:00
Milos Kozak f7779bd9f1 Treatments fragment 2016-06-05 14:53:03 +02:00
Milos Kozak 629ed62e03 Profile fragment 2016-06-05 01:40:35 +02:00
Milos Kozak 9b749202fd Objectives design 2016-06-04 17:28:05 +02:00