Sorting global settings (showElement X, chart-settings, actions-settings, other-settings)
This commit is contained in:
rICTx-T1D
mh
parent
c34fcd0b91
commit
8718204537
2 changed files with 120 additions and 117 deletions
|
|
@ -2,29 +2,6 @@
|
||||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="vibrateOnBolus"
|
|
||||||
android:title="@string/pref_vibrate_on_bolus"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on" />
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="units_mgdl"
|
|
||||||
android:title="@string/pref_units_for_actions"
|
|
||||||
android:summaryOn="mg/dl"
|
|
||||||
android:summaryOff="mmol/l"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on" />
|
|
||||||
|
|
||||||
<!--<CheckBoxPreference
|
|
||||||
android:defaultValue="false"
|
|
||||||
android:key="show_date"
|
|
||||||
android:title="@string/pref_show_date"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on" />-->
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:defaultValue="true"
|
android:defaultValue="true"
|
||||||
android:key="show_iob"
|
android:key="show_iob"
|
||||||
|
|
@ -41,10 +18,18 @@
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
app:wear_iconOn="@drawable/settings_on" />
|
app:wear_iconOn="@drawable/settings_on" />
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="showBG"
|
||||||
|
android:summary="Show BG."
|
||||||
|
android:title="@string/pref_show_bg"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:defaultValue="true"
|
android:defaultValue="true"
|
||||||
android:key="showDelta"
|
android:key="showDelta"
|
||||||
android:summary="Show delta. (Circle WF)"
|
android:summary="Show delta."
|
||||||
android:title="@string/pref_show_delta"
|
android:title="@string/pref_show_delta"
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
@ -56,6 +41,21 @@
|
||||||
android:title="@string/pref_show_avgdelta"
|
android:title="@string/pref_show_avgdelta"
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="show_direction"
|
||||||
|
android:summary="Show direction arrow"
|
||||||
|
android:title="@string/pref_show_direction_arrow"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="showAgo"
|
||||||
|
android:summary="Minutes since last reading."
|
||||||
|
android:title="@string/pref_show_ago"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:defaultValue="true"
|
android:defaultValue="true"
|
||||||
|
|
@ -85,37 +85,7 @@
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
app:wear_iconOn="@drawable/settings_on" />
|
app:wear_iconOn="@drawable/settings_on" />
|
||||||
|
|
||||||
<!--<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="showBG"
|
|
||||||
android:summary="Show BG. (Circle WF)"
|
|
||||||
android:title="@string/pref_show_bg"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>-->
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="show_direction"
|
|
||||||
android:summary="Show direction arrow"
|
|
||||||
android:title="@string/pref_show_direction_arrow"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="showAgo"
|
|
||||||
android:summary="Minutes since last reading. (Circle WF)"
|
|
||||||
android:title="@string/pref_show_ago"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
|
||||||
|
|
||||||
<!--<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="dark"
|
|
||||||
android:summary="Dark theme"
|
|
||||||
android:title="@string/pref_dark"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/> -->
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:defaultValue="false"
|
android:defaultValue="false"
|
||||||
|
|
@ -125,14 +95,6 @@
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
<!--<CheckBoxPreference
|
|
||||||
android:defaultValue="false"
|
|
||||||
android:key="match_divider"
|
|
||||||
android:summary="Status bar divider background matches watchface background"
|
|
||||||
android:title="@string/pref_matching_divider"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/> -->
|
|
||||||
|
|
||||||
<ListPreference
|
<ListPreference
|
||||||
android:defaultValue="3"
|
android:defaultValue="3"
|
||||||
android:entries="@array/chart_timeframe"
|
android:entries="@array/chart_timeframe"
|
||||||
|
|
@ -141,6 +103,17 @@
|
||||||
android:summary="Chart Timeframe"
|
android:summary="Chart Timeframe"
|
||||||
android:title="@string/pref_chart_timeframe" />
|
android:title="@string/pref_chart_timeframe" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="units_mgdl"
|
||||||
|
android:title="@string/pref_units_for_actions"
|
||||||
|
android:summaryOn="mg/dl"
|
||||||
|
android:summaryOff="mmol/l"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on" />
|
||||||
|
|
||||||
<ListPreference
|
<ListPreference
|
||||||
android:defaultValue="1"
|
android:defaultValue="1"
|
||||||
android:entries="@array/input_design"
|
android:entries="@array/input_design"
|
||||||
|
|
@ -149,6 +122,103 @@
|
||||||
android:summary="Input Design"
|
android:summary="Input Design"
|
||||||
android:title="@string/pref_input_design" />
|
android:title="@string/pref_input_design" />
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="showWizard"
|
||||||
|
android:summary="Wizard from watch possible"
|
||||||
|
android:title="@string/pref_wizard_in_menu"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="vibrateOnBolus"
|
||||||
|
android:title="@string/pref_vibrate_on_bolus"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on" />
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="false"
|
||||||
|
android:key="primefill"
|
||||||
|
android:summary="Prime/Fill from watch possible"
|
||||||
|
android:title="@string/pref_prime_in_menu"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="singletarget"
|
||||||
|
android:summary="Single temp-target instead of a range."
|
||||||
|
android:title="@string/pref_single_target"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="false"
|
||||||
|
android:key="wizardpercentage"
|
||||||
|
android:summary="Percentage correction."
|
||||||
|
android:title="@string/pref_wizard_percentage"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<ListPreference
|
||||||
|
android:defaultValue="default"
|
||||||
|
android:entries="@array/complication_tap_action"
|
||||||
|
android:entryValues="@array/complication_tap_action_values"
|
||||||
|
android:key="complication_tap_action"
|
||||||
|
android:summary="What dialog to show after tap on complication"
|
||||||
|
android:title="@string/pref_complication_tap_action" />
|
||||||
|
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="complication_unicode"
|
||||||
|
android:summary="Use unicode special characters in complications."
|
||||||
|
android:title="@string/pref_unicode_in_complications"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
|
<info.nightscout.androidaps.interaction.utils.VersionPreference
|
||||||
|
android:defaultValue="1"
|
||||||
|
android:entries="@array/input_design"
|
||||||
|
android:entryValues="@array/input_design_values"
|
||||||
|
android:key="version_number"
|
||||||
|
android:summary="Input Design"
|
||||||
|
android:title="@string/pref_version" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!--<CheckBoxPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
android:key="dark"
|
||||||
|
android:summary="Dark theme"
|
||||||
|
android:title="@string/pref_dark"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/> -->
|
||||||
|
|
||||||
|
<!--<CheckBoxPreference
|
||||||
|
android:defaultValue="false"
|
||||||
|
android:key="match_divider"
|
||||||
|
android:summary="Status bar divider background matches watchface background"
|
||||||
|
android:title="@string/pref_matching_divider"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on"/> -->
|
||||||
|
|
||||||
|
<!--<CheckBoxPreference
|
||||||
|
android:defaultValue="false"
|
||||||
|
android:key="show_date"
|
||||||
|
android:title="@string/pref_show_date"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on" />-->
|
||||||
|
|
||||||
|
<!--<CheckBoxPreference
|
||||||
|
android:key="vibrate_Hourly"
|
||||||
|
android:title="@string/pref_vibrate_hourly"
|
||||||
|
android:defaultValue="false"
|
||||||
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
|
app:wear_iconOn="@drawable/settings_on" />-->
|
||||||
|
|
||||||
<!--<ListPreference
|
<!--<ListPreference
|
||||||
android:defaultValue="2"
|
android:defaultValue="2"
|
||||||
android:entries="@array/delta_granularity"
|
android:entries="@array/delta_granularity"
|
||||||
|
|
@ -189,66 +259,7 @@
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
app:wear_iconOn="@drawable/settings_on"/>-->
|
app:wear_iconOn="@drawable/settings_on"/>-->
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="showWizard"
|
|
||||||
android:summary="Wizard from watch possible"
|
|
||||||
android:title="@string/pref_wizard_in_menu"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="false"
|
|
||||||
android:key="primefill"
|
|
||||||
android:summary="Prime/Fill from watch possible"
|
|
||||||
android:title="@string/pref_prime_in_menu"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="singletarget"
|
|
||||||
android:summary="Single temp-target instead of a range."
|
|
||||||
android:title="@string/pref_single_target"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="false"
|
|
||||||
android:key="wizardpercentage"
|
|
||||||
android:summary="Percentage correction."
|
|
||||||
android:title="@string/pref_wizard_percentage"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
|
||||||
|
|
||||||
<ListPreference
|
|
||||||
android:defaultValue="default"
|
|
||||||
android:entries="@array/complication_tap_action"
|
|
||||||
android:entryValues="@array/complication_tap_action_values"
|
|
||||||
android:key="complication_tap_action"
|
|
||||||
android:summary="What dialog to show after tap on complication"
|
|
||||||
android:title="@string/pref_complication_tap_action" />
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="complication_unicode"
|
|
||||||
android:summary="Use unicode special characters in complications."
|
|
||||||
android:title="@string/pref_unicode_in_complications"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
|
||||||
|
|
||||||
<!--<CheckBoxPreference
|
|
||||||
android:key="vibrate_Hourly"
|
|
||||||
android:title="@string/pref_vibrate_hourly"
|
|
||||||
android:defaultValue="false"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on" />-->
|
|
||||||
|
|
||||||
<info.nightscout.androidaps.interaction.utils.VersionPreference
|
|
||||||
android:defaultValue="1"
|
|
||||||
android:entries="@array/input_design"
|
|
||||||
android:entryValues="@array/input_design_values"
|
|
||||||
android:key="version_number"
|
|
||||||
android:summary="Input Design"
|
|
||||||
android:title="@string/pref_version" />
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
|
|
||||||
|
|
@ -18,14 +18,6 @@
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
app:wear_iconOff="@drawable/settings_off"
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
app:wear_iconOn="@drawable/settings_on"/>
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="true"
|
|
||||||
android:key="showBG"
|
|
||||||
android:summary="Show BG. (Circle WF)"
|
|
||||||
android:title="@string/pref_show_bg"
|
|
||||||
app:wear_iconOff="@drawable/settings_off"
|
|
||||||
app:wear_iconOn="@drawable/settings_on"/>
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:defaultValue="false"
|
android:defaultValue="false"
|
||||||
android:key="showRingHistory"
|
android:key="showRingHistory"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue