1.32 superbolus & trend contribution in wizard

app/build.gradle

@@ -44,7 +44,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 23
         versionCode 1100
-        version "1.31"
+        version "1.32"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
     }
@@ -180,4 +180,8 @@ dependencies {
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.google.guava:guava:18.0'
 
+    compile ('com.jakewharton:butterknife:8.5.1') {
+        exclude module: 'support-compat'
+    }
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
 }

app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java

@@ -47,6 +47,7 @@ public class LoopPlugin implements PluginBase {
     private boolean fragmentVisible = true;
 
     private long loopSuspendedTill = 0L; // end of manual loop suspend
+    private boolean isSuperBolus = false;
 
     public class LastRun {
         public APSResult request = null;
@@ -68,6 +69,7 @@ public class LoopPlugin implements PluginBase {
         }
         MainApp.bus().register(this);
         loopSuspendedTill = SP.getLong("loopSuspendedTill", 0L);
+        isSuperBolus = SP.getBoolean("isSuperBolus", false);
     }
 
     @Override
@@ -137,6 +139,13 @@ public class LoopPlugin implements PluginBase {
 
     public void suspendTo(long endTime) {
         loopSuspendedTill = endTime;
+        isSuperBolus = false;
+        SP.putLong("loopSuspendedTill", loopSuspendedTill);
+    }
+
+    public void superBolusTo(long endTime) {
+        loopSuspendedTill = endTime;
+        isSuperBolus = true;
         SP.putLong("loopSuspendedTill", loopSuspendedTill);
     }
 
@@ -169,6 +178,20 @@ public class LoopPlugin implements PluginBase {
         return true;
     }
 
+   public boolean isSuperBolus() {
+        if (loopSuspendedTill == 0)
+            return false;
+
+        long now = new Date().getTime();
+
+        if (loopSuspendedTill <= now) { // time exceeded
+            suspendTo(0L);
+            return false;
+        }
+
+        return isSuperBolus;
+    }
+
     public void invoke(String initiator, boolean allowNotification) {
         try {
             if (Config.logFunctionCalls)

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.Overview.Dialogs;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -21,32 +22,49 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
+import com.squareup.otto.Subscribe;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Text;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnCheckedChanged;
+import butterknife.OnClick;
+import butterknife.OnItemSelected;
+import butterknife.OnTextChanged;
+import butterknife.Unbinder;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.events.EventNewBG;
+import info.nightscout.androidaps.events.EventRefreshGui;
 import info.nightscout.androidaps.interfaces.TempBasalsInterface;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.data.IobTotal;
+import info.nightscout.androidaps.plugins.Loop.APSResult;
+import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSProfile;
+import info.nightscout.androidaps.plugins.OpenAPSAMA.DetermineBasalResultAMA;
+import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
+import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.utils.BolusWizard;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
@@ -54,33 +72,81 @@ import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
 
-public class WizardDialog extends DialogFragment implements OnClickListener {
+import static butterknife.OnItemSelected.Callback.NOTHING_SELECTED;
+
+public class WizardDialog extends DialogFragment {
     private static Logger log = LoggerFactory.getLogger(WizardDialog.class);
 
+    @BindView(R.id.treatments_wizard_deliverButton)
     Button wizardDialogDeliverButton;
+    @BindView(R.id.treatments_wizard_correctioninput)
     TextView correctionInput;
+    @BindView(R.id.treatments_wizard_carbsinput)
     TextView carbsInput;
+    @BindView(R.id.treatments_wizard_bginput)
     TextView bgInput;
-    TextView bg, bgInsulin, bgUnits;
+    @BindView(R.id.treatments_wizard_bg)
+    TextView bg;
+    @BindView(R.id.treatments_wizard_bginsulin)
+    TextView bgInsulin;
+    @BindView(R.id.treatments_wizard_bgunits)
+    TextView bgUnits;
+    @BindView(R.id.treatments_wizard_bgcheckbox)
     CheckBox bgCheckbox;
-    TextView carbs, carbsInsulin;
+    @BindView(R.id.treatments_wizard_carbs)
+    TextView carbs;
+    @BindView(R.id.treatments_wizard_carbsinsulin)
+    TextView carbsInsulin;
+    @BindView(R.id.treatments_wizard_bolusiobinsulin)
     TextView bolusIobInsulin;
+    @BindView(R.id.treatments_wizard_basaliobinsulin)
     TextView basalIobInsulin;
+    @BindView(R.id.treatments_wizard_bolusiobcheckbox)
     CheckBox bolusIobCheckbox;
+    @BindView(R.id.treatments_wizard_basaliobcheckbox)
     CheckBox basalIobCheckbox;
+    @BindView(R.id.treatments_wizard_correctioninsulin)
     TextView correctionInsulin;
-    TextView total, totalInsulin;
+    @BindView(R.id.treatments_wizard_total)
+    TextView total;
+    @BindView(R.id.treatments_wizard_totalinsulin)
+    TextView totalInsulin;
+    @BindView(R.id.treatments_wizard_carbtimeinput)
     EditText carbTimeEdit;
+    @BindView(R.id.treatments_wizard_profile)
     Spinner profileSpinner;
+    @BindView(R.id.treatments_wizard_sbcheckbox)
+    CheckBox superbolusCheckbox;
+    @BindView(R.id.treatments_wizard_sb)
+    TextView superbolus;
+    @BindView(R.id.treatments_wizard_sbinsulin)
+    TextView superbolusInsulin;
+    @BindView(R.id.treatments_wizard_bgtrendcheckbox)
+    CheckBox bgtrendCheckbox;
+    @BindView(R.id.treatments_wizard_bgtrend)
+    TextView bgTrend;
+    @BindView(R.id.treatments_wizard_bgtrendinsulin)
+    TextView bgTrendInsulin;
+    @BindView(R.id.treatments_wizard_cob_layout)
+    LinearLayout cobLayout;
+    @BindView(R.id.treatments_wizard_cobcheckbox)
+    CheckBox cobCheckbox;
+    @BindView(R.id.treatments_wizard_cob)
+    TextView cob;
+    @BindView(R.id.treatments_wizard_cobinsulin)
+    TextView cobInsulin;
 
     PlusMinusEditText editBg;
     PlusMinusEditText editCarbs;
     PlusMinusEditText editCorr;
     PlusMinusEditText editCarbTime;
 
+    private Unbinder unbinder;
+
     Integer calculatedCarbs = 0;
     Double calculatedTotalInsulin = 0d;
     JSONObject boluscalcJSON;
+    boolean cobAvailable = false;
 
     Handler mHandler;
     public static HandlerThread mHandlerThread;
@@ -100,6 +166,57 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
         this.context = context;
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getDialog() != null)
+            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        MainApp.bus().register(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MainApp.bus().unregister(this);
+    }
+
+    @Subscribe
+    public void onStatusEvent(final EventOpenAPSUpdateGui e) {
+        Activity activity = getActivity();
+        if (activity != null)
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (ConfigBuilderPlugin.getActiveAPS() instanceof OpenAPSAMAPlugin && ConfigBuilderPlugin.getActiveAPS().getLastAPSResult() != null && ConfigBuilderPlugin.getActiveAPS().getLastAPSRun().after(new Date(new Date().getTime() - 11 * 60 * 1000L))) {
+                        cobLayout.setVisibility(View.VISIBLE);
+                        cobAvailable = true;
+                    } else {
+                        cobLayout.setVisibility(View.GONE);
+                        cobAvailable = false;
+                    }
+                    calculateInsulin();
+                }
+            });
+    }
+
+    @Subscribe
+    public void onStatusEvent(final EventNewBG e) {
+        Activity activity = getActivity();
+        if (activity != null)
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    calculateInsulin();
+                }
+            });
+    }
+
     final private TextWatcher textWatcher = new TextWatcher() {
         @Override
         public void afterTextChanged(Editable s) {
@@ -115,67 +232,20 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
         }
     };
 
-    final CompoundButton.OnCheckedChangeListener onCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
-        @Override
-        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            calculateInsulin();
-        }
-    };
-
-    final AdapterView.OnItemSelectedListener onItemSelectedListener = new AdapterView.OnItemSelectedListener() {
-        @Override
-        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-            calculateInsulin();
-            wizardDialogDeliverButton.setVisibility(View.VISIBLE);
-        }
-
-        @Override
-        public void onNothingSelected(AdapterView<?> parent) {
-            ToastUtils.showToastInUiThread(context, MainApp.sResources.getString(R.string.noprofileselected));
-            wizardDialogDeliverButton.setVisibility(View.GONE);
-        }
-    };
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.overview_wizard_dialog, null, false);
 
-        wizardDialogDeliverButton = (Button) view.findViewById(R.id.treatments_wizard_deliverButton);
-        wizardDialogDeliverButton.setOnClickListener(this);
-
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
 
-        correctionInput = (TextView) view.findViewById(R.id.treatments_wizard_correctioninput);
+        unbinder = ButterKnife.bind(this, view);
-        carbsInput = (TextView) view.findViewById(R.id.treatments_wizard_carbsinput);
-        bgInput = (TextView) view.findViewById(R.id.treatments_wizard_bginput);
 
         correctionInput.addTextChangedListener(textWatcher);
         carbsInput.addTextChangedListener(textWatcher);
         bgInput.addTextChangedListener(textWatcher);
 
