From 8eeb91a0a80efb1d79856c41bf6be8e14527bccd Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Fri, 29 Nov 2019 21:23:12 +1300
Subject: [PATCH] Add New preferences for oref 0.7.0

---
 app/src/main/res/values/strings.xml      | 10 ++++
 app/src/main/res/xml/pref_openapssmb.xml | 70 ++++++++++++++++--------
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ccc91c699b..e8a8888ec2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -837,6 +837,9 @@
     <string name="smbmaxminutes_summary">Max minutes of basal to limit SMB to</string>
     <string name="uamsmbmaxminutes">UAM SMB max minutes</string>
     <string name="uamsmbmaxminutes_summary">Max minutes of basal to limit SMB to for UAM</string>
+    <string name="key_carbsReqThreshold" translatable="false">carbsReqThreshold</string>
+    <string name="carbsReqThreshold">Carb suggestion threshold</string>
+    <string name="carbsReqThreshold_summary">When Carbs are suggested, how many carbs will prompt a notification</string>
     <string name="key_bolus_increment" translatable="false">bolus_increment</string>
     <string name="bolus_increment_summary">Minimum bolus that can be delivered as an SMB</string>
     <string name="unsupportedfirmware">Unsupported pump firmware</string>
@@ -1152,6 +1155,12 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Raise sensitivity for temptargets >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Low temptarget lowers sensitivity</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Lower sensitivity for temptargets < 100]]></string>
+    <string name="key_resistance_lowers_target" translatable="false">resistance_lowers_target</string>
+    <string name="resistance_lowers_target_title">Resistance lowers target</string>
+    <string name="resistance_lowers_target_summary">When resistance is detected, lower the target glucose</string>
+    <string name="key_sensitivity_raises_target" translatable="false">sensitivity_raises_target</string>
+    <string name="sensitivity_raises_target_title">Sensitivity raises target</string>
+    <string name="sensitivity_raises_target_summary">When sensitivity is detected, raise the target glucose</string>
     <string name="combo_invalid_setup">Invalid pump setup, check the docs and verify that the Quick Info menu is named QUICK INFO using the 360 configuration software.</string>
     <string name="custom">Custom</string>
     <string name="largetimedifftitle">Large Time Difference</string>
@@ -1354,6 +1363,7 @@
     <string name="tidepool_upload_bg">Upload BG tests</string>
 
     <string name="key_smbmaxminutes" translatable="false">smbmaxminutes</string>
+    <string name="key_uamsmbmaxminutes" translatable="false">uamsmbmaxminutes</string>
     <string name="dst_plugin_name" translatable="false">Daylight Saving time</string>
     <string name="dst_in_24h_warning">Daylight Saving time change in 24h or less</string>
     <string name="dst_loop_disabled_warning">Daylight Saving time change less than 3 hours ago - Closed loop disabled</string>
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 45375df376..99e3332bb7 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -93,30 +93,30 @@
             validate:testType="numericRange" />
 
         <com.andreabaccega.widget.ValidatingEditTextPreference
-                android:defaultValue="30"
-                android:dialogMessage="@string/uamsmbmaxminutes"
-                android:digits="0123456789"
-                android:inputType="number"
-                android:key="key_uamsmbmaxminutes"
-                android:maxLines="20"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
-                android:title="@string/uamsmbmaxminutes_summary"
-                validate:maxNumber="120"
-                validate:minNumber="15"
-                validate:testType="numericRange" />
+            android:defaultValue="30"
+            android:dialogMessage="@string/uamsmbmaxminutes"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:key="@string/key_uamsmbmaxminutes"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/uamsmbmaxminutes_summary"
+            validate:maxNumber="120"
+            validate:minNumber="15"
+            validate:testType="numericRange" />
 
         <com.andreabaccega.widget.ValidatingEditTextPreference
-                android:defaultValue="0.1"
-                android:inputType="numberDecimal"
-                android:key="key_bolus_increment"
-                android:maxLines="20"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
-                android:title="@string/bolus_increment_summary"
-                validate:floatmaxNumber="1.0"
-                validate:floatminNumber="0.05"
-                validate:testType="floatNumericRange" />
+            android:defaultValue="0.1"
+            android:inputType="numberDecimal"
+            android:key="key_bolus_increment"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/bolus_increment_summary"
+            validate:floatmaxNumber="1.0"
+            validate:floatminNumber="0.05"
+            validate:testType="floatNumericRange" />
 
 
         <SwitchPreference
@@ -126,6 +126,18 @@
             android:title="@string/enableuam" />
 
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_sensitivity_raises_target"
+            android:summary="@string/sensitivity_raises_target_summary"
+            android:title="@string/sensitivity_raises_target_title"
+            />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_resistance_lowers_target"
+            android:summary="@string/resistance_lowers_target_summary"
+            android:title="@string/resistance_lowers_target_title"
+            />
         <!-- TODO AS-FIX -->
         <SwitchPreference
             android:defaultValue="false"
@@ -144,6 +156,20 @@
             android:enabled="false"
             />
 
+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            android:key="@string/key_carbsReqThreshold"
+            android:title="@string/carbsReqThreshold"
+            android:defaultValue="1"
+            android:dialogMessage="@string/carbsReqThreshold_summary"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            validate:maxNumber="10"
+            validate:minNumber="1"
+            validate:testType="numericRange"/>
+
         <PreferenceScreen android:title="@string/advancedsettings_title">
 
             <Preference android:summary="@string/openapsama_link_to_preferncejson_doc_txt">