Commit graph

687 commits

Author SHA1 Message Date
Johannes Mockenhaupt 58aa4f1323
Unbreak wizard xml, small fixes. 2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt 5d66ecc767
NewCarbsDialog: use correct 'constraint applied' messages.
(cherry picked from commit a9e290e)
2018-04-14 10:43:39 +02:00
Johannes Mockenhaupt 10604299e7
Cleanups. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt f420491611
NewCarbsDialog: cleanups. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt bf7e9e4bf3
NewInsulinDialog: add notes field, use relative time, align style. 2018-04-13 21:35:25 +02:00
AdrianLxM 10b9171afe
Distribute carbs strictly within timeframe 2018-04-13 00:48:57 +02:00
Johannes Mockenhaupt bf02edd871
Make visibility of notes field a preference. 2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt 4acf0c713a
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr
* origin/dev:
  Adding notes to carbs and to wizard on overview
2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt 7e19aff121
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr
* origin/dev:
  Overview: fix rendering zero-temp covering entire displayed range.
  cleanup
  remove duplicate upload
  upload temptargets to NS properly
  fix NPE
  log profile conditional
  adding device name to AndroidAPS started note
  show tests in travis
  gradle 3.1.1
  Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().
  added phone Manufacturer and model note to NS
  dummy-edit to re-trigger travis
  Fix for black number and labels on black background (aaps wear)
  Fix re-enabling the loop plugin from overview. Fixes #861.
  int to double in the isOlderThan()
  Get thresholds from NS

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
2018-04-12 21:18:04 +02:00
Milos Kozak 7fafd59a5e
Merge pull request #872 from triplem/notes_wizard
Notes wizard
2018-04-12 21:17:33 +02:00
Milos Kozak c573bcc277
Merge pull request #876 from MilosKozak/temptargetfix
upload temptargets to NS properly
2018-04-12 21:17:11 +02:00
Johannes Mockenhaupt b04eee0b52
Overview: fix rendering zero-temp covering entire displayed range.
(cherry picked from commit 525eaef)
2018-04-12 21:00:08 +02:00
Johannes Mockenhaupt a075d87da1
Remove help dialog.
(cherry picked from commit b1ef8e1)
2018-04-12 20:59:24 +02:00
Milos Kozak dfc869ba2b upload temptargets to NS properly 2018-04-12 10:17:59 +02:00
Johannes Mockenhaupt 5ef2502b4f
Saner types. 2018-04-12 00:50:28 +02:00
Johannes Mockenhaupt b1f66d086a
Fix overshoot on last carb record. 2018-04-12 00:42:12 +02:00
Markus M. May ca53b94498 Merge branch 'dev' into notes_wizard 2018-04-11 20:05:47 +02:00
Johannes Mockenhaupt d0edd89b5b
Remove CB.getActiveLoop(), use LoopPlugin.getPlugin(). 2018-04-11 15:42:51 +02:00
Johannes Mockenhaupt 61cce65947
Revert "NewCarbsDialog: prefill with carbsReq."
This reverts commit f8d022ba87.
2018-04-11 15:22:38 +02:00
Johannes Mockenhaupt f8d022ba87
NewCarbsDialog: prefill with carbsReq. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt d2491ca429
NewCarbsDialog: add duration, help. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt 80be7fb586
Fix re-enabling the loop plugin from overview. Fixes #861.
Note that enabling a loop plugin is hardcoded against the only
impl currently available LoopPlugin. Support for multiple loop
plugins is incomplete (and not needed at this point), since
there's no LoopInterface, but immediately LoopPlugin (as compared
to APSInterface with OpenAPS* impls).
When adding support, the last activated loop plugin must be remembered
so the correct one is re-enabled.
2018-04-10 12:10:19 +02:00
Markus M. May 99c8bbc6c2 Adding notes to carbs and to wizard on overview 2018-04-09 22:10:08 +02:00
Milos Kozak e9ac979a1b fix NPE in TempBasal treatments tab 2018-04-09 19:52:01 +02:00
Milos Kozak 828b20e358 optimize notifications & overview, fix reporting profile update 2018-04-05 23:42:27 +02:00
swissalpine 4ec959b0c4
Show "Disconnected (2d m)" on overview fragment 2018-04-05 21:53:09 +02:00
Milos Kozak aebaa76864 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-05 09:39:34 +02:00
Milos Kozak f6cd1201e3 Treatments refactor 2018-04-05 09:39:18 +02:00
AdrianLxM 8c303fd447 notifications for oreo quickfix 2018-04-04 14:55:25 +02:00
Milos Kozak 5a192d82d0 read pump status after pump driver change 2018-04-01 20:04:54 +02:00
Milos Kozak 0a03798de9 move treatments interface out of ConfigBuilder 2018-04-01 11:09:58 +02:00
Milos Kozak 34ec1225c6 fix NSCLIENT after plugin refactor 2018-03-31 21:41:14 +02:00
Milos Kozak 364364f205 ConfigBuilderTest 2018-03-31 11:31:09 +02:00
Milos Kozak bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Johannes Mockenhaupt da6f6dfe72
Clean up missed spots w.r.t. to FabricPrivacy transition. 2018-03-27 14:52:31 +02:00
Milos Kozak cc436a09d9 TempBasal, TempTarget refactor; NonOverlapingIntervalsTest 2018-03-26 22:37:53 +02:00
Milos Kozak f0e779cb1f set axisWidth based on dpi 2018-03-26 10:53:14 +02:00
Milos Kozak d5e60fa16f fix negative correction in wizard 2018-03-26 07:49:09 +02:00
Milos Kozak 8c5a2ab524
Merge pull request #799 from jotomo/prime-fill-refresh
Prime/fill button refresh and some drive-by improvements
2018-03-25 16:10:39 +02:00
Milos Kozak 2cfa2ae8cf overview graph rendering update 2018-03-24 18:10:57 +01:00
Milos Kozak bcf71d70dc increase font size 2018-03-24 17:33:23 +01:00
Milos Kozak b2db393436 fix rendering in nsclient mode 2018-03-24 17:21:55 +01:00
Milos Kozak 62d775b78e DEV warning only for APS builds 2018-03-24 17:09:56 +01:00
Milos Kozak 3d710dcf46 fix rendering TT in mmol 2018-03-23 23:55:38 +01:00
Johannes Mockenhaupt a4e9cb4976
Fixes. 2018-03-23 23:15:38 +01:00
Johannes Mockenhaupt e5bfa1fb1d
Show boluses with the precision the pump actually supports. 2018-03-23 23:02:35 +01:00
Milos Kozak 044a3fc10f LoopPluginTest 2018-03-23 20:10:45 +01:00
Milos Kozak ad8ff15cdc getMax... constraints functions 2018-03-22 23:20:10 +01:00
Milos Kozak 1aba9a2564 applyCarbsConstraints refactor & tests 2018-03-22 10:31:07 +01:00
Milos Kozak 15158fb5ea applyBolusConstraints refactor & tests 2018-03-21 23:01:30 +01:00