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:30:26 +01:00
parent a0b22dae69 a5a5f048ea
commit 7df82774a4
1 changed files with 58 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1008,6 +1008,63 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
} }
} }
private void processInsulinCarbsButtonsVisibility() {
BgReading lastBG = iobCobCalculatorPlugin.lastBg();
final PumpInterface pump = activePlugin.getActivePump();
final Profile profile = profileFunction.getProfile();
final String profileName = profileFunction.getProfileName();
// QuickWizard button
QuickWizardEntry quickWizardEntry = quickWizard.getActive();
if (quickWizardEntry != null && lastBG != null && profile != null && pump.isInitialized() && !pump.isSuspended()) {
quickWizardButton.setVisibility(View.VISIBLE);
String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
BolusWizard wizard = quickWizardEntry.doCalc(profile, profileName, lastBG, false);
text += " " + DecimalFormatter.toPumpSupportedBolus(wizard.getCalculatedTotalInsulin(), pump) + "U";
quickWizardButton.setText(text);
if (wizard.getCalculatedTotalInsulin() <= 0)
quickWizardButton.setVisibility(View.GONE);
} else
quickWizardButton.setVisibility(View.GONE);
// **** Various treatment buttons ****
if (carbsButton != null) {
if ((!activePlugin.getActivePump().getPumpDescription().storesCarbInfo || (pump.isInitialized() && !pump.isSuspended())) &&
profile != null &&
sp.getBoolean(R.string.key_show_carbs_button, true))
carbsButton.setVisibility(View.VISIBLE);
else
carbsButton.setVisibility(View.GONE);
}
if (treatmentButton != null) {
if (pump.isInitialized() && !pump.isSuspended() &&
profile != null &&
sp.getBoolean(R.string.key_show_treatment_button, false))
treatmentButton.setVisibility(View.VISIBLE);
else
treatmentButton.setVisibility(View.GONE);
}
if (wizardButton != null) {
if (pump.isInitialized() && !pump.isSuspended() &&
profile != null &&
sp.getBoolean(R.string.key_show_wizard_button, true))
wizardButton.setVisibility(View.VISIBLE);
else
wizardButton.setVisibility(View.GONE);
}
if (insulinButton != null) {
if (pump.isInitialized() && !pump.isSuspended() &&
profile != null &&
sp.getBoolean(R.string.key_show_insulin_button, true))
insulinButton.setVisibility(View.VISIBLE);
else
insulinButton.setVisibility(View.GONE);
}
}
private void scheduleUpdateGUI(final String from) { private void scheduleUpdateGUI(final String from) {
class UpdateRunnable implements Runnable { class UpdateRunnable implements Runnable {
public void run() { public void run() {
@ -1060,7 +1117,6 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
final Profile profile = profileFunction.getProfile(); final Profile profile = profileFunction.getProfile();
if (profile == null) return; if (profile == null) return;
final String profileName = profileFunction.getProfileName();
final String units = profileFunction.getUnits(); final String units = profileFunction.getUnits();
final double lowLine = defaultValueHelper.determineLowLine(); final double lowLine = defaultValueHelper.determineLowLine();
@ -1234,50 +1290,7 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
activeProfileView.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault)); activeProfileView.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault));
} }
// QuickWizard button processInsulinCarbsButtonsVisibility();
QuickWizardEntry quickWizardEntry = quickWizard.getActive();
if (quickWizardEntry != null && lastBG != null && pump.isInitialized() && !pump.isSuspended()) {
quickWizardButton.setVisibility(View.VISIBLE);
String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
BolusWizard wizard = quickWizardEntry.doCalc(profile, profileName, lastBG, false);
text += " " + DecimalFormatter.toPumpSupportedBolus(wizard.getCalculatedTotalInsulin(), pump) + "U";
quickWizardButton.setText(text);
if (wizard.getCalculatedTotalInsulin() <= 0)
quickWizardButton.setVisibility(View.GONE);
} else
quickWizardButton.setVisibility(View.GONE);
// **** Various treatment buttons ****
if ((!activePlugin.getActivePump().getPumpDescription().storesCarbInfo ||
(pump.isInitialized() && !pump.isSuspended())) && carbsButton != null) {
if (sp.getBoolean(R.string.key_show_carbs_button, true)) {
carbsButton.setVisibility(View.VISIBLE);
} else {
carbsButton.setVisibility(View.GONE);
}
}
if (pump.isInitialized() && !pump.isSuspended() && treatmentButton != null) {
if (sp.getBoolean(R.string.key_show_treatment_button, false)) {
treatmentButton.setVisibility(View.VISIBLE);
} else {
treatmentButton.setVisibility(View.GONE);
}
}
if (pump.isInitialized() && !pump.isSuspended() && wizardButton != null) {
if (sp.getBoolean(R.string.key_show_wizard_button, true)) {
wizardButton.setVisibility(View.VISIBLE);
} else {
wizardButton.setVisibility(View.GONE);
}
}
if (pump.isInitialized() && !pump.isSuspended() && insulinButton != null) {
if (sp.getBoolean(R.string.key_show_insulin_button, true)) {
insulinButton.setVisibility(View.VISIBLE);
} else {
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...