Rework prime/fill button.

app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java

@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.plugins.Actions.dialogs;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -13,17 +13,23 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.CheckBox;
 
 import com.crashlytics.android.answers.CustomEvent;
+import com.google.common.base.Joiner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.Constants;
 import java.text.DecimalFormat;
+import java.util.LinkedList;
+import java.util.List;
 
 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;
@@ -31,6 +37,7 @@ import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.SafeParse;
@@ -38,13 +45,13 @@ import info.nightscout.utils.SafeParse;
 public class FillDialog extends DialogFragment implements OnClickListener {
     private static Logger log = LoggerFactory.getLogger(FillDialog.class);
 
-    Button deliverButton;
-
     double amount1 = 0d;
     double amount2 = 0d;
     double amount3 = 0d;
 
     NumberPicker editInsulin;
+    CheckBox pumpSiteChangeCheckbox;
+    CheckBox insulinCartridgeChangeCheckbox;
 
     public FillDialog() {
     }
@@ -54,22 +61,24 @@ public class FillDialog extends DialogFragment implements OnClickListener {
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.actions_fill_dialog, null, false);
 
-        deliverButton = (Button) view.findViewById(R.id.treatments_newtreatment_deliverbutton);
+        view.findViewById(R.id.ok).setOnClickListener(this);
+        view.findViewById(R.id.cancel).setOnClickListener(this);
 
-        deliverButton.setOnClickListener(this);
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
 
+        pumpSiteChangeCheckbox = view.findViewById(R.id.catheter_change);
+        insulinCartridgeChangeCheckbox = view.findViewById(R.id.cartridge_change);
+
         Double maxInsulin = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
         double bolusstep = ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep;
-        editInsulin = (NumberPicker) view.findViewById(R.id.treatments_newtreatment_insulinamount);
+        editInsulin = view.findViewById(R.id.treatments_newtreatment_insulinamount);
-        editInsulin.setParams(0d, 0d, maxInsulin, bolusstep, new DecimalFormat("0.00"), false);
+        editInsulin.setParams(0d, 0d, maxInsulin, bolusstep, DecimalFormatter.pumpSupportedBolusFormat(), false);
 
         //setup preset buttons
         Button button1 = (Button) view.findViewById(R.id.fill_preset_button1);
         Button button2 = (Button) view.findViewById(R.id.fill_preset_button2);
         Button button3 = (Button) view.findViewById(R.id.fill_preset_button3);
-        View divider = view.findViewById(R.id.fill_preset_divider);
 
         amount1 = SP.getDouble("fill_button1", 0.3);
         amount2 = SP.getDouble("fill_button2", 0d);
@@ -77,103 +86,108 @@ public class FillDialog extends DialogFragment implements OnClickListener {
 
         if (amount1 > 0) {
             button1.setVisibility(View.VISIBLE);
-            button1.setText(DecimalFormatter.to2Decimal(amount1) + "U");
+            button1.setText(DecimalFormatter.toPumpSupportedBolus(amount1)); // + "U");
             button1.setOnClickListener(this);
         } else {
             button1.setVisibility(View.GONE);
         }
         if (amount2 > 0) {
             button2.setVisibility(View.VISIBLE);
-            button2.setText(DecimalFormatter.to2Decimal(amount2) + "U");
+            button2.setText(DecimalFormatter.toPumpSupportedBolus(amount2)); // + "U");
             button2.setOnClickListener(this);
         } else {
             button2.setVisibility(View.GONE);
         }
         if (amount3 > 0) {
             button3.setVisibility(View.VISIBLE);
-            button3.setText(DecimalFormatter.to2Decimal(amount3) + "U");
+            button3.setText(DecimalFormatter.toPumpSupportedBolus(amount3)); // + "U");
             button3.setOnClickListener(this);
         } else {
             button3.setVisibility(View.GONE);
         }
 
-        if (button1.getVisibility() == View.GONE && button2.getVisibility() == View.GONE && button3.getVisibility() == View.GONE) {
-            divider.setVisibility(View.GONE);
-        }
-
         setCancelable(true);
         getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getDialog() != null)
-            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-    }
-
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.treatments_newtreatment_deliverbutton:
+            case R.id.ok:
-                Double insulin = SafeParse.stringToDouble(editInsulin.getText().toString());
+                confirmAndDeliver();
-                confirmAndDeliver(insulin);
+                break;
+            case R.id.cancel:
+                dismiss();
                 break;
             case R.id.fill_preset_button1:
