caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
13174 commits 1 branch 20 tags 140 MiB
Commit graph

7505 commits

Author SHA1 Message Date
Milos Kozak
88f5eec306 do not run AcceptTemp on UI thread 2021-05-03 20:46:23 +02:00
Milos Kozak
e8ecf43894 ProfileSwitch improvements, resolve initial PS 2021-05-03 18:19:10 +02:00
Milos Kozak
5d55bdadf4 Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only 2021-05-03 14:59:20 +02:00
Milos Kozak
07b3557b81 NSClientService -> kt 2021-05-03 14:59:10 +02:00
Milos Kozak
ac7da44336
Merge pull request #498 from jotomo/dev2_dana_combo_only 
Fix: turn APSResult.bolusRequested into a function.
 2021-05-03 14:42:59 +02:00
Milos Kozak
840de7b3b9 NSClient -> kt 2021-05-03 14:15:19 +02:00
Milos Kozak
c75d4e8e4e eliminate old NS sync style 2021-05-03 12:49:11 +02:00
Milos Kozak
37bc7c040c invalidateTemporaryBasalWithTempId 2021-05-03 10:56:26 +02:00
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
Andrei Vereha
e3f7608de7 Merge remote-tracking branch 'upstream/dev2_dana_combo_only' into avereha/dev2-merge 2021-05-01 20:11:48 +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
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
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
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
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
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
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
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
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
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
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
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
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
Philoul
ac3baab3f3 Merge remote-tracking branch 'Nightscout/dev' into UserEntryImprovement 2021-03-23 15:42:03 +01:00
Milos Kozak
616871c95c prepare DetailedBolusInfo 2021-03-22 16:59:09 +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
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
Philoul
fc78e5c0b7 Stats: inRange percentage to always get a sum equal to 100% 2021-03-14 17:37:58 +01:00
Philoul
4bd21c2a68 Add string to Activity monitor for translation 2021-03-14 17:07:27 +01:00
Philoul
c08af324e2 Refactor UserEntry.Units and UserEntry.Actions translations (now included in Translator.kt) 
=> Just missing TT_Reason included in #414
 2021-03-13 22:46:14 +01:00
Philoul
fcb3bfc6eb Fix Missing Profile Name 2021-03-13 22:35:37 +01:00
Philoul
605ca7def4 Fix TT Reason in TTDialog and add Reason to translator 2021-03-13 17:31:58 +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
391c5e19f7 Fix Notes visibility + Update UE on Pref change 2021-03-10 20:55:22 +01:00
Philoul
dc010adf8c Improve UserEntryitem Layout 2021-03-09 23:02:31 +01:00
Philoul
441f419bfa Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge 2021-03-09 22:44:33 +01:00
Philoul
9e2ce1cc27 Fix uel after last merge (Mainly Careportal entries form NS) 2021-03-09 22:41:57 +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
Philoul
01a1321cbb Clean and simplify code 
Add comment in UserEntry (data type for each Unit)
 2021-03-09 21:09:59 +01:00
Philoul
f3d6fff565 Add Export CSV in Maintenance Fragment 2021-03-08 21:42:16 +01:00
Milos Kozak
c28fb465fb Merge remote-tracking branch 'ns/dev' into careportal 2021-03-08 20:27:53 +01:00
Milos Kozak
6c072dbe6e
Merge pull request #402 from nightscout/adrian/cleanup-glucosestatus 
Refactor GlucoseStatusProvider out of GlucoseStatus
 2021-03-08 20:20:10 +01:00
Milos Kozak
8db8edc3f6 Careportal -> Room 2021-03-08 20:10:02 +01:00
Philoul
f7f6f4b7c1 Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML 2021-03-08 18:22:50 +01:00
Philoul
816fd531a2 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits 2021-03-08 18:21:57 +01:00
AdrianLxM
3cb07c215e Refactor GlucoseStatusProvider out of GlucoseStatus 2021-03-07 20:22:03 +01:00
Milos Kozak
bcfa449ec8 lints 2021-03-07 19:26:08 +01:00
Milos Kozak
658f565cf2 Notofocation -> kt 2021-03-07 17:46:21 +01:00
Milos Kozak
563bee2faf PumpDescription -> kt 2021-03-07 15:19:51 +01:00
Philoul
c931c8d25a Careportal Remove Duration ValueWithUnit if empty 2021-03-07 15:07:35 +01:00
Milos Kozak
54ad6caf83 interfaces -> kt 2021-03-07 14:37:05 +01:00
Milos Kozak
2ea423c704 PumpEnactResult -> kt 2021-03-07 13:31:11 +01:00
Philoul
46cc4d9e85 Careportal Remove Duration ValueWithUnit if empty 2021-03-07 10:52:42 +01:00
Philoul
c259aa345c Csv format (not xml) modified to Excel default 
remove unnecessary " and use ; as separator
 2021-03-07 10:43:33 +01:00
Philoul
6096825f4c Formatage xml 1ère version 2021-03-07 03:09:30 +01:00
Milos Kozak
72176edfb9 core -> kt, move tests to core 2021-03-07 00:49:18 +01:00
Philoul
cf83d20e13 Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML 
# Conflicts:
#	core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
#	database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
 2021-03-06 22:31:39 +01:00
Philoul
523a9f2800 Add detailed information for Careportal entries 2021-03-06 19:45:13 +01:00
Philoul
5d827d123e 8 ColorGroup added for UI + Fix Carbs in WizardDialog 2021-03-06 17:42:41 +01:00
Philoul
177bf214fd xml export initialization 2021-03-06 16:14:44 +01:00
Milos Kozak
23c23ea0b8 TrendArrow calculation 2021-03-05 23:08:43 +01:00
Philoul
c065672179 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
 2021-03-04 23:19:08 +01:00
Milos Kozak
04f074caf9 MainApp -> kt, the rest of DatabaseHelperInterface 2021-03-04 19:23:01 +01:00
Philoul
db4268f408 UserEntry text format and colors.xml 
ValueWithUnit Bold
Note standard grey color
Action Colored (table in UserEntryExt.kt)
 2021-03-04 14:52:30 +01:00
