Milos Kozak
4ae7efc75f
Merge branch 'dev' into automation
2019-04-16 21:08:08 +02:00
Milos Kozak
e7d7a37aeb
LINT: input type
2019-04-08 18:13:47 +02:00
Milos Kozak
3b1d96ecc9
LINT: xml
2019-04-08 17:03:18 +02:00
Milos Kozak
a339e0cf28
LINT: xml
2019-04-08 16:39:41 +02:00
Milos Kozak
190b9408bd
fixed package name
2019-04-08 15:38:20 +02:00
Milos Kozak
5a555cdfba
AutomationPlugin:processActions and some tweaking
2019-03-31 21:54:31 +02:00
Nico Schmitz
236349a063
Bugfixes. Add remove icon for actions.
2019-03-26 23:28:46 +01:00
Nico Schmitz
97a7a75c86
work on automation plugin
...
- implement clone() methods for actions and triggers
- add AutomationEventTest
- improve ui
2019-03-26 00:06:37 +01:00
Nico Schmitz
fc7e65c4d1
Update to recent upstream/dev
2019-03-22 23:08:13 +01:00
Nico Schmitz
f017b7a7a2
Work on automation plugin.
...
- Remove unused imports
- Add icons for actions and triggers
2019-03-21 23:38:56 +01:00
Nico Schmitz
6dc87db73e
Improve EditEventDialog
2019-03-21 00:38:06 +01:00
Nico Schmitz
c074ec36c4
Implement temp target dialog for automation action
2019-03-20 00:39:00 +01:00
Milos Kozak
381ae67829
Merge pull request #1420 from tanja3981/improvement/#1269
...
[2.0] Improvement: Allow some objectives to go back.
2019-03-19 23:42:38 +01:00
Nico Schmitz
91e4b01f10
Display actions and merge recent upstream/dev
...
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
Andy Rozman
8594525d2c
Merge branch 'dev' into ench_1455_custom_actions
2019-03-08 23:49:56 +00:00
Tanja Schmidt
a5d1905be8
Allow some objectives to go back.
2019-03-06 19:03:42 +01:00
Milos Kozak
d9a9c933bc
package refactor
2019-02-28 23:16:50 +01:00
Milos Kozak
395faa7dc9
pumps package refactor
2019-02-26 20:38:27 +01:00
Andy Rozman
b0fe8fc5aa
Merge branch 'dev' into ench_1455_custom_actions
2019-02-20 23:41:09 +00:00
TebbeUbben
cc189d360f
Merge remote-tracking branch 'nico/dev-wip' into dev-nico
2019-02-02 16:58:21 +01:00
TebbeUbben
d1f7086651
Merge branch 'master' into insight-dev
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
2019-01-31 13:08:33 +01:00
TebbeUbben
2770a49869
Local Insight driver
2019-01-18 22:40:22 +01:00
Nico Schmitz
9e03f0f8ca
Update to current dev branch
2018-12-11 14:51:26 +01:00
Nico Schmitz
49b0e3ab71
Add EditTriggerDialog
2018-12-05 21:22:32 +01:00
triplem
eea79c5d0f
fixes PR#1550
2018-11-08 21:14:44 +01:00
Nico Schmitz
04574d759f
Improve dialogs. Add JSON serialization for actions and events.
2018-10-29 21:24:30 +01:00
Nico Schmitz
2e4f18794f
Add ChooseTriggerDialog
2018-10-16 00:07:13 +02:00
Nico Schmitz
f98d40f71b
Work on automation plugin.
...
- Add MainApp.dpToPx() helper function
- Remove trigger layout resources
- Generate trigger layout programmatically
- Improve ux (when composing trigger logic)
- Refactoring
2018-10-15 23:20:06 +02:00
Nico Schmitz
c60aae8630
Work on implementation for automation plugin.
...
- Use butterknife
- Import weekdays selector
- Implement layout for trigger connection and trigger time
- Implement view holders
- Implement adapters
- Implement dummy code for quick testings
- Refactor code
2018-09-25 00:00:09 +02:00
Andy Rozman
48e4a041f8
- First changes for CustomActions
...
- changed PumpInterface to add CustomActions
- added class CustomActions and CustomActionType
- changed all PumpImplementations to use new methods
- started changing ActionsFragment (most should be done)
2018-09-20 17:23:36 +01:00
Nico Schmitz
b5f30a0f46
Add some content to automation plugin fragment
2018-09-19 22:29:35 +02:00
Milos Kozak
d317ec94ad
AutomationPlugin
2018-09-18 10:05:19 +02:00
Sebastian Lenz
6323f2dd49
fixed typo
2018-09-16 18:32:51 +02:00
Milos Kozak
69544f67b5
nsclient arrow layout update
2018-09-11 19:50:35 +02:00
Milos Kozak
8a92bed479
tratments layout improvement
2018-09-11 19:29:51 +02:00
Milos Kozak
f5e7d28aa6
fix WizardInfoDialog 2nd
2018-09-01 23:34:35 +02:00
Milos Kozak
2c5837a235
Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into andyrozman-virtual_pump_Bug863
2018-08-23 17:53:28 +02:00
Milos Kozak
653a98fd5b
better layout for nsclient mode
2018-08-21 23:19:04 +02:00
Milos Kozak
414c3416dd
WizardInfoDialog
2018-08-20 19:32:18 +02:00
Nico Schmitz
5386c7db4a
Update to upstream/dev and resolve conflicts
2018-08-19 14:37:42 +02:00
Milos Kozak
4bfd851bf6
Merge pull request #1297 from MilosKozak/overview-flexbox
...
overview flexbox
2018-08-04 09:02:19 +02:00
AdrianLxM
77a3972f6a
overview flexbox
2018-08-03 16:07:15 +02:00
Milos Kozak
70e2b64adf
rename Time -> Time offset in eCarbs dialog
2018-08-03 13:04:58 +02:00
Milos Kozak
a01d9924eb
Merge branch 'dev' into sens
2018-08-02 15:22:45 +02:00
Milos Kozak
3bcd656c14
Maintenance plugin cleanup
2018-08-02 15:19:13 +02:00
Markus M. May
8f5869d806
Add sens data to small height overview as well
2018-08-01 20:48:36 +02:00
Markus M. May
38ac294a3c
Add sens data to overview for normal overview
2018-08-01 20:40:34 +02:00
Milos Kozak
c6bc15e311
Merge branch 'dev' into virtual_pump_Bug863
2018-08-01 11:57:48 +02:00
Markus M. May
9f90d31f35
Merge latest dev changes
2018-07-30 19:39:38 +02:00
Milos Kozak
073b522b93
user defined level of logging
2018-07-30 17:04:43 +02:00