From 865264fc3c4d8108da3b645dceb790ac64b35792 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Tue, 17 Nov 2020 14:14:29 +0000
Subject: [PATCH] Group RC2.

---
 .../objectives/objectives/Objective2.java      | 18 ++++++++++++------
 app/src/main/res/values/exam.xml               |  5 +++++
 2 files changed, 17 insertions(+), 6 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 a55e871cea..3530d94c89 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
@@ -52,7 +52,6 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.isf_preferences, false))
                 .option(new Option(R.string.isf_increasingvalue, false))
                 .option(new Option(R.string.isf_noeffect, false))
-                .option(new Option(R.string.isf_profile, false))
                 .hint(new Hint(R.string.isf_hint1))
                 .hint(new Hint(R.string.isf_hint2))
         );
@@ -78,11 +77,11 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.profileswitch_hint1))
         );
         tasks.add(new ExamTask(R.string.profileswitch2_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
-                        .option(new Option(R.string.profileswitch2_bghigher, false))
-                        .option(new Option(R.string.profileswitch2_basalhigher, true))
-                        .option(new Option(R.string.profileswitch2_bgunchanged, true))
-                        .option(new Option(R.string.profileswitch2_isfhigher, false))
-                        .hint(new Hint(R.string.profileswitch_hint1))
+                .option(new Option(R.string.profileswitch2_bghigher, false))
+                .option(new Option(R.string.profileswitch2_basalhigher, true))
+                .option(new Option(R.string.profileswitch2_bgunchanged, true))
+                .option(new Option(R.string.profileswitch2_isfhigher, false))
+                .hint(new Hint(R.string.profileswitch_hint1))
         );
         tasks.add(new ExamTask(R.string.profileswitchtime_label, R.string.profileswitchtime_iwant,"profileswitchtime")
                 .option(new Option(R.string.profileswitchtime_2, false))
@@ -91,6 +90,13 @@ 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.profileswitch4_label, R.string.blank,"profileswitch4")
+                .option(new Option(R.string.profileswitch4_rates, true))
+                .option(new Option(R.string.profileswitch4_internet, true))
+                .option(new Option(R.string.profileswitch4_sufficient, false))
+                .option(new Option(R.string.profileswitch4_multi, true))
+                .hint(new Hint(R.string.profileswitch_hint1))
+        );
         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))
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index ab4e0641bd..94dfc3ccdb 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -190,6 +190,11 @@
     <string name="profileswitchtime_tt">Set an eating soon temporary target.</string>
     <string name="profileswitchtime_100">Do a profile switch to more than 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitch4_label">Topic 7: Changes to profiles</string>
+    <string name="profileswitch4_rates">Basal rates, ISF, I:C ratios, etc., should be set in profiles.</string>
+    <string name="profileswitch4_internet">Activating changes to your Nightscout Profile requires your AndroidAPS phone to have an internet connection.</string>
+    <string name="profileswitch4_sufficient">Editing profiles to change values is sufficient to enact any changes made.</string>
+    <string name="profileswitch4_multi">Multiple profiles can be set up and selected to accommodate changing circumstances (e.g. hormonal changes, shift working, weekdays/weekend lifestyle).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">Topic: Help with basal rates</string>
     <string name="basalhelp_where">Where to go for help with basalrate etc.</string>