caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/dagger3' into rs

Browse source
This commit is contained in:
Milos Kozak 2020-03-27 22:06:01 +01:00
parent 502eb59089 efbcbaf885
commit a0b22dae69
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
View file

@ -1248,18 +1248,16 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
quickWizardButton.setVisibility(View.GONE); quickWizardButton.setVisibility(View.GONE);
// **** Various treatment buttons **** // **** Various treatment buttons ****
if (carbsButton != null) { if ((!activePlugin.getActivePump().getPumpDescription().storesCarbInfo ||
if (sp.getBoolean(R.string.key_show_carbs_button, true) (pump.isInitialized() && !pump.isSuspended())) && carbsButton != null) {
&& (!activePlugin.getActivePump().getPumpDescription().storesCarbInfo || if (sp.getBoolean(R.string.key_show_carbs_button, true)) {
(pump.isInitialized() && !pump.isSuspended()))) {
carbsButton.setVisibility(View.VISIBLE); carbsButton.setVisibility(View.VISIBLE);
} else { } else {
carbsButton.setVisibility(View.GONE); carbsButton.setVisibility(View.GONE);
} }
} }
if (pump.isInitialized() && !pump.isSuspended()) { if (pump.isInitialized() && !pump.isSuspended() && treatmentButton != null) {
if (treatmentButton != null) {
if (sp.getBoolean(R.string.key_show_treatment_button, false)) { if (sp.getBoolean(R.string.key_show_treatment_button, false)) {
treatmentButton.setVisibility(View.VISIBLE); treatmentButton.setVisibility(View.VISIBLE);
} else { } else {
@ -1280,7 +1278,6 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
insulinButton.setVisibility(View.GONE); insulinButton.setVisibility(View.GONE);
} }
} }
}
// **** BG value **** // **** BG value ****
if (lastBG == null) { //left this here as it seems you want to exit at this point if it is null... if (lastBG == null) { //left this here as it seems you want to exit at this point if it is null...