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
|
e829a6918c
|
Fix uel after merge
|
2021-03-29 22:30:44 +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 |
|
|
Philoul
|
654ca35dd1
|
Merge branch 'UserEntryImprovement' into AdrianVWU_Update
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.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/LoopDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.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/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
# 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/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
# core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
# core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
|
2021-03-28 17:04:52 +02:00 |
|
|
Milos Kozak
|
df1e2c53db
|
Bolus, Carbs, BolusCalcResult new way of upload to NS
|
2021-03-28 13:45:27 +02:00 |
|
|
Milos Kozak
|
4edf51d6ea
|
remove nsUpload call for TemporaryTargets
|
2021-03-26 16:23:47 +01:00 |
|
|
Milos Kozak
|
ff001b0add
|
remove MealLink.class
|
2021-03-25 23:52:08 +01:00 |
|
|
Milos Kozak
|
7f0fe881b6
|
DetailedBolusInfo, MealLink UI
|
2021-03-25 17:48:07 +01:00 |
|
|
Philoul
|
6e0d21a874
|
Add Source icon in UserEntryFragment, Update source in uel.log
|
2021-03-25 13:32:11 +01:00 |
|
|
AdrianLxM
|
d9aced595b
|
make new ValueWithUnit translatable
|
2021-03-25 03:23:28 +01:00 |
|
|
AdrianLxM
|
2da872bbfe
|
idea: value with unit as sealed class
|
2021-03-25 02:24:26 +01:00 |
|
|
Philoul
|
d3a9947cb4
|
Integrate Source for SMS, NS and Bolus Record (Simplify list of actions)
|
2021-03-23 15:42:55 +01:00 |
|
|
Milos Kozak
|
616871c95c
|
prepare DetailedBolusInfo
|
2021-03-22 16:59:09 +01:00 |
|
|
Philoul
|
400f55f3d9
|
Remove TT_Reason unit (now the same than TherapyEvent Unit that include all enum key translated with Translator)
Fix TT Custom missing
|
2021-03-18 11:15:45 +01:00 |
|
|
Philoul
|
accfc24332
|
Optimize Actions
|
2021-03-17 22:45:08 +01:00 |
|
|
Philoul
|
d731762c70
|
Add optional condition in ValueWithUnit constructor and remove tests for uel.log
|
2021-03-13 12:15:21 +01:00 |
|
|
Philoul
|
f3787304f8
|
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge
# 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/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# database/schemas/info.nightscout.androidaps.database.AppDatabase/4.json
|
2021-03-09 21:50:17 +01:00 |
|
|
Milos Kozak
|
8db8edc3f6
|
Careportal -> Room
|
2021-03-08 20:10:02 +01:00 |
|
|
Philoul
|
4ce59b929a
|
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU
# 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/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
|
2021-03-03 22:49:31 +01:00 |
|
|
Philoul
|
efa9e18f83
|
Constructor for formated Strings with param, add notes, convert to AAPS units in fragment
|
2021-03-02 22:43:18 +01:00 |
|
|
Milos Kozak
|
3b5b945fea
|
TemporaryTarget -> room database
|
2021-03-01 12:42:42 +01:00 |
|
|
Philoul
|
df995724a7
|
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft
# Conflicts:
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
|
2021-03-01 08:34:40 +01:00 |
|
|
Philoul
|
8798be0c34
|
Update uel.log entries, Increase database version 3=>4, update migration3to4
|
2021-02-28 15:54:37 +01:00 |
|
|
Milos Kozak
|
07bf16b07b
|
rename core strings
|
2021-02-22 18:04:30 +01:00 |
|
|
Philoul
|
820566fa62
|
Switched to Enum class for UserEntryLogger
|
2021-02-21 00:28:44 +01:00 |
|
|
Philoul
|
14454f6c15
|
Create keys for uel.log
|
2021-02-20 13:30:34 +01:00 |
|
|
Milos Kozak
|
af1ee97d83
|
cleanup
|
2021-02-14 15:09:06 +01:00 |
|
|
Milos Kozak
|
7b4a30865a
|
UserEntry logging
|
2021-02-09 17:57:28 +01:00 |
|
|
Milos Kozak
|
b09a909d74
|
InsulinDialog -> jetpack
|
2021-01-21 20:31:20 +01:00 |
|
|
Milos Kozak
|
561ba72bf0
|
prevent NPE
|
2020-11-26 12:22:38 +01:00 |
|
|
Milos Kozak
|
09e5c82d4d
|
unify units spacing
|
2020-08-19 21:24:01 +02:00 |
|
|
Milos Kozak
|
7bf9b8d588
|
better info in nsclient mode
|
2020-07-24 13:00:11 +02:00 |
|
|
Milos Kozak
|
70e9d3e88a
|
fix tests
|
2020-05-07 23:40:59 +02:00 |
|
|
Milos Kozak
|
120c526b80
|
move to core
|
2020-05-07 09:54:36 +02:00 |
|
|
Milos Kozak
|
0585ba80fa
|
Cleanup
|
2020-04-08 14:03:57 +02:00 |
|
|
Milos Kozak
|
7e9402b939
|
remove ProfileFunctions dependency
|
2020-03-17 22:56:14 +01:00 |
|
|
Milos Kozak
|
66bea16bdf
|
PluginStore
|
2020-03-16 21:40:29 +01:00 |
|
|
Milos Kozak
|
fcf1966f58
|
Merge branch 'dev' into dagger3
|
2020-02-28 18:20:31 +01:00 |
|
|
Milos Kozak
|
a79393c65a
|
Log user actions
|
2020-02-04 22:25:07 +01:00 |
|
|
Milos Kozak
|
faaa659b3d
|
Dana drivers refactor
|
2020-01-12 23:43:44 +01:00 |
|
|
Milos Kozak
|
ac5ea83d38
|
more of dagger
|
2020-01-10 23:14:58 +01:00 |
|
|
Milos Kozak
|
bcc3829915
|
NSClient rafactor
|
2020-01-01 23:23:16 +01:00 |
|
|
Milos Kozak
|
7518537108
|
wizard injection
|
2019-12-31 11:57:58 +01:00 |
|
|
Milos Kozak
|
fef74726b2
|
daggerize
|
2019-12-30 00:53:44 +01:00 |
|
|
Milos Kozak
|
7f8abcf591
|
Constraints, Dialogs daggerize
|
2019-12-27 19:20:38 +01:00 |
|
|
Milos Kozak
|
91000dc1bb
|
Confirmation dialogs cleanup
|
2019-12-22 21:37:26 +01:00 |
|
|
Milos Kozak
|
cbfb8a6a0f
|
Automation dialogs refactor
|
2019-12-21 23:17:20 +01:00 |
|
|
AdrianLxM
|
953d6bc029
|
small cleanup
|
2019-12-20 23:05:35 +01:00 |
|
|
Milos Kozak
|
83fe8527ce
|
ErrorDialog refactor
|
2019-12-20 19:46:07 +01:00 |
|