Philoul
37777d7d82 Convert Long duration to min (TT from NS) 2021-03-04 00:22:40 +01:00
Philoul
e89aaf4d11 Merge Dev, Fix new uel.log in NSClientPlugin 2021-03-03 23:53:15 +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
db1b3b7328 Add EventTime if changed (Carbs, TT, CP, PS) 2021-03-03 21:16:37 +01:00
Tim Gunn
6688a2696e
add Window Permssion into Setup Wizard 2021-03-04 04:39:35 +13:00
swissalpine
98e2d9ec86
Update XdripPlugin.kt 2021-03-03 11:06:55 +01:00
Philoul
a556df86c5 uel log, put name in value with unit 2021-03-03 08:53:48 +01:00
Philoul
e0610a8341 Fix 0 value not hidden and add separator for VWU 2021-03-03 00:31:28 +01:00
Milos Kozak
17ceb42df8 better message for out of limit 2021-03-03 00:07:02 +01:00
Milos Kozak
94edd017dd show TBR tab in engineering mode only 2021-03-02 23:32:30 +01:00
Milos Kozak
6eafda561c exclude dots from profile name 2021-03-02 23:22:15 +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
efddea0eee
Merge pull request #386 from nightscout/tt 
TempTarget -> room
 2021-03-02 22:41:36 +01:00
Philoul
f226a03c83 Fix Converters.kt 
Initialize a first version of Layout with Card and TreamentsUserEntryFragment
 2021-03-02 13:31:07 +01:00
Milos Kozak
06f35dc522 small fixes 2021-03-01 23:37:14 +01:00
Milos Kozak
ae86cfea77 log errors without tags 2021-03-01 23:11:59 +01:00
Milos Kozak
05d5f8217c fix tests 2021-03-01 17:22:12 +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
AdrianLxM
d098f81241 missing import 2021-02-28 20:02:36 +01:00
AdrianLxM
d42e8fbe92 call confirm wear event 2021-02-28 19:48:33 +01:00
Philoul
8798be0c34 Update uel.log entries, Increase database version 3=>4, update migration3to4 2021-02-28 15:54:37 +01:00
Philoul
95e32c3406 Exemple with CalibrationDialog and CarbsDialog.kt 
Good Direction ?
 2021-02-27 15:45:47 +01:00
Milos Kozak
a7f1758104 convert interfaces to kotlin 2021-02-25 18:42:36 +01:00
Milos Kozak
4a512841fd Intents -> kt 2021-02-25 17:55:42 +01:00
Milos Kozak
469d11e2b3 SntpClient -> kt 2021-02-25 17:43:20 +01:00
Milos Kozak
e6f229b15b Sensitivity plugins -> kt 2021-02-25 15:32:09 +01:00
Philoul
274cac8ff9 First draft with bug 2021-02-25 12:28:36 +01:00
Milos Kozak
b9d03e4d00 make classes static where possible 2021-02-24 13:50:35 +01:00
Milos Kozak
fdb6bcc178 @NonNull lints 2021-02-24 13:46:38 +01:00
Philoul
51add9a4fd Fix TT Dialog Cancel if duration 
Force Cancel when Cancel button pressed (even if a duration exists in field when button is pressed)
 2021-02-23 10:16:11 +01:00
Bart Sopers
12ff37123d Add and wire some Omnipod Dash UI 2021-02-23 01:26:57 +01:00
Bart Sopers
16f35870eb Minor renaming 2021-02-23 00:08:56 +01:00
Philoul
ca8ad6ca9e Fix TT UserEntries from TT Dialog 
Always entered as TT even if TT EatingSoon, TT Cancel ...
 2021-02-22 18:43:37 +01:00
Milos Kozak
07bf16b07b rename core strings 2021-02-22 18:04:30 +01:00
Milos Kozak
aaa1ecea8d
Merge pull request #364 from bartsopers/dash 
More Omnipod Dash preparation + some Eros fixes
 2021-02-22 17:33:13 +01:00
Milos Kozak
a0632f7753 automation module 2021-02-22 17:22:30 +01:00
Bart Sopers
f52b11c78e Merge remote-tracking branch 'upstream/dev' into dash 2021-02-22 12:04:35 +01:00
Bart Sopers
567c215388 More work in progress on moving stuff from omnipod-eros to omnipod-common 2021-02-21 22:01:59 +01:00
Philoul
b4f1996717 Add extension 2021-02-21 20:49:34 +01:00
Milos Kozak
c501a41824 dependency injection and manifests cleanup 2021-02-21 20:11:22 +01:00
Milos Kozak
0322dd48ac insight -> lib 2021-02-21 18:03:26 +01:00
Milos Kozak
32873e0730 combo -> new lib 2021-02-21 14:34:31 +01:00
Milos Kozak
2b51525719 Privacy option in StartupWizard 2021-02-21 12:30:45 +01:00
Philoul
bdd5fe383c Update enum class 
=> Need help for strings location
 2021-02-21 12:03:15 +01:00
Milos Kozak
ae9c7b4329 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-02-21 11:52:34 +01:00
Milos Kozak
5e36b49e5a fix notification logging 2021-02-21 11:12:57 +01:00
Philoul
db23a5e9f7 Update Strings (translatable and key removed) 2021-02-21 10:35:04 +01:00
Philoul
820566fa62 Switched to Enum class for UserEntryLogger 2021-02-21 00:28:44 +01:00
Philoul
73ebc00085 Fix key 2021-02-20 20:25:52 +01:00
Milos Kozak
fe3c049999 Nitification store logging 2021-02-20 19:34:19 +01:00
Bart Sopers
b56a3d8132 Merge remote-tracking branch 'upstream/dev' into dash 2021-02-20 18:48:06 +01:00
Philoul
14454f6c15 Create keys for uel.log 2021-02-20 13:30:34 +01:00
Milos Kozak
a025fc8ece disable deprecation warning for android auto 2021-02-20 11:34:01 +01:00
Philoul
1a78588011 Fix LocalProfile 
I apologize
 2021-02-19 23:14:15 +01:00
Philoul
fa77582856 Merge remote-tracking branch 'Nightscout/dev' into Selected_Item_Background 2021-02-19 22:58:51 +01:00
Philoul
026c3efded Local Profil Select dia tab on opening 2021-02-19 22:30:54 +01:00
Milos Kozak
52eecd75ca log SMS reply 2021-02-19 21:30:54 +01:00
Philoul
26cb52883b Change Selected item background color 2021-02-19 21:25:55 +01:00
Milos Kozak
051cbe7870
Merge pull request #348 from nightscout/jacoco2 
Jacoco, tests and gradle cleanup
 2021-02-19 19:53:24 +01:00
Milos Kozak
aae0c03ae4
Merge pull request #333 from nightscout/adrian/system-carb-timer 
Adrian/system carb timer
 2021-02-19 16:21:33 +01:00
Milos Kozak
6cb8c93282
Merge pull request #346 from Philoul/UserEntry_Fixes 
Fix user Entry
 2021-02-19 10:50:08 +01:00
Bart Sopers
ecfabccffb Move several parts of Omnipod Eros driver to omnipod-common, did some renaming and added some preliminary Dash stuff 2021-02-19 09:40:59 +01:00
Philoul
3c7cd31612 Fix user Entry 
i2 always visible even if 0
Improve layout (hide 0 or "" values to reduce spaces)
 2021-02-19 00:36:58 +01:00
