From 50041e1733b79f819d5ed839258d7c726945bd56 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 15 Sep 2019 11:42:01 +0200
Subject: [PATCH] simplify statuslights preferences

---
 .../general/overview/OverviewFragment.java    | 24 ++++++++-----------
 app/src/main/res/values/strings.xml           |  3 ---
 app/src/main/res/xml/pref_overview.xml        |  7 ------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index b1909ba2f0..93f499c8ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -1323,23 +1323,19 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             cobView.setText(cobText);
         }
 
-        if (statuslightsLayout != null && SP.getBoolean(R.string.key_show_statuslights, false)) {
-            StatuslightHandler handler = new StatuslightHandler();
-
-            if (SP.getBoolean(R.string.key_show_statuslights_easy, false)) {
-                handler.statuslight(cageView, iageView, reservoirView, sageView, batteryView);
-
-                statuslightsLayout.setVisibility(View.VISIBLE);
-            } else if (SP.getBoolean(R.string.key_show_statuslights_extended, false)) {
-                handler.extendedStatuslight(cageView, iageView, reservoirView, sageView, batteryView);
-
-                statuslightsLayout.setVisibility(View.VISIBLE);
+        if (statuslightsLayout != null)
+            if (SP.getBoolean(R.string.key_show_statuslights, false)) {
+                StatuslightHandler handler = new StatuslightHandler();
+                if (SP.getBoolean(R.string.key_show_statuslights_extended, false)) {
+                    handler.extendedStatuslight(cageView, iageView, reservoirView, sageView, batteryView);
+                    statuslightsLayout.setVisibility(View.VISIBLE);
+                } else {
+                    handler.statuslight(cageView, iageView, reservoirView, sageView, batteryView);
+                    statuslightsLayout.setVisibility(View.VISIBLE);
+                }
             } else {
                 statuslightsLayout.setVisibility(View.GONE);
             }
-        } else if (statuslightsLayout != null) {
-            statuslightsLayout.setVisibility(View.GONE);
-        }
 
         boolean predictionsAvailable;
         if (Config.APS)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 257df4d1b4..3ecfa935c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -623,11 +623,8 @@
     <string name="enablesuperbolus">Enable superbolus in wizard</string>
     <string name="enablesuperbolus_summary">Enable superbolus functionality in wizard. Do not enable until you learn what it really does. IT MAY CAUSE INSULIN OVERDOSE IF USED BLINDLY!</string>
     <string name="key_show_statuslights" translatable="false">key_show_statuslights</string>
-    <string name="key_show_statuslights_easy" translatable="false">key_show_statuslights_easy</string>
     <string name="key_show_statuslights_extended" translatable="false">key_show_statuslights_extended</string>
     <string name="show_statuslights">Show status lights on home screen</string>
-    <string name="show_statuslights_easy">Show original status lights on home screen</string>
-    <string name="show_statuslights_easy_summary">Enable original status lights for cage, iage, sage, reservoir and battery level on home screen.</string>
     <string name="show_statuslights_extended">Show extended status lights on home screen</string>
     <string name="show_statuslights_extended_summary">Enable extended status lights for cage, iage, sage, reservoir and battery level on home screen.</string>
     <string name="key_statuslights_res_warning" translatable="false">key_statuslights_res_warning</string>
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index 996f5591cd..7f1823de81 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -167,13 +167,6 @@
                 android:key="@string/key_show_statuslights"
                 android:title="@string/show_statuslights" />
 
-            <SwitchPreference
-                android:defaultValue="false"
-                android:dependency="@string/key_show_statuslights"
-                android:key="@string/key_show_statuslights_easy"
-                android:summary="@string/show_statuslights_easy_summary"
-                android:title="@string/show_statuslights_easy" />
-
             <SwitchPreference
                 android:defaultValue="false"
                 android:dependency="@string/key_show_statuslights"