TreatmentDialog refactor

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

@@ -90,7 +90,7 @@ import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizar
 import info.nightscout.androidaps.plugins.general.overview.dialogs.CalibrationDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.CarbsDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.InsulinDialog;
-import info.nightscout.androidaps.plugins.general.overview.dialogs.NewTreatmentDialog;
+import info.nightscout.androidaps.plugins.general.overview.dialogs.TreatmentDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.ProfileSwitchDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.TempTargetDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.WizardDialog;
@@ -856,8 +856,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 }
                 break;
             case R.id.overview_treatmentbutton:
-                NewTreatmentDialog treatmentDialogFragment = new NewTreatmentDialog();
+                new TreatmentDialog().show(manager, "Overview");
-                treatmentDialogFragment.show(manager, "TreatmentDialog");
                 break;
             case R.id.overview_insulinbutton:
                 new InsulinDialog().show(manager, "Overview");

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/CarbsDialog.kt

@@ -30,7 +30,6 @@ import java.util.*
 import kotlin.math.max
 
 class CarbsDialog : DialogFragmentWithDate() {
-    private val log = LoggerFactory.getLogger(CarbsDialog::class.java)
 
     companion object {
         private const val FAV1_DEFAULT = 5
@@ -163,10 +162,11 @@ class CarbsDialog : DialogFragmentWithDate() {
         val duration = overview_carbs_duration.value.toInt()
         if (duration > 0)
             actions.add(MainApp.gs(R.string.duration) + ": " + duration + MainApp.gs(R.string.shorthour))
-        if (carbs > 0)
+        if (carbsAfterConstraints > 0) {
             actions.add(MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + MainApp.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
-        if (carbsAfterConstraints != carbs)
+            if (carbsAfterConstraints != carbs)
-            actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.carbsconstraintapplied) + "</font>")
+                actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.carbsconstraintapplied) + "</font>")
+        }
         val notes = notes.text.toString()
         if (notes.isNotEmpty())
             actions.add(MainApp.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/InsulinDialog.kt

@@ -32,7 +32,6 @@ import kotlin.math.abs
 import kotlin.math.max
 
 class InsulinDialog : DialogFragmentWithDate() {
-    private val log = LoggerFactory.getLogger(InsulinDialog::class.java)
 
     companion object {
         private const val PLUS1_DEFAULT = 0.5
@@ -122,13 +121,13 @@ class InsulinDialog : DialogFragmentWithDate() {
         val recordOnlyChecked = overview_insulin_record_only.isChecked
         val eatingSoonChecked = overview_insulin_start_eating_soon_tt.isChecked
 
-        if (insulin > 0) {
+        if (insulinAfterConstraints > 0) {
             actions.add(MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + MainApp.gs(R.string.insulin_unit_shortname) + "</font>")
             if (recordOnlyChecked)
                 actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusrecordedonly) + "</font>")
+            if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
+                actions.add(MainApp.gs(R.string.bolusconstraintappliedwarning, MainApp.gc(R.color.warning), insulin, insulinAfterConstraints))
         }
-        if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-            actions.add(MainApp.gs(R.string.bolusconstraintappliedwarning, MainApp.gc(R.color.warning), insulin, insulinAfterConstraints))
         val eatingSoonTTDuration = DefaultValueHelper.determineEatingSoonTTDuration()
         val eatingSoonTT = DefaultValueHelper.determineEatingSoonTT()
         if (eatingSoonChecked)

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewTreatmentDialog.java

@@ -1,213 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview.dialogs;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import android.text.Editable;
-import android.text.Html;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.DecimalFormat;
-import java.util.Objects;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.NumberPicker;
-import info.nightscout.androidaps.utils.SafeParse;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-public class NewTreatmentDialog extends DialogFragment implements OnClickListener {
-    private static Logger log = LoggerFactory.getLogger(NewTreatmentDialog.class);
-
-    private NumberPicker editCarbs;
-    private NumberPicker editInsulin;
-
-    private Integer maxCarbs;
-    private Double maxInsulin;
-
-    //one shot guards
-    private boolean accepted;
-    private boolean okClicked;
-
-    private CheckBox recordOnlyCheckbox;
-
-    public NewTreatmentDialog() {
-    }
-
-    final private TextWatcher textWatcher = new TextWatcher() {
-        @Override
-        public void afterTextChanged(Editable s) {
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            validateInputs();
-        }
-    };
-
-    private void validateInputs() {
-        Integer carbs = SafeParse.stringToInt(editCarbs.getText());
-        if (carbs > maxCarbs) {
-            editCarbs.setValue(0d);
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.carbsconstraintapplied));
-        }
-        Double insulin = SafeParse.stringToDouble(editInsulin.getText());
-        if (insulin > maxInsulin) {
-            editInsulin.setValue(0d);
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.bolusconstraintapplied));
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.overview_newtreatment_dialog, container, false);
-
-        view.findViewById(R.id.ok).setOnClickListener(this);
-        view.findViewById(R.id.cancel).setOnClickListener(this);
-
-        getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
-
-        maxCarbs = MainApp.getConstraintChecker().getMaxCarbsAllowed().value();
-        maxInsulin = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
-
-        editCarbs = (NumberPicker) view.findViewById(R.id.treatments_newtreatment_carbsamount);
-        editInsulin = (NumberPicker) view.findViewById(R.id.treatments_newtreatment_insulinamount);
-
-        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), textWatcher);
-        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, view.findViewById(R.id.ok), textWatcher);
-
-        recordOnlyCheckbox = (CheckBox) view.findViewById(R.id.newtreatment_record_only);
-
-        setCancelable(true);
-        getDialog().setCanceledOnTouchOutside(false);
-        return view;
-    }
-
-    @Override
-    public synchronized void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.ok:
-                if (okClicked) {
-                    log.debug("guarding: ok already clicked");
-                    dismiss();
-                    return;
-                }
-                okClicked = true;
-
-                try {
-                    final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-
-                    if (pump == null)
-                        return;
-
-                    Double insulin = SafeParse.stringToDouble(editInsulin.getText());
-                    final Integer carbs = SafeParse.stringToInt(editCarbs.getText());
-
-                    String confirmMessage = MainApp.gs(R.string.entertreatmentquestion) + "<br/>";
-
-                    Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(insulin)).value();
-                    Integer carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(carbs)).value();
-
-                    if (insulin > 0) {
-                        confirmMessage += MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + "U" + "</font>";
-                        if (recordOnlyCheckbox.isChecked()) {
-                            confirmMessage += "<br/><font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusrecordedonly) + "</font>";
-                        }
-                        if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusStepSize(insulinAfterConstraints) || !Objects.equals(carbsAfterConstraints, carbs))
-                            confirmMessage += "<br/>" + MainApp.gs(R.string.bolusconstraintappliedwarning, MainApp.gc(R.color.warning), insulin, insulinAfterConstraints);
-                    }
-                    if (carbsAfterConstraints > 0)
-                        confirmMessage += "<br/>" + MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + carbsAfterConstraints + "g" + "</font>";
-
-
-                    final double finalInsulinAfterConstraints = insulinAfterConstraints;
-                    final int finalCarbsAfterConstraints = carbsAfterConstraints;
-
-                    final Context context = getContext();
-                    final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-
-                    builder.setTitle(MainApp.gs(R.string.confirmation));
-                    builder.setMessage(Html.fromHtml(confirmMessage));
-                    builder.setPositiveButton(MainApp.gs(R.string.ok), new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int id) {
-                            synchronized (builder) {
-                                if (accepted) {
-                                    log.debug("guarding: already accepted");
-                                    return;
-                                }
-                                accepted = true;
-                                if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                                    DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                                    if (finalInsulinAfterConstraints == 0)
-                                        detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION;
-                                    if (finalCarbsAfterConstraints == 0)
-                                        detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
-                                    detailedBolusInfo.insulin = finalInsulinAfterConstraints;
-                                    detailedBolusInfo.carbs = finalCarbsAfterConstraints;
-                                    detailedBolusInfo.context = context;
-                                    detailedBolusInfo.source = Source.USER;
-                                    if (!(recordOnlyCheckbox.isChecked() && (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo))) {
-                                        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                                            @Override
-                                            public void run() {
-                                                if (!result.success) {
-                                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                                    i.putExtra("soundid", R.raw.boluserror);
-                                                    i.putExtra("status", result.comment);
-                                                    i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror));
-                                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                                    MainApp.instance().startActivity(i);
-                                                }
-                                            }
-                                        });
-                                    } else {
-                                        TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-                                    }
-                                }
-                            }
-                        }
-                    });
-                    builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
-                    builder.show();
-
-                    dismiss();
-                } catch (Exception e) {
-                    log.error("Unhandled exception", e);
-                }
-                break;
-            case R.id.cancel:
-                dismiss();
-                break;
-        }
-
-    }
-
-}

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/TreatmentDialog.kt