-        bg = (TextView) view.findViewById(R.id.treatments_wizard_bg);
-        bgInsulin = (TextView) view.findViewById(R.id.treatments_wizard_bginsulin);
-        bgUnits = (TextView) view.findViewById(R.id.treatments_wizard_bgunits);
-        bgCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_bgcheckbox);
-        carbs = (TextView) view.findViewById(R.id.treatments_wizard_carbs);
-        carbsInsulin = (TextView) view.findViewById(R.id.treatments_wizard_carbsinsulin);
-        bolusIobInsulin = (TextView) view.findViewById(R.id.treatments_wizard_bolusiobinsulin);
-        basalIobInsulin = (TextView) view.findViewById(R.id.treatments_wizard_basaliobinsulin);
-        bolusIobCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_bolusiobcheckbox);
-        basalIobCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_basaliobcheckbox);
-        correctionInsulin = (TextView) view.findViewById(R.id.treatments_wizard_correctioninsulin);
-        total = (TextView) view.findViewById(R.id.treatments_wizard_total);
-        totalInsulin = (TextView) view.findViewById(R.id.treatments_wizard_totalinsulin);
-        carbTimeEdit = (EditText) view.findViewById(R.id.treatments_wizard_carbtimeinput);
-        profileSpinner = (Spinner) view.findViewById(R.id.treatments_wizard_profile);
-
-        bgCheckbox.setOnCheckedChangeListener(onCheckedChangeListener);
-        basalIobCheckbox.setOnCheckedChangeListener(onCheckedChangeListener);
-        bolusIobCheckbox.setOnCheckedChangeListener(onCheckedChangeListener);
-        profileSpinner.setOnItemSelectedListener(onItemSelectedListener);
-
         Integer maxCarbs = MainApp.getConfigBuilder().applyCarbsConstraints(Constants.carbsOnlyForCheckLimit);
         Double maxCorrection = MainApp.getConfigBuilder().applyBolusConstraints(Constants.bolusOnlyForCheckLimit);
 
@@ -188,71 +258,102 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
         return view;
     }
 