Milos Kozak
f3fb533cf0 fix tests and dependencies 2021-02-18 21:38:36 +01:00
Milos Kozak
531c74de6a use fun instead of val in pump interface 2021-02-17 19:28:43 +01:00
Milos Kozak
0fc570780d MDIPlugin -> kt 2021-02-17 09:35:48 +01:00
Milos Kozak
749bc49ad5 more CommandQueue tests 2021-02-17 09:26:17 +01:00
Milos Kozak
341a536011 PumpInterface -> kt 2021-02-16 21:30:47 +01:00
Milos Kozak
beb02e9aad QueueThread -> kt 2021-02-16 19:22:43 +01:00
AdrianLxM
0457c1bf70 fix tests and switch icon and checkbox 2021-02-16 19:03:38 +01:00
Milos Kozak
32df0b9490 IobThreads -> kt 2021-02-16 18:47:35 +01:00
Milos Kozak
67184c96d9 IobCobCalculatorPlugin fix 2021-02-16 17:43:45 +01:00
Milos Kozak
41b66d40e0 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-02-16 16:38:09 +01:00
Milos Kozak
b7c93ac1a3 ProfileHelperActivity fix 2021-02-16 15:28:42 +01:00
Milos Kozak
2ac0411939 forgotten data access 2021-02-16 14:08:09 +01:00
Milos Kozak
0a31d79e29 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-02-16 13:49:03 +01:00
Milos Kozak
6f3266e845 IobCobCalculatorPlugin -> kt 2021-02-16 13:48:59 +01:00
Milos Kozak
b1b318dd5e fix LoopDialog 2021-02-16 11:46:34 +01:00
AdrianLxM
3314cbfbc2 Merge branch 'dev' into adrian/system-carb-timer 2021-02-16 00:06:09 +01:00
AdrianLxM
2f05c431aa layout CarbDialog alarm and use timer for automation alarms 2021-02-15 23:55:57 +01:00
Milos Kozak
bbcc813474 ActivityGraph -> kt 2021-02-15 22:38:41 +01:00
Milos Kozak
e1c7963c98 LoggerUtils -> kt 2021-02-15 22:20:25 +01:00
Milos Kozak
aa7de3b8c4 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-02-15 13:57:16 +01:00
Milos Kozak
86fb53ce34 SetupWizard update 2021-02-15 13:57:01 +01:00
Milos Kozak
5c910306c6 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-02-15 12:54:43 +01:00
Milos Kozak
e5521956c5 ignore missing versionNum 2021-02-15 12:54:24 +01:00
Milos Kozak
1ef8629f57 SafetyPlugin -> kt 2021-02-15 00:57:45 +01:00
Milos Kozak
475517c328 Objectives -> kt 2021-02-15 00:12:56 +01:00
Milos Kozak
a3b500edf2 OpenAPSAMAPlugin -> kt 2021-02-14 21:50:19 +01:00
Milos Kozak
3de003b6ea fix tests 2021-02-14 21:17:08 +01:00
Milos Kozak
9e170aa23c DetermineBasalAdapterAMAJS -> kt 2021-02-14 20:49:07 +01:00
Milos Kozak
48c9d39b26 OpenAPSSMBPlugin -> kt 2021-02-14 17:13:07 +01:00
Milos Kozak
cfa1fc42d7 DetermineBasalAdapterSMBJS -> kt 2021-02-14 15:50:21 +01:00
Milos Kozak
af1ee97d83 cleanup 2021-02-14 15:09:06 +01:00
Milos Kozak
ed9c8a1d05 LoopPlugin -> kt 2021-02-14 14:14:10 +01:00
Milos Kozak
c07e81ab77 Rename .java to .kt 2021-02-14 14:14:09 +01:00
Milos Kozak
1b132fd589 cleanup 2021-02-14 11:38:28 +01:00
Milos Kozak
30c530a109 ScriptReader -> kt 2021-02-13 22:48:17 +01:00
Milos Kozak
f0ac7c4c25 LoggerCallback -> kt 2021-02-13 22:44:01 +01:00
AdrianLxM
b9bf699942 use system countdown for simple reminder all the time 2021-02-13 22:41:33 +01:00
AdrianLxM
a15377b48d carb timer for carbs dialog 2021-02-13 21:45:14 +01:00
AdrianLxM
2de2d4f4f0 system carb timer 2021-02-13 21:16:31 +01:00
AdrianLxM
0d601634e0 cleanups of new weekday selector 2021-02-13 19:40:27 +01:00
AdrianLxM
c7e261d0e6 weekday picker working without view 2021-02-13 18:30:35 +01:00
AdrianLxM
ab9c533ff3
Fix crash of charts if no bg data exists in mg/dl 2021-02-13 01:38:43 +01:00
Milos Kozak
7acaf8a7e6 accept NSProfile as bundle 2021-02-11 23:42:40 +01:00
Milos Kozak
5a4a662ec1 Merge branch 'dev' into newdb 2021-02-11 21:55:47 +01:00
Milos Kozak
341bfdcdfa test libs update 2021-02-11 20:52:57 +01:00
Milos Kozak
7506c7e2ab remove findbug 2021-02-11 18:10:14 +01:00
Milos Kozak
30d77e845b
Merge pull request #304 from bartsopers/dash 
Prepare for Dash development
 2021-02-11 12:39:48 +01:00
Milos Kozak
e374cdfa98 Merge branch 'dev' into newdb 2021-02-11 12:01:12 +01:00
Milos Kozak
6e4effae55
Merge pull request #276 from Philoul/Graph_Scale 
Secondary graphs : replace Activity by -BGI and align curves scales if same units
 2021-02-11 11:48:01 +01:00
Bart Sopers
c05dcbd8db Minor Eros stuff 2021-02-11 00:51:20 +01:00
Bart Sopers
9489cbf9a7 Rename OmnipodPumpPlugin to OmnipodErosPumpPlugin 2021-02-09 21:05:40 +01:00
Bart Sopers
4456aaa015 Move omnipod package to omnipod.eros and fix some tests 2021-02-09 19:44:26 +01:00
Milos Kozak
9cade8f422 Merge remote-tracking branch 'ns/dev' into newdb 2021-02-09 18:12:10 +01:00
Milos Kozak
7b4a30865a UserEntry logging 2021-02-09 17:57:28 +01:00
AdrianLxM
922e6c5e9e data receiver fixes 2021-02-09 12:32:21 +01:00
Milos Kozak
6b9f62fbd5 plusAssign unify 2021-02-08 18:30:11 +01:00
Milos Kozak
3cb18b7d4e fix NPE 2021-02-08 16:17:24 +01:00
Milos Kozak
290ff23ddc add logging 2021-02-08 15:29:13 +01:00
Milos Kozak
420c5584cd reset databases in CompositeDisposable 2021-02-08 15:15:42 +01:00
Milos Kozak
cdac8d9d99 reset databases in thread 2021-02-08 14:51:57 +01:00
Milos Kozak
145765e611 improve BG sync 2021-02-08 13:40:09 +01:00
Milos Kozak
887819edf4 eliminate BgReading::class in favor of GlucoseValue::class 2021-02-08 10:05:21 +01:00
Milos Kozak
d93865997c update NS values from patched Dexcom app smoothing 2021-02-07 11:14:32 +01:00
Philoul
4f52358516 Change color for BGI curve 
I choose light blue because calculated from insulin but it could be anything else...
 2021-02-06 14:51:38 +01:00
