Philoul
|
6956a17bf6
|
Move Colored Action to UserEntryPresentationHelper.kt
Treatment is now replaced by Bolus + Carbs (blue and orange)
|
2021-03-29 09:49:08 +02:00 |
|
Philoul
|
74b911d875
|
Remove SerializedName (all) and Text (Sources)
|
2021-03-28 21:45:40 +02:00 |
|
Philoul
|
9d4a1d5944
|
Remove UserEntryExt file and move UserEntryPresentationHelper.kt in utils folder
|
2021-03-28 18:52:13 +02:00 |
|
Philoul
|
09349fddd4
|
Fix Action Name and Translator
|
2021-03-28 17:54:18 +02:00 |
|
Philoul
|
87fecfd255
|
Fix Build 2
|
2021-03-28 17:37:32 +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 |
|
AdrianLxM
|
4e77902bdb
|
correct call of teardown wear plugin
|
2021-03-27 23:35:57 +01:00 |
|
AdrianLxM
|
dc79109f5e
|
load Action String Handler
|
2021-03-27 23:35:50 +01:00 |
|
AdrianLxM
|
7db2e112ee
|
UserEntryPresentationHelper
|
2021-03-27 22:33:39 +01:00 |
|
Philoul
|
8214874495
|
Add Local Profile source
|
2021-03-27 17:44:50 +01:00 |
|
Philoul
|
23c44b388b
|
Add Treatments source
|
2021-03-27 16:25:59 +01:00 |
|
Philoul
|
2bd2510bd8
|
Add Maintenance source
|
2021-03-27 16:17:38 +01:00 |
|
Philoul
|
b375ae45ae
|
Improve Layout (avoid overlap between Action and Icon on low res screen)
|
2021-03-27 16:02:40 +01:00 |
|
Philoul
|
1876a6064c
|
TimeUnit for ms-> min conversion
|
2021-03-27 14:15:35 +01:00 |
|
Philoul
|
2e59dd3112
|
Add UserEntry for Wear
|
2021-03-27 00:58:01 +01:00 |
|
Philoul
|
b329971d9a
|
Add Filter to hide Loop entries
I didn't find an easy way to filter with SQL query, so I filtered manually the list, probably not the best solution...
|
2021-03-25 23:47:03 +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 |
|
Philoul
|
a23545bbc1
|
Avoid SMB with 0.00 value
|
2021-03-25 17:53:54 +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 |
|
Philoul
|
ac3baab3f3
|
Merge remote-tracking branch 'Nightscout/dev' into UserEntryImprovement
|
2021-03-23 15:42:03 +01:00 |
|
Milos Kozak
|
3d08683e57
|
Merge pull request #428 from nightscout/adrian/automation-rework
automation elements without injector
|
2021-03-21 19:40:18 +01:00 |
|
Philoul
|
c3d593f7ae
|
Start implementation of Source
|
2021-03-21 19:14:42 +01:00 |
|
Milos Kozak
|
8ec991c3d7
|
LoopPluginTest without powermock
|
2021-03-21 14:05:05 +01:00 |
|
Milos Kozak
|
ed30e2bf10
|
fix NPE
|
2021-03-21 13:52:15 +01:00 |
|
Milos Kozak
|
87ab4fda0e
|
NSSgv -> kt
|
2021-03-21 13:50:06 +01:00 |
|
Milos Kozak
|
69f8195bbe
|
2.8.2.1-dev-e
|
2021-03-20 23:17:05 +01:00 |
|
Milos Kozak
|
70c08d0fe8
|
Merge remote-tracking branch 'ns/dev' into food
|
2021-03-20 20:40:51 +01:00 |
|
Milos Kozak
|
415729f243
|
bypass Intents on NS received data
|
2021-03-20 20:31:44 +01:00 |
|
Milos Kozak
|
7f95144564
|
Merge pull request #429 from Philoul/FixCarePortalNoteNull
Allow null notes in UserEntryLogger
|
2021-03-20 18:38:00 +01:00 |
|
Milos Kozak
|
98c7508383
|
NSClientMbgWorker
|
2021-03-20 14:51:10 +01:00 |
|
Milos Kozak
|
e53c91fc58
|
DataWorker, NSDeviceStatus -> kt
|
2021-03-20 12:30:57 +01:00 |
|
Philoul
|
fdbd7f63e5
|
Null notes managed in uel.log
|
2021-03-20 09:36:06 +01:00 |
|
Philoul
|
59abe42032
|
Timestamp before type for consistency of presentation in TreatmentsUserEntryFragment (Careportal Removed)
|
2021-03-20 09:27:46 +01:00 |
|
AdrianLxM
|
fd2c072799
|
automation elements without injector
|
2021-03-20 01:27:04 +01:00 |
|
Milos Kozak
|
8be3ccc989
|
return proper result from Worker
|
2021-03-19 22:41:19 +01:00 |
|
AdrianLxM
|
7d2e364c77
|
use UploadQueue through interface
|
2021-03-19 21:35:09 +01:00 |
|
Milos Kozak
|
a2fbab02f9
|
food -> Room
|
2021-03-19 18:49:34 +01:00 |
|
Milos Kozak
|
8736f6db7e
|
Merge branch 'dev' into pull/393
|
2021-03-19 11:42:59 +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
|
2b6f060eae
|
Translate TT_Reason (UserEntry and csv export)
|
2021-03-17 12:05:25 +01:00 |
|
Milos Kozak
|
253db21073
|
Merge pull request #416 from Philoul/Statistic_percentage
Stats: inRange percentage to always get a sum equal to 100%
|
2021-03-17 09:45:37 +01:00 |
|
Philoul
|
919a718a81
|
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
|
2021-03-17 08:55:26 +01:00 |
|
Milos Kozak
|
02afb58a14
|
fix of fix
|
2021-03-16 21:18:44 +01:00 |
|
Milos Kozak
|
91fecb6cc7
|
fix NPE
|
2021-03-16 19:06:05 +01:00 |
|
Milos Kozak
|
e2e060b9a9
|
Merge pull request #414 from Philoul/UpdateTranslator
Fix TT Reason in TTDialog and add TT Reason to Translator
|
2021-03-16 18:17:41 +01:00 |
|