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

7645 commits

Author SHA1 Message Date
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
Milos Kozak b4ff088974 Allow configuring pump type in NSClient 2020-10-25 23:10:09 +01:00
Milos Kozak 3442e29e5c Allow flat BGs for DexcomPlugin 2020-10-25 22:28:21 +01:00
Dominik Dzienia 0f4a428c00 Prevent duplicate numbers in SMS communicator config 2020-10-22 23:49:36 +02:00
Dominik Dzienia b2bd2cafec Allow exporting OTP authenticator secred, for manual provisioning or use in hardware OTP token burning apps 2020-10-22 23:18:52 +02:00
Dominik Dzienia 0df3aaccae Secure authenticator QRCode against screen grabers 2020-10-22 22:27:49 +02:00
Bart Sopers 6d51224089 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-10-21 14:45:44 +02:00
Philoul 405a5526ab Little more compact Low Res layout 2020-10-20 21:22:50 +02:00
Philoul 85c2c9bb50 Replace dedicated setting by Low Res Skin 
Just a copy of Classic skin for initialization
 2020-10-20 21:17:28 +02:00
Milos Kozak 4f5533ad9b
Merge pull request #39 from saydo-co/dev 
Validate durationStep from tbrSettings in Pumptype when setting TBR v…
 2020-10-19 23:27:46 +02:00
Milos Kozak 7ac74f5a9e firebase libs update 2020-10-19 22:42:26 +02:00
Philoul ee79588449 Add setting for shorten label on very low res 2020-10-19 22:14:28 +02:00
Philoul 6fe1a4ab1f Replace override function by default in BGSourceInterface 2020-10-19 21:03:10 +02:00
Milos Kozak fe5cc3d334 layouts -> AppCompat 2020-10-19 19:24:33 +02:00
Milos Kozak 154d2af774 activity -> FragmentActivity 2020-10-19 18:40:17 +02:00
Milos Kozak 0a207cbecc lint recommendation 2020-10-19 17:54:41 +02:00
Sam Spycher 2025e1bdae Remove unnecessary import 2020-10-19 14:13:21 +02:00
Sam Spycher 31bbb69c02 Remove String.format usage 2020-10-19 13:59:03 +02:00
Milos Kozak 00c5f140a9
Merge pull request #37 from dlvoy/fix-import-legacy-preferences 
Fixes import of legacy preferences
 2020-10-19 11:32:28 +02:00
Philoul 4dc042a772 Remove addition Layout and update to remove Level in NsClient Version 2020-10-18 16:52:05 +02:00
Philoul b5c77522ab Patch of xDripPlugin and Eversens plugin to disable Sensor battery level in Action tab 
- xDrip disabled because of an issue in xDrip today (Phone battery level sent and not Sensor battery level)
- Eversens disabled because I'm not sure of data sent (String, Int ?) to avoid error or crash
 2020-10-17 22:26:03 +02:00
Philoul 961ee4ccf4 Add Sensor Battery Level information 
It works with xDrip and Miaomiao2, but today there is a bug in xDrip (xDrip sends Phone battery level and not Sensor Battery level...)
 2020-10-17 22:22:09 +02:00
Philoul 3f4b3149db Add new interface for BgSource to get SensorBatteryLevel 
Note, for xDrip, an Int is sent but I don't know what type of value is sent for Eversens that has a sensor battery level too...
 2020-10-17 20:12:58 +02:00
Bart Sopers f64cc66298 Improve Setup Wizard for Omnipod 2020-10-17 19:47:39 +02:00
Philoul bd3cba8a1a First version of Layout and interface 2020-10-17 11:00:38 +02:00
Sam Spycher b355511f33 Validate durationStep from tbrSettings in Pumptype when setting TBR via SMS 
Fixes nightscout/AndroidAPS#38
 2020-10-16 18:27:04 +02:00
Dominik Dzienia 926e9099bb Fixes import of legacy preferences 2020-10-15 20:29:58 +02:00
Philoul c0ebb8f206 Remove BG decimal if mg/dl unit in Calculator 2020-10-11 20:41:37 +02:00
Milos Kozak cbdee2b81b
Merge pull request #7 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge 
Latest Omnipod updates + custom queue commands
 2020-10-02 09:40:45 +02:00
Bart Sopers b4bd05dc32 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-10-01 21:06:14 +02:00
Bart Sopers 2e0161edf0 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-10-01 19:43:34 +02:00
Bart Sopers 31215ea488 Split Change Pod wizard into Activate Pod wizard and Deactivate Pod wizard 2020-10-01 19:32:56 +02:00
Milos Kozak 6bc1549a91 catch NPE 2020-10-01 19:10:37 +02:00
Milos Kozak 05125af9e7 Lyumjev 2020-10-01 18:48:32 +02:00
Milos Kozak 04f2b0aa15
Merge pull request #15 from osodebailar/import_export_fix_for_very_small_displays 
fix for small displays that  cannot import settings due to scroll and…
 2020-10-01 18:03:54 +02:00
osodebailar 42e37710f2 fix bottom button and change layout again to fit better 2020-09-30 20:15:07 +02:00
osodebailar 8d93ab6e79 format changes 2020-09-30 09:06:49 +02:00
osodebailar 7b7a0e0d5e fix for small displays that cannot import settings due to scroll and display too large texts problem like Jelley 2020-09-30 08:58:03 +02:00
Bart Sopers 8af6519687 Finish new Change Pod Wizard (and some other small changes) 2020-09-29 20:53:12 +02:00
Milos Kozak c2d54c33fd
Merge pull request #12 from dlvoy/hotfix/fix-enginering-mode 
[FIX] Make enginering mode enabled only when turned on
 2020-09-29 11:12:08 +02:00
