Sorting global settings (showElement X, chart-settings, actions-settings, other-settings)

This commit is contained in:
rICTx-T1D 2020-11-13 21:18:54 +01:00 committed by mh
parent c34fcd0b91
commit 8718204537
2 changed files with 120 additions and 117 deletions

View file

@ -2,29 +2,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
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
android:defaultValue="true"
android:key="show_iob"
@ -41,10 +18,18 @@
app:wear_iconOff="@drawable/settings_off"
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
android:defaultValue="true"
android:key="showDelta"
android:summary="Show delta. (Circle WF)"
android:summary="Show delta."
android:title="@string/pref_show_delta"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
@ -56,6 +41,21 @@
android:title="@string/pref_show_avgdelta"
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."
android:title="@string/pref_show_ago"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<CheckBoxPreference
android:defaultValue="true"
@ -85,37 +85,7 @@
app:wear_iconOff="@drawable/settings_off"
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
android:defaultValue="false"
@ -125,14 +95,6 @@
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"/> -->
<ListPreference
android:defaultValue="3"
android:entries="@array/chart_timeframe"
@ -141,6 +103,17 @@
android:summary="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
android:defaultValue="1"
android:entries="@array/input_design"
@ -149,46 +122,6 @@
android:summary="Input Design"
android:title="@string/pref_input_design" />
<!--<ListPreference
android:defaultValue="2"
android:entries="@array/delta_granularity"
android:entryValues="@array/delta_granularity_values"
android:key="delta_granularity"
android:summary="Delta Granularity (Steampunk)"
android:title="@string/pref_delta_granularity" />-->
<!--<CheckBoxPreference
android:defaultValue="false"
android:key="showBigNumbers"
android:summary="Big numbers. (Circle WF)"
android:title="@string/pref_big_numbers"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>-->
<!--<CheckBoxPreference
android:defaultValue="false"
android:key="showRingHistory"
android:summary="Graphical history. (Circle WF)"
android:title="@string/pref_ring_history"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />-->
<!--<CheckBoxPreference
android:defaultValue="true"
android:key="softRingHistory"
android:summary="Less eyecandy. (Circle WF)"
android:title="@string/pref_light_ring_history"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>-->
<!--<CheckBoxPreference
android:defaultValue="true"
android:key="animation"
android:summary="Animations. (Circle WF)"
android:title="@string/pref_animations"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>-->
<CheckBoxPreference
android:defaultValue="true"
android:key="showWizard"
@ -197,6 +130,13 @@
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"
@ -221,6 +161,8 @@
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<ListPreference
android:defaultValue="default"
android:entries="@array/complication_tap_action"
@ -237,13 +179,6 @@
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"
@ -251,4 +186,80 @@
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
android:defaultValue="2"
android:entries="@array/delta_granularity"
android:entryValues="@array/delta_granularity_values"
android:key="delta_granularity"
android:summary="Delta Granularity (Steampunk)"
android:title="@string/pref_delta_granularity" />-->
<!--<CheckBoxPreference
android:defaultValue="false"
android:key="showBigNumbers"
android:summary="Big numbers. (Circle WF)"
android:title="@string/pref_big_numbers"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>-->
<!--<CheckBoxPreference
android:defaultValue="false"
android:key="showRingHistory"
android:summary="Graphical history. (Circle WF)"
android:title="@string/pref_ring_history"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />-->
<!--<CheckBoxPreference
android:defaultValue="true"
android:key="softRingHistory"
android:summary="Less eyecandy. (Circle WF)"
android:title="@string/pref_light_ring_history"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>-->
<!--<CheckBoxPreference
android:defaultValue="true"
android:key="animation"
android:summary="Animations. (Circle WF)"
android:title="@string/pref_animations"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>-->
</PreferenceScreen>

View file

@ -18,14 +18,6 @@
app:wear_iconOff="@drawable/settings_off"
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="false"
android:key="showRingHistory"