caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Add prefernces.json changes

Browse source
This commit is contained in:
LadyViktoria 2017-02-09 09:36:51 +01:00
parent 0bf51710d1
commit 886c1ea359
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
} }
if (pref instanceof EditTextPreference) { if (pref instanceof EditTextPreference) {
EditTextPreference editTextPref = (EditTextPreference) pref; EditTextPreference editTextPref = (EditTextPreference) pref;
if (pref.getTitle().toString().toLowerCase().contains("password")) { if (pref.getKey().contains("danar_password")) {
pref.setSummary("******"); pref.setSummary("******");
} else if (editTextPref.getText() != null && !editTextPref.getText().equals("")) { } else if (editTextPref.getText() != null && !editTextPref.getText().equals("")) {
((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage()); ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());

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

@ -268,7 +268,6 @@
<string name="danarprofile_dia">DIA [h]</string> <string name="danarprofile_dia">DIA [h]</string>
<string name="danarprofile_dia_summary">Duration of Insulin Activity</string> <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
<string name="danarprofile_car">Carbs absorption rate</string> <string name="danarprofile_car">Carbs absorption rate</string>
<string name="failedupdatebasalprofile">Failed to update basal profile</string>
<string name="danar_history">History</string> <string name="danar_history">History</string>
<string name="danar_historyreload">Reload</string> <string name="danar_historyreload">Reload</string>
<string name="uploading">Uploading</string> <string name="uploading">Uploading</string>

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

@ -61,8 +61,8 @@
android:key="openapsama_current_basal_safety_multiplier" /> android:key="openapsama_current_basal_safety_multiplier" />
<com.andreabaccega.widget.ValidatingEditTextPreference <com.andreabaccega.widget.ValidatingEditTextPreference
validate:testType="floatNumericRange" validate:testType="floatNumericRange"
validate:floatminNumber="0.1" validate:floatminNumber="0.5"
validate:floatmaxNumber="5" validate:floatmaxNumber="3"
android:digits="0123456789.," android:digits="0123456789.,"
android:defaultValue="1.2" android:defaultValue="1.2"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
@ -75,7 +75,7 @@
<com.andreabaccega.widget.ValidatingEditTextPreference <com.andreabaccega.widget.ValidatingEditTextPreference
validate:testType="floatNumericRange" validate:testType="floatNumericRange"
validate:floatminNumber="0.1" validate:floatminNumber="0.1"
validate:floatmaxNumber="5" validate:floatmaxNumber="1.0"
android:defaultValue="0.7" android:defaultValue="0.7"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
@ -92,7 +92,7 @@
<com.andreabaccega.widget.ValidatingEditTextPreference <com.andreabaccega.widget.ValidatingEditTextPreference
validate:testType="numericRange" validate:testType="numericRange"
validate:minNumber="1" validate:minNumber="1"
validate:maxNumber="10" validate:maxNumber="5"
android:digits="0123456789.," android:digits="0123456789.,"
android:defaultValue="2" android:defaultValue="2"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
@ -105,7 +105,7 @@
<com.andreabaccega.widget.ValidatingEditTextPreference <com.andreabaccega.widget.ValidatingEditTextPreference
validate:testType="floatNumericRange" validate:testType="floatNumericRange"
validate:floatminNumber="0.1" validate:floatminNumber="0.1"
validate:floatmaxNumber="10" validate:floatmaxNumber="5.0"
android:defaultValue="3.0" android:defaultValue="3.0"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"