Milos Kozak c2c1fc15e6 fix passing key_smbinterval 2020-09-29 11:08:48 +02:00
Dominik Dzienia 252063d822 Make enginering mode enabled only when turned on 2020-09-28 22:36:20 +02:00
Bart Sopers 787fa0b305 Prepare Omnipod for upstream merge 2020-09-25 16:33:10 +02:00
Bart Sopers 50c3ec702c Merge branch 'omnipod_eros_dev_upstream_merge' into omnipod_eros_dev 2020-09-24 23:13:46 +02:00
Milos Kozak fea6dff294 update paths 2020-09-23 15:53:38 +02:00
Milos Kozak 5c0c84ae2d Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-09-23 15:44:22 +02:00
Milos Kozak 8ad9c05c90 default automation event 2020-09-23 15:44:00 +02:00
Bart Sopers adb26b3ccf Move CustomCommand interface to queue.commands package 2020-09-14 19:59:20 +02:00
Bart Sopers feecfc5676 - Add custom queue command mechanism to replace abusing getPumpStatus for this purpose 
- Display error and confirmation dialog for commands executed from the Omnipod tab
- Improve Exception logging in AapsOmnipodManager
- A few random improvements and bug fixes
 2020-09-14 16:19:09 +02:00
Bart Sopers c7687aa6c7 Revert "Prepare Omnipod branch for upstream merge" 
This reverts commit 02583c2612.
 2020-09-13 18:51:10 +02:00
Bart Sopers d21a8ed00e Merge branch 'omnipod_eros_dev_upstream_merge' into omnipod_eros_dev 2020-09-13 18:47:10 +02:00
AdrianLxM 8a57ed6559
Update OpenHumansUploader.kt 2020-09-10 20:31:57 +02:00
Milos Kozak 5a14c4d48d disable option for skipping objectives 2020-09-10 16:05:01 +02:00
Milos Kozak a87a69be38
Merge pull request #2945 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge 
More Omnipod updates & cleanup
 2020-09-08 16:20:24 +02:00
Bart Sopers efc384f39c Process review findings from upstream merge 2020-09-06 15:31:40 +02:00
Bart Sopers b944c51372 Process review findings from upstream merge 2020-09-06 15:25:56 +02:00
AdrianLxM 54be27e76a
Merge pull request #2950 from MilosKozak/feature/oh-uploader-2_7 
Open Humans Uploader for v2.7
 2020-09-05 21:31:43 +02:00
Tebbe Ubben 1d88d16545
Set maxProgress to correct value 2020-09-05 11:55:38 +02:00
Bart Sopers 503fc9dbf9 Allow to continue in Setup Wizard when Omnipod has been selected and a RL connection has been established 2020-09-05 04:26:22 +02:00
TebbeUbben f3d8690f5c Change term 2020-09-04 23:24:20 +02:00
TebbeUbben 3745525489 Remove debugging call 2020-09-04 23:18:14 +02:00
TebbeUbben 45fd5264b0 Fix queue size view 2020-09-04 23:11:27 +02:00
TebbeUbben 71b13917c4 Segmental upload 2020-09-04 23:11:11 +02:00
Geoffrey Hansen 354e77e733 indeterminate progress bar OH uploader 2020-09-04 21:19:00 +02:00
Geoffrey Hansen e6f8da32cc correct text on worker foreground 2020-09-04 21:14:38 +02:00
Geoffrey Hansen f24e69dfc8 correct text on worker foreground 2020-09-04 21:13:40 +02:00
Dominik Dzienia 651c3fc426 Add additional prompt for old master password 
Prompt for old master password (used to encrypt exported preferences) if current master password is different and cannot decrypt file.
 2020-09-04 03:55:02 +02:00
Bart Sopers 02583c2612 Prepare Omnipod branch for upstream merge 2020-09-04 00:07:37 +02:00
Bart Sopers cd5bc21b17 Add BatteryReplaceable PumpCapability and hide Battery change button in Actions tab for pumps without this capability (Omnipod); create battery change and insulin change careportal event after activating new Pod 2020-09-03 23:35:03 +02:00
Geoffrey Hansen 25164eab01 remove artificial delay for testing 2020-09-03 22:16:02 +02:00
Geoffrey Hansen 02f85398d7 cleanup 2020-09-03 21:22:33 +02:00
Geoffrey Hansen ae980e12f4 oh foreground worker and some edgecases 2020-09-03 19:39:43 +02:00
Geoffrey Hansen 8a6a3d2283 OH uploader enqueue Treatments and don_t load historical values 2020-09-03 18:01:42 +02:00
Geoffrey Hansen e69966ad47 exclude OH uploader on NSClient flavor 2020-09-02 15:48:17 +02:00
Geoffrey Hansen 2c2e01dee6 Merge remote-tracking branch 'origin/openhumans_old_db' into HEAD 2020-09-02 15:32:11 +02:00
Bart Sopers 898100a0e1 Move RileyLink dagger module class to RileyLink gradle module 2020-09-02 02:22:18 +02:00
Bart Sopers d994f2a184 Move Omnipod dagger module class to Omnipod gradle module 2020-09-02 02:04:31 +02:00
Bart Sopers fead64aa16 Revert "Prepare Omnipod for upstream merge" 
This reverts commit 7c82dbdf93.
 2020-09-01 22:19:08 +02:00
Bart Sopers 5bd623e322 Remove unresolved Omnipod import after merge 2020-09-01 22:05:59 +02:00
Bart Sopers b0d0ea3476 Merge remote-tracking branch 'upstream/2.7.0-rc5' into omnipod_eros_dev_upstream_merge 2020-09-01 21:57:40 +02:00
Milos Kozak 3457f8f511 remove language setting from wizard 2020-09-01 10:02:35 +02:00
Milos Kozak 7c7d115612 ns_upload_only true everywhere 2020-09-01 09:53:24 +02:00
Bart Sopers 01c4d34df8 Display last connection in Omnipod tab in either red or white based on local alerts settings 2020-08-29 01:44:31 +02:00
Bart Sopers aa7e57512a Move Omnipod RileyLink classes into subpackages 2020-08-28 01:22:50 +02:00
Bart Sopers d26cd9f069 Create fake 0 TBR when Pod is not running 2020-08-28 01:18:32 +02:00
Milos Kozak 134b79dd8a show tir range 2020-08-27 10:38:53 +02:00
Milos Kozak d7817792ca show correct constraint in loop plugin 2020-08-26 18:12:03 +02:00
Bart Sopers 5a7c14fb2e Fix dependency injection in RLHistoryItemOmnipod 2020-08-26 14:30:36 +02:00
Bart Sopers 2fdbbd9057 Check in files forgotten in previous commit 2020-08-25 14:00:04 +02:00
Milos Kozak f2d89ac428 lint recommendations 2020-08-24 21:54:53 +02:00
Milos Kozak 20e7020b07
Merge pull request #2917 from GermanBluefox/patch-3 
Show time string instead of ms in JSON structures
 2020-08-24 21:51:27 +02:00
