caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1871 from jotomo/tidepool-prefs-category

Browse source 
Fix Tidepool prefs header not showing
This commit is contained in:
Milos Kozak 2019-07-14 13:22:54 +02:00 committed by GitHub
commit 6e6d21438b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1333,7 +1333,6 @@
<string name="key_tidepool_test_login" translatable="false">tidepool_test_login</string> <string name="key_tidepool_test_login" translatable="false">tidepool_test_login</string>
<string name="key_tidepool_only_while_charging" translatable="false">tidepool_only_while_charging</string> <string name="key_tidepool_only_while_charging" translatable="false">tidepool_only_while_charging</string>
<string name="key_tidepool_only_while_unmetered" translatable="false">tidepool_only_while_unmetered</string> <string name="key_tidepool_only_while_unmetered" translatable="false">tidepool_only_while_unmetered</string>
<string name="summary_tidepool_upload_screen">Upload data to the Tidepool service</string>
<string name="summary_tidepool_username">Your Tidepool login user name, normally your email address</string> <string name="summary_tidepool_username">Your Tidepool login user name, normally your email address</string>
<string name="title_tidepool_username">Login User Name</string> <string name="title_tidepool_username">Login User Name</string>
<string name="summary_tidepool_password">Your Tidepool login password</string> <string name="summary_tidepool_password">Your Tidepool login password</string>

107
app/src/main/res/xml/pref_tidepool.xml
View file

@ -1,57 +1,60 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
android:key="tidepool_upload_screen"
android:summary="@string/summary_tidepool_upload_screen"
android:title="@string/tidepool">
<EditTextPreference <PreferenceCategory
android:key="@string/key_tidepool_username" android:key="tidepool_upload_screen"
android:summary="@string/summary_tidepool_username" android:title="@string/tidepool">
android:title="@string/title_tidepool_username" />
<EditTextPreference <EditTextPreference
android:inputType="textPassword" android:key="@string/key_tidepool_username"
android:key="@string/key_tidepool_password" android:summary="@string/summary_tidepool_username"
android:summary="@string/summary_tidepool_password" android:title="@string/title_tidepool_username" />
android:title="@string/title_tidepool_password" /> <EditTextPreference
<Preference android:inputType="textPassword"
android:key="@string/key_tidepool_test_login" android:key="@string/key_tidepool_password"
android:title="@string/title_tidepool_test_login" /> android:summary="@string/summary_tidepool_password"
<CheckBoxPreference android:title="@string/title_tidepool_password" />
android:defaultValue="true" <Preference
android:key="@string/key_tidepool_upload_cgm" android:key="@string/key_tidepool_test_login"
android:title="@string/tidepool_upload_cgm" /> android:title="@string/title_tidepool_test_login" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/key_tidepool_upload_bolus" android:key="@string/key_tidepool_upload_cgm"
android:title="@string/tidepool_upload_bolus" /> android:title="@string/tidepool_upload_cgm" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/key_tidepool_upload_bg" android:key="@string/key_tidepool_upload_bolus"
android:title="@string/tidepool_upload_bg" /> android:title="@string/tidepool_upload_bolus" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/key_tidepool_upload_tbr" android:key="@string/key_tidepool_upload_bg"
android:title="@string/tidepool_upload_tbr" /> android:title="@string/tidepool_upload_bg" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/key_tidepool_upload_profile" android:key="@string/key_tidepool_upload_tbr"
android:title="@string/tidepool_upload_profile" /> android:title="@string/tidepool_upload_tbr" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:enabled="false" android:key="@string/key_tidepool_upload_profile"
android:key="@string/key_tidepool_dev_servers" android:title="@string/tidepool_upload_profile" />
android:summary="@string/summary_tidepool_dev_servers" <CheckBoxPreference
android:title="@string/title_tidepool_dev_servers" /> android:defaultValue="true"
<CheckBoxPreference android:enabled="false"
android:defaultValue="false" android:key="@string/key_tidepool_dev_servers"
android:key="@string/key_tidepool_only_while_charging" android:summary="@string/summary_tidepool_dev_servers"
android:summary="Upload data only when charging" android:title="@string/title_tidepool_dev_servers" />
android:title="Only when charging" /> <CheckBoxPreference
<CheckBoxPreference android:defaultValue="false"
android:defaultValue="false" android:key="@string/key_tidepool_only_while_charging"
android:key="@string/key_tidepool_only_while_unmetered" android:summary="Upload data only when charging"
android:summary="Upload data only when connected to an unmetered network like Wifi" android:title="Only when charging" />
android:title="Only on Wifi" /> <CheckBoxPreference
android:defaultValue="false"
android:key="@string/key_tidepool_only_while_unmetered"
android:summary="Upload data only when connected to an unmetered network like Wifi"
android:title="Only on Wifi" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>