Milos Kozak
7763a96d6a migrate BG code 2021-02-06 00:30:27 +01:00
Milos Kozak
cfe23cef96 AapsSchedulers 2021-02-04 20:54:09 +01:00
Milos Kozak
230cc943af
Merge pull request #280 from nightscout/dataservice 
Dataservice
 2021-02-04 18:03:19 +01:00
Milos Kozak
136c7fbe6f cleanup 2021-02-04 13:19:58 +01:00
Milos Kozak
e16d661183 OverviewFragment -> jetpack 2021-02-04 12:03:34 +01:00
Milos Kozak
f5eba51d5a ActionsFragment -> jetpack 2021-02-04 10:06:19 +01:00
Milos Kozak
ff28f26bda ActionsFragment binding 2021-02-04 00:19:34 +01:00
Milos Kozak
0054fce4d9 treatments UI cleanup 2021-02-03 22:40:13 +01:00
Milos Kozak
a6b7beb2d7 TreatmentsTemporaryBasalsFragment -> jetpack 2021-02-03 20:22:03 +01:00
Milos Kozak
327f1ca63b TreatmentsProfileSwitchFragment -> jetpack 2021-02-03 20:08:53 +01:00
Milos Kozak
8a15fe12ba TreatmentsBolusFragment -> jetpack 2021-02-03 16:04:09 +01:00
Milos Kozak
74ae51a9e0 TreatmentsFragment -> jetpack 2021-02-03 15:52:43 +01:00
Milos Kozak
fab3c870d7 BGSourceFragment -> jetpack 2021-02-03 15:43:47 +01:00
Milos Kozak
4476d0e0db TreatmentsCareportalFragmentBinding -> jetpack 2021-02-03 15:30:05 +01:00
Milos Kozak
dbb2234236 check for invalid actions 2021-02-03 12:57:33 +01:00
Milos Kozak
c353da5767 fix tests 2021-02-02 23:30:11 +01:00
Milos Kozak
61871a924b LocalProfileFragment -> jetpack 2021-02-02 21:53:57 +01:00
Milos Kozak
29e33a68c2 TreatmentsExtendedBolusesFragment -> jetpack 2021-02-02 21:38:22 +01:00
Milos Kozak
609c1dfad3 InsulinFragment -> jetpack 2021-02-02 21:11:40 +01:00
Milos Kozak
026d6039dc SmsCommunicatorOtpActivity -> jetpack 2021-02-02 21:04:44 +01:00
Milos Kozak
2e58bfc829 SmsCommunicatorOtpActivity -> jetpack 2021-02-02 20:48:03 +01:00
Milos Kozak
2078962057 SmsCommunicatorOtpActivity -> jetpack 2021-02-02 20:32:07 +01:00
Milos Kozak
e7d58a8f84 EditQuickWizardDialog -> jetpack #2 2021-02-02 20:25:15 +01:00
Milos Kozak
97ddba4941 Merge branch 'dev' into dataservice 2021-02-02 18:18:13 +01:00
Milos Kozak
31924ce6d1 BundleStore 2021-02-02 17:48:39 +01:00
Milos Kozak
99185f3d1f EditQuickWizardDialog -> jetpack 2021-02-01 20:36:58 +01:00
Milos Kozak
acf3b23bf7 cleanup 2021-02-01 15:24:48 +01:00
Milos Kozak
920cba5219 DataService refactor 2021-01-30 22:34:05 +01:00
Philoul
71af958fca Replace Activity by -BGI in secondary graphs 
Align scales (IOB / Absolute) and (deviation / -BGI) if selected in the same graph
 2021-01-30 21:27:22 +01:00
Milos Kozak
f2e5ef76aa OverviewFragment simplify 2021-01-26 15:44:56 +01:00
Milos Kozak
a15522fd50 VirtualPumpFragment -> jetpack 2021-01-26 15:44:14 +01:00
Milos Kozak
7f924deb7f
Merge pull request #260 from nightscout/fix/include-treatments-in-chartheight 
include treatments in chart height
 2021-01-25 13:30:51 +01:00
Milos Kozak
4e9b8ed78e Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-01-25 13:28:35 +01:00
Milos Kozak
d568b83169
Merge pull request #263 from nightscout/feature/open-app-on-notification 
open app on notification press
 2021-01-25 13:27:52 +01:00
Milos Kozak
f33c7f0b79 SetupWizardActivity -> jetpack 2021-01-25 12:09:22 +01:00
Milos Kozak
aeec33eb9e FoodFragment -> jetpack 2021-01-25 11:35:36 +01:00
Milos Kozak
c3878de916 QuickWizardListActivity -> jetpack 2021-01-25 10:36:05 +01:00
Milos Kozak
7e0be475f8 ObjectivesExamDialog -> jetpack 2021-01-24 22:12:03 +01:00
AdrianLxM
df655a234e include treatments in chart height 2021-01-24 20:56:31 +01:00
Milos Kozak
55da01d4a9 ObjectivesFragment -> jetpack 2021-01-24 16:16:07 +01:00
Milos Kozak
fcf67cd014 ConfigBuilderFragment -> jetpack 2021-01-24 15:20:12 +01:00
Milos Kozak
c4eb6eae91 OpenAPSSMBFragment -> jetpack 2021-01-24 14:55:38 +01:00
Milos Kozak
95e97edc74 OpenAPSAMAFragment -> jetpack 2021-01-24 14:50:21 +01:00
Milos Kozak
21095233dc HistoryBrowseActivity -> jetpack 2021-01-24 14:44:11 +01:00
Milos Kozak
1294642feb LoopFragment -> jetpack 2021-01-24 14:19:25 +01:00
Milos Kozak
ec281c24d2
Merge pull request #256 from swissalpine/patch-4 
CareDialog.kt: exercises - enable note field
 2021-01-24 13:59:44 +01:00