Milos Kozak cc8b22aa31
Merge pull request #2919 from Philoul/AddCalibrationInTreatmentTab 
Add Manual BG or Calibration in CarePortal Tab of Treatment
 2020-08-24 21:45:56 +02:00
Bart Sopers ddd9687425 Reorganized packages and removed a few unused classes 2020-08-23 19:21:01 +02:00
Bart Sopers 4a10a04f79 Remove OmnipodUiComm and OmnipodUiTask 2020-08-23 16:15:35 +02:00
Philoul 0d3d83806b Add Calibration in Translator.kt 
Replace strings by Constants defined in CareportalEvent (most of them already defined)
8 Constants added in CareportalEvent file (3 types used in CareDialog.kt and Translator.kt, 5 only used in translator.kt)
=> I don't know if these types still exists now without CarePortal Plugin...
 2020-08-22 18:33:13 +02:00
Bluefox f224cb1af1
Show time string instead of ms in JSON structures 2020-08-22 17:17:43 +02:00
Bart Sopers 7c82dbdf93 Prepare Omnipod for upstream merge 2020-08-22 11:06:33 +02:00
Bart Sopers 1f3e8a4102 Merge remote-tracking branch 'upstream/2.7.0-rc4' into omnipod_eros_dev 2020-08-21 15:34:47 +02:00
Milos Kozak e7627f4f6c try to fix IllegalStateException 2020-08-21 13:41:48 +02:00
Milos Kozak 8c987c8be9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-08-21 10:30:41 +02:00
Milos Kozak 7282f460fc better synchronize graph rendering 2020-08-21 10:29:23 +02:00
Bart Sopers c22119bb85 Store LastRun SMB data in their dedicated fields instead of overwriting TBR fields 2020-08-20 18:39:16 +02:00
Bart Sopers 7d63671d7b fix import 2020-08-20 02:30:15 +02:00
Bart Sopers 0e9adda3a4 Make sure that after restart, bolus treatment is added when the app is killed during a bolus 2020-08-20 02:20:05 +02:00
Milos Kozak 09e5c82d4d unify units spacing 2020-08-19 21:24:01 +02:00
Milos Kozak 9ca20f425f BG input in wizard improvement 2020-08-19 10:58:45 +02:00
bartsopers 6c3e7a8f43
Merge pull request #143 from smuething/move-protection-to-core 
Move protection to core
 2020-08-18 20:00:57 +02:00
Steffen Müthing d0cbaeeb32 Move protection infrastructure to core 
The protection infrastructure is useful for other modules like pump drivers,
so it should be in core.
 2020-08-18 19:33:50 +02:00
Steffen Müthing 75cbc87b4a Move SingleClickButton to core 
SingleClickButton is a utility used in a number of modules and such should be
in core. While the app seems to built with the button in app, this wrong
structure should be fixed.

As the button is a UI element, the patch also moves the class to the package
info.nightscout.androidaps.utils.ui.
 2020-08-18 15:09:14 +02:00
bartsopers 228441f54c
Merge pull request #139 from smuething/more-daggerization 
More daggerization
 2020-08-18 12:44:21 +02:00
Steffen Müthing 80f1ed52b3 Move CryptoUtil to core 
CryptoUtil is a dependency of ProtectionCheck, so it needs to move to core.
 2020-08-18 12:36:25 +02:00
Bart Sopers 48ad85ae6a Move Omnipod tab closer to Overview tab 2020-08-18 12:33:26 +02:00
Steffen Müthing 3646ef083e Simplify provisioning of PodStateManager 
PodStateManager can be provided by AapsPodStateManager, that's much easier than
getting the constructor signature right in the dependency injection module.
 2020-08-18 00:25:14 +02:00
Steffen Müthing 7d52228e15 Move RileyLink components to a separate dependency injection module 
Having them in the Medtronic module will only create confusion later on.
 2020-08-18 00:22:24 +02:00
Bart Sopers 5c4b9846e6 WIP on moving Omnipod into a separate module 2020-08-17 19:53:43 +02:00
Bart Sopers 2a55c6413c Remove redundant DeviceCommandExecutor interface 2020-08-17 00:07:56 +02:00
Bart Sopers b5c46e3bcf WIP on moving Omnipod to a separate module 2020-08-16 23:54:41 +02:00
bartsopers a30ca700f7
Merge pull request #137 from smuething/protect-pod-management 
Add protection to Pod management activity
 2020-08-16 21:10:14 +02:00
Bart Sopers 100f8fe235 Some Omnipod cleanup after merge 2020-08-16 17:05:32 +02:00
Bart Sopers 5d3426dc70 Replace custom functional interfaces with built in types 2020-08-16 13:56:39 +02:00
Bart Sopers 5bd873cd0e Remove unused Dash code 2020-08-16 13:22:31 +02:00
Bart Sopers a3cb8ff648 Merge remote-tracking branch 'upstream/dev' into omnipod_eros_dev_merge_from_upstream 2020-08-16 12:37:28 +02:00
Steffen Müthing 1bae8526d0 Add protection to Pod management activity 
Pod management should be protected, as it lets you stop the current
Pod. The available activities semm preferences-like to me, so that's
the protection type that I used.
 2020-08-15 22:09:29 +02:00
Bart Sopers f37a2452fb Small cleanup and added some TODOs 2020-08-15 19:01:48 +02:00
Bart Sopers 59ad718969 Remove SetupProgress enum in favor of PodProgressStatus, which comes directly from the Pod 2020-08-15 11:23:45 +02:00
Milos Kozak d7f9208acf fix LP reset button 2020-08-14 17:22:06 +02:00
Milos Kozak 9318f0637a
Merge pull request #2887 from Philoul/ExtendedIOBCalc 
Replace Default Dia by profile Dia in extendedBolus's Iob calculation
 2020-08-14 13:57:26 +02:00