-    @Override
+    @OnCheckedChanged({R.id.treatments_wizard_bgcheckbox, R.id.treatments_wizard_bolusiobcheckbox, R.id.treatments_wizard_basaliobcheckbox, R.id.treatments_wizard_sbcheckbox, R.id.treatments_wizard_cobcheckbox, R.id.treatments_wizard_bgtrendcheckbox})
+    public void checkboxToggled(boolean isChecked) {
+        calculateInsulin();
+    }
+
+    @OnItemSelected(R.id.treatments_wizard_profile)
+    public void profileSelected(int position) {
+        calculateInsulin();
+        wizardDialogDeliverButton.setVisibility(View.VISIBLE);
+    }
+
+    @OnItemSelected(value = R.id.treatments_wizard_profile,
+            callback = NOTHING_SELECTED)
+    public void profileNotSelected() {
+        ToastUtils.showToastInUiThread(context, MainApp.sResources.getString(R.string.noprofileselected));
+        wizardDialogDeliverButton.setVisibility(View.GONE);
+    }
+
+    @OnClick(R.id.treatments_wizard_deliverButton)
     public void onClick(View view) {
-        switch (view.getId()) {
+        if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
-            case R.id.treatments_wizard_deliverButton:
+            DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
-                if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
+            String confirmMessage = getString(R.string.entertreatmentquestion);
-                    DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
-                    String confirmMessage = getString(R.string.entertreatmentquestion);
 
-                    Double insulinAfterConstraints = MainApp.getConfigBuilder().applyBolusConstraints(calculatedTotalInsulin);
+            Double insulinAfterConstraints = MainApp.getConfigBuilder().applyBolusConstraints(calculatedTotalInsulin);
-                    Integer carbsAfterConstraints = MainApp.getConfigBuilder().applyCarbsConstraints(calculatedCarbs);
+            Integer carbsAfterConstraints = MainApp.getConfigBuilder().applyCarbsConstraints(calculatedCarbs);
 
-                    confirmMessage += "\n" + getString(R.string.bolus) + ": " + formatNumber2decimalplaces.format(insulinAfterConstraints) + "U";
+            confirmMessage += "\n" + getString(R.string.bolus) + ": " + formatNumber2decimalplaces.format(insulinAfterConstraints) + "U";
-                    confirmMessage += "\n" + getString(R.string.carbs) + ": " + carbsAfterConstraints + "g";
+            confirmMessage += "\n" + getString(R.string.carbs) + ": " + carbsAfterConstraints + "g";
 
-                    if (insulinAfterConstraints - calculatedTotalInsulin != 0 || !carbsAfterConstraints.equals(calculatedCarbs)) {
+            if (insulinAfterConstraints - calculatedTotalInsulin != 0 || !carbsAfterConstraints.equals(calculatedCarbs)) {
-                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                        builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                        builder.setMessage(getString(R.string.constraints_violation) + "\n" + getString(R.string.changeyourinput));
+                builder.setMessage(getString(R.string.constraints_violation) + "\n" + getString(R.string.changeyourinput));
-                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
-                        builder.show();
+                builder.show();
-                        return;
+                return;
-                    }
+            }
 
-                    final Double finalInsulinAfterConstraints = insulinAfterConstraints;
+            final Double finalInsulinAfterConstraints = insulinAfterConstraints;
-                    final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
+            final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
+            final Double bg = SafeParse.stringToDouble(bgInput.getText().toString());
+            final int carbTime = SafeParse.stringToInt(carbTimeEdit.getText().toString());
+            final boolean useSuperBolus = superbolusCheckbox.isChecked();
 
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                    builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
+            builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
-                    builder.setMessage(confirmMessage);
+            builder.setMessage(confirmMessage);
-                    builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+            builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int id) {
+                public void onClick(DialogInterface dialog, int id) {
-                            if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
+                    if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                                final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
+                        final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
-                                mHandler.post(new Runnable() {
+                        mHandler.post(new Runnable() {
-                                    @Override
+                            @Override
-                                    public void run() {
+                            public void run() {
-                                        PumpEnactResult result = pump.deliverTreatmentFromBolusWizard(
+                                PumpEnactResult result = pump.deliverTreatmentFromBolusWizard(
-                                                context,
+                                        context,
-                                                finalInsulinAfterConstraints,
+                                        finalInsulinAfterConstraints,
-                                                finalCarbsAfterConstraints,
+                                        finalCarbsAfterConstraints,
-                                                SafeParse.stringToDouble(bgInput.getText().toString()),
+                                        bg,
-                                                "Manual",
+                                        "Manual",
-                                                SafeParse.stringToInt(carbTimeEdit.getText().toString()),
+                                        carbTime,
-                                                boluscalcJSON
+                                        boluscalcJSON
-                                        );
+                                );
-                                        if (!result.success) {
+                                if (!result.success) {
-                                            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                                            builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                    builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                            builder.setMessage(result.comment);
+                                    builder.setMessage(result.comment);
-                                            builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                    builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
-                                            builder.show();
+                                    builder.show();
-                                        }
+                                }
+                                if (useSuperBolus) {
+                                    final LoopPlugin activeloop = MainApp.getConfigBuilder().getActiveLoop();
+                                    result = pump.setTempBasalAbsolute(0d, 120);
+                                    if (!result.success) {
+                                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                        builder.setTitle(MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
+                                        builder.setMessage(result.comment);
+                                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                        builder.show();
                                     }
-                                });
+                                    if (activeloop != null) {
-                                Answers.getInstance().logCustom(new CustomEvent("Wizard"));
+                                        activeloop.superBolusTo(new Date().getTime() + 2 * 60L * 60 * 1000);
+                                        MainApp.bus().post(new EventRefreshGui(false));
+                                    }
+                                }
                             }
-                        }
+                        });
-                    });
+                        Answers.getInstance().logCustom(new CustomEvent("Wizard"));
-                    builder.setNegativeButton(getString(R.string.cancel), null);
+                    }
-                    builder.show();
-                    dismiss();
                 }