@@ -0,0 +1,124 @@
+package info.nightscout.androidaps.plugins.general.overview.dialogs
+
+import android.content.Intent
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.common.base.Joiner
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.*
+import kotlinx.android.synthetic.main.okcancel.*
+import kotlinx.android.synthetic.main.overview_treatment_dialog.*
+import java.text.DecimalFormat
+import java.util.*
+import kotlin.math.abs
+
+class TreatmentDialog : DialogFragmentWithDate() {
+    private var maxCarbs = MainApp.getConstraintChecker().maxCarbsAllowed.value().toDouble()
+    private var maxInsulin = MainApp.getConstraintChecker().maxBolusAllowed.value()
+
+    private val textWatcher: TextWatcher = object : TextWatcher {
+        override fun afterTextChanged(s: Editable) {}
+        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+            validateInputs()
+        }
+    }
+
+    private fun validateInputs() {
+        if (SafeParse.stringToInt(overview_treatment_carbs.text) > maxCarbs) {
+            overview_treatment_carbs.value = 0.0
+            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.carbsconstraintapplied))
+        }
+        if (SafeParse.stringToDouble(overview_treatment_insulin.text) > maxInsulin) {
+            overview_treatment_insulin.value = 0.0
+            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.bolusconstraintapplied))
+        }
+    }
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
+        savedInstanceState.putDouble("overview_treatment_carbs", overview_treatment_carbs.value)
+        savedInstanceState.putDouble("overview_treatment_insulin", overview_treatment_insulin.value)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        onCreateView()
+        return inflater.inflate(R.layout.overview_treatment_dialog, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription ?: return
+        overview_treatment_carbs.setParams(savedInstanceState?.getDouble("overview_treatment_carbs")
+                ?: 0.0, 0.0, maxCarbs, 1.0, DecimalFormat("0"), false, ok, textWatcher)
+        overview_treatment_insulin.setParams(savedInstanceState?.getDouble("overview_treatment_insulin")
+                ?: 0.0, 0.0, maxInsulin, pumpDescription.bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, ok, textWatcher)
+    }
+
+    override fun submit() {
+        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription ?: return
+        val insulin = SafeParse.stringToDouble(overview_treatment_insulin.text)
+        val carbs = SafeParse.stringToInt(overview_treatment_carbs.text)
+        val recordOnlyChecked = overview_treatment_record_only.isChecked
+        val actions: LinkedList<String?> = LinkedList()
+        val insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(Constraint(insulin)).value()
+        val carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(Constraint(carbs)).value()
+
+        actions.add("<b>" + MainApp.gs(R.string.entertreatmentquestion) + "</b>")
+        if (insulinAfterConstraints > 0) {
+            actions.add(MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + MainApp.gs(R.string.insulin_unit_shortname) + "</font>")
+            if (recordOnlyChecked)
+                actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusrecordedonly) + "</font>")
+            if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
+                actions.add(MainApp.gs(R.string.bolusconstraintappliedwarning, MainApp.gc(R.color.warning), insulin, insulinAfterConstraints))
+        }
+        if (carbsAfterConstraints > 0) {
+            actions.add(MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + MainApp.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
+            if (carbsAfterConstraints != carbs)
+                actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.carbsconstraintapplied) + "</font>")
+        }
+        if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) {
+            activity?.let { activity ->
+                OKDialog.showConfirmation(activity, HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions))) {
+                    val detailedBolusInfo = DetailedBolusInfo()
+                    if (insulinAfterConstraints == 0.0) detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION
+                    if (carbsAfterConstraints == 0) detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS
+                    detailedBolusInfo.insulin = insulinAfterConstraints
+                    detailedBolusInfo.carbs = carbsAfterConstraints.toDouble()
+                    detailedBolusInfo.context = context
+                    detailedBolusInfo.source = Source.USER
+                    if (!(recordOnlyChecked && (detailedBolusInfo.insulin > 0 || pumpDescription.storesCarbInfo))) {
+                        ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                            override fun run() {
+                                if (!result.success) {
+                                    val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+                                    i.putExtra("soundid", R.raw.boluserror)
+                                    i.putExtra("status", result.comment)
+                                    i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror))
+                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    MainApp.instance().startActivity(i)
+                                }
+                            }
+                        })
+                    } else
+                        TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false)
+                }
+            }
+        } else
+            OKDialog.show(activity, "", MainApp.gs(R.string.no_action_selected), null)
+    }
+}

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