Milos Kozak 3dfa066cf5 MINDIA = 5.0 2020-08-14 11:25:30 +02:00
Philoul 5c7d0a8516 Replace Default Dia by profile Dia in extendedBolus Iob calculation 2020-08-14 10:00:53 +02:00
Milos Kozak f546fdf837 ignore Can not perform this action after onSaveInstanceState 2020-08-13 13:55:39 +02:00
Bart Sopers c56bc5ae61 Temporary workaround for pod activation and deactivation wizard crashes on rotation 2020-08-13 12:22:36 +02:00
Bart Sopers 159c1f941d Ignore IllegalPacketTypeException in AssignAddressAction if packetType is ACK and we already successfully assigned the address before 2020-08-12 18:30:57 +02:00
Bart Sopers 07d520313f Set String instead of int value for pod LOT in RileyLinkStatusGeneralFragment 2020-08-11 22:46:02 +02:00
Bart Sopers b5d55adb2e Store PodProgressStatus in PodState 2020-08-11 21:17:37 +02:00
Bart Sopers 0584cbd6af Use PodStateManager as a source for displaying info in Omnipod tab (and some other small changes) 2020-08-11 21:00:03 +02:00
Milos Kozak b8327f6b3a fix ABS IOB calculation 2020-08-11 14:32:48 +02:00
Bart Sopers 1b2c91a6f9 Fix message sequence numbers when resyncing nonce 2020-08-11 13:10:53 +02:00
Bart Sopers 84ce2d1790 Set pump driver to busy and set state to suspended when Pod has a fault event 2020-08-11 13:10:00 +02:00
Bart Sopers 1ba9244ecd Don't duplicately log request message when exchanging OmnipodMessage 2020-08-11 10:16:06 +02:00
Bart Sopers 0ba26e8b2c Update last failed communication time when an exception is thrown in OmnipodCommunicationManager.transportMessages and add log response from the Pod when exchanging messages 2020-08-11 10:16:05 +02:00
Andy Rozman 5e20444bf4 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-08-10 23:07:14 +01:00
Bart Sopers a55be8d33f - Fix local alerts 
- Remove duplicate RL error from Pod tab
 2020-08-10 22:27:52 +02:00
Bart Sopers 906b8c2585 Remove argument checks for piVersion in internal pod state representation 2020-08-10 20:49:48 +02:00
Bart Sopers 341474295f - Allow resetting pairingParameters in PodStateManager if the setup state is ADDRESS_ASSIGNED 
- Improve pod status screen
- Improve event dispatching in AapsPodStateManager (send less events)
- Add more FIXMEs and TODOs
 2020-08-10 20:15:52 +02:00
Bart Sopers a0ca8cf9cc - Partial fix for display of RL status 
- Fix IllegalStateException when AssignAddressAction is executed when an address has already been assigned
- Improve (not yet used) custom unreachable alert check
- Remove hasFixedUnreachableAlert from PumpType
- Remove omnipodPumpStatus.podAvailable in favor of PodStateManager
- Remove some unused code / comments
- Add a bunch of TODOs
 2020-08-10 17:58:54 +02:00
Andy Rozman 1ebb7144ec - reenable fabric events 2020-08-10 14:18:04 +01:00
Milos Kozak 4bacfad0db fix empty mgdl local profile 2020-08-10 13:06:27 +02:00
Milos Kozak 1bbca2787b BolusWizard typographic 2020-08-10 12:35:59 +02:00
Bart Sopers 8ed802d91b Improve information on Pod tab 2020-08-09 21:03:40 +02:00
Bart Sopers e74e80a4ce Inject RileyLinkServiceData in SetPreamble command and remove some unused code 2020-08-09 19:11:00 +02:00
Milos Kozak 817ec086a1 prevent IndexOutOfBoundsException 2020-08-09 17:43:51 +02:00
Bart Sopers 1787afda98 Daggerize AapsPodStateManager 2020-08-09 16:41:16 +02:00
Bart Sopers da2c2110da Load pod state after initializing PodStateManager 2020-08-09 14:06:45 +02:00
Bart Sopers 050816ddf9 Restore accidentally removed code 2020-08-09 14:04:24 +02:00
Bart Sopers 62bda451a0 Prevent NPE 2020-08-09 13:36:08 +02:00
Bart Sopers e5274e2d3a - Extract abstract class for PodStateManager on driver level 
- Remove PodStateChangedHandler
- Add new fields to PodState
- Add Lot, Tid and Firmware Version in Pod tab
- Various small improvements
- Add some FIXMEs
 2020-08-09 13:24:48 +02:00
