Commit graph

3795 commits

Author SHA1 Message Date
Johannes Mockenhaupt 9b80221752
Set inputType for notes fields.
(cherry picked from commit af0807d)
2018-04-14 10:43:48 +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
Johannes Mockenhaupt 719d3d459b
NumberPicker: apply signed, decimal constraints for keyboard usage. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt efcc02775b
FillDialog: add missed validation, notes field, 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 05e07cf943
Align style of labels, i18n. 2018-04-12 21:32:47 +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 0a377eb98e cleanup 2018-04-12 10:32:52 +02:00
Milos Kozak 5eee8054c4 remove duplicate upload 2018-04-12 10:21:38 +02:00
Milos Kozak dfc869ba2b upload temptargets to NS properly 2018-04-12 10:17:59 +02:00
Milos Kozak 80e81b1c25 fix NPE 2018-04-12 09:53:14 +02:00
Milos Kozak 613b8a2f30 log profile conditional 2018-04-12 09:40:12 +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
Milos Kozak 263263daf1
Merge pull request #869 from PoweRGbg/phoneModel
Phone model note added to Ns #841
2018-04-11 17:57:30 +02:00
Roumen Georgiev 1acefaea3c
adding device name to AndroidAPS started note 2018-04-11 18:09:08 +03:00
Milos Kozak 83421c7266 show tests in travis 2018-04-11 16:23:35 +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
Roumen Georgiev 564e87d782 added phone Manufacturer and model note to NS 2018-04-11 15:44:53 +03:00
Johannes Mockenhaupt f8d022ba87
NewCarbsDialog: prefill with carbsReq. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt 9b3b228aad
Color active/scheduled bolus/carbs and TT entries in treatment tab. 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
AdrianLxM d1d46849ee
Merge pull request #832 from MilosKozak/lp-edit
LocalProfile reset/save button
2018-04-09 14:08:22 +02:00
Milos Kozak b2129fa48e
Merge pull request #857 from TebbeUbben/disable-tdd-load-button
Hide TDD buttons
2018-04-09 00:36:48 +02:00
Milos Kozak 0f0d68e46a
Merge pull request #855 from TebbeUbben/automatic-careportal-events
Automatic careportal events
2018-04-09 00:35:23 +02:00
Milos Kozak 82bb65560b QuickWizardTest part1 2018-04-09 00:37:23 +02:00
Milos Kozak 9b91b4ab93
Merge branch 'dev' into automatic-careportal-events 2018-04-08 23:53:04 +02:00
Milos Kozak 05591cd762 missing conditional logging 2018-04-08 22:28:05 +02:00
Milos Kozak 44e923dd09 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-08 22:24:51 +02:00
Milos Kozak 4663bb3cf6 extended boluses NS sync fix 2018-04-08 22:24:04 +02:00
Milos Kozak a609d806d1 fix tests 2018-04-08 20:37:05 +02:00
TebbeUbben df7d93ab2a Check for TDD support in updateGUI 2018-04-08 20:33:07 +02:00
TebbeUbben 851cec7240 Renamed alerts.xml to insight_alerts.xml 2018-04-08 20:27:23 +02:00
Milos Kozak d9279eed2a split MaxIOB for SMB 2018-04-08 20:17:15 +02:00
TebbeUbben 42541fc7e3 Switched back to custom careportal code 2018-04-08 18:57:29 +02:00
TebbeUbben b488e30459 Use uploadError for pump alarms 2018-04-08 18:46:29 +02:00