Milos Kozak
4911fe0165 MaintenanceFragment -> jetpack 2021-01-23 22:45:14 +01:00
Milos Kozak
4e3506007f WearFragment, SkinInterface -> jetpack 2021-01-23 22:42:13 +01:00
AdrianLxM
9da8f188b7 open app on notification press 2021-01-23 22:26:18 +01:00
Milos Kozak
724b52e929 AutomationPlugin synchronized 2021-01-23 21:51:59 +01:00
swissalpine
d66ed2459d
CareDialog.kt: Enable notes when saving activities 
Allows notes (e.g. type of sport, intensity, etc.) when logging activities.
 2021-01-23 14:12:12 +01:00
swissalpine
451dd59c2b
Fix: Seperate cartridge change from canula change 2021-01-22 20:08:33 +01:00
Milos Kozak
36d3182b1b LogSettingActivity -> jetpack 2021-01-22 14:34:13 +01:00
Milos Kozak
a6449a7578 SurveyActivity -> jetpack 2021-01-22 14:23:49 +01:00
Milos Kozak
9409193935 -> jetpack 2021-01-22 14:20:56 +01:00
Milos Kozak
b9477eef16 ProfileHelperActivity -> jetpack 2021-01-22 14:16:59 +01:00
Milos Kozak
3022214105 PreferencesActivity -> jetpack 2021-01-22 14:04:32 +01:00
Milos Kozak
3f229dfa9b MainActivity -> jetpack 2021-01-22 11:34:28 +01:00
Milos Kozak
407a7700a5 fix DialogFragmentWithDate 2021-01-22 10:26:34 +01:00
Milos Kozak
39c3a1404d fix AutoStartReceiver injection 2021-01-22 09:45:21 +01:00
Milos Kozak
0c6cd4aa82 WizardInfoDialog -> jetpack 2021-01-21 20:54:13 +01:00
Milos Kozak
63d328b940 TreatmentDialog -> jetpack 2021-01-21 20:46:21 +01:00
Milos Kozak
4a2213d11e TempTargetDialog -> jetpack 2021-01-21 20:41:29 +01:00
Milos Kozak
19b82f2246 TempBasalDialog -> jetpack 2021-01-21 20:35:14 +01:00
Milos Kozak
b09a909d74 InsulinDialog -> jetpack 2021-01-21 20:31:20 +01:00
Milos Kozak
83c709e2bc FillDialog -> jetpack 2021-01-21 20:21:25 +01:00
Milos Kozak
f1f0703a88 ExtendedBolusDialog -> jetpack 2021-01-21 20:16:13 +01:00
Milos Kozak
d376ee2229 CareDialog -> jetpack 2021-01-21 17:21:29 +01:00
Milos Kozak
bcc573202c CarbsDialog -> jetpack 2021-01-21 17:03:05 +01:00
Milos Kozak
24eec08a35 CalibrationDialog -> jetpack 2021-01-21 16:45:54 +01:00
Milos Kozak
157642649e ProfileSwitchDialog -> jetpack 2021-01-21 16:38:42 +01:00
Milos Kozak
99bf1567e2 NSProfileFragment -> jetpack 2021-01-21 12:48:30 +01:00
Milos Kozak
c6438f5df9 prevent NPE 2021-01-21 09:37:04 +01:00
Milos Kozak
8801c28176 fix bolus advisor for nsclient 2021-01-20 21:03:45 +01:00
Milos Kozak
7aa689d331 fix AutoStartReceiver 2021-01-20 15:56:46 +01:00
Milos Kozak
d2517f0beb fix NPE and Target fragment must implement TargetFragment interface issue 2021-01-20 15:07:01 +01:00
AdrianLxM
d665fdd0f7
First plugin / Overview should register for preference name 2021-01-20 09:51:31 +01:00
Milos Kozak
6239f8e289 higher default TT values 2021-01-19 10:59:46 +01:00
Milos Kozak
e26ae1af7d asking for permissions refactor 2021-01-18 22:47:55 +01:00
Milos Kozak
65a39d91be refactor import/export to create DaggerAppCompatActivityWithResult 2021-01-18 17:36:18 +01:00
Milos Kozak
270b6623ea prevent IndexOutOfBoundsException 2021-01-18 11:06:37 +01:00
Milos Kozak
3f561943dc avoid ConcurrentModificationException 2021-01-17 17:01:13 +01:00
Milos Kozak
68faba8951 DummyServiceHelper 2021-01-17 13:23:59 +01:00
Milos Kozak
d40559d444 LocationServiceHelper 2021-01-16 18:36:57 +01:00
Milos Kozak
22f9ccab32 simplify code 2021-01-16 18:29:18 +01:00
Milos Kozak
5f3fdca063 lint 2021-01-16 18:13:59 +01:00
Milos Kozak
d300a95e39 prevent NPE 2021-01-15 13:37:30 +01:00
Milos Kozak
534b27cb71 prevent NPE 2021-01-15 13:34:05 +01:00
Milos Kozak
4c9052b29a prevent NPE 2021-01-14 18:45:51 +01:00
Milos Kozak
90f6908b22 HistoryBrowser: synchronize access to graph 2021-01-14 18:39:23 +01:00
Milos Kozak
10bd1d2df0 fix button visibility logic 2021-01-12 18:45:46 +01:00
Milos Kozak
9f0ff6d872 fix NPE 2021-01-12 14:46:28 +01:00
Milos Kozak
76f1407d2c fix import from wizard 2021-01-12 11:32:54 +01:00
Milos Kozak
80c12a2c21 engineering__mode 2021-01-12 11:07:26 +01:00
Milos Kozak
ba282f098e allow NS_UPLOAD_ONLY in engineering mode only 2021-01-12 10:55:20 +01:00
Milos Kozak
1fd8257953
Merge pull request #209 from nightscout/app/crash-on-unattached-fragment 
only handl callback if fragment is attached to activity
 2021-01-10 19:52:46 +01:00
Milos Kozak
a843bb8b84
Merge pull request #210 from nightscout/fix/concurrent-button-press-crash 
Fix/concurrent button press crash
 2021-01-10 19:52:04 +01:00
AdrianLxM
301c44627f fix menu crash and make graph label translatable 2021-01-10 04:10:21 +01:00
AdrianLxM
b509d13073 avoid concurrent button press crash in TimeListEdit - now for real 2021-01-10 03:54:51 +01:00
AdrianLxM
4c25272969 avoid concurrent button press crash in TimeListEdit 2021-01-10 03:41:54 +01:00
AdrianLxM
e8a0a1fcaf only handl callback if fragment is attached to activity 2021-01-10 03:27:47 +01:00
Milos Kozak
48084ff7bf add keys to crash report 2021-01-08 18:55:01 +01:00
Milos Kozak
2ab27f5eb9
Merge pull request #197 from AAPS-Omnipod/rl_battery_level_medtronic 
Show RL battery level for Medtronic & add setting to enable battery change logging for Omnipod
 2021-01-08 13:39:19 +01:00