-                break;
+            });
+            builder.setNegativeButton(getString(R.string.cancel), null);
+            builder.show();
+            dismiss();
         }
-
     }
 
     private void initDialog() {
@@ -327,13 +428,14 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
         totalInsulin.setText("");
         wizardDialogDeliverButton.setVisibility(Button.INVISIBLE);
 
-    }
+        // COB only if AMA is selected
-
+        if (ConfigBuilderPlugin.getActiveAPS() instanceof OpenAPSAMAPlugin && ConfigBuilderPlugin.getActiveAPS().getLastAPSResult() != null && ConfigBuilderPlugin.getActiveAPS().getLastAPSRun().after(new Date(new Date().getTime() - 11 * 60 * 1000L))) {
-    @Override
+            cobLayout.setVisibility(View.VISIBLE);
-    public void onResume() {
+            cobAvailable = true;
-        super.onResume();
+        } else {
-        if (getDialog() != null)
+            cobLayout.setVisibility(View.GONE);
-            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            cobAvailable = false;
+        }
     }
 
     private void calculateInsulin() {
@@ -368,8 +470,19 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
 
         c_bg = bgCheckbox.isChecked() ? c_bg : 0d;
 
+        // COB
+        Double c_cob = 0d;
+        if (cobAvailable && cobCheckbox.isChecked()) {
+            if (ConfigBuilderPlugin.getActiveAPS().getLastAPSResult() != null && ConfigBuilderPlugin.getActiveAPS().getLastAPSRun().after(new Date(new Date().getTime() - 11 * 60 * 1000L))) {
+                try {
+                    c_cob = SafeParse.stringToDouble(ConfigBuilderPlugin.getActiveAPS().getLastAPSResult().json().getString("COB"));
+                } catch (JSONException e) {
+                }
+            }
+        }
+
         BolusWizard wizard = new BolusWizard();
-        wizard.doCalc(specificProfile, carbsAfterConstraint, c_bg, corrAfterConstraint, bolusIobCheckbox.isChecked(), basalIobCheckbox.isChecked());
+        wizard.doCalc(specificProfile, carbsAfterConstraint, c_cob, c_bg, corrAfterConstraint, bolusIobCheckbox.isChecked(), basalIobCheckbox.isChecked(), superbolusCheckbox.isChecked(), bgtrendCheckbox.isChecked());
 
         bg.setText(c_bg + " ISF: " + DecimalFormatter.to1Decimal(wizard.sens));
         bgInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromBG) + "U");
@@ -393,6 +506,35 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
 
         calculatedCarbs = carbsAfterConstraint;
 
+        // Superbolus
+        if (superbolusCheckbox.isChecked()) {
+            superbolus.setText("2h");
+        } else {
+            superbolus.setText("");
+        }
+        superbolusInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromSuperBolus) + "U");
+
+        // Trend
+        if (bgtrendCheckbox.isChecked()) {
+            if (wizard.glucoseStatus != null) {
+                bgTrend.setText((wizard.glucoseStatus.avgdelta > 0 ? "+" : "") + NSProfile.toUnitsString(wizard.glucoseStatus.avgdelta * 3, wizard.glucoseStatus.avgdelta * 3 / 18, profile.getUnits()) + " " + profile.getUnits());
+            } else {
+                bgTrend.setText("");
+            }
+        } else {
+            bgTrend.setText("");
+        }
+        bgTrendInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromTrend) + "U");
+
+        // COB
+        if (cobAvailable && cobCheckbox.isChecked()) {
+            cob.setText(DecimalFormatter.to2Decimal(c_cob) + "g IC: " + DecimalFormatter.to1Decimal(wizard.ic));
+            cobInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCOB) + "U");
+        } else {
+            cob.setText("");
+            cobInsulin.setText("");
+        }
+
         if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
             String insulinText = calculatedTotalInsulin > 0d ? (DecimalFormatter.to2Decimal(calculatedTotalInsulin) + "U") : "";
             String carbsText = calculatedCarbs > 0d ? (DecimalFormatter.to0Decimal(calculatedCarbs) + "g") : "";
@@ -419,7 +561,11 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
             boluscalcJSON.put("bgdiff", wizard.bgDiff);
             boluscalcJSON.put("insulincarbs", wizard.insulinFromCarbs);
             boluscalcJSON.put("carbs", c_carbs);
