Milos Kozak
|
c04993ddad
|
rename interfaces, cleanup
|
2021-04-14 00:45:30 +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
|
cc3919e9fc
|
Add SITE/RESERVOIR CHANGE Action and improve Colors
|
2021-04-04 15:05:43 +02:00 |
|
|
AdrianLxM
|
c2b3e617df
|
pair programming session
|
2021-04-03 21:29:26 +02:00 |
|
|
Philoul
|
9b9bafb4bc
|
CarePortal, ExtendedBolusDialog, FillDialog, InsulinDialog
Some cleaning in Imports
|
2021-04-01 22:59:05 +02:00 |
|
|
Philoul
|
ab0c739281
|
Clean Imports and add missing Sources in existing uel
|
2021-03-31 00:18:55 +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
|
e3ac451f8d
|
PumpSync interface, VirtualPump, remove pump driver dependency to database
|
2021-03-29 00:31:40 +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 |
|
|
Philoul
|
854715955a
|
Add Careportal and actions sources + icons
|
2021-03-25 23:08:32 +01:00 |
|
|
Philoul
|
0e835cfb23
|
Fix Missing eventTime for Prime/Fill Dialog
|
2021-03-25 18:40:20 +01:00 |
|
|
Milos Kozak
|
7f0fe881b6
|
DetailedBolusInfo, MealLink UI
|
2021-03-25 17:48:07 +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 |
|
|
Milos Kozak
|
616871c95c
|
prepare DetailedBolusInfo
|
2021-03-22 16:59:09 +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
|
441f419bfa
|
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge
|
2021-03-09 22:44:33 +01:00 |
|
|
Milos Kozak
|
8ec346cd35
|
specify glucoseUnit, DB++
|
2021-03-09 22:11:30 +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
|
efa9e18f83
|
Constructor for formated Strings with param, add notes, convert to AAPS units in fragment
|
2021-03-02 22:43:18 +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 |
|
|
swissalpine
|
451dd59c2b
|
Fix: Seperate cartridge change from canula change
|
2021-01-22 20:08:33 +01:00 |
|
|
Milos Kozak
|
83c709e2bc
|
FillDialog -> jetpack
|
2021-01-21 20:21:25 +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
|
7fc631a729
|
RS -> danaRS finished
|
2020-05-09 10:52:20 +02:00 |
|
|
Milos Kozak
|
67b4be6963
|
Merge remote-tracking branch 'origin/dev' into rs2
|
2020-05-08 11:08:45 +02:00 |
|
|
Milos Kozak
|
70e9d3e88a
|
fix tests
|
2020-05-07 23:40:59 +02:00 |
|
|
Milos Kozak
|
29f71f283d
|
Merge remote-tracking branch 'origin/dev' into rs
|
2020-04-24 23:03:46 +02:00 |
|
|
Milos Kozak
|
752a49573c
|
ConfigBuilder refactor
|
2020-04-24 22:39:56 +02:00 |
|
|
Milos Kozak
|
f595560baa
|
RS insulin and canula change logging
|
2020-04-19 12:57:08 +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
|
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
|
cf2855ab02
|
Merge branch 'dev' into dagger3
|
2020-01-26 21:15:57 +01:00 |
|
|
Johannes Mockenhaupt
|
a1c7aae794
|
Refactor: dedup, method abstraction level.
|
2020-01-16 20:39:25 +01:00 |
|
|
Johannes Mockenhaupt
|
8f02459849
|
#2369 Set event time for second event plus 1s too
|
2020-01-16 15:46:53 +01:00 |
|
|
Milos Kozak
|
ac5ea83d38
|
more of dagger
|
2020-01-10 23:14:58 +01:00 |
|