Bart Sopers
5c0545cd99 Add setting for showing RL battery level for Medtronic and add setting for enabling battery change logging for Omnipod 2021-01-07 23:38:00 +01:00
Milos Kozak
83324c97a7 prevent ArrayIndexOutOfBoundsException 2021-01-07 11:16:41 +01:00
Bart Sopers
8034c7411d Only automatically update Omnipod time for DST and TZ changes 2021-01-07 03:56:54 +01:00
Stephen Brown II
151fb270df Remove extra minus sign from Bolus Wizard timeshift result 2021-01-04 16:22:21 -07:00
Milos Kozak
eb84f5e6a7 LoopDialog protection 2021-01-03 17:26:37 +01:00
Milos Kozak
34435d4684 fix CGM data is unchanged 2021-01-03 16:26:57 +01:00
Milos Kozak
d6f00e5b0d fix editing automation event name 2021-01-03 16:02:29 +01:00
Philoul
6f8faae8de Improve Dialog Refresh 2021-01-01 16:44:25 +01:00
Milos Kozak
21c92d41c8 fix passing context 2021-01-01 11:37:24 +01:00
AdrianLxM
aedc2cb352 prepare graphs with settings size used for ui updates 2020-12-29 13:30:46 +01:00
AdrianLxM
d0b6e09250 reduce access to setting in OverviewMenus 2020-12-29 13:14:03 +01:00
Milos Kozak
6ed733f8cf Objectives correction 2020-12-28 22:59:45 +01:00
Milos Kozak
52c6d762f5 Merge branch 'dev' into objectives 2020-12-28 18:40:10 +01:00
Milos Kozak
e59fa702ec Merge branch 'wizard' into dev 2020-12-28 16:42:43 +01:00
Milos Kozak
c8f7dae2c8 Bolus advisor 2020-12-28 16:42:00 +01:00
Milos Kozak
b2047b7810 code style 2020-12-28 12:21:31 +01:00
Milos Kozak
ce8fbc5580 fix typo in LocalAlertUtils 2020-12-27 21:46:13 +01:00
Philoul
01062c4755 Use Jetpack instead of Kotlin 2020-12-27 16:20:32 +01:00
Philoul
08ab436d90 Add Closed / LGS / Open switching in Loop paragraph 2020-12-27 15:32:12 +01:00
Philoul
b4710b4936 Merge remote-tracking branch 'Nightscout/dev' into LoopDialog 2020-12-27 13:18:04 +01:00
Philoul
f74ca3b424 Remove old code 2020-12-26 22:54:14 +01:00
Philoul
329e5af94f Update "Loop header" 2020-12-26 18:26:46 +01:00
Philoul
cefdaa471d Replace Loop Menu by Loop Dialog 2020-12-26 17:40:16 +01:00
Bart Sopers
fcd3276e47 Rework RileyLink scan and add option to remove RileyLink 2020-12-25 18:43:51 +01:00
Philoul
47fe4d83be First draft 2020-12-25 16:47:42 +01:00
Milos Kozak
03c59d6e19 SMS: report pump unreachable 2020-12-25 12:06:54 +01:00
Philoul
124b8c07b1 Switch Short and long click functions 
Short Click View Profile
Long Click Profile Switch Dialog
 2020-12-24 18:03:18 +01:00
Philoul
2ae77ed66a Replace Profile Menu by Short / Long Click 
Short Click => Profile Switch dialog
Long Click => View Current Profile
 2020-12-24 09:25:28 +01:00
Philoul
ae2c29a98d Improve TT Long Click 2020-12-23 22:03:39 +01:00
Philoul
f76c6a4910 Remove unused code 2020-12-23 21:46:15 +01:00
Philoul
4a368c554e Show TT dialog on short click 2020-12-23 21:31:27 +01:00
Philoul
75e8eb9633 Merge remote-tracking branch 'Nightscout/dev' into ShortClick 2020-12-23 21:13:14 +01:00
Milos Kozak
3be91d83f6
Merge pull request #129 from Philoul/TempTargetButtons 
TT Dialog Add 5 buttons for quick selection of TempTarget's type
 2020-12-23 20:55:34 +01:00
Philoul
c6e8f277c0 Manual button hidden, Cancel only if TT running, Spinner added 
Long Click removed for Cancel and Spinner don't update values
 2020-12-23 19:28:50 +01:00
Philoul
ef1fa6b7d1 Long Click to fill parameters 
Not sure code is optimum but it works...
 2020-12-22 11:15:31 +01:00
Milos Kozak
87c21f0d02
Merge pull request #131 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge 
Prevent crashes in Omnipod driver during/before setup
 2020-12-22 01:27:18 +01:00
Bart Sopers
029a7e27fb Prevent crash on startup 2020-12-21 22:26:41 +01:00
Philoul
ffb5a7cd4a Spinner removed and Confirm dialog if click on Cancel to Hypo buttons 2020-12-21 21:03:30 +01:00
Milos Kozak
07763f7c7d
Merge pull request #126 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge 
Omnipod improvements
 2020-12-21 20:45:06 +01:00
Philoul
1d1359dfd4 TT Dialog Add 5 buttons for quick selection of TempTarget 2020-12-20 19:54:54 +01:00
Bart Sopers
849e333cf4 i18n for Omnipod short status and hide battery level in overview and sms response when Use RL battery level setting is disabled 2020-12-19 15:57:20 +01:00
Bart Sopers
d7cd8ea0ba Don't show battery age in overview for pumps without a replaceable battery 2020-12-19 02:53:26 +01:00
Bart Sopers
ba0bd0fca3 Add comment 2020-12-19 02:16:20 +01:00
Bart Sopers
488b5427b0 Display Omnipod reservoir as 50+ units instead of fixed placeholder value 2020-12-19 02:12:41 +01:00
Milos Kozak
f6dbb9e0e3
Merge pull request #121 from osodebailar/configbuilder_icons 
Configbuilder icons for all plugins and further minor GUI changes
 2020-12-18 23:46:03 +01:00
Milos Kozak
92d8fd8920
Merge pull request #124 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge 
Omnipod updates
 2020-12-18 21:30:49 +01:00
