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 @@ Enable superbolus in wizard Enable superbolus functionality in wizard. Do not enable until you learn what it really does. IT MAY CAUSE INSULIN OVERDOSE IF USED BLINDLY! key_show_statuslights - key_show_statuslights_easy key_show_statuslights_extended Show status lights on home screen - Show original status lights on home screen - Enable original status lights for cage, iage, sage, reservoir and battery level on home screen. Show extended status lights on home screen Enable extended status lights for cage, iage, sage, reservoir and battery level on home screen. key_statuslights_res_warning 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" /> - -