@@ -50,7 +50,7 @@
                 android:layout_gravity="center_horizontal"
                 android:width="120dp"
                 android:padding="10dp"
-                android:text="@string/treatments_newtreatment_insulinamount_label"
+                android:text="@string/overview_insulin_label"
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 

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

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".plugins.general.overview.dialogs.NewTreatmentDialog">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical"
-            android:padding="10dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/overview_treatment_label"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <CheckBox
-                android:id="@+id/newtreatment_record_only"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/do_not_bolus_record_only" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="5dp"
-                android:layout_marginTop="15dp"
-                android:text="@string/treatments_newtreatment_insulinamount_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
-                android:textStyle="bold" />
-
-            <info.nightscout.androidaps.utils.NumberPicker
-                android:id="@+id/treatments_newtreatment_insulinamount"
-                android:layout_width="130dp"
-                android:layout_height="40dp"
-                android:layout_gravity="end"
-                android:layout_marginLeft="30dp"
-                android:layout_marginRight="30dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="5dp"
-                android:layout_marginTop="15dp"
-                android:text="@string/treatments_newtreatment_carbsamount_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
-                android:textStyle="bold" />
-
-            <info.nightscout.androidaps.utils.NumberPicker
-                android:id="@+id/treatments_newtreatment_carbsamount"
-                android:layout_width="130dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="15dp" />
-
-            <include layout="@layout/okcancel" />
-
-        </LinearLayout>
-
-    </ScrollView>
-</FrameLayout>

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

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".plugins.general.overview.dialogs.TreatmentDialog">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal"
+            android:padding="10dp">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/overview_treatment_label"
+                android:src="@drawable/icon_bolus" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/overview_treatment_label"
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="vertical">
+
+            <CheckBox
+                android:id="@+id/overview_treatment_record_only"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="5dp"
+                android:text="@string/do_not_bolus_record_only" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:width="120dp"
+                android:padding="10dp"
+                android:text="@string/overview_insulin_label"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
+
+            <info.nightscout.androidaps.utils.NumberPicker
+                android:id="@+id/overview_treatment_insulin"
+                android:layout_width="130dp"
+                android:layout_height="40dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="start"
+                android:minWidth="45dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/insulin_unit_shortname"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:width="120dp"
+                android:padding="10dp"
+                android:text="@string/overview_carbs_label"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
+
+            <info.nightscout.androidaps.utils.NumberPicker
+                android:id="@+id/overview_treatment_carbs"
+                android:layout_width="130dp"
+                android:layout_height="40dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="start"
+                android:minWidth="45dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/shortgramm"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        </LinearLayout>
+
+        <include layout="@layout/okcancel" />
+
+    </LinearLayout>
+
+</ScrollView>

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

@@ -97,8 +97,6 @@
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Total IOB:</string>
-    <string name="treatments_newtreatment_insulinamount_label">Insulin</string>
-    <string name="treatments_newtreatment_carbsamount_label">Carbs</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Carbs</string>