From c5ee40b393d4dd9f3c7e38f46c1c3b8cd7e0299a Mon Sep 17 00:00:00 2001 From: Matthew Gray Date: Tue, 3 Nov 2020 11:47:25 +0000 Subject: [PATCH] 1st build fixes. --- .../objectives/objectives/Objective2.java | 14 +++++++------- app/src/main/res/values/exam.xml | 11 ++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java index d20977fd9e..a6ee06cd54 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java @@ -47,7 +47,7 @@ public class Objective2 extends Objective { .option(new Option(R.string.dia_valuemustbedetermined, true)) .hint(new Hint(R.string.dia_hint1)) ); - tasks.add(new ExamTask(R.string.isf_label_exam, R.string.whatistrue,"isf") + tasks.add(new ExamTask(R.string.isf_label_exam, R.string.blank,"isf") .option(new Option(R.string.isf_decreasingvalue, true)) .option(new Option(R.string.isf_preferences, false)) .option(new Option(R.string.isf_increasingvalue, false)) @@ -56,7 +56,7 @@ public class Objective2 extends Objective { .hint(new Hint(R.string.isf_hint1)) .hint(new Hint(R.string.isf_hint2)) ); - tasks.add(new ExamTask(R.string.ic_label_exam, R.string.whatistrue,"ic") + tasks.add(new ExamTask(R.string.ic_label_exam, R.string.blank,"ic") .option(new Option(R.string.ic_increasingvalue, false)) .option(new Option(R.string.ic_decreasingvalue, true)) .option(new Option(R.string.ic_multiple, true)) @@ -77,7 +77,7 @@ public class Objective2 extends Objective { .option(new Option(R.string.profileswitch_unchanged, false)) .hint(new Hint(R.string.profileswitch_hint1)) ); - tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch2") + tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch2_pctwillchange,"profileswitch2") .option(new Option(R.string.profileswitch2_bghigher, true)) .option(new Option(R.string.profileswitch2_basalhigher, true)) .option(new Option(R.string.profileswitch2_bgunchanged, true)) @@ -91,7 +91,7 @@ public class Objective2 extends Objective { .option(new Option(R.string.profileswitchtime_100, false)) .hint(new Hint(R.string.profileswitchtime_hint1)) ); - tasks.add(new ExamTask(R.string.exerciseprofile_label, R.string.exercise_whattodo,"exercise") + tasks.add(new ExamTask(R.string.exerciseprofile_label, R.string.exerciseprofile_whattodo,"exercise") .option(new Option(R.string.exerciseprofile_switchprofileabove100, false)) .option(new Option(R.string.exerciseprofile_switchprofilebelow100, true)) .option(new Option(R.string.exerciseprofile_suspendloop, false)) @@ -142,11 +142,11 @@ public class Objective2 extends Objective { .hint(new Hint(R.string.objectives_hint1)) .hint(new Hint(R.string.objectives_hint2)) ); - tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update") + tasks.add(new ExamTask(R.string.update_label, R.string.blank,"update") .option(new Option(R.string.update_git, true)) .option(new Option(R.string.update_askfriend, false)) .option(new Option(R.string.update_keys, true)) - .option(new Option(R.string.update_asap, false)) + .option(new Option(R.string.update_asap, true)) .hint(new Hint(R.string.update_hint1)) ); tasks.add(new ExamTask(R.string.troubleshooting_label, R.string.troubleshooting_wheretoask,"troubleshooting") @@ -159,7 +159,7 @@ public class Objective2 extends Objective { .hint(new Hint(R.string.troubleshooting_hint3)) ); tasks.add(new ExamTask(R.string.wrongcarbs_label, R.string.wrongcarbs_whattodo,"wrongcarbs") - .option(new Option(R.string.wrongcarbs_addfakeinsulin, false)) + .option(new Option(R.string.wrongcarbs_addinsulin, false)) .option(new Option(R.string.wrongcarbs_treatmentstab, true)) .option(new Option(R.string.wrongcarbs_donothing, false)) .option(new Option(R.string.wrongcarbs_bolus, false)) diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml index 9d97fb0686..49e0c08972 100644 --- a/app/src/main/res/values/exam.xml +++ b/app/src/main/res/values/exam.xml @@ -32,7 +32,7 @@ Export your settings after changing any of your settings. Export your settings after you finish your initial set-up and have set your Preferences. Export your settings locally using the maintenance menu. - Your settings file is found in the folder Internal Storage\AndroidAPS\preferences on your phone. + Your settings file is found in the folder Internal Storage/AndroidAPS/preferences on your phone. Copy your preferences file to a safe location outside of your phone (e.g. by using a cloud drive, connecting a cable to a computer, email, etc.) If your phone is damaged or lost, there are easy ways to remotely recover your settings without a backup. https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html @@ -90,7 +90,7 @@ Validated information to set up a profile (ISF, I:C ratio, basal rates, DIA etc.). A compatible Android device (e.g. mobile/cell phone, full Android watch, or tablet). AndroidAPS requires an internet connection in order to run in closed loop. - A Supported CGM and appropriate app to receive blood glucose values on the phone/device. + A supported CGM and appropriate app to receive blood glucose values on the phone/device. https://androidaps.readthedocs.io/en/latest/EN/Module/module.html Topic 14: Updating AndroidAPS Check all correct answers. @@ -126,9 +126,9 @@ Topic 16: Carb Entry Errors What should you do if you’ve made an incorrect carb entry? Delete the incorrect entry in Treatments and enter the correct new carb value. - Add fake insulin by using Refill function - Add fake insulin by using Refill function - Add fake insulin by using Refill function + Bolus with insulin using the Insulin (bolus) button in Overview.  + Do nothing – AndroidAPS will make the appropriate adjustments. + Bolus with insulin using the Insulin (bolus) button in Overview. Topic 17: Insulin delivery/entry errors What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower?  Delete insulin data from Nightscout Careportal to remove it from the pump history. @@ -193,6 +193,7 @@ Your diabetes team Google Facebook + Topic 21: Other Medication. Please read the statement below and then check the box to accept the declaration. AndroidAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA. \nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AndroidAPS or will deactivate the loop before using such drugs.