From cab592efb526cf6a08f9a9375bae877d4bb66e0e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 21 Apr 2018 21:31:42 +0200
Subject: [PATCH] overview preferences cleanup

---
 .../androidaps/PreferencesActivity.java       |   3 +-
 app/src/main/res/xml/pref_advanced.xml        |   7 -
 app/src/main/res/xml/pref_overview.xml        | 146 ++++++++++--------
 3 files changed, 87 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
index 52984d3697..915e1ef00d 100644
--- a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
@@ -128,7 +128,6 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
             if (id != -1) {
                 addPreferencesFromResource(id);
             } else {
-                addPreferencesFromResource(R.xml.pref_overview);
 
                 if (!Config.NSCLIENT && !Config.G5UPLOADER) {
                     addPreferencesFromResource(R.xml.pref_password);
@@ -136,6 +135,8 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                 addPreferencesFromResource(R.xml.pref_age);
                 addPreferencesFromResource(R.xml.pref_language);
 
+                addPreferencesFromResource(R.xml.pref_overview);
+
                 if (!Config.NSCLIENT && !Config.G5UPLOADER) {
                     addPreferencesFromResource(R.xml.pref_quickwizard);
                 }
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index f5ab617946..1ca031a94e 100644
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -5,13 +5,6 @@
         android:key="advanced"
         android:title="@string/advancedsettings_title">
         <PreferenceScreen android:title="@string/advancedsettings_title">
-            <PreferenceCategory android:title="@string/superbolus">
-                <SwitchPreference
-                    android:defaultValue="false"
-                    android:key="@string/key_usesuperbolus"
-                    android:summary="@string/enablesuperbolus_summary"
-                    android:title="@string/enablesuperbolus" />
-            </PreferenceCategory>
             <PreferenceCategory android:title="@string/openapsma">
                 <SwitchPreference
                     android:defaultValue="false"
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index 7d2ecc4282..0b17bb7400 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -1,120 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
+
     <PreferenceCategory android:title="@string/overview">
+
         <PreferenceScreen android:title="@string/overview_buttons_selection">
+
             <SwitchPreference
                 android:defaultValue="false"
                 android:key="@string/key_show_treatment_button"
                 android:title="Treatments" />
+
             <SwitchPreference
                 android:defaultValue="true"
                 android:key="@string/key_show_wizard_button"
-                android:title="@string/overview_calculator_label"/>
+                android:title="@string/overview_calculator_label" />
 
             <SwitchPreference
                 android:defaultValue="true"
                 android:key="@string/key_show_insulin_button"
                 android:title="Insulin" />
+
             <com.andreabaccega.widget.ValidatingEditTextPreference
-                android:dependency="@string/key_show_insulin_button"
-                validate:testType="floatNumericRange"
-                validate:floatminNumber="-5.0"
-                validate:floatmaxNumber="5.0"
                 android:defaultValue="0.5"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
+                android:dependency="@string/key_show_insulin_button"
+                android:dialogMessage="@string/insulin_increment_button_message"
                 android:inputType="numberDecimal|numberDecimal|numberSigned"
+                android:key="@string/key_insulin_button_increment_1"
                 android:maxLines="20"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
                 android:title="First insulin increment"
-                android:dialogMessage="@string/insulin_increment_button_message"
-                android:key="@string/key_insulin_button_increment_1" />
-            <com.andreabaccega.widget.ValidatingEditTextPreference
-                android:dependency="@string/key_show_insulin_button"
-                validate:testType="floatNumericRange"
-                validate:floatminNumber="-5.0"
                 validate:floatmaxNumber="5.0"
+                validate:floatminNumber="-5.0"
+                validate:testType="floatNumericRange" />
+
+            <com.andreabaccega.widget.ValidatingEditTextPreference
                 android:defaultValue="1.0"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
-                android:inputType="numberDecimal|numberSigned"
-                android:maxLines="20"
-                android:title="Second insulin increment"
-                android:dialogMessage="@string/insulin_increment_button_message"
-                android:key="@string/key_insulin_button_increment_2" />
-            <com.andreabaccega.widget.ValidatingEditTextPreference
                 android:dependency="@string/key_show_insulin_button"
-                validate:testType="floatNumericRange"
-                validate:floatminNumber="-5.0"
-                validate:floatmaxNumber="5.0"
-                android:defaultValue="2.0"
+                android:dialogMessage="@string/insulin_increment_button_message"
+                android:inputType="numberDecimal|numberSigned"
+                android:key="@string/key_insulin_button_increment_2"
+                android:maxLines="20"
                 android:selectAllOnFocus="true"
                 android:singleLine="true"
-                android:inputType="numberDecimal|numberSigned"
-                android:maxLines="20"
-                android:title="Third insulin increment"
+                android:title="Second insulin increment"
+                validate:floatmaxNumber="5.0"
+                validate:floatminNumber="-5.0"
+                validate:testType="floatNumericRange" />
+
+            <com.andreabaccega.widget.ValidatingEditTextPreference
+                android:defaultValue="2.0"
+                android:dependency="@string/key_show_insulin_button"
                 android:dialogMessage="@string/insulin_increment_button_message"
-                android:key="@string/key_insulin_button_increment_3"/>
+                android:inputType="numberDecimal|numberSigned"
+                android:key="@string/key_insulin_button_increment_3"
+                android:maxLines="20"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
+                android:title="Third insulin increment"
+                validate:floatmaxNumber="5.0"
+                validate:floatminNumber="-5.0"
+                validate:testType="floatNumericRange" />
 
             <SwitchPreference
                 android:defaultValue="true"
                 android:key="@string/key_show_carbs_button"
                 android:title="Carbs" />
+
             <com.andreabaccega.widget.ValidatingEditTextPreference
-                android:dependency="@string/key_show_carbs_button"
-                validate:testType="numericRange"
-                validate:minNumber="-50"
-                validate:maxNumber="50"
                 android:defaultValue="5"
+                android:dependency="@string/key_show_carbs_button"
+                android:dialogMessage="@string/carb_increment_button_message"
+                android:inputType="numberSigned"
+                android:key="@string/key_carbs_button_increment_1"
+                android:maxLines="20"
                 android:selectAllOnFocus="true"
                 android:singleLine="true"
-                android:inputType="numberSigned"
-                android:maxLines="20"
                 android:title="First carbs increment"
-                android:dialogMessage="@string/carb_increment_button_message"
-                android:key="@string/key_carbs_button_increment_1" />
-            <com.andreabaccega.widget.ValidatingEditTextPreference
-                android:dependency="@string/key_show_carbs_button"
-                validate:testType="numericRange"
-                validate:minNumber="-50"
                 validate:maxNumber="50"
+                validate:minNumber="-50"
+                validate:testType="numericRange" />
+
+            <com.andreabaccega.widget.ValidatingEditTextPreference
                 android:defaultValue="10"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
-                android:inputType="numberSigned"
-                android:maxLines="20"
-                android:title="Second carbs increment"
-                android:dialogMessage="@string/carb_increment_button_message"
-                android:key="@string/key_carbs_button_increment_2" />
-            <com.andreabaccega.widget.ValidatingEditTextPreference
                 android:dependency="@string/key_show_carbs_button"
-                validate:testType="numericRange"
-                validate:minNumber="-50"
-                validate:maxNumber="50"
-                android:defaultValue="20"
+                android:dialogMessage="@string/carb_increment_button_message"
+                android:inputType="numberSigned"
+                android:key="@string/key_carbs_button_increment_2"
+                android:maxLines="20"
                 android:selectAllOnFocus="true"
                 android:singleLine="true"
-                android:inputType="numberSigned"
-                android:maxLines="20"
-                android:title="Third carbs increment"
+                android:title="Second carbs increment"
+                validate:maxNumber="50"
+                validate:minNumber="-50"
+                validate:testType="numericRange" />
+
+            <com.andreabaccega.widget.ValidatingEditTextPreference
+                android:defaultValue="20"
+                android:dependency="@string/key_show_carbs_button"
                 android:dialogMessage="@string/carb_increment_button_message"
-                android:key="@string/key_carbs_button_increment_3" />
+                android:inputType="numberSigned"
+                android:key="@string/key_carbs_button_increment_3"
+                android:maxLines="20"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
+                android:title="Third carbs increment"
+                validate:maxNumber="50"
+                validate:minNumber="-50"
+                validate:testType="numericRange" />
 
             <SwitchPreference
                 android:defaultValue="false"
                 android:key="@string/key_show_cgm_button"
-                android:title="CGM"
-                android:summary="@string/show_cgm_button_summary"/>
+                android:summary="@string/show_cgm_button_summary"
+                android:title="CGM" />
+
             <SwitchPreference
                 android:defaultValue="true"
                 android:key="@string/key_show_calibration_button"
-                android:title="@string/overview_calibration"
-                android:summary="@string/show_calibration_button_summary"/>
+                android:summary="@string/show_calibration_button_summary"
+                android:title="@string/overview_calibration" />
+
             <SwitchPreference
                 android:defaultValue="false"
                 android:key="@string/key_show_notes_entry_dialogs"
                 android:title="@string/overview_show_notes_field_in_dialogs_title" />
 
         </PreferenceScreen>
+
+        <PreferenceScreen android:title="@string/advancedsettings_title">
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_usesuperbolus"
+                android:summary="@string/enablesuperbolus_summary"
+                android:title="@string/enablesuperbolus" />
+
+        </PreferenceScreen>
+
     </PreferenceCategory>
+
 </PreferenceScreen>
\ No newline at end of file