mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 16:53:04 +02:00
Code Issues Releases Wiki Activity

added preference categories.

Browse Source
This commit is contained in:
OliE
2017-11-01 19:00:03 +01:00
parent 987efab026
commit 2e7434df9c
4 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android_app/app/src/main/res/values-de/strings.xml
View File

@@ -135,4 +135,15 @@
<string name="label_bmr">Grundumsatz (BMR)</string> <string name="label_bmr">Grundumsatz (BMR)</string>
<string name="info_measuring">Messe Gewicht: %.2f</string> <string name="info_measuring">Messe Gewicht: %.2f</string>
<string name="info_new_data_added">%1$.2f%2$s [%3$s] zu %4$s hinzugefügt</string> <string name="info_new_data_added">%1$.2f%2$s [%3$s] zu %4$s hinzugefügt</string>
<string name="error_max_scale_users">Maximale Anzahl gleichzeitiger Benutzer erreicht.</string>
<string name="info_step_on_scale">Bitte steigen Sie barfuß auf die Waage zur Referenzmessung</string>
<string name="label_automatic">auto</string>
<string name="label_category_body_metrics_estimation">Körpermetriken abschätzen</string>
<string name="label_category_display">Anzeige</string>
<string name="label_category_measurement_database">Messwertedatenbank</string>
<string name="label_category_misc">Verschiedenes</string>
<string name="label_estimate_fat">Körperfettschätzung</string>
<string name="label_estimate_fat_formula">Körperfettformel</string>
<string name="label_estimate_water">Körperwasserschätzung</string>
<string name="label_estimate_water_formula">Körperwasserformel</string>
</resources> </resources>

5
android_app/app/src/main/res/values/strings.xml
View File

@@ -123,6 +123,11 @@
<string name="label_estimate_fat">Estimate body fat</string> <string name="label_estimate_fat">Estimate body fat</string>
<string name="label_estimate_water">Estimate body water</string> <string name="label_estimate_water">Estimate body water</string>
<string name="label_category_display">Display</string>
<string name="label_category_body_metrics_estimation">Body metrics estimation</string>
<string name="label_category_measurement_database">Measurement database</string>
<string name="label_category_misc">Miscellaneous</string>
<string name="label_estimate_fat_formula">Body fat formula</string> <string name="label_estimate_fat_formula">Body fat formula</string>
<string name="label_estimate_water_formula">Body water formula</string> <string name="label_estimate_water_formula">Body water formula</string>
<string name="label_automatic">auto</string> <string name="label_automatic">auto</string>

18
android_app/app/src/main/res/xml/graph_preferences.xml
View File

@@ -1,10 +1,14 @@
<?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">
<CheckBoxPreference android:title="@string/label_enable_labels" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="labelsEnable" android:defaultValue="true"/> <PreferenceCategory android:title="@string/label_category_display">
<CheckBoxPreference android:title="@string/label_enable_points" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="pointsEnable" android:defaultValue="true"/> <CheckBoxPreference android:title="@string/label_enable_labels" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="labelsEnable" android:defaultValue="true"/>
<CheckBoxPreference android:title="@string/label_delete_confirmation" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="deleteConfirmationEnable" android:defaultValue="true" /> <CheckBoxPreference android:title="@string/label_enable_points" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="pointsEnable" android:defaultValue="true"/>
<CheckBoxPreference android:title="@string/label_average_data" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="averageData" android:defaultValue="true" /> <CheckBoxPreference android:title="@string/label_goal_line" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="goalLine" android:defaultValue="true" />
<CheckBoxPreference android:title="@string/label_goal_line" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="goalLine" android:defaultValue="true" /> <CheckBoxPreference android:title="@string/label_regression_line" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="regressionLine" android:defaultValue="false" />
<CheckBoxPreference android:title="@string/label_regression_line" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="regressionLine" android:defaultValue="false" /> <EditTextPreference android:title="@string/label_regression_line_degree" android:key="regressionLineOrder" android:defaultValue="1" />
<EditTextPreference android:title="@string/label_regression_line_degree" android:key="regressionLineOrder" android:defaultValue="1" /> </PreferenceCategory>
<PreferenceCategory android:title="@string/label_category_misc">
<CheckBoxPreference android:title="@string/label_delete_confirmation" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="deleteConfirmationEnable" android:defaultValue="true" />
<CheckBoxPreference android:title="@string/label_average_data" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="averageData" android:defaultValue="true" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

28
android_app/app/src/main/res/xml/measurement_preferences.xml
View File

@@ -1,14 +1,20 @@
<?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">
<CheckBoxPreference android:title="@string/label_fat" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="fatEnable" android:defaultValue="true"/> <PreferenceCategory android:title="@string/label_category_display">
<CheckBoxPreference android:title="@string/label_water" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="waterEnable" android:defaultValue="true"/> <CheckBoxPreference android:title="@string/label_fat" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="fatEnable" android:defaultValue="true"/>
<CheckBoxPreference android:title="@string/label_muscle" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="muscleEnable" android:defaultValue="true"/> <CheckBoxPreference android:title="@string/label_water" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="waterEnable" android:defaultValue="true"/>
<CheckBoxPreference android:title="@string/label_bone" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="boneEnable" android:defaultValue="false"/> <CheckBoxPreference android:title="@string/label_muscle" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="muscleEnable" android:defaultValue="true"/>
<CheckBoxPreference android:title="@string/label_waist" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="waistEnable" android:defaultValue="false"/> <CheckBoxPreference android:title="@string/label_bone" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="boneEnable" android:defaultValue="false"/>
<CheckBoxPreference android:title="@string/label_hip" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="hipEnable" android:defaultValue="false"/> <CheckBoxPreference android:title="@string/label_waist" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="waistEnable" android:defaultValue="false"/>
<CheckBoxPreference android:title="@string/label_estimate_fat" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="estimateFatEnable" android:defaultValue="false"/> <CheckBoxPreference android:title="@string/label_hip" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="hipEnable" android:defaultValue="false"/>
<ListPreference android:title="@string/label_estimate_fat_formula" android:key="estimateFatFormula" android:defaultValue="BF_GALLAGHER"/> </PreferenceCategory>
<CheckBoxPreference android:title="@string/label_estimate_water" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="estimateWaterEnable" android:defaultValue="false"/> <PreferenceCategory android:title="@string/label_category_body_metrics_estimation">
<ListPreference android:title="@string/label_estimate_water_formula" android:key="estimateWaterFormula" android:defaultValue="TBW_LEESONGKIM"/> <CheckBoxPreference android:title="@string/label_estimate_fat" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="estimateFatEnable" android:defaultValue="false"/>
<Preference android:title="@string/label_delete_all" android:key="deleteAll"></Preference> <ListPreference android:title="@string/label_estimate_fat_formula" android:key="estimateFatFormula" android:defaultValue="BF_GALLAGHER"/>
<CheckBoxPreference android:title="@string/label_estimate_water" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="estimateWaterEnable" android:defaultValue="false"/>
<ListPreference android:title="@string/label_estimate_water_formula" android:key="estimateWaterFormula" android:defaultValue="TBW_LEESONGKIM"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/label_category_measurement_database">
<Preference android:title="@string/label_delete_all" android:key="deleteAll"></Preference>
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>