Philoul b70c6c9f1b Update BGSourceFragment 
Arrow color a little bit lighter than text (don't find exact text color)
Default color for arrows swtiched to white
 2020-08-09 10:49:54 +02:00
Bart Sopers 31938547a5 Fixes for PodStateManager 2020-08-08 21:38:08 +02:00
Philoul adc71aae08 Update Overview Layout for Arrow icons 
Add a directionToIcon function in BGReading
Move arrow icons to core
 2020-08-08 19:09:21 +02:00
Bart Sopers 10cde3e744 More improvements for PodStateManager 2020-08-08 19:05:36 +02:00
Bart Sopers 2a73127202 Small code improvements for PodStateManager 2020-08-08 18:52:49 +02:00
Bart Sopers 76d267dce4 Prevent NPE 2020-08-08 18:44:33 +02:00
Bart Sopers 3bc53544a2 Bug fixes and improvements in PodStateManager stuff 2020-08-08 18:37:10 +02:00
Bart Sopers b50670cceb Replace PodState with PodStateManager 2020-08-08 18:16:37 +02:00
Andy Rozman 337c61d500 - added dependency 2020-08-08 15:16:50 +01:00
Bart Sopers a06d78b0b7 Add dagger annotations in AapsPodStateManager 2020-08-08 15:42:53 +02:00
Bart Sopers ffb518f50f Introduce PodStateManager 2020-08-08 15:26:51 +02:00
Bart Sopers 80e8d094df Improve pod status text 2020-08-06 23:01:28 +02:00
Bart Sopers d446751d8a Correctly load Pod state from Shared Preferences after startup 2020-08-06 20:19:15 +02:00
Andy Rozman eafb68d496 - small change init of RfSpyReader 
- changed log in RfSpy
 2020-08-02 15:28:07 +01:00
Andy Rozman 11c71149ad - added firmware versions 
- changed faulty init in RadioResponse
- added some logging
 2020-08-02 14:46:07 +01:00
Andy Rozman faeb2576a9 - added real pod status to pod status 2020-08-01 19:54:58 +01:00
Philoul 4bf1e886a4 Fix Plugin Preference enable for Overview 2020-08-01 19:14:38 +02:00
Andy Rozman 54d30cd8c4 - reverted some of my changes 
- fixed problem that service doesn't start with AAPS, but with Tab click
 2020-07-31 19:00:00 +01:00
Andy Rozman 557568b353 - fixed some cosmetical changes 
- fixed problem with initialization, now MDT is initialized at once
 2020-07-31 16:39:56 +01:00
Andy Rozman 20e2bf0b06 Merge branch 'dev' into medtronic_modules 2020-07-31 11:21:05 +01:00
Milos Kozak ba4f599242 include EB in statistics 2020-07-28 13:51:03 +02:00
Milos Kozak ed969300ef fix tests 2020-07-27 22:27:47 +02:00
Milos Kozak 400e9399a5 MinutesNumberPicker 2020-07-27 21:11:57 +02:00
Milos Kozak b7221aa286 prevent missing pump status in NS 2020-07-27 15:21:36 +02:00
Andy Rozman 6ad35510f3 - moved tests 
- some other minor changes
 2020-07-26 14:36:00 +01:00
Milos Kozak 007df3aab3 make SMB prefs more clear 2020-07-26 12:56:47 +02:00
Milos Kozak 1edef7fb4e prevent stack overflow 2020-07-26 11:11:14 +02:00
Andy Rozman 996417bb47 Merge branch 'dev' into medtronic_modules 2020-07-25 00:44:09 +01:00
Andy Rozman 8e438f05fe - some changes with package fixes 2020-07-25 00:39:56 +01:00
Milos Kozak bad7a584c6 cleanup nsclient settings 2020-07-24 13:30:19 +02:00
Milos Kozak 7bf9b8d588 better info in nsclient mode 2020-07-24 13:00:11 +02:00
Milos Kozak 80f2467694 remove logging 2020-07-24 12:42:28 +02:00
Milos Kozak d51a7c9461 scheduleBgHistoryChange 2020-07-24 12:39:18 +02:00
Milos Kozak 6b676a1dfd prevent NPE 2020-07-24 10:18:19 +02:00
Milos Kozak fc69e851d1
Merge pull request #2849 from dlvoy/fix-prefs-import-crash 
Fix preferences import/export related crashes
 2020-07-24 10:06:46 +02:00
Milos Kozak f9806162e1 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-24 07:48:00 +02:00
Milos Kozak 0a6cd80257 fix keepalive 2020-07-24 07:47:54 +02:00
Dominik Dzienia 310c0b9137 Refactor hardcoded error messages to be translatable 2020-07-23 13:42:55 +02:00
Dominik Dzienia 3d0c214f44 Fix crash when user insist on exporting preferences while denying granting storage permission 
* Handles IO errors and display toast about FS / permission errors
* Clarify text - storage permissions are needed not only for logs, but for export too
 2020-07-23 13:33:15 +02:00
Dominik Dzienia 4068cd72ca Fix crash when preferences import list is opened for the second time (due to buggy implementation of ActivityResult and Contracts in early androidx) 
* updated to newest version of fragments where bug is fixed
* catched exception and inform user with Toast
* refactor duplicated code in ImportExportPrefs
 2020-07-23 12:59:42 +02:00
Milos Kozak 66a19cce22 remove unneeded variable 2020-07-21 22:24:13 +02:00
Milos Kozak 74ca36bb6e fix NPE 2020-07-21 22:14:46 +02:00
Milos Kozak 05eee2ebb9 fix user message time 2020-07-20 13:28:07 +02:00
Milos Kozak 35a2692d25
Merge pull request #2822 from Philoul/ProfileHelperImprovement 
Profile helper UI improvement (color & icon)
 2020-07-20 12:57:54 +02:00
Milos Kozak 15586abe52 fix AS calculation 2020-07-20 12:33:35 +02:00
Milos Kozak 3174b8219e
Merge pull request #2821 from Philoul/FixOverviewTBRIcon 
Fix TBR icon even with 100% percent set
 2020-07-20 08:14:12 +02:00
Andy Rozman 23cd1d9143 - some minor changes on dependency (removed full path) 
- removed some logging
- fixed DailyTotalsDTO toString
- changed level of some logging
 2020-07-18 15:18:25 +01:00
Philoul 507e04a30b Compare Profile icon and tab2 color 
Change tab 2 color (to red) and Profile type label color (to red when tab 2 selected)
 2020-07-17 01:09:30 +02:00
Milos Kozak e3cd61cffc DPV profile 2020-07-16 17:30:04 +02:00
Milos Kozak 39b4eac60f add delay to executing automations 2020-07-15 22:46:59 +02:00
Philoul 61c3391eb5 Fix TBR icon even with TBR 100% set 2020-07-15 21:15:49 +02:00
Milos Kozak 9ff3011514 fix current location button 2020-07-15 20:06:45 +02:00
Milos Kozak 24f60ebc65 profile helper 2020-07-14 16:51:13 +02:00
Andy Rozman 6e50c3651d Merge branch 'dev' into medtronic_modules 2020-07-12 20:21:03 +01:00
Andy Rozman ea80eb3c9b - created 2 modules: rileylink and medtronic 
- refactored some classes
 2020-07-12 20:15:11 +01:00
Milos Kozak 639e5b8302 Merge branch 'dev' into profilehelper 2020-07-09 18:59:25 +02:00
Milos Kozak 1d8120d051 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-09 18:58:58 +02:00
Milos Kozak c2e5470da7 prevent ArrayIndexOutOfBoundsException 2020-07-09 18:52:09 +02:00
Milos Kozak f39df8e8eb check for input data 2020-07-09 18:48:28 +02:00
Milos Kozak 4b967d237c Merge branch 'dev' into profilehelper 2020-07-09 18:40:48 +02:00
Milos Kozak 112032ab0e fix nullable params 2020-07-09 14:26:19 +02:00
Milos Kozak 9401fd0d80 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-09 14:21:58 +02:00
Milos Kozak 950e3a677b
Merge pull request #2804 from Tornado-Tim/greenbox-fix 
Fix: Green Glucose Target override
 2020-07-08 23:07:31 +02:00
Milos Kozak 45f168d427 fix nsclient layout 2020-07-08 22:29:26 +02:00
Tim Gunn a93485a3c0
Fix the greenbox 2020-07-09 00:46:10 +12:00
Milos Kozak 2b7cb0d558 prevent kotlin exceptions 2020-07-07 17:16:22 +02:00
Milos Kozak 2c884821e0 ProfileHelper 2020-07-06 21:14:00 +02:00
Milos Kozak b91f8e668a Profile comparator 2020-07-06 13:52:10 +02:00
AdrianLxM 73cb485607 Warn user of insecure fallback on missing master password and activated fingerprint 2020-07-04 21:57:27 +02:00
Milos Kozak 91bc31ba1b fix tablet mode 2020-07-04 10:22:37 +02:00
Milos Kozak b02992e46b fix tests 2020-07-03 21:07:20 +02:00
Milos Kozak 888e7f4ab6 keep reference time for cached values 2020-07-03 20:10:47 +02:00
Milos Kozak 9c57e6b9b9 prevent NPE 2020-07-03 10:46:19 +02:00
Milos Kozak 1f71da4346 overview target logging 2020-07-03 10:38:16 +02:00
Milos Kozak 045b79d22f do not run RandomBgPlugin in main thread 2020-07-03 00:24:01 +02:00
Milos Kozak 9361010e46 do not run automation in main thread 2020-07-03 00:19:51 +02:00
Milos Kozak c2ae713cc4 prevent NPE: 2020-07-02 23:50:38 +02:00
Milos Kozak e9670dd20a fix displaying cob for nsclient 2020-07-02 23:35:19 +02:00
Milos Kozak 6e88d127e5 fix grabbing SSID info 2020-07-02 22:45:47 +02:00
Milos Kozak 3a2790acc3 remove BgSource from setup wizard 2020-07-02 20:28:42 +02:00
Milos Kozak b13c39ebc5 set predefined values for nsclient 2020-07-02 16:41:48 +02:00
Milos Kozak a08c1d5269 fix clash comming from RS history 2020-07-01 20:54:49 +02:00
Milos Kozak d66d362aa3
Merge pull request #2775 from Philoul/BGDeltaConsistency 
BG Deltas consistency enhancement
 2020-06-30 23:01:56 +02:00
Tim Gunn c4a317f515
Dismiss carb notifications automatically if no longer needed, crossfingers fix double wear OS notifications 2020-06-27 01:06:28 +12:00
Tim Gunn 2391ebe399
Remove the amount of carbs required from the main overview if a carb treatment has been made after APS run 2020-06-27 01:03:25 +12:00
Milos Kozak d04cf567b8
Merge pull request #2776 from Philoul/AutomationTempTargetMmol 
Fix mmol units in automation Temp Target Action
 2020-06-26 10:59:48 +02:00
Philoul 5f02a1cc84 Fix units in Automation TT Action 2020-06-26 09:28:12 +02:00
Philoul d28770ac08 Forgotten prediction lines 2020-06-25 21:33:45 +02:00
Philoul 2656e6a12c BG Deltas consistency enhancement 
- Delta after minutes and label right aligned in layout (hard coded for label as it was in OverviewFragment)
- Signed delta avg values
 2020-06-25 18:16:10 +02:00
Philoul 2606e51eb1 Second Fix, send all raw values sent in mg/dl (BG values, lowline and highline) 
It's hard coded in mg/dl in Wear
Minor improvement in Wear code (just increase a little bit highest BG value in graphs, 400 mg/dl is sometimes too low => updated to 450 mg/dl)
 2020-06-25 17:02:18 +02:00
Milos Kozak 0b0b4fc637 handle NS announcements properly 2020-06-24 19:15:35 +02:00
Milos Kozak 4d5880f034
Merge pull request #2741 from Philoul/Vector_Icons 
Vector icons
 2020-06-23 10:31:52 +02:00
Milos Kozak be6c184061 try to catch startup error 2020-06-22 23:31:13 +02:00
Milos Kozak 3305a5979d fix displaying profile switches 2020-06-22 22:55:50 +02:00
Milos Kozak 6783c78d32 remove TODO 2020-06-22 22:20:11 +02:00
Milos Kozak 6cbdd6b98a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-06-22 22:19:34 +02:00
Milos Kozak 6a1394b7b9 activate correct profile 2020-06-22 22:19:27 +02:00
Milos Kozak 63bf758636
Merge pull request #2747 from Philoul/Fix_Color_Watch_mmol 
Fix "always yellow" in watch even if within range (mmol unit)
 2020-06-22 21:06:30 +02:00
Milos Kozak 500de5fa2d fix status lights 2020-06-22 21:01:32 +02:00
Philoul 7f32881e10 Fix "always yellow" in watch 2020-06-20 14:54:54 +02:00
Philoul d55c9d9ff6 Update Layout and code with new icons 2020-06-19 14:24:31 +02:00
Milos Kozak c66084d3ab revert RandomBg safety 2020-06-19 11:13:30 +02:00
Dominik Dzienia 7f62450d99 Fix prediction data sent to WearOS by properly reacalculating them into current app unit 2020-06-17 15:53:46 +02:00
Dominik Dzienia 6b7420d0b7 Fix data sent to WearOS by properly reacalculating them into current app unit 2020-06-17 15:10:25 +02:00
Milos Kozak 782b109ebe
Merge pull request #2716 from Philoul/Replace_Png_Icons 
Replace some png icons by vector
 2020-06-16 22:16:34 +02:00
Philoul 5c2c8b5190 Safe Delete done 
Forgotten usage added
 2020-06-16 19:46:42 +02:00
Philoul 87f7dc0422 Delta added and clone lightened 2020-06-15 19:15:06 +02:00
Philoul acfd9621b7 replace 4 LowRes Icons (add, remove, clone and as) 
For add, remove and clone I set width and height to 16dp (automatically scaled in Local Profile layout but not in automation)
for as, I replaced low res icon by double arrows of overview fragment (size a little bit increased because in automation icons are very small)
 2020-06-15 16:48:35 +02:00
Milos Kozak 0f971ebe29
Merge pull request #2712 from Philoul/Clean_double_string_names 
Clean double string names
 2020-06-15 12:34:01 +02:00
Milos Kozak dae39d4379 fix NPE 2020-06-15 11:23:06 +02:00
Milos Kozak bb5157bcca synchronized updateGui 2020-06-15 11:21:39 +02:00
Philoul 129c3d82d6 Seven loop icons done 2020-06-14 01:57:54 +02:00
Philoul 5ef52ea90f Some new vector icons again 2020-06-13 17:37:52 +02:00
Philoul d3e98fb09b Create vector icon to replace png 2020-06-12 22:17:15 +02:00
Milos Kozak dae717d524 try to fix crash 2020-06-11 23:33:29 +02:00
Milos Kozak b5c72cb4a9
Merge pull request #2614 from Tornado-Tim/carbs-required 
Show Carbs required - Updated from #1974
 2020-06-11 20:42:43 +02:00
Milos Kozak b73196a8d1 Merge branch 'dev' into insight-artificial-end-delay 2020-06-11 14:56:58 +02:00
Milos Kozak 6826bed92f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-06-11 14:56:38 +02:00
Milos Kozak 17d71d218b allow RandomBg upload 2020-06-11 14:55:29 +02:00
Milos Kozak e09fd75a9b
Merge pull request #2680 from Lexsus/dev_Milos 
add PUMP CONNECT and PUMP DISCONNECT commands
 2020-06-11 14:14:39 +02:00
Milos Kozak deb99f236b better automation logging 2020-06-11 12:26:38 +02:00
Milos Kozak 8d2139fb59 history browser x-axis fix 2020-06-11 11:34:33 +02:00
Philoul ac98f2e144 Rename Exam double Strings 2020-06-10 15:38:26 +02:00
Milos Kozak 8b45464f30 secondary graphs layout improvements 2020-06-04 16:24:53 +02:00
Milos Kozak 064389d066 fix HistoryBrowser crash 2020-06-04 14:34:40 +02:00
Tim Gunn 3b3df40ef5
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-03 20:54:29 +12:00
Milos Kozak 15378fb2b8 InMemoryGlucoseValue 2020-06-02 21:59:51 +02:00
Milos Kozak 484f3a2a98 invalidate cache including bg after bg change 2020-06-02 19:28:56 +02:00
Tim Gunn 2c2201129b
Remove oref SMB carbs required preference 2020-06-03 00:17:05 +12:00
Tim Gunn 8142df9487
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-02 23:57:15 +12:00
Lexsus 94390ca32f fixed after review. 2020-06-01 19:29:37 +03:00
Milos Kozak 3f97530b02
Merge pull request #2691 from Philoul/AbsCurveBackgroung 
ABS Curve in background
 2020-06-01 13:28:03 +02:00
Tim Gunn ec188f1329
revert change 2020-06-01 12:14:45 +12:00
Milos Kozak 4efeb77fdc remove deprecation 2020-06-01 00:06:05 +02:00
Tim Gunn 8fefa0b5aa
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-01 02:14:17 +12:00
Milos Kozak 55bccafef5 Large display skin 2020-05-31 12:02:42 +02:00
Milos Kozak 09de329934 libs update & cleanup 2020-05-31 11:27:12 +02:00
Milos Kozak 95e6b02873 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-31 10:12:45 +02:00
Milos Kozak 31b3177561 upgrade fabric to firebase 2020-05-31 10:12:36 +02:00
Tim Gunn f69c11af40
Refractor to use new function 2020-05-31 16:43:32 +12:00
Tim Gunn 8aabf15dfe
snooze carb alerts for 15 min after treatments 2020-05-31 16:43:07 +12:00
Tim Gunn 28f2630a91
Eliminate Double notifications 2020-05-31 16:42:13 +12:00
Tim Gunn 04bd98e0e5
Add Last Carb Time 2020-05-31 16:41:19 +12:00
Philoul a39b7be520 Order in menu changed too for consistency 
So it's necessary to select again curves in secondary graphs...
 2020-05-31 00:52:32 +02:00
Philoul 51739c31b7 ABS Curve in background 
I didn't change order in selection menu (otherwise selected curves are changed in secondary graphs...)
 2020-05-31 00:18:23 +02:00
Milos Kozak f4293d4183
Merge pull request #2688 from Philoul/Add_Translation_Secondary_Graph_Title 
Add translation for secondary graph title
 2020-05-30 21:50:02 +02:00
Tebbe Ubben 5395ca4e71
Update LocalInsightPlugin.java 2020-05-29 19:51:13 +02:00
Lexsus 4af06620fb add tests for PUMP DISCONNECT sms command 2020-05-29 19:15:11 +03:00
Tim Gunn 15717f0271
fix duplicate vals 2020-05-29 22:42:54 +12:00
Tim Gunn 0dfdf6c68a
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-29 21:51:05 +12:00
Milos Kozak df0e46f47b remove duplicated files 2020-05-28 22:00:16 +02:00
Milos Kozak 02aff75dff
change delay to 1.5s 2020-05-28 21:33:36 +02:00
Milos Kozak 458efe467f
Merge pull request #2689 from Philoul/FixCOBHistoryBrowser 
Fix Missing COB in history browser
 2020-05-28 21:21:19 +02:00
Philoul bef8b38b76 Fix Missing COB in history browser 
But more calculation and slower :(
 2020-05-28 18:06:32 +02:00
Lexsus 9a1993c5f6 corrections. 
add some test for sms commands
 2020-05-28 17:33:51 +03:00
Philoul 1a94d3d55e Add Strings for secondary graph title for translation 2020-05-28 16:26:57 +02:00
TebbeUbben 79cafc14f5 Insight: Log end events five seconds earlier 2020-05-28 15:24:53 +02:00
TebbeUbben fa8e784733 Fix Open Humans Uploader 2020-05-28 15:19:35 +02:00
Milos Kozak 0abfb4c4f3
Merge branch 'dev' into carbs-required 2020-05-27 23:19:24 +02:00
Milos Kozak 49274ac0ef
Merge pull request #2602 from Tornado-Tim/skip-neutral-temps 
WIP: Add skip Neutral Temps preference
 2020-05-27 23:16:42 +02:00
Milos Kozak 77df5cdc10
Merge pull request #2679 from andyrozman/bug_2654_1 
Bug 2654 (2)
 2020-05-26 20:16:46 +02:00
Milos Kozak c5aa12c5ba double SMB fix 2020-05-26 19:58:50 +02:00
Lexsus 11f768636e add PUMP CONNECT and PUMP DISCONNECT commands 2020-05-26 12:48:21 +03:00
TebbeUbben 5533f87bbc Also upload APS data 2020-05-26 01:42:33 +02:00
Andy Rozman 3bbbeed07d - There are few fields hidden between implementations MedtronicCommunicationManager and RileyLinkCommunicationManager. If there is error in packet (if MySentry is configugured on Pump), there is NPE when trying to write to log. 2020-05-25 22:40:55 +01:00
Milos Kozak ec3ebd17db History activity performance improvement 2020-05-25 13:54:43 +02:00
Tim Gunn 7622d272c3
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-25 21:16:32 +12:00
Milos Kozak 8a731a9187 SMSCommunicator LOOP command auth 2020-05-24 23:40:51 +02:00
Milos Kozak 0a33f4c0db fix TriggerRecurringTime #2 2020-05-24 21:10:44 +02:00
Milos Kozak 1cb648c09a fix TriggerRecurringTime 2020-05-24 20:23:22 +02:00
Milos Kozak 87eb8021de configbuilder fix 2020-05-23 22:49:05 +02:00
Milos Kozak 3d1b500395 fix ProfileSwitch loading 2020-05-23 22:16:55 +02:00
Milos Kozak 8ae817cdda nsalarm notifications fix 2020-05-23 21:54:01 +02:00
Milos Kozak 8e49717794
Merge pull request #2647 from Philoul/Insight_Pref_Vibration 
Add vibration in Insight preferences
 2020-05-23 18:08:53 +02:00
Milos Kozak 88adf04652
Merge pull request #2663 from Tornado-Tim/show-targets 
Show oref internal overridden targets
 2020-05-23 18:01:28 +02:00
Philoul 4f41890add Add additionnal setting for automated deliveries and add both in pumpcontrol pref 
- previous setting is for manual bolus and extended bolus
- This new setting is for SMB and temp basal with TBR emulation
You can change settings name and summary if you find better...
 2020-05-23 16:30:03 +02:00
Milos Kozak d40188f04e Default language option 2020-05-23 15:39:05 +02:00
Tim Gunn 72943a5236
Add back setting adjustment 2020-05-22 11:08:01 +12:00
TebbeUbben 3fc2aede23 Improve performance of copy operation 2020-05-21 00:21:31 +02:00
TebbeUbben db1f9366aa Increase maximum wakelock duration 2020-05-21 00:05:54 +02:00
TebbeUbben c7df607d97 Some UI candy 2020-05-20 23:59:14 +02:00
AdrianLxM 06e97400f7 Simplify show-targets view logic 2020-05-20 22:34:09 +02:00
TebbeUbben 09b81093dc Also upload preferences 2020-05-20 22:11:31 +02:00
TebbeUbben b239100c13 Open Humans Uploader: Initial commit 2020-05-20 21:49:01 +02:00
Tim Gunn bf412ea798
refractor 2020-05-21 04:19:22 +12:00
Tim Gunn 723c029228
Deal with 0.0 if AMA is used 2020-05-21 02:20:38 +12:00
Tim Gunn 77a5af75e2
Display when Target BG is overidden 2020-05-21 00:11:36 +12:00
Tim Gunn a20008c0db
Add TargetBG 2020-05-21 00:10:51 +12:00
Philoul 6229161c96 Add constraintChecker for autosens icon in overview 2020-05-19 19:32:27 +02:00
Tim Gunn 3ae1bb669d
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-20 00:09:57 +12:00
Milos Kozak b2b1485c27 fix Actions buttons visibility 2020-05-19 13:22:02 +02:00
Milos Kozak d9b8a32aea Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-19 12:52:15 +02:00
Milos Kozak eeb4ce1686 fix HistoryBrowser injection 2020-05-19 12:52:01 +02:00
Philoul 72e541908c Revert "Fix Wear Control Kotlin doesn't like regex... (AAPS crashed on these lines with ""\\s+", replaced by a space)" 
=> Second proposal better than my first one, split works with regex if it is of type Regex (it doesn't recognize first \ as a regex string but as an escape character...)
This reverts commit 480542a1
 2020-05-17 08:09:58 +02:00
Philoul 480542a143 Fix Wear Control 
Kotlin doesn't like regex... (AAPS crashed on these lines with ""\\s+", replaced by a space)
 2020-05-17 01:58:07 +02:00
Milos Kozak 8729fe18bd fix urgent NS alarm preference 2020-05-16 22:43:18 +02:00
Milos Kozak ca94e6cc67 layout #2 2020-05-15 22:41:14 +02:00
Philoul 1dd579fd19 Add disable vibration in insight settings (local_full only) 
Build works but as it related to pump communication, I prefer to not test it on my pump before Tebbe confirmation... (code is very simple, so it should work!)
 2020-05-15 11:37:09 +02:00
Milos Kozak 51ab43416a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-15 08:20:24 +02:00
Milos Kozak c311d593c1 show actions tab in NSC 2020-05-15 08:20:09 +02:00
Tim Gunn b1c6b81bb7
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-15 16:26:23 +12:00
Tim Gunn 32e4bb1220
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-15 16:25:35 +12:00
Milos Kozak be883afabe
Merge pull request #2644 from Philoul/Sensitivity_Icon 
Sensitivity icon
 2020-05-14 21:13:33 +02:00
Milos Kozak 2d3f1323dd layout update 2020-05-14 21:07:51 +02:00
Philoul 66c2bab60f Sensitivity Icon end proposal with a new icon 
Svg file added in icons folder
 2020-05-14 14:39:27 +02:00