caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Advanced Settings

Browse source
This commit is contained in:
AdrianLxM 2017-01-24 10:28:42 +01:00
parent 3a43858948
commit 950b638e50
7 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/Constants.java
View file

@ -53,7 +53,7 @@ public class Constants {
// Very Hard Limits Ranges
// First value is the Lowest and second value is the Highest a Limit can define
public static final int[] VERY_HARD_LIMIT_MIN_BG = {72,180};
public static final int[] VERY_HARD_LIMIT_MAX_BG = {99,270};
public static final int[] VERY_HARD_LIMIT_MAX_BG = {90,270};
public static final int[] VERY_HARD_LIMIT_TARGET_BG = {80,200};
// Very Hard Limits Ranges for Temp Targets

1
app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
View file

@ -104,6 +104,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
if (Config.SMSCOMMUNICATORENABLED)
addPreferencesFromResource(R.xml.pref_smscommunicator);
addPreferencesFromResource(R.xml.pref_others);
addPreferencesFromResource(R.xml.pref_advanced);
initSummary(getPreferenceScreen());
}

2
app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
View file

@ -112,7 +112,7 @@ public class GlucoseStatus {
status.short_avgdelta = average(short_deltas);
if(prefs.getBoolean("always_use_shortavg",false) || (last_deltas.isEmpty() && prefs.getBoolean("default_to_shortavg",false))){
if(prefs.getBoolean("always_use_shortavg",false) || last_deltas.isEmpty()){
status.delta = status.short_avgdelta;
} else {
status.delta = average(last_deltas);

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

@ -449,8 +449,7 @@
<string name="smscommunicator_shortname">SMS</string>
<string name="short_tabtitles">Shorten tab titles</string>
<string name="prefs_delta_title">Delta Settings</string>
<string name="default_to_shortavg">Default to short average delta</string>
<string name="default_to_shortavg_summary">Use short average delta when simple delta cannot be computed.</string>
<string name="always_use_shortavg">Always use short average delta instead of simple delta</string>
<string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
<string name="advancedsettings_title">Advanced Settings</string>
</resources>

30
app/src/main/res/xml/pref_advanced.xml Normal file
View file

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="advanced"
android:title="@string/advancedsettings_title">
<PreferenceScreen
android:title="@string/advancedsettings_title">
<PreferenceCategory
android:title="@string/nightscout">
<SwitchPreference
android:defaultValue="false"
android:key="ns_upload_only"
android:title="@string/ns_upload_only"
android:summary="@string/ns_upload_only_summary"/>
<SwitchPreference
android:defaultValue="false"
android:key="ns_sync_use_absolute"
android:title="@string/ns_sync_use_absolute_title" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/openapsma">
<SwitchPreference
android:defaultValue="false"
android:key="always_use_shortavg"
android:title="@string/always_use_shortavg"
android:summary="@string/always_use_shortavg_summary"/>
</PreferenceCategory>
</PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>

10
app/src/main/res/xml/pref_nightscout.xml
View file

@ -8,16 +8,6 @@
android:defaultValue="false"
android:key="syncprofiletopump"
android:title="@string/syncprofiletopump_title" />
<SwitchPreference
android:defaultValue="false"
android:key="ns_upload_only"
android:title="@string/ns_upload_only"
android:summary="@string/ns_upload_only_summary"/>
<SwitchPreference
android:defaultValue="false"
android:key="ns_sync_use_absolute"
android:title="@string/ns_sync_use_absolute_title" />
</PreferenceCategory>
</PreferenceScreen>

13
app/src/main/res/xml/pref_openapsma.xml
View file

@ -30,18 +30,5 @@
android:key="openapsma_max_iob"
android:numeric="decimal"
android:title="@string/openapsma_maxiob_summary" />
<PreferenceScreen
android:title="@string/prefs_delta_title">
<SwitchPreference
android:defaultValue="false"
android:key="default_to_shortavg"
android:title="@string/default_to_shortavg"
android:summary="@string/default_to_shortavg_summary"/>
<SwitchPreference
android:defaultValue="false"
android:key="always_use_shortavg"
android:title="@string/always_use_shortavg"
android:summary="@string/always_use_shortavg_summary"/>
</PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>