Milos Kozak
e17f96ac5c
Merge pull request #497 from jotomo/dev2-cd+insight
...
Insight fixes and refactorings
2021-05-03 09:36:03 +02:00
Milos Kozak
5747f97201
DanaHistoryDatabase
2021-05-03 09:33:14 +02:00
Andy Rozman
67a2c0dca3
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-05-01 12:11:29 +01:00
Andy Rozman
5abdba0579
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-01 11:26:53 +01:00
Johannes Mockenhaupt
dc2d64ceb7
Fix: turn APSResult.bolusRequested into a function.
...
Previously this var was set while parsing determine-basal output, setting it to true if determine-basal provided a value which was assigned to var smb. However, the variable smb is changed when constraints are applied, making the val bolusRequested invalid afterwards. Hence, dynamically evaluate the smb var by turning bolusRequested into a function.
2021-05-01 00:23:32 +02:00
Milos Kozak
e48d317d55
ProfileSwitch NS sync
2021-04-30 17:21:24 +02:00
Andy Rozman
6504498cd2
- added bolus handling (complete)
...
- added PumpSyncStorage class for handling temporary data
2021-04-30 15:28:24 +01:00
Milos Kozak
0731ccb6d4
Merge pull request #487 from Philoul/uel.log_BolusCancel
...
Add uel.log for Cancel Bolus Button
2021-04-29 21:04:38 +02:00
Milos Kozak
37e3c4532a
Profiles -> room (no NS sync yet)
2021-04-29 20:42:45 +02:00
Johannes Mockenhaupt
970aebc6db
Refactor: rename PumpDescription.setPumpDescription to pd.fillFor().
2021-04-29 14:51:04 +02:00
Andy Rozman
727862c743
- DailyTotals changes
...
- GraphData merge
2021-04-25 18:15:53 +01:00
Andy Rozman
e7d4f57c84
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-04-24 19:22:57 +01:00
Andy Rozman
edb7f42e7f
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-04-24 19:19:09 +01:00
Philoul
e7578b4c8f
Loop Dialog, hide loop buttons if pump disconnected or loop suspended
2021-04-23 00:31:40 +02:00
Andy Rozman
08a5c50037
- kotlin changes almost done, 1 file left
2021-04-20 23:23:03 +01:00
Philoul
0f18d43da8
Icon overview of userEntry updated
2021-04-20 22:28:58 +02:00
Andy Rozman
6b7efdcb95
- more kotlinize, MedtronicHistoryActivity not yet working
2021-04-20 16:45:29 +01:00
Milos Kozak
cada2919d1
prepare Profile interface
2021-04-19 18:44:17 +02:00
Milos Kozak
430a871993
fix DeviceStatus upload
2021-04-18 18:31:21 +02:00
Milos Kozak
3928b579a7
TDD -> room
2021-04-18 13:31:25 +02:00
Andy Rozman
99946dd728
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-04-16 21:49:31 +01:00
Milos Kozak
481ba32b3b
Merge remote-tracking branch 'ns/dev' into dev2_dana_combo_only
2021-04-15 18:38:32 +02:00
Milos Kozak
6b16e93427
New Crowdin updates ( #479 )
...
* New translations exam.xml (Czech)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Dutch)
* New translations objectives.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Romanian)
* New translations exam.xml (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (Slovak)
* New translations strings.xml (Hebrew)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Spanish)
* New translations strings.xml (Norwegian)
* New translations exam.xml (Hebrew)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations strings.xml (Greek)
* New translations strings.xml (Irish)
* New translations strings.xml (Italian)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations alert_titles.xml (Portuguese)
* New translations exceptions.xml (Portuguese)
* New translations strings.xml (Romanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Dutch)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Polish)
* New translations validator.xml (Dutch)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Croatian)
* New translations strings.xml (Tamil)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (French)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Czech)
* New translations strings.xml (French)
* New translations strings.xml (Slovak)
* New translations strings.xml (Catalan)
* New translations strings.xml (Slovak)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Catalan)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations validator.xml (Portuguese)
* New translations strings.xml (Croatian)
* New translations strings.xml (Tamil)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Turkish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Danish)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
2021-04-15 18:18:10 +02:00
Philoul
90ff9d972b
Fix order of curves for scale
2021-04-15 00:10:08 +02:00
Philoul
f08eefbf9c
Fix Scale
2021-04-14 23:30:04 +02:00
Milos Kozak
4effade9a4
lints
2021-04-14 23:10:11 +02:00
Milos Kozak
9c8f99b331
lints
2021-04-14 23:07: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
Philoul
015ec3a937
Merge branch 'dev' into test_sec_scale
2021-04-14 22:32:35 +02:00
Philoul
591e9bab89
100% for 0 value
2021-04-14 22:31:49 +02:00
Milos Kozak
24164eee98
PumpInterface rename
2021-04-14 19:36:13 +02:00
Milos Kozak
eacdbffebc
ImportExportPrefsInterface rename
2021-04-14 19:15:10 +02:00
Milos Kozak
6ac01a26cd
DanaRInterface rename
2021-04-14 19:03:50 +02:00
Milos Kozak
176fc4bb47
ConstriantsInterface rename
2021-04-14 19:01:49 +02:00
Milos Kozak
8ecc02c994
rename ConfigInterface
2021-04-14 18:42:12 +02:00
Milos Kozak
58c185a75a
Workers for NSAcks
2021-04-14 15:54:09 +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
05bfb957ec
IconsProvider rename
2021-04-13 23:02:47 +02:00
Milos Kozak
e57c9ea0b8
utils -> kt
2021-04-13 22:52:40 +02:00
Milos Kozak
f95d4725f1
fix tests
2021-04-13 19:43:58 +02:00
Milos Kozak
e643399987
2.8.2.1-dev-e3
2021-04-13 18:36:15 +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
7e5cf23115
remove logging
2021-04-13 18:35:10 +02:00
Milos Kozak
36040b7ed2
IobCobCalculator refactor
2021-04-13 18:33:44 +02:00
Milos Kozak
25de9a60f6
Merge pull request #469 from Philoul/meallink_VWU_v2
...
Remove StringResource
2021-04-13 15:37:20 +02:00
Milos Kozak
c637b7072c
IobCobCalculator refactor
2021-04-12 19:49:12 +02:00
Milos Kozak
639328bdc3
show bucketed data in dev mode
2021-04-12 16:04:06 +02:00
Milos Kozak
a6b67b2bb7
optimize events for IobCobCalculator
2021-04-12 14:31:15 +02:00
Milos Kozak
aadeeeebbf
lints
2021-04-11 22:03:22 +02:00
Philoul
0ad53011c1
Merge branch 'meallink' into meallink_VWU_v2
2021-04-11 18:09:20 +02:00
Milos Kozak
dcc0b040df
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
2021-04-11 17:59:02 +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
09aa909cd6
Move uel.log outside Callback
2021-04-11 16:11:37 +02:00
Philoul
f5330287e9
Replace ValueWithUnit.StringResource by ValueWithUnit.SimpleString
2021-04-11 16:02:53 +02:00
Milos Kozak
b0a12dab1a
Merge pull request #468 from Philoul/meallink_VWU_v2
...
Fix double Entries in Treatment Dialog (+ add new uel.log for plugin enabled/disabled
2021-04-11 08:39:43 +02:00
Philoul
62443f6738
Merge branch 'meallink' into meallink_VWU_v2
2021-04-10 20:44:08 +02:00
Philoul
4d1f330064
Fix double userEntry with VirtualPump if we enter Carbs + Insulin
2021-04-10 19:56:28 +02:00
Philoul
baa37c4e3a
uel.log for plugin enabled / disabled
2021-04-10 19:55:24 +02:00
Milos Kozak
ebf0781f47
Merge pull request #466 from Philoul/meallink_VWU_v2
...
New uel.log
2021-04-10 18:23:40 +02:00
Milos Kozak
d898a374e6
fix tests, removed Trigger reflection
2021-04-10 14:36:55 +02:00
Milos Kozak
e4d70a7303
fix tests
2021-04-10 12:56:54 +02:00
Milos Kozak
4eef2507fb
fix tests
2021-04-10 12:19:31 +02:00
Philoul
c728f8689b
uel.log for Start and Exit AAPS
2021-04-10 11:35:38 +02:00
Milos Kozak
194cf305fd
Rv2,RKorean
2021-04-10 10:41:53 +02:00
Philoul
5a143b5444
Merge branch 'meallink' into meallink_VWU_v2
2021-04-09 12:38:42 +02:00
Philoul
5023225650
Add uel.log for Alert Carbs required
2021-04-09 12:00:33 +02:00
Milos Kozak
4120e9eef9
DanaR working
2021-04-09 08:02:46 +02:00
Philoul
ff0e6e9c87
Use icon of activeBgSource for uel Log
2021-04-08 18:47:00 +02:00
Philoul
8bba73a6ca
Fix Plugin Type for BGSource in PluginStore.kt
...
I don't know if it could have side effect...
2021-04-08 11:24:10 +02:00
Philoul
6114effb22
Add BG sources for uel (Calibration and Sensor Change)
2021-04-08 10:06:00 +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
f74cd6796f
Same Color for DEV and BGI in menu + SEN value * 100
2021-04-05 10:44:52 +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
Philoul
61d84e66fe
Add QuickWizard Source (Solution TBC, information got through Note, so I create a "complicated String" to avoid Fake QuickWizard in UserEntry)
2021-03-29 23:47:21 +02:00
Philoul
d607b855b0
Add QuickWizard Source (not sure if it's the best solution...)
2021-03-29 23:03:53 +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
Philoul
e829a6918c
Fix uel after merge
2021-03-29 22:30:44 +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
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
Milos Kozak
f37e3ab4c2
Simplify IOB calculation call
2021-03-29 09:43:25 +02:00
Milos Kozak
e3ac451f8d
PumpSync interface, VirtualPump, remove pump driver dependency to database
2021-03-29 00:31:40 +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
Milos Kozak
df1e2c53db
Bolus, Carbs, BolusCalcResult new way of upload to NS
2021-03-28 13:45:27 +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
Milos Kozak
c9c02458d6
TT & GV new way of upload to NS
2021-03-27 23:14:51 +01:00
AdrianLxM
57f9fa0730
correct call of teardown wear plugin
2021-03-27 22:49:22 +01:00
AdrianLxM
b077b1d5b1
load Action String Handler
2021-03-27 22:47:45 +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
Milos Kozak
6aa9a0fe12
bypass Queue for TemporaryTargets
2021-03-26 21:16:27 +01:00