-                confirmAndDeliver(amount1);
+                editInsulin.setValue(amount1);
                 break;
             case R.id.fill_preset_button2:
-                confirmAndDeliver(amount2);
+                editInsulin.setValue(amount2);
                 break;
             case R.id.fill_preset_button3:
-                confirmAndDeliver(amount3);
+                editInsulin.setValue(amount3);
                 break;
         }
 
     }
 
-    private void confirmAndDeliver(Double insulin) {
+    private void confirmAndDeliver() {
         try {
+            Double insulin = SafeParse.stringToDouble(editInsulin.getText());
 
-            String confirmMessage = getString(R.string.fillwarning) + "\n";
+            List<String> confirmMessage = new LinkedList<>();
 
             Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(insulin)).value();
-            confirmMessage += getString(R.string.bolus) + ": " + insulinAfterConstraints + "U";
+            if (insulinAfterConstraints > 0) {
-            if (insulinAfterConstraints - insulin != 0)
+                confirmMessage.add(MainApp.gs(R.string.fillwarning));
-                confirmMessage += "\n" + getString(R.string.constraintapllied);
+                confirmMessage.add("");
+                confirmMessage.add(MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.colorCarbsButton) + "'>" + insulinAfterConstraints + "U" + "</font>");
+                if (!insulinAfterConstraints.equals(insulin))
+                    confirmMessage.add("<font color='" + MainApp.sResources.getColor(R.color.low) + "'>" + MainApp.gs(R.string.bolusconstraintapplied) + "</font>");
+            }
+
+            if (pumpSiteChangeCheckbox.isChecked())
+                confirmMessage.add("" + "<font color='" + MainApp.sResources.getColor(R.color.high) + "'>" + getString(R.string.record_pump_site_change) +  "</font>");
+
+            if (insulinCartridgeChangeCheckbox.isChecked())
+                confirmMessage.add("" + "<font color='" + MainApp.sResources.getColor(R.color.high) + "'>" + getString(R.string.record_insulin_cartridge_change) + "</font>");
 
             final Double finalInsulinAfterConstraints = insulinAfterConstraints;
 
             final Context context = getContext();
             AlertDialog.Builder builder = new AlertDialog.Builder(context);
 
-            builder.setTitle(this.getContext().getString(R.string.confirmation));
+            if (confirmMessage.isEmpty())
-            builder.setMessage(confirmMessage);
+                confirmMessage.add(MainApp.gs(R.string.no_action_selected));
-            builder.setPositiveButton(getString(R.string.primefill), new DialogInterface.OnClickListener() {
+
-                public void onClick(DialogInterface dialog, int id) {
+            builder.setTitle(MainApp.gs(R.string.confirmation));
-                    if (finalInsulinAfterConstraints > 0) {
+            builder.setMessage(Html.fromHtml(Joiner.on("<br/>").join(confirmMessage)));
-                        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
+            builder.setPositiveButton(getString(R.string.primefill), (dialog, id) -> {
-                        detailedBolusInfo.insulin = finalInsulinAfterConstraints;
+                if (finalInsulinAfterConstraints > 0) {
-                        detailedBolusInfo.context = context;
+                    DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                        detailedBolusInfo.source = Source.USER;
+                    detailedBolusInfo.insulin = finalInsulinAfterConstraints;
-                        detailedBolusInfo.isValid = false; // do not count it in IOB (for pump history)
+                    detailedBolusInfo.context = context;
-                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                    detailedBolusInfo.source = Source.USER;
-                            @Override
+                    detailedBolusInfo.isValid = false; // do not count it in IOB (for pump history)
-                            public void run() {
+                    ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                                if (!result.success) {
+                        @Override
-                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                        public void run() {
-                                    i.putExtra("soundid", R.raw.boluserror);
+                            if (!result.success) {
-                                    i.putExtra("status", result.comment);
+                                Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                    i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                i.putExtra("soundid", R.raw.boluserror);
-                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                i.putExtra("status", result.comment);
-                                    MainApp.instance().startActivity(i);
+                                i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                }
+                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                MainApp.instance().startActivity(i);
                             }
-                        });
+                        }
-                        FabricPrivacy.getInstance().logCustom(new CustomEvent("Fill"));
+                    });
-                    }
+                    FabricPrivacy.getInstance().logCustom(new CustomEvent("Fill"));
                 }
+                if (pumpSiteChangeCheckbox.isChecked()) NSUpload.uploadEvent(CareportalEvent.SITECHANGE);
+                if (insulinCartridgeChangeCheckbox.isChecked()) NSUpload.uploadEvent(CareportalEvent.INSULINCHANGE);
             });
             builder.setNegativeButton(getString(R.string.cancel), null);
             builder.show();

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java

@@ -98,7 +98,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
         pumpDescription.basalStep = 0.01d;
         pumpDescription.basalMinimumRate = 0.01d;
 
-        pumpDescription.isRefillingCapable = false;
+        pumpDescription.isRefillingCapable = true;
 
         pumpDescription.storesCarbInfo = false;
         pumpDescription.is30minBasalRatesCapable = true;

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

@@ -16,8 +16,10 @@ import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -384,39 +386,32 @@ public class NSUpload {
     }
 
     public static void uploadOpenAPSOffline(double durationInMinutes) {
-        try {
+        Map<String, Object> map = new HashMap<>();
-            Context context = MainApp.instance().getApplicationContext();
+        map.put("duration", durationInMinutes);
-            JSONObject data = new JSONObject();
+        uploadEvent(CareportalEvent.OPENAPSOFFLINE, map);
-            data.put("eventType", "OpenAPS Offline");
-            data.put("duration", durationInMinutes);
-            data.put("created_at", DateUtil.toISOString(new Date()));
-            data.put("enteredBy", "openaps://" + MainApp.instance().getString(R.string.app_name));
-            Bundle bundle = new Bundle();
-            bundle.putString("action", "dbAdd");
-            bundle.putString("collection", "treatments");
-            bundle.putString("data", data.toString());
-            Intent intent = new Intent(Intents.ACTION_DATABASE);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-            DbLogger.dbAdd(intent, data.toString());
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
     }
 
     public static void uploadError(String error) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("notes", error);
+        map.put("isAnnouncement", true);
+        uploadEvent(CareportalEvent.ANNOUNCEMENT, map);
+    }
+
+    public static void uploadEvent(String event) {
+        uploadEvent(event, null);
+    }
+
+    public static void uploadEvent(String event, Map<String, Object> map) {
         Context context = MainApp.instance().getApplicationContext();
         Bundle bundle = new Bundle();
         bundle.putString("action", "dbAdd");
         bundle.putString("collection", "treatments");
-        JSONObject data = new JSONObject();
+        JSONObject data = map != null ? new JSONObject(map) : new JSONObject();
         try {
-            data.put("eventType", "Announcement");
+            data.put("eventType", event);
             data.put("created_at", DateUtil.toISOString(new Date()));
             data.put("enteredBy", SP.getString("careportal_enteredby", MainApp.gs(R.string.app_name)));
-            data.put("notes", error);
-            data.put("isAnnouncement", true);
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
         }

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

@@ -1,110 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
-    android:focusableInTouchMode="true"
+    xmlns:android="http://schemas.android.com/apk/res/android">
-    android:orientation="vertical"
-    android:padding="10dp">
 
-     <LinearLayout
+        <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:orientation="vertical"
-            android:width="120dp"
+            android:focusableInTouchMode="true"
-            android:padding="10dp"
+            android:padding="10dp">
-            android:text="@string/treatments_newtreatment_insulinamount_label"
-            android:textAppearance="@android:style/TextAppearance.Material.Small"
-            android:textStyle="bold" />
 
-        <info.nightscout.utils.NumberPicker
+            <TextView
-            android:id="@+id/treatments_newtreatment_insulinamount"
+                android:layout_width="wrap_content"
-            android:layout_width="130dp"
+                android:layout_height="wrap_content"
-            android:layout_height="40dp" />
+                android:layout_gravity="center_horizontal"
+                android:padding="5dp"
+                android:text="@string/primefill"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textColor="@color/colorInsulinButton" />
 
-        <TextView
+            <ImageView
-            android:layout_width="wrap_content"
+                android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
+                android:layout_marginTop="5dp"
-            android:gravity="left"
+                android:padding="5dp"
-            android:minWidth="45dp"
+                android:layout_gravity="center_horizontal"
-            android:paddingLeft="5dp"
+                android:src="@drawable/icon_cp_pump_canula" />
-            android:text="U"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
 
-    </LinearLayout>
+            <LinearLayout
+                android:id="@+id/careportal_newnstreatment_insulin_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:orientation="vertical">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                <CheckBox
-        android:layout_width="match_parent"
+                    android:id="@+id/catheter_change"
-        android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
-        android:layout_marginLeft="20dp"
+                    android:layout_height="match_parent"
-        android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
-        android:orientation="horizontal"
+                    android:text="Pump site change" />
-        android:padding="10dp">
 
-        <Button
+                <CheckBox
-            android:id="@+id/treatments_newtreatment_deliverbutton"
+                    android:id="@+id/cartridge_change"
-            style="?android:attr/buttonStyle"
+                    android:layout_width="wrap_content"
-            android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
-            android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
-            android:layout_weight="1"
+                    android:text="Insulin cartridge change" />
-            android:padding="10dp"
-            android:text="@string/primefill"
-            android:textSize="20sp" />
 
-    </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/treatments_newtreatment_insulinamount"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="end"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginLeft="30dp"
+                    android:layout_marginRight="30dp"
+                    android:layout_marginTop="10dp" />
 
-    <View
+            </LinearLayout>
-        android:id="@+id/fill_preset_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@android:color/darker_gray"/>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
+                android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-        android:layout_marginLeft="20dp"
+                android:layout_marginTop="5dp">
-        android:layout_marginRight="20dp"
-        android:orientation="horizontal"
-        android:padding="10dp"
-        android:gravity="center_horizontal"
-        android:layout_gravity="center_horizontal">
 
-        <Button
+                <Button
-            android:id="@+id/fill_preset_button1"
+                    android:id="@+id/fill_preset_button1"
-            style="?android:attr/buttonStyle"
+                    android:layout_width="wrap_content"
-            android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
-            android:layout_height="wrap_content"
+                    android:layout_weight="1"
-            android:layout_weight="0.3"
+                    android:text="0.3U" />
-            android:padding="10dp"
+
-            android:text="0.3U"
+                <Button
-            android:textSize="20sp" />
+                    android:id="@+id/fill_preset_button2"
-        <Button
+                    android:layout_width="wrap_content"
-            android:id="@+id/fill_preset_button2"
+                    android:layout_height="match_parent"
-            style="?android:attr/buttonStyle"
+                    android:layout_weight="1"
-            android:layout_width="wrap_content"
+                    android:text="0.7U" />
-            android:layout_height="wrap_content"
+
-            android:layout_weight="0.3"
+                <Button
-            android:padding="10dp"
+                    android:id="@+id/fill_preset_button3"
-            android:text="0.7U"
+                    android:layout_width="wrap_content"
-            android:textSize="20sp" />
+                    android:layout_height="match_parent"
-        <Button
+                    android:layout_weight="1"
-            android:id="@+id/fill_preset_button3"
+                    android:text="1.2U" />
-            style="?android:attr/buttonStyle"
+
-            android:layout_width="wrap_content"
+            </LinearLayout>
-            android:layout_height="wrap_content"
+
-            android:layout_weight="0.3"
+            <include layout="@layout/mdtp_done_button" />
-            android:padding="10dp"
+
-            android:text="1.2U"
+        </LinearLayout>
-            android:textSize="20sp" />
 
 
-    </LinearLayout>
+    </ScrollView>
-
-
-</LinearLayout>

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

@@ -101,7 +101,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_actions_refill"
+                android:drawableTop="@drawable/icon_cp_pump_canula"
                 android:text="@string/primefill" />
 
         </LinearLayout>

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

@@ -989,5 +989,7 @@
     <string name="key_treatmentssafety_maxcarbs">treatmentssafety_maxcarbs</string>
     <string name="unsafeusage">unsafe usage</string>
     <string name="key_openapsama_useautosens" translatable="false">openapsama_useautosens</string>
+    <string name="record_pump_site_change">Record pump site change</string>
+    <string name="record_insulin_cartridge_change">Record insulin cartridge change</string>
 </resources>