1
0
Fork 0
Commit graph

111 commits

Author SHA1 Message Date
Milos Kozak
1f65ee38c7 RxBusWrapper -> RxBus 2021-10-15 14:56:22 +02:00
Milos Kozak
a8895668bd fix ActionCarePortalEvent strings 2021-10-09 13:35:09 +02:00
Philoul
ec627ae48c Add Careportal actions (Note, Exercise, Question and Announcement) 2021-10-09 01:51:43 +02:00
Milos Kozak
9d99913282 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-10-03 19:01:07 +02:00
Milos Kozak
214078b477 fix displaying profile status 2021-10-03 19:01:03 +02:00
Milos Kozak
917ecaa479
Merge pull request from Philoul/Fix/CrashMissingTrigger
Fix crash if trigger not found (minor improvement)
2021-10-03 18:53:07 +02:00
Philoul
b636eb785b Fix Crash if a missing trigger is found 2021-09-29 21:58:58 +02:00
Philoul
ddc9b9c6ad Add new automation trigger Temp Target Value 2021-09-24 18:34:48 +02:00
Milos Kozak
d33f62b23d remove PowerMockRunner where possible 2021-09-21 21:57:56 +02:00
Milos Kozak
9e42f91848 finish removing Objective8 2021-09-21 15:16:19 +02:00
Milos Kozak
4b6d4d287c Ask for old apssword in SetupWizard 2021-09-20 13:04:13 +02:00
Philoul
c49dbe655a Fix Automation rule
Action not displayed with JSONArray, it works with a JSONObject...
2021-09-12 15:56:34 +02:00
Milos Kozak
d18c05205c Resolve warnings 2021-09-07 12:08:19 +02:00
Milos Kozak
84343c39a4 fix tests 2021-09-06 11:27:27 +02:00
Philoul
2fafa78f56 Fix Automation regression (Add missing return) 2021-09-04 23:59:45 +02:00
Milos Kozak
dfdea82731 fix Action loading 2021-08-17 18:08:29 +02:00
Milos Kozak
1c065c75e8 API 30 lints 2021-08-11 18:10:44 +02:00
Milos Kozak
0e928bbb9c compileSdkVersion 30 2021-08-06 00:08:49 +02:00
Milos Kozak
6735d22934 OfflineEvent -> room 2021-05-28 16:06:44 +02:00
Milos Kozak
37e3c4532a Profiles -> room (no NS sync yet) 2021-04-29 20:42:45 +02:00
Milos Kozak
cada2919d1 prepare Profile interface 2021-04-19 18:44:17 +02:00
Milos Kozak
312136451b ProfileInterface rename 2021-04-14 22:58:21 +02:00
Milos Kozak
bb82f41b9e NotificationHolderInterface rename 2021-04-14 22:44:24 +02:00
Milos Kozak
4e604124c5 SmsCommunicatorInterface rename 2021-04-14 22:37:34 +02:00
Milos Kozak
8ecc02c994 rename ConfigInterface 2021-04-14 18:42:12 +02:00
Milos Kozak
c04993ddad rename interfaces, cleanup 2021-04-14 00:45:30 +02:00
Milos Kozak
3aa38d46bb ConfigBuilderInterface rename 2021-04-13 23:27:55 +02:00
Milos Kozak
429842ecd0 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-13 18:35:15 +02:00
Milos Kozak
36040b7ed2 IobCobCalculator refactor 2021-04-13 18:33:44 +02:00
Milos Kozak
c637b7072c IobCobCalculator refactor 2021-04-12 19:49:12 +02:00
Philoul
0ad53011c1 Merge branch 'meallink' into meallink_VWU_v2 2021-04-11 18:09:20 +02:00
Milos Kozak
8ce5a881d3 _now() -> now() 2021-04-11 17:58:50 +02:00
Milos Kozak
998eba8b9f DateUtil -> kt, static funcs removed 2021-04-11 17:47:55 +02:00
Philoul
f5330287e9 Replace ValueWithUnit.StringResource by ValueWithUnit.SimpleString 2021-04-11 16:02:53 +02:00
Milos Kozak
d898a374e6 fix tests, removed Trigger reflection 2021-04-10 14:36:55 +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
AdrianLxM
c2b3e617df pair programming session 2021-04-03 21:29:26 +02:00
Philoul
2a03d1d7ca Remove presentation of StringResource with Param to avoid crash
Move String used in uel.log to core
2021-04-03 15:39:43 +02:00
Philoul
1f4b75a30d Add Rule Title in UserEntry for Automation (as note) 2021-04-03 13:35:15 +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
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
Philoul
ab0c739281 Clean Imports and add missing Sources in existing uel 2021-03-31 00:18:55 +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
e9f4f87894 Remove Tratment.class where possible 2021-03-30 19:37:26 +02:00
Philoul
6c8b4dfab0 Merge branch 'meallink' into meallink_ValueWithUnit
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
2021-03-29 22:39:12 +02:00
Milos Kozak
cb298a2646 eliminate treatments cache from TreatmentsPlugin 2021-03-29 19:15:46 +02:00
Philoul
22384ef2e8 Merge branch 'Adrian_ValueWithUnit_Refactor' into meallink_ValueWithUnit
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
#	combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
#	core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
#	core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
#	database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
#	omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java
2021-03-29 13:51:28 +02:00
Milos Kozak
df1e2c53db Bolus, Carbs, BolusCalcResult new way of upload to NS 2021-03-28 13:45:27 +02:00