osodebailar
32f37c6b00 change string concetenate with standard coding 2020-12-18 09:05:41 +01:00
Bart Sopers
078eec82eb Acknowledge getPumpStatus request in Omnipod plugin when explicitly requested with SMS 2020-12-18 01:43:29 +01:00
osodebailar
00145520ff change name: pluginpreference with <plugin name> preference 2020-12-17 15:49:47 +01:00
osodebailar
df8616e60b new nav header with plugin icons and extend colors for black and white transparence for future extensions 2020-12-17 13:59:06 +01:00
osodebailar
39355a4b6f add configbuilder icons for all plugins. rearrange view 2020-12-17 12:07:34 +01:00
Philoul
f514f58c6a Merge remote-tracking branch 'Nightscout/dev' into ShortClick 2020-12-17 08:33:09 +01:00
Milos Kozak
756c76f591
Merge pull request #120 from nightscout/adrian/graph-update 
refactor update graph and prevent crash if view is no longer available.
 2020-12-16 00:06:33 +01:00
AdrianLxM
b3418ef29c remove no longer needed compatibility function in WearUpdaterService 2020-12-15 23:04:59 +01:00
AdrianLxM
953887562c refactor update graph and prevent crash if view is no longer available. 2020-12-15 22:25:09 +01:00
Philoul
7f9f6d3f03 Remove Redundant Context menu 2020-12-14 22:12:40 +01:00
Philoul
28fa373d83 Replace Context menu by long click menu 2020-12-14 22:04:23 +01:00
Matthew Gray
5dcbd051ff Merge remote-tracking branch 'origin/master' 2020-12-14 13:23:51 +00:00
Matthew Gray
fa7cab9365 Open topics: 
1) Typo in Hypo Temp Target - FIXED.
2) Profile switching I:C answer (negate text or expected answer) - FIXED.
3) Douplicated copy in wrongcarbs - FIXED.
4) Possible other strategy in insulin delivery/entry errors. - FIXED.
 2020-12-14 13:15:04 +00:00
Milos Kozak
f5f4c655c5 ActionAlarm 2020-12-14 13:52:47 +01:00
Milos Kozak
4d02587bb7 AutomationEvent new options, automation jetpack bindings 2020-12-14 12:46:38 +01:00
Milos Kozak
7ed013d44c
Merge branch 'dev' into master 2020-12-11 21:46:00 +01:00
Milos Kozak
2c43bc75c0
Merge pull request #113 from Philoul/ProfileSwitch_Dialog 
ProfileSwitch dialog Improvements
 2020-12-11 21:35:29 +01:00
Milos Kozak
24034b46b8
Merge pull request #112 from Philoul/Overview_Info_Layout 
Move Ago below Arrow
 2020-12-11 21:15:58 +01:00
Philoul
7c3d85d3fd I propose to change ProfileSwitch steps to a fixed value of 5% (no additional settings) 2020-12-11 18:55:59 +01:00
Milos Kozak
989976f1e6
Merge pull request #105 from Philoul/TempTarget_Icons 
New TempTarget icons
 2020-12-11 14:20:40 +01:00
Philoul
ef21a068a9 Improve vertical position of apsmode icon 
apsmode_text TextView visible only if necessary
 2020-12-11 14:06:59 +01:00
Philoul
5f7108317f Move Ago below Arrow 2020-12-11 10:23:04 +01:00
Philoul
b889ef3612 Remove Patch for Sensor Battery level 2020-12-10 22:37:16 +01:00
Philoul
7a87cfc7ee Delete Automation rule with button 
onItemDismiss left but could be simplified
 2020-12-09 21:58:55 +01:00
Philoul
096aa008bc New TempTarget icons 
Refactor to delete redundant icons
 2020-12-09 20:59:43 +01:00
Brian Quinion
66a651a062 Use TextInputEditText instead of TextView to preference filter 2020-12-08 23:29:20 +00:00
Milos Kozak
3175fbef31 fix NSClient mode 2020-12-08 18:21:52 +01:00
Milos Kozak
bf0dc1cb9b revert change 2020-12-08 08:50:21 +01:00
Milos Kozak
e100e5abae large bg delta in tablet mode 2020-12-07 22:42:04 +01:00
Milos Kozak
a5d9d25564
Merge pull request #98 from Rig22/pump_icons 
SVG Icons for pumps fragment tab
 2020-12-07 21:20:11 +01:00
osodebailar
634efad48f extend Plugin with icon resource for menue and config builder. Integrate plugin icon for pump selection into config builder 2020-12-07 18:51:16 +01:00
Milos Kozak
51fae5fa36 suppress warning 2020-12-06 17:43:41 +01:00
Milos Kozak
370c54a20b Merge remote-tracking branch 'ns/adrian/single-click-kotlin' into dev 2020-12-06 16:48:09 +01:00
Milos Kozak
5f3aaf6b54 code cleanup 2020-12-06 15:09:32 +01:00
Milos Kozak
f370def798 improve SetupWizard 2020-12-06 13:19:53 +01:00
AdrianLxM
cb0c0f47af SingleClickButton kotlin with Handler 2020-12-04 23:10:46 +01:00
Matthew Gray
8c4b2f20a1 Removed question numbers. Added noise and bread units questions. 2020-12-04 17:29:07 +00:00
Milos Kozak
30624053e3 transfer overview configuration to NSClient 2020-12-04 17:55:35 +01:00
AdrianLxM
8e95296bf7 fix logging lambda 2020-11-29 21:06:12 +01:00
AdrianLxM
5024db6748 fix two compiler warnings 2020-11-29 21:04:26 +01:00
AdrianLxM
ea57e9b6cb use new permission system and fix a few compiler warnings 2020-11-29 20:44:57 +01:00
Milos Kozak
5c9a8d2f60
Merge pull request #86 from nightscout/adrian/recycler-adapter 
BGSourceFragment UI tweaks and recognize history change
 2020-11-29 19:41:51 +01:00
swissalpine
a9bcb0ee76
Don't ignore the decision for low skin display 
The decision made in the settings, that low skin should be displayed, should be respected - and not overwritten by display properties.
 2020-11-29 15:31:45 +01:00
Milos Kozak
7a96c90ecf
Merge branch 'dev' into bugfix_clone_invalid_profile_causes_fatal_error 2020-11-29 13:29:44 +01:00
Milos Kozak
0ce368e6e1
Merge pull request #85 from nightscout/adrian/dkma 
about dialog cleanup and dkma
 2020-11-29 13:27:24 +01:00
Milos Kozak
6aa1b0c9e1
Merge pull request #87 from nightscout/adrian/coroutine-scoping 
coroutines on lifecycle scope of view they are in
 2020-11-29 13:26:24 +01:00
