ExtendedBolusDialog refactor

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt

@@ -20,15 +20,19 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.actions.dialogs.CareDialog
+import info.nightscout.androidaps.plugins.general.actions.dialogs.ExtendedBolusDialog
 import info.nightscout.androidaps.plugins.general.actions.dialogs.FillDialog
-import info.nightscout.androidaps.plugins.general.actions.dialogs.NewExtendedBolusDialog
 import info.nightscout.androidaps.plugins.general.actions.dialogs.TempBasalDialog
 import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment
+import info.nightscout.androidaps.plugins.general.overview.dialogs.ErrorHelperActivity
 import info.nightscout.androidaps.plugins.general.overview.dialogs.ProfileSwitchDialog
 import info.nightscout.androidaps.plugins.general.overview.dialogs.TempTargetDialog
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.SingleClickButton
+import info.nightscout.androidaps.utils.plusAssign
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.actions_fragment.*
@@ -57,25 +61,39 @@ class ActionsFragment : Fragment() {
             fragmentManager?.let { TempTargetDialog().show(it, "Actions") }
         }
         actions_extendedbolus.setOnClickListener {
-            fragmentManager?.let { NewExtendedBolusDialog().show(it, "NewExtendedDialog") }
+            fragmentManager?.let { ExtendedBolusDialog().show(it, "Actions") }
         }
         actions_extendedbolus_cancel.setOnClickListener {
             if (TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress) {
                 ConfigBuilderPlugin.getPlugin().commandQueue.cancelExtended(object : Callback() {
                     override fun run() {
-                        if (!result.success)
+                        if (!result.success) {
-                            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.extendedbolusdeliveryerror))
+                            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.extendedbolusdeliveryerror))
+                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            MainApp.instance().startActivity(i)
+                        }
                     }
                 })
             }
         }
-        actions_settempbasal.setOnClickListener { fragmentManager?.let { TempBasalDialog().show(it, "NewTempDialog") } }
+        actions_settempbasal.setOnClickListener {
+            fragmentManager?.let { TempBasalDialog().show(it, "Actions") }
+        }
         actions_canceltempbasal.setOnClickListener {
             if (TreatmentsPlugin.getPlugin().isTempBasalInProgress) {
                 ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
-                        if (!result.success)
+                        if (!result.success) {
-                            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.tempbasaldeliveryerror))
+                            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.tempbasaldeliveryerror))
+                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            MainApp.instance().startActivity(i)
+                        }
                     }
                 })
             }

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.java

@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.general.actions.defs;
-
-import info.nightscout.androidaps.R;
-
-/**
- * Created by andy on 9/20/18.
- */
-
-public class CustomAction {
-
-    private int name;
-    private String iconName;
-    private CustomActionType customActionType;
-    private int iconResourceId;
-    private boolean enabled = true;
-
-
-    public CustomAction(int nameResourceId, CustomActionType actionType) {
-        this(nameResourceId, actionType, R.drawable.icon_actions_profileswitch, true);
-    }
-
-
-    public CustomAction(int nameResourceId, CustomActionType actionType, int iconResourceId) {
-        this(nameResourceId, actionType, iconResourceId, true);
-    }
-
-    public CustomAction(int nameResourceId, CustomActionType actionType, boolean enabled) {
-        this(nameResourceId, actionType, R.drawable.icon_actions_profileswitch, enabled);
-    }
-
-    public CustomAction(int nameResourceId, CustomActionType actionType, int iconResourceId, boolean enabled) {
-        this.name = nameResourceId;
-        this.customActionType = actionType;
-        this.iconResourceId = iconResourceId;
-        this.enabled = enabled;
-    }
-
-
-    public int getName() {
-        return name;
-    }
-
-
-    public CustomActionType getCustomActionType() {
-        return customActionType;
-    }
-
-
-    public int getIconResourceId() {
-        return iconResourceId;
-    }
-
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-}

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt

@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.plugins.general.actions.defs
+
+import info.nightscout.androidaps.R
+
+class CustomAction @JvmOverloads constructor(val name: Int, val customActionType: CustomActionType?, val iconResourceId: Int = R.drawable.icon_actions_profileswitch, var isEnabled: Boolean = true) {
+
+    constructor(nameResourceId: Int, actionType: CustomActionType?, enabled: Boolean) :
+            this(nameResourceId, actionType, R.drawable.icon_actions_profileswitch, enabled)
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.java

@@ -1,11 +0,0 @@
-package info.nightscout.androidaps.plugins.general.actions.defs;
-
-/**
- * Created by andy on 9/20/18.
- */
-
-public interface CustomActionType {
-
-    String getKey();
-
-}

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt

@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.actions.defs
+
+interface CustomActionType {
+    val key: String?
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/dialogs/ExtendedBolusDialog.kt

@@ -0,0 +1,82 @@
+package info.nightscout.androidaps.plugins.general.actions.dialogs
+
+import android.content.Intent
+import android.os.Bundle
+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.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.general.overview.dialogs.DialogFragmentWithDate
+import info.nightscout.androidaps.plugins.general.overview.dialogs.ErrorHelperActivity
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.SafeParse
+import kotlinx.android.synthetic.main.actions_extendedbolus_dialog.*
+import kotlinx.android.synthetic.main.okcancel.*
+import java.text.DecimalFormat
+import java.util.*
+import kotlin.math.abs
+
+class ExtendedBolusDialog : DialogFragmentWithDate() {
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
+        savedInstanceState.putDouble("actions_extendedbolus_insulin", actions_extendedbolus_insulin.value)
+        savedInstanceState.putDouble("actions_extendedbolus_duration", actions_extendedbolus_duration.value)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        onCreateView()
+        return inflater.inflate(R.layout.actions_extendedbolus_dialog, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription ?: return
+
+        val maxInsulin = MainApp.getConstraintChecker().maxExtendedBolusAllowed.value()
+        val extendedStep = pumpDescription.extendedBolusStep
+        actions_extendedbolus_insulin.setParams(savedInstanceState?.getDouble("actions_extendedbolus_insulin")
+                ?: extendedStep, extendedStep, maxInsulin, extendedStep, DecimalFormat("0.00"), false, ok)
+
+        val extendedDurationStep = pumpDescription.extendedBolusDurationStep
+        val extendedMaxDuration = pumpDescription.extendedBolusMaxDuration
+        actions_extendedbolus_duration.setParams(savedInstanceState?.getDouble("actions_extendedbolus_duration")
+                ?: extendedDurationStep, extendedDurationStep, extendedMaxDuration, extendedDurationStep, DecimalFormat("0"), false, ok)
+    }
+
+    override fun submit() {
+        val insulin = SafeParse.stringToDouble(actions_extendedbolus_insulin.text)
+        val durationInMinutes = SafeParse.stringToInt(actions_extendedbolus_duration.text)
+        val actions: LinkedList<String> = LinkedList()
+        actions.add("<b>" + MainApp.gs(R.string.setextendedbolusquestion) + "</b>")
+        val insulinAfterConstraint = MainApp.getConstraintChecker().applyExtendedBolusConstraints(Constraint(insulin)).value()
+        actions.add(MainApp.gs(R.string.formatinsulinunits, insulinAfterConstraint))
+        actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_mins, durationInMinutes))
+        if (abs(insulinAfterConstraint - insulin) > 0.01) actions.add(MainApp.gs(R.string.constraintapllied))
+
+        activity?.let { activity ->
+            OKDialog.showConfirmation(activity, HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions))) {
+                ConfigBuilderPlugin.getPlugin().commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, 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)
+                        }
+                    }
+                })
+            }
+        }
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/dialogs/NewExtendedBolusDialog.java

