Commit graph

8940 commits

Author SHA1 Message Date
Milos Kozak
4eef2507fb fix tests 2021-04-10 12:19:31 +02:00
Milos Kozak
194cf305fd Rv2,RKorean 2021-04-10 10:41:53 +02:00
Milos Kozak
4120e9eef9 DanaR working 2021-04-09 08:02:46 +02:00
Philoul
22dfea652d RRemove unused injection and try to fix tests...
It works for LoopPluginTest, but not for ClassicPrefsFormatTest as many other... (don't know if it's my config or not)
2021-04-06 23:58:54 +02:00
Philoul
ffa9c04496 Remove dependency and create 2 classes for drivers 2021-04-06 23:30:16 +02:00
Philoul
e490c2df04 Update uel.log NSClientAddUpdateWorker 2021-04-06 00:43:51 +02:00
Milos Kozak
7b4ebbd440 2.8.2.1-dev-e2 2021-04-05 23:26:13 +02:00
Milos Kozak
d27b7a6139 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-05 23:13:17 +02:00
Milos Kozak
2463f8fc47 ExtendedBolus, TemporaryBasal -> room, DanaRS working 2021-04-05 22:41:28 +02:00
Philoul
1e4983e659 Merge branch 'meallink' into meallink_ValueWithUnit 2021-04-04 19:55:36 +02:00
Milos Kozak
0782878725
Merge pull request #458 from nightscout/meallink-carb-callback
callback if carbs are added to db but not pump
2021-04-04 16:18:27 +02:00
Philoul
cc3919e9fc Add SITE/RESERVOIR CHANGE Action and improve Colors 2021-04-04 15:05:43 +02:00
Philoul
22c1233201 Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-04-04 13:51:53 +02:00
Philoul
3cc7a72b3d Fix XXXValueWithUnit Refactoring 2021-04-04 09:20:02 +02:00
AdrianLxM
94a0283eb6 callback if carbs are added to db but not pump 2021-04-03 22:51:34 +02:00
AdrianLxM
d62456f2e2 Merge branch 'meallink_ValueWithUnit' of https://github.com/Philoul/AndroidAPS into meallink_ValueWithUnit 2021-04-03 21:34:41 +02:00
AdrianLxM
c2b3e617df pair programming session 2021-04-03 21:29:26 +02:00
Philoul
ae9503dcc0 Add StringResource to uel.log Food 2021-04-03 19:04:08 +02:00
Philoul
be35597da4 Add Pump Sources (only Dana currently has an Entry, but required I think for pump history uploaded in AAPS, or Prime/Fill/ReservoirChange from pump) 2021-04-03 18:51:36 +02:00
Philoul
206bac6da8 Safe Delete old ValueWithUnit Class in UserEntry 2021-04-03 12:51:49 +02:00
Philoul
dc87bfa303 Replace all remaining ValueWithUnit by XXXValueWithUnit and remove Deprecated uel.log functions 2021-04-03 12:25:44 +02:00
Philoul
442e64e3f0 Add dao for Fragment 2021-04-02 18:59:41 +02:00
Milos Kozak
e26e023ebf prepare TemporaryBasal 2021-04-01 23:46:21 +02:00
Philoul
bb147deb92 CalibrationDialog + CarbDialog 2021-04-01 23:22:22 +02:00
Philoul
16959d4de9 Merge branch 'meallink' into meallink_ValueWithUnit 2021-04-01 23:02:52 +02:00
Philoul
9b9bafb4bc CarePortal, ExtendedBolusDialog, FillDialog, InsulinDialog
Some cleaning in Imports
2021-04-01 22:59:05 +02:00
Philoul
1a1d718fa2 TreatmentDialog (fix missing uel.log if only carbs), BolusWizard, and TempTargetDialog 2021-04-01 22:23:53 +02:00
Philoul
83f4d25527 UserEntry refactor to include XXXValueWithUnit (Loop Dialog and ProfileSwitchDialog only) 2021-04-01 19:27:13 +02:00
Philoul
a07b685e8d UserEntry refactor to include XXXValueWithUnit (first test) 2021-04-01 18:26:13 +02:00
Milos Kozak
46793abbfc Treatment cleanup 2021-04-01 18:14:31 +02:00
Philoul
e13e5e10eb Merge branch 'meallink' into meallink_ValueWithUnit 2021-04-01 08:13:48 +02:00
Milos Kozak
699413dd6f fix tests 2021-04-01 00:37:15 +02:00
Milos Kozak
ab0f64bd46 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-01 00:03:54 +02:00
Milos Kozak
2df8c4fc74 provide Worker failure results 2021-04-01 00:03:49 +02:00
Milos Kozak
28f366d5fe
Merge pull request #453 from jotomo/meallink+revert-lint-suggestion
Revert incorrect Lint suggestion.
2021-04-01 00:01:14 +02:00
Milos Kozak
cacf239d17 VirtualPump plugin remove init 2021-03-31 22:59:05 +02:00
Philoul
3d9ef71045 Merge branch 'meallink' into meallink_ValueWithUnit
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
2021-03-31 22:18:50 +02:00
Milos Kozak
a5ea0d9027 DeviceStatus 2021-03-31 21:54:49 +02:00
Johannes Mockenhaupt
edcdc4c785
Revert incorrect Lint suggestion. 2021-03-31 20:44:35 +02:00
Philoul
ab0c739281 Clean Imports and add missing Sources in existing uel 2021-03-31 00:18:55 +02:00
Philoul
21f382f0ae Remove unused code 2021-03-30 23:29:43 +02:00
Philoul
348c260d3d QuickWizard 2021-03-30 23:13:20 +02:00
Philoul
bf218e9ff4 Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
2021-03-30 23:05:19 +02:00
Milos Kozak
299d0a9b01 finish Dana pumps 2021-03-30 22:45:45 +02:00
Philoul
9b0226719f Remove used import 2021-03-30 22:25:28 +02:00
Philoul
78a98358d7 Add QuickWizard Source (final solution) 2021-03-30 22:20:21 +02:00
Milos Kozak
07d060c2b5 carbs with duration 2021-03-30 22:05:44 +02:00
Milos Kozak
1ae4823a9a Merge remote-tracking branch 'ns/dev' into meallink 2021-03-30 19:39:22 +02:00
Milos Kozak
e9f4f87894 Remove Tratment.class where possible 2021-03-30 19:37:26 +02:00
Philoul
07e2e0eaf4 Add QuickWizard Source (final solution)
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
2021-03-30 12:22:49 +02:00