Brian Quinion
559a07fa6d Fix clone local profile to test that profile is valid before adding it (causes a fatal error) 2020-11-29 12:19:03 +00:00
Milos Kozak
85104c3c9d fix tests 2020-11-29 11:56:24 +01:00
AdrianLxM
f3065c3268 coroutines on lifecycle scope of view they are in 2020-11-29 01:28:37 +01:00
AdrianLxM
fe53b733d0 BGSourceFragment UI tweaks and recognize history change 2020-11-28 23:42:59 +01:00
AdrianLxM
124d61577d about dialog cleanup and dkma 2020-11-28 17:26:03 +01:00
Milos Kozak
7bc7388f06 fix AlarmSoundService crashing 2020-11-28 09:02:12 +01:00
Milos Kozak
3f77496c88 automated copy of configuration AAPS -> NSCLIENT 2020-11-27 16:46:33 +01:00
Milos Kozak
d0d5dca959 improve landscape mode 2020-11-26 17:02:50 +01:00
Milos Kozak
561ba72bf0 prevent NPE 2020-11-26 12:22:38 +01:00
Milos Kozak
8ff9985b6e nsuploadonly default true 2020-11-25 22:20:07 +01:00
Brian Quinion
33431bd5a8 Add a clear button for preference filter, clean up layout a little 2020-11-24 11:43:59 +00:00
Brian Quinion
eaba35c024 Add a text filter to the top of preferences 2020-11-24 00:50:09 +00:00
Milos Kozak
9c766ff5a8
Merge pull request #77 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge 
Latest Omnipod updates
 2020-11-23 13:27:13 +01:00
Milos Kozak
e1a1a4228d larger font in tabled landscape mode 2020-11-23 13:24:38 +01:00
Bart Sopers
354060232d Merge branch 'dev' into omnipod_eros_dev_upstream_merge 2020-11-22 23:24:42 +01:00
Bart Sopers
eff37e8c33 Remove instead of invalidate uncertain Omnipod TBR after recovery 2020-11-22 21:04:33 +01:00
Milos Kozak
b4fb6ebff9 get rid of tablet layout, allign NSClient layout with AAPS 2020-11-22 20:48:36 +01:00
Milos Kozak
6f7cfdd06d report failed TBR properly 2020-11-22 14:13:29 +01:00
Milos Kozak
0cdcc8f1c2 fix SMS RESUME 2020-11-18 17:50:10 +01:00
Matthew Gray
865264fc3c Group RC2. 2020-11-17 14:14:29 +00:00
Bart Sopers
728b666834 Merge branch 'dev' into omnipod_eros_dev_upstream_merge 2020-11-13 14:50:55 +01:00
Milos Kozak
edd5dd7980 fix Stats 2020-11-12 22:56:03 +01:00
Bart Sopers
642a7c8e3b Revert "Prepare Omnipod for upstream merge" 
This reverts commit 787fa0b305.
 2020-11-12 17:29:17 +01:00
Milos Kozak
d1009e5321 better handle storage permission on import 2020-11-12 15:27:45 +01:00
Milos Kozak
4986ddef46
Merge pull request #65 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge 
Latest Omnipod updates
 2020-11-12 11:25:21 +01:00
Bart Sopers
5e8cb2e1ed Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-11-11 21:09:33 +01:00
Bart Sopers
cdf059a0ba Revert hiding disconnect buttons in overview for Omnipod 2020-11-11 20:31:05 +01:00
Bart Sopers
c16fc3a946 Show disconnected icon in overview for Omnipod when Pod is suspended and hide disconnect buttons in overview for Omnipod 2020-11-11 20:12:57 +01:00
Milos Kozak
e9d0cb3d5c
Merge pull request #55 from twain47/pregnancy_age 
Add 'pregnant' age option to allow for higher insulin requirements during pregnancy
 2020-11-08 18:01:01 +01:00
Milos Kozak
6b629a1dda
Merge pull request #41 from Philoul/Action_CarePortalInfo 
Level informations added in Action>Careportal
 2020-11-08 17:47:14 +01:00
Brian Quinion
e89eb67236 Update hard limits based on looping in pregnancy group feedback 2020-11-08 16:31:10 +00:00
Brian Quinion
aa53ac11f2 Move PREGNANT to a correct key/value pair 2020-11-08 00:45:49 +00:00
Matthew Gray
9546d9adef Group RC1. 2020-11-03 13:37:31 +00:00
Matthew Gray
4e914d213b 2nd build fixes. 2020-11-03 13:29:45 +00:00
Matthew Gray
d0037886ba 1st build fixes. 2020-11-03 12:08:32 +00:00
Matthew Gray
c5ee40b393 1st build fixes. 2020-11-03 11:47:25 +00:00
Matthew Gray
c42464da06 SpIdentifiers done. 2020-11-03 10:26:16 +00:00
Matthew Gray
159a465ff8 All questions done. 
Check SpIdentifier.
 2020-11-01 14:22:08 +00:00
Matthew Gray
cb71f550b9 more tidying 2020-10-30 15:15:35 +00:00
Matthew Gray
ed2a73339e more tidying 2020-10-30 14:56:03 +00:00
Matthew Gray
ca343e7b2d more tidying 2020-10-30 14:51:41 +00:00
Matthew Gray
5b1cf6cd0c Questions in. 2020-10-30 14:06:50 +00:00
Matthew Gray
b608d25599 Can't remember if I did a commit when I stopped work yesterday. 
Doing one before I start.
 2020-10-29 14:00:02 +00:00
Matthew Gray
b2b59968ca Can't remember if I did a commit when I stopped work yesterday. 
Doing one before I start.
 2020-10-29 13:49:52 +00:00
Brian Quinion
21b1117655 Add 'pregnant' age option to allow for higher insulin requirements during pregnancy 2020-10-29 12:53:01 +00:00
Matthew Gray
584869094f 2nd few changes so I can build this as a test. 2020-10-28 14:05:35 +00:00
Bart Sopers
da8c231743 Disable Omnipod plugin for upstream 
This reverts commit aa8e71e0f8.
 2020-10-28 14:54:55 +01:00
Matthew Gray
0f5bfd1b08 1st few changes 2020-10-28 11:37:38 +00:00
Philoul
fb95eb4f2f Add LowRes Layout for action tab and additional function in Skininterface 2020-10-26 22:55:22 +01:00
Bart Sopers
aa8e71e0f8 Revert "Disable Omnipod plugin for upstream" 
This reverts commit 00a54b48c7.
 2020-10-26 15:26:16 +01:00
Milos Kozak
13a55eeb42 fix importing settings 2020-10-26 14:34:55 +01:00
Milos Kozak
79d24dfeca updateGui in onResume for BGSource fragment 2020-10-26 12:27:59 +01:00
Milos Kozak
6c19edbf1c Improve NSClient preferences in NSC mode 2020-10-26 10:37:55 +01:00
Milos Kozak
ab41ffa83e Allow BT watchdog setting for all pumps 2020-10-26 09:58:11 +01:00