@@ -1,115 +0,0 @@
-package info.nightscout.androidaps.plugins.general.actions.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.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.overview.dialogs.ErrorHelperActivity;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.NumberPicker;
-import info.nightscout.androidaps.utils.SafeParse;
-
-public class NewExtendedBolusDialog extends DialogFragment implements View.OnClickListener {
-    private static Logger log = LoggerFactory.getLogger(NewExtendedBolusDialog.class);
-
-    NumberPicker editInsulin;
-    NumberPicker editDuration;
-
-    public NewExtendedBolusDialog() {
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        getDialog().setTitle(MainApp.gs(R.string.overview_extendedbolus_button));
-
-        View view = inflater.inflate(R.layout.overview_newextendedbolus_dialog, container, false);
-
-        Double maxInsulin = MainApp.getConstraintChecker().getMaxExtendedBolusAllowed().value();
-        editInsulin = (NumberPicker) view.findViewById(R.id.overview_newextendedbolus_insulin);
-        editInsulin.setParams(0d, 0d, maxInsulin, 0.1d, new DecimalFormat("0.00"), false, view.findViewById(R.id.ok));
-
-        double extendedDurationStep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().extendedBolusDurationStep;
-        double extendedMaxDuration = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().extendedBolusMaxDuration;
-        editDuration = (NumberPicker) view.findViewById(R.id.overview_newextendedbolus_duration);
-        editDuration.setParams(extendedDurationStep, extendedDurationStep, extendedMaxDuration, extendedDurationStep, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
-
-        view.findViewById(R.id.ok).setOnClickListener(this);
-        view.findViewById(R.id.cancel).setOnClickListener(this);
-
-        setCancelable(true);
-        getDialog().setCanceledOnTouchOutside(false);
-        return view;
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.ok:
-                try {
-                    Double insulin = SafeParse.stringToDouble(editInsulin.getText());
-                    int durationInMinutes = SafeParse.stringToInt(editDuration.getText());
-
-                    String confirmMessage = MainApp.gs(R.string.setextendedbolusquestion);
-
-                    Double insulinAfterConstraint = MainApp.getConstraintChecker().applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
-                    confirmMessage += " " + insulinAfterConstraint + " U  ";
-                    confirmMessage += MainApp.gs(R.string.duration) + " " + durationInMinutes + "min ?";
-                    if (Math.abs(insulinAfterConstraint - insulin) > 0.01d)
-                        confirmMessage += "\n" + MainApp.gs(R.string.constraintapllied);
-                    insulin = insulinAfterConstraint;
-
-                    final Double finalInsulin = insulin;
-                    final int finalDurationInMinutes = durationInMinutes;
-
-                    final Context context = getContext();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                    builder.setTitle(MainApp.gs(R.string.confirmation));
-                    builder.setMessage(confirmMessage);
-                    builder.setPositiveButton(MainApp.gs(R.string.ok), new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int id) {
-                            ConfigBuilderPlugin.getPlugin().getCommandQueue().extendedBolus(finalInsulin, finalDurationInMinutes, 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);
-                                    }
-                                }
-                            });
-                        }
-                    });
-                    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/res/layout/actions_extendedbolus_dialog.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusableInTouchMode="true"
+    android:minWidth="300dp"
+    android:orientation="vertical"
+    android:padding="10dp">
+
+    <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/virtualpump_extendedbolus_label"
+                android:src="@drawable/icon_actions_startextbolus" />
+
+            <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/virtualpump_extendedbolus_label"
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+        </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/treatments_newtreatment_insulinamount_label"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
+
+            <info.nightscout.androidaps.utils.NumberPicker
+                android:id="@+id/actions_extendedbolus_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:paddingLeft="5dp"
+                android:paddingRight="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/careportal_newnstreatment_duration_label"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
+
+            <info.nightscout.androidaps.utils.NumberPicker
+                android:id="@+id/actions_extendedbolus_duration"
+                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:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:text="@string/unit_minute_short"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        </LinearLayout>
+
+
+        <include layout="@layout/okcancel" />
+
+    </LinearLayout>
+
+</ScrollView>

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

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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"
-    android:minWidth="300dp"
-    android:orientation="vertical"
-    android:padding="10dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:paddingBottom="10dp"
-        android:text="@string/virtualpump_extendedbolus_label"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <LinearLayout
-        android:id="@+id/careportal_newnstreatment_insulin_layout"
-        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/treatments_newtreatment_insulinamount_label"
-            android:textAppearance="@android:style/TextAppearance.Material.Small"
-            android:textStyle="bold" />
-
-        <info.nightscout.androidaps.utils.NumberPicker
-            android:id="@+id/overview_newextendedbolus_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="left"
-            android:minWidth="45dp"
-            android:paddingLeft="5dp"
-            android:text="U"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/careportal_newnstreatment_duration_layout"
-        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/careportal_newnstreatment_duration_label"
-            android:textAppearance="@android:style/TextAppearance.Material.Small"
-            android:textStyle="bold" />
-
-        <info.nightscout.androidaps.utils.NumberPicker
-            android:id="@+id/overview_newextendedbolus_duration"
-            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="left"
-            android:minWidth="45dp"
-            android:paddingLeft="5dp"
-            android:text="min"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    </LinearLayout>
-
-
-    <include layout="@layout/okcancel" />
-
-</LinearLayout>