+            boluscalcJSON.put("cob", c_cob);
+            boluscalcJSON.put("insulincob", wizard.insulinFromCOB);
             boluscalcJSON.put("othercorrection", corrAfterConstraint);
+            boluscalcJSON.put("insulinsuperbolus", wizard.insulinFromSuperBolus);
+            boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
             boluscalcJSON.put("insulin", calculatedTotalInsulin);
         } catch (JSONException e) {
             e.printStackTrace();

app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java

@@ -451,7 +451,7 @@ public class OverviewFragment extends Fragment {
             quickWizardButton.setVisibility(View.VISIBLE);
             String text = MainApp.sResources.getString(R.string.bolus) + ": " + quickWizardEntry.buttonText();
             BolusWizard wizard = new BolusWizard();
-            wizard.doCalc(profile.getDefaultProfile(), quickWizardEntry.carbs(), actualBg.valueToUnits(profile.getUnits()), 0d, true, true);
+            wizard.doCalc(profile.getDefaultProfile(), quickWizardEntry.carbs(), 0d, actualBg.valueToUnits(profile.getUnits()), 0d, true, true, false, true);
 
             final JSONObject boluscalcJSON = new JSONObject();
             try {
@@ -470,6 +470,7 @@ public class OverviewFragment extends Fragment {
                 boluscalcJSON.put("insulincarbs", wizard.insulinFromCarbs);
                 boluscalcJSON.put("carbs", quickWizardEntry.carbs());
                 boluscalcJSON.put("othercorrection", 0d);
+                boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
                 boluscalcJSON.put("insulin", wizard.calculatedTotalInsulin);
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -694,7 +695,11 @@ public class OverviewFragment extends Fragment {
             apsModeView.setBackgroundResource(R.drawable.loopmodeborder);
             apsModeView.setTextColor(Color.BLACK);
             final LoopPlugin activeloop = MainApp.getConfigBuilder().getActiveLoop();
-            if (activeloop != null && activeloop.isEnabled(activeloop.getType()) && activeloop.isSuspended()) {
+            if (activeloop != null && activeloop.isEnabled(activeloop.getType()) && activeloop.isSuperBolus()) {
+                apsModeView.setBackgroundResource(R.drawable.loopmodesuspendedborder);
+                apsModeView.setText(String.format(MainApp.sResources.getString(R.string.loopsuperbolusfor), activeloop.minutesToEndOfSuspend()));
+                apsModeView.setTextColor(Color.WHITE);
+            } else if (activeloop != null && activeloop.isEnabled(activeloop.getType()) && activeloop.isSuspended()) {
                 apsModeView.setBackgroundResource(R.drawable.loopmodesuspendedborder);
                 apsModeView.setText(String.format(MainApp.sResources.getString(R.string.loopsuspendedfor), activeloop.minutesToEndOfSuspend()));
                 apsModeView.setTextColor(Color.WHITE);
@@ -820,7 +825,7 @@ public class OverviewFragment extends Fragment {
             quickWizardButton.setVisibility(View.VISIBLE);
             String text = MainApp.sResources.getString(R.string.bolus) + ": " + quickWizardEntry.buttonText() + " " + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
             BolusWizard wizard = new BolusWizard();
-            wizard.doCalc(profile.getDefaultProfile(), quickWizardEntry.carbs(), lastBG.valueToUnits(profile.getUnits()), 0d, true, true);
+            wizard.doCalc(profile.getDefaultProfile(), quickWizardEntry.carbs(), 0d, lastBG.valueToUnits(profile.getUnits()), 0d, true, true, false, true);
             text += " " + DecimalFormatter.to2Decimal(wizard.calculatedTotalInsulin) + "U";
             quickWizardButton.setText(text);
             if (wizard.calculatedTotalInsulin <= 0)

app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java

@@ -192,7 +192,7 @@ public class ActionStringHandler {
             }
             DecimalFormat format = new DecimalFormat("0.00");
             BolusWizard bolusWizard = new BolusWizard();
-            bolusWizard.doCalc(profile.getDefaultProfile(), carbsAfterConstraints, useBG?bgReading.valueToUnits(profile.getUnits()):0d, 0d, useBolusIOB, useBasalIOB);
+            bolusWizard.doCalc(profile.getDefaultProfile(), carbsAfterConstraints, 0d, useBG?bgReading.valueToUnits(profile.getUnits()):0d, 0d, useBolusIOB, useBasalIOB, false, false);
 
             Double insulinAfterConstraints = MainApp.getConfigBuilder().applyBolusConstraints(bolusWizard.calculatedTotalInsulin);
             if(insulinAfterConstraints - bolusWizard.calculatedTotalInsulin !=0){

app/src/main/java/info/nightscout/utils/BolusWizard.java

@@ -5,6 +5,7 @@ import org.json.JSONObject;
 import java.util.Date;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.interfaces.TempBasalsInterface;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.data.IobTotal;
@@ -23,11 +24,15 @@ public class BolusWizard {
     Double correction;
     Boolean includeBolusIOB = true;
     Boolean includeBasalIOB = true;
+    Boolean superBolus = false;
+    Boolean trend = false;
 
     // Intermediate
     public Double sens = 0d;
     public Double ic = 0d;
 
+    public GlucoseStatus glucoseStatus;
+
     public Double targetBGLow = 0d;
     public Double targetBGHigh = 0d;
     public Double bgDiff = 0d;
@@ -40,16 +45,21 @@ public class BolusWizard {
     public Double insulingFromBolusIOB = 0d;
     public Double insulingFromBasalsIOB = 0d;
     public Double insulinFromCorrection = 0d;
+    public Double insulinFromSuperBolus = 0d;
+    public Double insulinFromCOB = 0d;
+    public Double insulinFromTrend = 0d;
 
     // Result
     public Double calculatedTotalInsulin = 0d;
     public Double carbsEquivalent = 0d;
 
-    public Double doCalc(JSONObject specificProfile, Integer carbs, Double bg, Double correction, Boolean includeBolusIOB, Boolean includeBasalIOB) {
+    public Double doCalc(JSONObject specificProfile, Integer carbs, Double cob, Double bg, Double correction, Boolean includeBolusIOB, Boolean includeBasalIOB, Boolean superBolus, Boolean trend) {
         this.specificProfile = specificProfile;
         this.carbs = carbs;
         this.bg = bg;
         this.correction = correction;
+        this.superBolus = superBolus;
+        this.trend = trend;
 
         NSProfile profile = ConfigBuilderPlugin.getActiveProfile().getProfile();
 
@@ -64,9 +74,16 @@ public class BolusWizard {
         }
         insulinFromBG = bg != 0d ? bgDiff / sens : 0d;
 
+        // Insulin from 15 min trend
+        glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+        if (glucoseStatus != null) {
+            insulinFromTrend = (NSProfile.fromMgdlToUnits(glucoseStatus.short_avgdelta, profile.getUnits()) * 3) / sens;
+        }
+
         // Insuling from carbs
         ic = profile.getIc(specificProfile, NSProfile.secondsFromMidnight());
         insulinFromCarbs = carbs / ic;
+        insulinFromCOB = -cob / ic;
 
         // Insulin from IOB
         // IOB calculation
@@ -86,8 +103,16 @@ public class BolusWizard {
         // Insulin from correction
         insulinFromCorrection = correction;
 
+        // Insulin from superbolus for 2h. Get basal rate now and after 1h
+        if (superBolus) {
+            insulinFromSuperBolus = profile.getBasal(NSProfile.secondsFromMidnight());
+            long timeAfter1h = new Date().getTime();
+            timeAfter1h += 60L * 60 * 1000;
+            insulinFromSuperBolus += profile.getBasal(NSProfile.secondsFromMidnight(new Date(timeAfter1h)));
+        }
+
         // Total
-        calculatedTotalInsulin = insulinFromBG + insulinFromCarbs + insulingFromBolusIOB + insulingFromBasalsIOB + insulinFromCorrection;
+        calculatedTotalInsulin = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulingFromBolusIOB + insulingFromBasalsIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB;
 
         if (calculatedTotalInsulin < 0) {
             carbsEquivalent = -calculatedTotalInsulin * ic;

app/src/main/res/layout/overview_wizard_dialog.xml

@@ -253,7 +253,7 @@
 
         <LinearLayout
             android:id="@+id/treatments_wizard_profile_layout"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:orientation="horizontal">
@@ -269,9 +269,42 @@
             <Spinner
                 android:id="@+id/treatments_wizard_profile"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.5" />
 
 
+            <CheckBox
+                android:id="@+id/treatments_wizard_sbcheckbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:checked="false"
+                android:text="Super\nbolus" />
+
+        </LinearLayout>
+
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:orientation="horizontal"
+            android:padding="10dp">
+
+            <Button
+                android:id="@+id/treatments_wizard_deliverButton"
+                style="?android:attr/buttonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="10dp"
+                android:text="SEND TO PUMP"
+                android:textAllCaps="false"
+                android:textSize="20sp" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -288,7 +321,6 @@
                 android:checked="true" />
 
             <TextView
-                android:id="@+id/textView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:width="80dp"
@@ -317,27 +349,66 @@
             android:layout_gravity="center"
             android:orientation="horizontal">
 
-            <TextView
+            <CheckBox
+                android:id="@+id/treatments_wizard_bgtrendcheckbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:width="32dp" />
+                android:width="32dp"
+                android:checked="true" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:width="80dp"
-                android:text="@string/treatments_wizard_carbs_label"
+                android:text="@string/treatments_wizard_bgtrend_label"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
-                android:id="@+id/treatments_wizard_carbs"
+                android:id="@+id/treatments_wizard_bgtrend"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:width="100dp"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
-                android:id="@+id/treatments_wizard_carbsinsulin"
+                android:id="@+id/treatments_wizard_bgtrendinsulin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="50dp"
+                android:gravity="end"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/treatments_wizard_cob_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/treatments_wizard_cobcheckbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="32dp"
+                android:checked="false" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="80dp"
+                android:text="@string/treatments_wizard_cob_label"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/treatments_wizard_cob"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="100dp"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/treatments_wizard_cobinsulin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:width="50dp"
@@ -417,6 +488,74 @@
                 android:textAppearance="?android:attr/textAppearanceSmall" />
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="32dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="80dp"
+                android:text="@string/treatments_wizard_carbs_label"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/treatments_wizard_carbs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="100dp"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/treatments_wizard_carbsinsulin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="50dp"
+                android:gravity="end"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="32dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="80dp"
+                android:text="@string/treatments_wizard_sb_label"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/treatments_wizard_sb"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="100dp"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/treatments_wizard_sbinsulin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:width="50dp"
+                android:gravity="end"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -491,27 +630,5 @@
                 android:textStyle="bold" />
         </LinearLayout>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:orientation="horizontal"
-            android:padding="10dp">
-
-            <Button
-                android:id="@+id/treatments_wizard_deliverButton"
-                style="?android:attr/buttonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:padding="10dp"
-                android:text="SEND TO PUMP"
-                android:textAllCaps="false"
-                android:textSize="20sp" />
-
-        </LinearLayout>
-
     </LinearLayout>
 </ScrollView>

app/src/main/res/values-cs/strings.xml

@@ -520,7 +520,7 @@
     <string name="loopsuspendedfor" formatted="false">Pozastaveno (%d min)</string>
     <string name="needwhitelisting">%s potřebuje vypnout optimalizace baterie pro optimalní výkon</string>
     <string name="pleaseallowpermission">Prosím povolte oprávnění</string>
-    <string name="resume">Obnovit</string>
+    <string name="resume">Uvolnit</string>
     <string name="suspendloopfor10h">Pozastavit smyčku na 10 h</string>
     <string name="suspendloopfor1h">Pozastavit smyčku na 1 h</string>
     <string name="suspendloopfor2h">Pozastavit smyčku na 2 h</string>

app/src/main/res/values/strings.xml

@@ -562,7 +562,8 @@
     <string name="pleaseallowpermission">Please Allow Permission</string>
     <string name="needwhitelisting">%s needs battery optimalization whitelisting for proper performance</string>
     <string name="loopsuspended">Loop suspended</string>
-    <string name="loopsuspendedfor">Suspended (%d m)</string>
+    <string name="loopsuspendedfor" formatted="false">Suspended (%d m)</string>
+    <string name="loopsuperbolusfor" formatted="false">Superbolus (%d m)</string>
     <string name="loopmenu">Loop menu</string>
     <string name="suspendloopfor1h">Suspend loop for 1h</string>
     <string name="suspendloopfor2h">Suspend loop for 2h</string>
@@ -577,4 +578,7 @@
     <string name="smscommunicator_wrongduration">Wrong duration</string>
     <string name="smscommunicator_loopsuspended">Loop suspended</string>
     <string name="smscommunicator_loopresumed">Loop resumed</string>
+    <string name="treatments_wizard_bgtrend_label">15min trend</string>
+    <string name="treatments_wizard_cob_label">COB</string>
+    <string name="treatments_wizard_sb_label">Superbolus</string>
 </resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files