caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into dev

Browse source
This commit is contained in:
Milos Kozak 2019-09-07 11:58:19 +02:00 committed by GitHub
parent 6d85215641 45638ef5eb
commit 940d413d1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
View file

@ -21,11 +21,10 @@ public class Objective2 extends Objective {
.option(new Option(R.string.dia_valuemustbedetermined, true)) .option(new Option(R.string.dia_valuemustbedetermined, true))
.hint(new Hint(R.string.dia_hint1)) .hint(new Hint(R.string.dia_hint1))
); );
tasks.add(new ExamTask(R.string.hypott, R.string.hypott_whenhypott,"hypott") tasks.add(new ExamTask(R.string.hypott, R.string.hypott_whyhypott,"hypott")
.option(new Option(R.string.hypott_goinglow, true)) .option(new Option(R.string.hypott_goinglow, false))
.option(new Option(R.string.hypott_havinglow, true)) .option(new Option(R.string.hypott_havinglow, false))
.option(new Option(R.string.hypott_notlowanymorebutrising, false)) .option(new Option(R.string.hypott_preventoversmb, true))
.option(new Option(R.string.hypott_havehadalowbg, false))
.hint(new Hint(R.string.hypott_hint1)) .hint(new Hint(R.string.hypott_hint1))
); );
tasks.add(new ExamTask(R.string.offlineprofile, R.string.offlineprofile_whatprofile,"offlineprofile") tasks.add(new ExamTask(R.string.offlineprofile, R.string.offlineprofile_whatprofile,"offlineprofile")
@ -57,6 +56,27 @@ public class Objective2 extends Objective {
.option(new Option(R.string.noisycgm_checksmoothing, true)) .option(new Option(R.string.noisycgm_checksmoothing, true))
.hint(new Hint(R.string.noisycgm_hint1)) .hint(new Hint(R.string.noisycgm_hint1))
); );
tasks.add(new ExamTask(R.string.exercise, R.string.exercise_whattodo,"exercise")
.option(new Option(R.string.nothing, false))
.option(new Option(R.string.exercise_setactivitytt, true))
.option(new Option(R.string.exercise_switchprofilebelow100, true))
.option(new Option(R.string.exercise_switchprofileabove100, false))
.option(new Option(R.string.exercise_stoploop, false))
.option(new Option(R.string.exercise_doitbeforestart, true))
.option(new Option(R.string.exercise_doitafterstart, false))
.hint(new Hint(R.string.exercise_hint1))
);
tasks.add(new ExamTask(R.string.suspendloop, R.string.suspendloop_doigetinsulin,"suspendloop")
.option(new Option(R.string.suspendloop_yes, true))
.option(new Option(R.string.no, false))
.hint(new Hint(R.string.exercise_hint1))
);
tasks.add(new ExamTask(R.string.basaltest, R.string.basaltest_when,"basaltest")
.option(new Option(R.string.basaltest_beforeloop, true))
.option(new Option(R.string.basaltest_havingregularhypo, true))
.option(new Option(R.string.basaltest_havingregularhyper, true))
.hint(new Hint(R.string.basaltest_hint1))
);
for (Task task : tasks) for (Task task : tasks)
Collections.shuffle(((ExamTask)task).options); Collections.shuffle(((ExamTask)task).options);

11
app/src/main/res/layout/objectives_exam_fragment.xml
View file

@ -17,7 +17,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/objectives_exam_question" app:layout_constraintTop_toBottomOf="@+id/objectives_exam_hint"
tools:layout_editor_absoluteX="3dp"> tools:layout_editor_absoluteX="3dp">
</LinearLayout> </LinearLayout>
@ -81,6 +81,15 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/objectives_exam_name" /> app:layout_constraintTop_toBottomOf="@id/objectives_exam_name" />
<TextView
android:id="@+id/objectives_exam_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/objectives_hint"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/objectives_exam_question" />
<TextView <TextView
android:id="@+id/objectives_exam_name" android:id="@+id/objectives_exam_name"
android:layout_width="0dp" android:layout_width="0dp"

18
app/src/main/res/values/exam.xml
View file

@ -40,5 +40,23 @@
<string name="noisycgm_turnoffcgmreceiver">Turn off CGM receiver.</string> <string name="noisycgm_turnoffcgmreceiver">Turn off CGM receiver.</string>
<string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string> <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
<string name="noisycgm_checksmoothing">Check if your CGM app smoothes data.</string> <string name="noisycgm_checksmoothing">Check if your CGM app smoothes data.</string>
<string name="hypott_preventoversmb">to prevent SMB after a hypo rise from fast carbs</string>
<string name="exercise">Exercise</string>
<string name="exercise_whattodo">How to help the system deal with exercise</string>
<string name="exercise_setactivitytt">set activity temp target</string>
<string name="exercise_switchprofilebelow100">do a profile switch below 100%</string>
<string name="exercise_switchprofileabove100">do profile switch above 100%</string>
<string name="exercise_stoploop">stop loop</string>
<string name="exercise_doitbeforestart">do it before start exercise</string>
<string name="exercise_doitafterstart">do it after start exercise</string>
<string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
<string name="suspendloop_doigetinsulin">Do I get insuling when loop is suspended?</string>
<string name="suspendloop_yes">Yes, common basal rate</string>
<string name="basaltest">Basal and ISF, IC testing</string>
<string name="basaltest_when">When should I test basals, ISF and IC?</string>
<string name="basaltest_beforeloop">before I start looping</string>
<string name="basaltest_havingregularhypo">when having regular hypos</string>
<string name="basaltest_havingregularhyper">when having regular hypers</string>
<string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
</resources> </resources>

1
app/src/main/res/values/strings.xml
View file

@ -1637,6 +1637,7 @@
<string name="close">Close</string> <string name="close">Close</string>
<string name="key_objectives_request_code" translatable="false">objectives_request_code</string> <string name="key_objectives_request_code" translatable="false">objectives_request_code</string>
<string name="requestcode">Request code: %1$s</string> <string name="requestcode">Request code: %1$s</string>
<string name="objectives_hint">(check all correct answers)</string>
<plurals name="objective_days"> <plurals name="objective_days">
<item quantity="one">%1$d day</item> <item quantity="one">%1$d day</item>