From 341b0660a837d81a8ec5880b3c5e582d80d63388 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 27 Jun 2017 15:25:11 +0200
Subject: [PATCH 01/17] calibration dialog cancel button

---
 .../plugins/Overview/Dialogs/CalibrationDialog.java  | 10 ++++++----
 .../main/res/layout/overview_calibration_dialog.xml  | 12 +++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
index aa1d51f4dd..8bba8ceda2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
@@ -32,7 +32,6 @@ import info.nightscout.utils.XdripCalibrations;
 public class CalibrationDialog extends DialogFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(CalibrationDialog.class);
 
-    Button okButton;
     PlusMinusEditText bgText;
     TextView unitsView;
     TextView bgView;
@@ -57,8 +56,8 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
 
-        okButton = (Button) view.findViewById(R.id.overview_calibration_okbutton);
-        okButton.setOnClickListener(this);
+        view.findViewById(R.id.ok).setOnClickListener(this);
+        view.findViewById(R.id.cancel).setOnClickListener(this);
 
         String units = MainApp.getConfigBuilder().getProfileUnits();
         Double bg = Profile.fromMgdlToUnits(GlucoseStatus.getGlucoseStatusData() != null ? GlucoseStatus.getGlucoseStatusData().glucose : 0d, units);
@@ -78,13 +77,16 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.overview_calibration_okbutton:
+            case R.id.ok:
                 final Double bg = SafeParse.stringToDouble(this.bgView.getText().toString());
                 ;
                 XdripCalibrations.confirmAndSendCalibration(bg, context);
                 dismiss();
                 Answers.getInstance().logCustom(new CustomEvent("Calibration"));
                 break;
+            case R.id.cancel:
+                dismiss();
+                break;
         }
     }
 }
diff --git a/app/src/main/res/layout/overview_calibration_dialog.xml b/app/src/main/res/layout/overview_calibration_dialog.xml
index 2118b9b274..8981ac9ff8 100644
--- a/app/src/main/res/layout/overview_calibration_dialog.xml
+++ b/app/src/main/res/layout/overview_calibration_dialog.xml
@@ -40,6 +40,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
+                    android:layout_marginLeft="30dp"
+                    android:layout_marginRight="30dp"
                     android:orientation="horizontal">
 
 
@@ -81,15 +83,7 @@
 
                 </LinearLayout>
 
-                <Button
-                    android:id="@+id/overview_calibration_okbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="10dp"
-                    android:text="OK"
-                    android:textSize="20sp"
-                    android:layout_marginTop="30dp" />
+                <include layout="@layout/mdtp_done_button" />
 
             </LinearLayout>
 

From ef4a1feda2c124a76083b50911dd1cc39b31be5e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 27 Jun 2017 17:06:23 +0200
Subject: [PATCH 02/17] numberpicker in calibration dialog

---
 .../Overview/Dialogs/CalibrationDialog.java   |  16 +-
 .../info/nightscout/utils/NumberPicker.java   | 234 ++++++++++++++++++
 .../res/drawable-hdpi/background_darkgray.xml |   9 +
 .../main/res/drawable-hdpi/border_gray.xml    |  18 ++
 .../main/res/layout/number_picker_layout.xml  |  40 +++
 .../layout/overview_calibration_dialog.xml    |  53 +---
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |   2 +-
 8 files changed, 318 insertions(+), 55 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/utils/NumberPicker.java
 create mode 100644 app/src/main/res/drawable-hdpi/background_darkgray.xml
 create mode 100644 app/src/main/res/drawable-hdpi/border_gray.xml
 create mode 100644 app/src/main/res/layout/number_picker_layout.xml

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
index 8bba8ceda2..83b341b03c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
@@ -9,7 +9,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.crashlytics.android.answers.Answers;
@@ -25,16 +24,15 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.utils.PlusMinusEditText;
+import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.XdripCalibrations;
 
 public class CalibrationDialog extends DialogFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(CalibrationDialog.class);
 
-    PlusMinusEditText bgText;
+    NumberPicker bgNumber;
     TextView unitsView;
-    TextView bgView;
 
     Context context;
 
@@ -62,14 +60,15 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
         String units = MainApp.getConfigBuilder().getProfileUnits();
         Double bg = Profile.fromMgdlToUnits(GlucoseStatus.getGlucoseStatusData() != null ? GlucoseStatus.getGlucoseStatusData().glucose : 0d, units);
 
+        bgNumber = (NumberPicker) view.findViewById(R.id.overview_calibration_bg);
+
          if (units.equals(Constants.MMOL))
-            bgText = new PlusMinusEditText(view, R.id.overview_calibration_bg, R.id.overview_calibration_bg_plus, R.id.overview_calibration_bg_minus, bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false);
+            bgNumber.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false);
         else
-            bgText = new PlusMinusEditText(view, R.id.overview_calibration_bg, R.id.overview_calibration_bg_plus, R.id.overview_calibration_bg_minus, bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
+             bgNumber.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
 
         unitsView = (TextView) view.findViewById(R.id.overview_calibration_units);
         unitsView.setText(units);
-        bgView = (TextView) view.findViewById(R.id.overview_calibration_bg);
 
         return view;
     }
@@ -78,8 +77,7 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.ok:
-                final Double bg = SafeParse.stringToDouble(this.bgView.getText().toString());
-                ;
+                final Double bg = SafeParse.stringToDouble(bgNumber.getText().toString());
                 XdripCalibrations.confirmAndSendCalibration(bg, context);
                 dismiss();
                 Answers.getInstance().logCustom(new CustomEvent("Calibration"));
diff --git a/app/src/main/java/info/nightscout/utils/NumberPicker.java b/app/src/main/java/info/nightscout/utils/NumberPicker.java
new file mode 100644
index 0000000000..fcf44ded71
--- /dev/null
+++ b/app/src/main/java/info/nightscout/utils/NumberPicker.java
@@ -0,0 +1,234 @@
+package info.nightscout.utils;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.NumberFormat;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+
+/**
+ * Created by mike on 28.06.2016.
+ */
+public class NumberPicker extends LinearLayout implements View.OnKeyListener,
+        View.OnTouchListener, View.OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(NumberPicker.class);
+
+    TextView editText;
+    Button minusButton;
+    Button plusButton;
+
+    Double value;
+    Double minValue = 0d;
+    Double maxValue = 1d;
+    Double step = 1d;
+    NumberFormat formater;
+    boolean allowZero = false;
+
+    private Handler mHandler;
+    private ScheduledExecutorService mUpdater;
+
+    private class UpdateCounterTask implements Runnable {
+        private boolean mInc;
+        private int repeated = 0;
+        private int multiplier = 1;
+
+        private final int doubleLimit = 5;
+
+        public UpdateCounterTask(boolean inc) {
+            mInc = inc;
+        }
+
+        public void run() {
+            Message msg = new Message();
+            if (repeated % doubleLimit == 0) multiplier *= 2;
+            repeated++;
+            msg.arg1 = multiplier;
+            msg.arg2 = repeated;
+            if (mInc) {
+                msg.what = MSG_INC;
+            } else {
+                msg.what = MSG_DEC;
+            }
+            mHandler.sendMessage(msg);
+        }
+    }
+
+    private static final int MSG_INC = 0;
+    private static final int MSG_DEC = 1;
+
+    public NumberPicker(Context context) {
+        super(context, null);
+    }
+
+    public NumberPicker(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        this.initialize(context, attrs);
+    }
+
+    public NumberPicker(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    private void initialize(Context context, AttributeSet attrs) {
+        // set layout view
+        LayoutInflater.from(context).inflate(R.layout.number_picker_layout, this, true);
+
+        // init ui components
+        this.minusButton = (Button) findViewById(R.id.decrement);
+        this.plusButton = (Button) findViewById(R.id.increment);
+        this.editText = (EditText) findViewById(R.id.display);
+
+        mHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                switch (msg.what) {
+                    case MSG_INC:
+                        inc(msg.arg1);
+                        return;
+                    case MSG_DEC:
+                        dec(msg.arg1);
+                        return;
+                }
+                super.handleMessage(msg);
+            }
+        };
+
+        minusButton.setOnTouchListener(this);
+        minusButton.setOnKeyListener(this);
+        minusButton.setOnClickListener(this);
+        plusButton.setOnTouchListener(this);
+        plusButton.setOnKeyListener(this);
+        plusButton.setOnClickListener(this);
+    }
+
+    public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero) {
+        this.value = initValue;
+        this.minValue = minValue;
+        this.maxValue = maxValue;
+        this.step = step;
+        this.formater = formater;
+        this.allowZero = allowZero;
+
+        updateEditText();
+    }
+
+    public void setValue(Double value) {
+        this.value = value;
+        updateEditText();
+    }
+
+    public Double getValue() {
+        return value;
+    }
+
+    public String getText() {
+        return editText.getText().toString();
+    }
+
+    public void setStep(Double step) {
+        this.step = step;
+    }
+
+    private void inc(int multiplier) {
+        value += step * multiplier;
+        if (value > maxValue) {
+            value = maxValue;
+            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.youareonallowedlimit));
+            stopUpdating();
+        }
+        updateEditText();
+    }
+
+    private void dec( int multiplier) {
+        value -= step * multiplier;
+        if (value < minValue) {
+            value = minValue;
+            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.youareonallowedlimit));
+            stopUpdating();
+        }
+        updateEditText();
+    }
+
+    private void updateEditText() {
+        if (value == 0d && !allowZero)
+            editText.setText("");
+        else
+            editText.setText(formater.format(value));
+    }
+
+    private void startUpdating(boolean inc) {
+        if (mUpdater != null) {
+            log.debug("Another executor is still active");
+            return;
+        }
+        mUpdater = Executors.newSingleThreadScheduledExecutor();
+        mUpdater.scheduleAtFixedRate(new UpdateCounterTask(inc), 200, 200,
+                TimeUnit.MILLISECONDS);
+    }
+
+    private void stopUpdating() {
+        if (mUpdater != null) {
+            mUpdater.shutdownNow();
+            mUpdater = null;
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (mUpdater == null) {
+            if (v == plusButton) {
+                inc(1);
+            } else {
+                dec(1);
+            }
+        }
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        boolean isKeyOfInterest = keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER;
+        boolean isReleased = event.getAction() == KeyEvent.ACTION_UP;
+        boolean isPressed = event.getAction() == KeyEvent.ACTION_DOWN
+                && event.getAction() != KeyEvent.ACTION_MULTIPLE;
+
+        if (isKeyOfInterest && isReleased) {
+            stopUpdating();
+        } else if (isKeyOfInterest && isPressed) {
+            startUpdating(v == plusButton);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        boolean isReleased = event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL;
+        boolean isPressed = event.getAction() == MotionEvent.ACTION_DOWN;
+
+        if (isReleased) {
+            stopUpdating();
+        } else if (isPressed) {
+            startUpdating(v == plusButton);
+        }
+        return false;
+    }
+
+}
diff --git a/app/src/main/res/drawable-hdpi/background_darkgray.xml b/app/src/main/res/drawable-hdpi/background_darkgray.xml
new file mode 100644
index 0000000000..4d5138556b
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/background_darkgray.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#505050"/>
+    <stroke android:width="1dp" android:color="@color/colorLightGray"/>
+    <corners android:radius="4dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/border_gray.xml b/app/src/main/res/drawable-hdpi/border_gray.xml
new file mode 100644
index 0000000000..c2792233ee
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/border_gray.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape
+            android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item android:bottom="0.5dp">
+        <shape
+            android:shape="rectangle">
+            <stroke android:width="1dp" android:color="@color/colorLightGray" />
+            <solid android:color="@android:color/white" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+</layer-list>
+
diff --git a/app/src/main/res/layout/number_picker_layout.xml b/app/src/main/res/layout/number_picker_layout.xml
new file mode 100644
index 0000000000..6d6e945fce
--- /dev/null
+++ b/app/src/main/res/layout/number_picker_layout.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="130dp"
+    android:layout_height="40dp"
+    android:orientation="horizontal"
+    android:background="@drawable/background_darkgray">
+
+    <Button
+        android:id="@+id/decrement"
+        android:layout_width="30dp"
+        android:layout_height="match_parent"
+        android:padding="0dp"
+        android:textColor="@color/mdtp_white"
+        android:background="@null"
+        android:textStyle="bold"
+        android:text="—"/>
+
+    <EditText
+        android:id="@+id/display"
+        android:layout_width="70dp"
+        android:background="@drawable/border_gray"
+        android:layout_height="match_parent"
+        android:text="1"
+        android:textColor="@android:color/black"
+        android:focusable="false"
+        android:inputType="number"
+        android:gravity="center"
+        android:imeOptions="actionDone"
+        />
+    <Button
+        android:id="@+id/increment"
+        android:layout_width="30dp"
+        android:layout_height="match_parent"
+        android:padding="0dp"
+        android:textSize="25sp"
+        android:textColor="@color/mdtp_white"
+        android:background="@null"
+        android:text="+"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/overview_calibration_dialog.xml b/app/src/main/res/layout/overview_calibration_dialog.xml
index 8981ac9ff8..2a29b06062 100644
--- a/app/src/main/res/layout/overview_calibration_dialog.xml
+++ b/app/src/main/res/layout/overview_calibration_dialog.xml
@@ -29,60 +29,23 @@
                     android:textAppearance="?android:attr/textAppearanceLarge" />
 
                 <TextView
+                    android:id="@+id/overview_calibration_units"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:padding="10dp"
-                    android:id="@+id/overview_calibration_units"
+                    android:layout_marginBottom="10dp"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/overview_calibration_bg"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
                     android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="20dp"
                     android:layout_marginLeft="30dp"
-                    android:layout_marginRight="30dp"
-                    android:orientation="horizontal">
+                    android:layout_marginRight="30dp" />
 
 
-                    <ImageView
-                        android:id="@+id/overview_calibration_bg_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_weight="0.5"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-                    <EditText
-                        android:id="@+id/overview_calibration_bg"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_weight="0.5"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:minWidth="100dp"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/overview_calibration_bg_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_weight="0.5"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-
-                </LinearLayout>
-
                 <include layout="@layout/mdtp_done_button" />
 
             </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ed64cb4d31..e1c2af548d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,6 +16,7 @@
     <color name="tempbasal">#C803A9F4</color>
     <color name="graphgrid">#757575</color>
     <color name="updating">#50ffffff</color>
+    <color name="colorLightGray">#d8d8d8</color>
 
     <color name="defaultbackground">#424242</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e795f03f62..242ca62650 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -483,7 +483,7 @@
     <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="nav_show_logcat">Show log</string>
     <string name="overview_calibration">Calibration</string>
-    <string name="overview_calibration_bg_label">Calibration BG</string>
+    <string name="overview_calibration_bg_label">Calibration</string>
     <string name="send_calibration" formatted="false">Send calibration %.1f to xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ not installed</string>
     <string name="calibrationsent">Calibration sent to xDrip</string>

From 4fc935f0bdba1036c749468dd72da12e3f2edaf5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 27 Jun 2017 19:14:32 +0200
Subject: [PATCH 03/17] bolus dialog numberpickers

---
 .../Overview/Dialogs/CalibrationDialog.java   |   6 +-
 .../Overview/Dialogs/NewTreatmentDialog.java  |  19 +--
 .../layout/overview_newtreatment_dialog.xml   | 158 +++++-------------
 app/src/main/res/values/strings.xml           |   4 +-
 4 files changed, 53 insertions(+), 134 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
index 83b341b03c..96ec8f2ba4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
@@ -62,10 +62,10 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
 
         bgNumber = (NumberPicker) view.findViewById(R.id.overview_calibration_bg);
 
-         if (units.equals(Constants.MMOL))
+        if (units.equals(Constants.MMOL))
             bgNumber.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false);
         else
-             bgNumber.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
+            bgNumber.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
 
         unitsView = (TextView) view.findViewById(R.id.overview_calibration_units);
         unitsView.setText(units);
@@ -77,7 +77,7 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.ok:
-                final Double bg = SafeParse.stringToDouble(bgNumber.getText().toString());
+                final Double bg = SafeParse.stringToDouble(bgNumber.getText());
                 XdripCalibrations.confirmAndSendCalibration(bg, context);
                 dismiss();
                 Answers.getInstance().logCustom(new CustomEvent("Calibration"));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
index e9a63c89db..0eb8d93720 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@@ -29,13 +29,14 @@ import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SafeParse;
 
 public class NewTreatmentDialog extends DialogFragment implements OnClickListener {
 
-    PlusMinusEditText editCarbs;
-    PlusMinusEditText editInsulin;
+    NumberPicker editCarbs;
+    NumberPicker editInsulin;
 
     Handler mHandler;
     public static HandlerThread mHandlerThread;
@@ -60,19 +61,15 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
         Integer maxCarbs = MainApp.getConfigBuilder().applyCarbsConstraints(Constants.carbsOnlyForCheckLimit);
         Double maxInsulin = MainApp.getConfigBuilder().applyBolusConstraints(Constants.bolusOnlyForCheckLimit);
 
-        editCarbs = new PlusMinusEditText(view, R.id.treatments_newtreatment_carbsamount, R.id.treatments_newtreatment_carbsamount_plus, R.id.treatments_newtreatment_carbsamount_minus, 0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false);
-        editInsulin = new PlusMinusEditText(view, R.id.treatments_newtreatment_insulinamount, R.id.treatments_newtreatment_insulinamount_plus, R.id.treatments_newtreatment_insulinamount_minus, 0d, 0d, maxInsulin, MainApp.getConfigBuilder().getPumpDescription().bolusStep, new DecimalFormat("0.00"), false);
+        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);
+        editInsulin.setParams(0d, 0d, maxInsulin, MainApp.getConfigBuilder().getPumpDescription().bolusStep, new DecimalFormat("0.00"), false);
 
         return view;
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getDialog() != null)
-            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-    }
-
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
diff --git a/app/src/main/res/layout/overview_newtreatment_dialog.xml b/app/src/main/res/layout/overview_newtreatment_dialog.xml
index 3ad0b8ebf2..cc7557ab80 100644
--- a/app/src/main/res/layout/overview_newtreatment_dialog.xml
+++ b/app/src/main/res/layout/overview_newtreatment_dialog.xml
@@ -12,135 +12,57 @@
         android:layout_height="match_parent">
 
         <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:focusableInTouchMode="true"
             android:orientation="vertical"
             android:padding="10dp">
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/bolus"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:text="@string/treatments_newtreatment_insulinamount_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
+            <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" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:layout_marginTop="50dp"
-                    android:orientation="horizontal">
+            <info.nightscout.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" />
 
-                    <ImageView
-                        android:id="@+id/treatments_newtreatment_insulinamount_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
+            <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" />
 
-                    <EditText
-                        android:id="@+id/treatments_newtreatment_insulinamount"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:minWidth="100dp"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/treatments_newtreatment_insulinamount_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/treatments_newtreatment_carbsamount_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="30dp"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/treatments_newtreatment_carbsamount_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-                    <EditText
-                        android:id="@+id/treatments_newtreatment_carbsamount"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:minWidth="100dp"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/treatments_newtreatment_carbsamount_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
-
-            </RelativeLayout>
+            <info.nightscout.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/mdtp_done_button" />
 
-
         </LinearLayout>
+
     </ScrollView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 242ca62650..0da74e858f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,8 +39,8 @@
     <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 amount</string>
-    <string name="treatments_newtreatment_carbsamount_label">Carbs amount</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_carbs_label">Carbs</string>
     <string name="treatments_wizard_correction_label">Corr</string>

From c3876c730bd841f830de9516a34e62b492351e03 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 27 Jun 2017 23:16:23 +0200
Subject: [PATCH 04/17] numberpicker in wizard dialog

---
 .../Overview/Dialogs/WizardDialog.java        | 103 ++++----
 .../info/nightscout/utils/NumberPicker.java   |  14 ++
 .../res/layout/overview_wizard_dialog.xml     | 225 ++++--------------
 3 files changed, 99 insertions(+), 243 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index 8ad8d08361..b1edad4de4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -60,6 +60,7 @@ import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui
 import info.nightscout.utils.BolusWizard;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.OKDialog;
 import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SP;
@@ -69,10 +70,7 @@ import info.nightscout.utils.ToastUtils;
 public class WizardDialog extends DialogFragment implements OnClickListener, CompoundButton.OnCheckedChangeListener, Spinner.OnItemSelectedListener {
     private static Logger log = LoggerFactory.getLogger(WizardDialog.class);
 
-    Button wizardDialogDeliverButton;
-    TextView correctionInput;
-    TextView carbsInput;
-    TextView bgInput;
+    Button okButton;
     TextView bg;
     TextView bgInsulin;
     TextView bgUnits;
@@ -85,8 +83,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     CheckBox basalIobCheckbox;
     TextView correctionInsulin;
     TextView total;
-    TextView totalInsulin;
-    EditText carbTimeEdit;
     Spinner profileSpinner;
     CheckBox superbolusCheckbox;
     TextView superbolus;
@@ -99,10 +95,10 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     TextView cob;
     TextView cobInsulin;
 
-    PlusMinusEditText editBg;
-    PlusMinusEditText editCarbs;
-    PlusMinusEditText editCorr;
-    PlusMinusEditText editCarbTime;
+    NumberPicker editBg;
+    NumberPicker editCarbs;
+    NumberPicker editCorr;
+    NumberPicker editCarbTime;
 
     Integer calculatedCarbs = 0;
     Double calculatedTotalInsulin = 0d;
@@ -129,9 +125,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
     @Override
     public void onResume() {
-        super.onResume();
-        if (getDialog() != null)
-            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        super.onPause();
         MainApp.bus().register(this);
     }
 
@@ -195,8 +189,9 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
 
-        wizardDialogDeliverButton = (Button) view.findViewById(R.id.treatments_wizard_deliverButton);
-        wizardDialogDeliverButton.setOnClickListener(this);
+        okButton = (Button) view.findViewById(R.id.ok);
+        okButton.setOnClickListener(this);
+        view.findViewById(R.id.cancel).setOnClickListener(this);
 
         bg = (TextView) view.findViewById(R.id.treatments_wizard_bg);
         bgInsulin = (TextView) view.findViewById(R.id.treatments_wizard_bginsulin);
@@ -207,8 +202,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         basalIobInsulin = (TextView) view.findViewById(R.id.treatments_wizard_basaliobinsulin);
         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);
         superbolus = (TextView) view.findViewById(R.id.treatments_wizard_sb);
         superbolusInsulin = (TextView) view.findViewById(R.id.treatments_wizard_sbinsulin);
 
@@ -236,22 +229,20 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         profileSpinner = (Spinner) view.findViewById(R.id.treatments_wizard_profile);
         profileSpinner.setOnItemSelectedListener(this);
 
-        correctionInput = (TextView) view.findViewById(R.id.treatments_wizard_correctioninput);
-        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);
+        editCarbTime = (NumberPicker) view.findViewById(R.id.treatments_wizard_carbtimeinput);
+        editCorr = (NumberPicker) view.findViewById(R.id.treatments_wizard_correctioninput);
+        editCarbs = (NumberPicker) view.findViewById(R.id.treatments_wizard_carbsinput);
+        editBg = (NumberPicker) view.findViewById(R.id.treatments_wizard_bginput);
 
         superbolusCheckbox.setVisibility(SP.getBoolean(R.string.key_usesuperbolus, false) ? View.VISIBLE : View.GONE);
 
         Integer maxCarbs = MainApp.getConfigBuilder().applyCarbsConstraints(Constants.carbsOnlyForCheckLimit);
         Double maxCorrection = MainApp.getConfigBuilder().applyBolusConstraints(Constants.bolusOnlyForCheckLimit);
 
-        editBg = new PlusMinusEditText(view, R.id.treatments_wizard_bginput, R.id.treatments_wizard_bginput_plus, R.id.treatments_wizard_bginput_minus, 0d, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false);
-        editCarbs = new PlusMinusEditText(view, R.id.treatments_wizard_carbsinput, R.id.treatments_wizard_carbsinput_plus, R.id.treatments_wizard_carbsinput_minus, 0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false);
-        editCorr = new PlusMinusEditText(view, R.id.treatments_wizard_correctioninput, R.id.treatments_wizard_correctioninput_plus, R.id.treatments_wizard_correctioninput_minus, 0d, -maxCorrection, maxCorrection, 0.05d, new DecimalFormat("0.00"), false);
-        editCarbTime = new PlusMinusEditText(view, R.id.treatments_wizard_carbtimeinput, R.id.treatments_wizard_carbtime_plus, R.id.treatments_wizard_carbtime_minus, 0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
+        editBg.setParams(0d, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false, textWatcher);
+        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
+        editCorr.setParams(0d, -maxCorrection, maxCorrection, 0.05d, new DecimalFormat("0.00"), false, textWatcher);
+        editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
         initDialog();
 
         return view;
@@ -265,19 +256,19 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         calculateInsulin();
-        wizardDialogDeliverButton.setVisibility(View.VISIBLE);
+        okButton.setVisibility(View.VISIBLE);
     }
 
     @Override
     public void onNothingSelected(AdapterView<?> parent) {
         ToastUtils.showToastInUiThread(context, MainApp.sResources.getString(R.string.noprofileselected));
-        wizardDialogDeliverButton.setVisibility(View.GONE);
+        okButton.setVisibility(View.GONE);
     }
 
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.treatments_wizard_deliverButton:
+            case R.id.ok:
                 if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
                     DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
                     String confirmMessage = getString(R.string.entertreatmentquestion);
@@ -299,8 +290,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
                     final Double finalInsulinAfterConstraints = insulinAfterConstraints;
                     final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
-                    final Double bg = SafeParse.stringToDouble(bgInput.getText().toString());
-                    final int carbTime = SafeParse.stringToInt(carbTimeEdit.getText().toString());
+                    final Double bg = SafeParse.stringToDouble(editBg.getText());
+                    final int carbTime = SafeParse.stringToInt(editCarbTime.getText());
                     final boolean useSuperBolus = superbolusCheckbox.isChecked();
 
                     AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -350,6 +341,9 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                     dismiss();
                 }
                 break;
+            case R.id.cancel:
+                dismiss();
+                break;
         }
     }
 
@@ -396,17 +390,17 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
             bg.setText(lastBg.valueToUnitsToString(units) + " ISF: " + DecimalFormatter.to1Decimal(sens));
             bgInsulin.setText(DecimalFormatter.to2Decimal(bgDiff / sens) + "U");
-            bgInput.removeTextChangedListener(textWatcher);
+            editBg.removeTextChangedListener(textWatcher);
             //bgInput.setText(lastBg.valueToUnitsToString(units));
             editBg.setValue(lastBg.valueToUnits(units));
-            bgInput.addTextChangedListener(textWatcher);
+            editBg.addTextChangedListener(textWatcher);
         } else {
             bg.setText("");
             bgInsulin.setText("");
-            bgInput.removeTextChangedListener(textWatcher);
+            editBg.removeTextChangedListener(textWatcher);
             //bgInput.setText("");
             editBg.setValue(0d);
-            bgInput.addTextChangedListener(textWatcher);
+            editBg.addTextChangedListener(textWatcher);
         }
 
         // IOB calculation
@@ -418,9 +412,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         bolusIobInsulin.setText(DecimalFormatter.to2Decimal(-bolusIob.iob) + "U");
         basalIobInsulin.setText(DecimalFormatter.to2Decimal(-basalIob.basaliob) + "U");
 
-        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(System.currentTimeMillis() - 11 * 60 * 1000L))) {
             cobLayout.setVisibility(View.VISIBLE);
@@ -429,6 +420,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
             cobLayout.setVisibility(View.GONE);
             cobAvailable = false;
         }
+        calculateInsulin();
     }
 
     private void calculateInsulin() {
@@ -439,23 +431,23 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         Profile specificProfile = profile.getSpecificProfile(selectedAlternativeProfile);
 
         // Entered values
-        Double c_bg = SafeParse.stringToDouble(bgInput.getText().toString());
-        Integer c_carbs = SafeParse.stringToInt(carbsInput.getText().toString());
-        Double c_correction = SafeParse.stringToDouble(correctionInput.getText().toString());
+        Double c_bg = SafeParse.stringToDouble(editBg.getText());
+        Integer c_carbs = SafeParse.stringToInt(editCarbs.getText());
+        Double c_correction = SafeParse.stringToDouble(editCorr.getText());
         Double corrAfterConstraint = MainApp.getConfigBuilder().applyBolusConstraints(c_correction);
         if (c_correction - corrAfterConstraint != 0) { // c_correction != corrAfterConstraint doesn't work
-            correctionInput.removeTextChangedListener(textWatcher);
-            correctionInput.setText("");
-            correctionInput.addTextChangedListener(textWatcher);
+            editCorr.removeTextChangedListener(textWatcher);
+            editCorr.setValue(0d);
+            editCorr.addTextChangedListener(textWatcher);
             //wizardDialogDeliverButton.setVisibility(Button.GONE);
             ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), getString(R.string.bolusconstraintapplied));
             return;
         }
         Integer carbsAfterConstraint = MainApp.getConfigBuilder().applyCarbsConstraints(c_carbs);
         if (c_carbs - carbsAfterConstraint != 0) {
-            carbsInput.removeTextChangedListener(textWatcher);
-            carbsInput.setText("");
-            carbsInput.addTextChangedListener(textWatcher);
+            editCarbs.removeTextChangedListener(textWatcher);
+            editCarbs.setValue(0d);
+            editCarbs.addTextChangedListener(textWatcher);
             //wizardDialogDeliverButton.setVisibility(Button.GONE);
             ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), getString(R.string.carbsconstraintapplied));
             return;
@@ -489,14 +481,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         correctionInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCorrection) + "U");
         calculatedTotalInsulin = wizard.calculatedTotalInsulin;
 
-        if (calculatedTotalInsulin <= 0) {
-            total.setText(getString(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
-            totalInsulin.setText("");
-        } else {
-            total.setText("");
-            totalInsulin.setText(DecimalFormatter.to2Decimal(calculatedTotalInsulin) + "U");
-        }
-
         calculatedCarbs = carbsAfterConstraint;
 
         // Superbolus
@@ -531,10 +515,11 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
             String insulinText = calculatedTotalInsulin > 0d ? (DecimalFormatter.to2Decimal(calculatedTotalInsulin) + "U") : "";
             String carbsText = calculatedCarbs > 0d ? (DecimalFormatter.to0Decimal(calculatedCarbs) + "g") : "";
-            wizardDialogDeliverButton.setText(getString(R.string.send) + " " + insulinText + " " + carbsText);
-            wizardDialogDeliverButton.setVisibility(Button.VISIBLE);
+            total.setText(getString(R.string.send) + " " + insulinText + " " + carbsText);
+            okButton.setVisibility(View.VISIBLE);
         } else {
-            wizardDialogDeliverButton.setVisibility(Button.INVISIBLE);
+            total.setText(getString(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
+            okButton.setVisibility(View.INVISIBLE);
         }
 
         boluscalcJSON = new JSONObject();
diff --git a/app/src/main/java/info/nightscout/utils/NumberPicker.java b/app/src/main/java/info/nightscout/utils/NumberPicker.java
index fcf44ded71..ce960cbe7a 100644
--- a/app/src/main/java/info/nightscout/utils/NumberPicker.java
+++ b/app/src/main/java/info/nightscout/utils/NumberPicker.java
@@ -3,6 +3,7 @@ package info.nightscout.utils;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -120,6 +121,19 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         plusButton.setOnClickListener(this);
     }
 
+    public void removeTextChangedListener(TextWatcher textWatcher) {
+        editText.removeTextChangedListener(textWatcher);
+    }
+
+    public void addTextChangedListener(TextWatcher textWatcher) {
+        editText.addTextChangedListener(textWatcher);
+    }
+
+    public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero, TextWatcher textWatcher) {
+        setParams(initValue, minValue, maxValue, step, formater, allowZero);
+        editText.addTextChangedListener(textWatcher);
+    }
+
     public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero) {
         this.value = initValue;
         this.minValue = minValue;
diff --git a/app/src/main/res/layout/overview_wizard_dialog.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
index 7fa5d4ef3d..f8534b2506 100644
--- a/app/src/main/res/layout/overview_wizard_dialog.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -26,38 +26,13 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/treatments_wizard_bg_label"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
 
-            <ImageView
-                android:id="@+id/treatments_wizard_bginput_minus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
-                android:tint="#ffffff" />
-
-            <EditText
+            <info.nightscout.utils.NumberPicker
                 android:id="@+id/treatments_wizard_bginput"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="0.5"
-                android:gravity="center_horizontal"
-                android:inputType="numberDecimal"
-                android:padding="10dp"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <ImageView
-                android:id="@+id/treatments_wizard_bginput_plus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_add"
-                android:tint="#ffffff" />
+                android:layout_width="130dp"
+                android:layout_height="40dp" />
 
             <TextView
                 android:id="@+id/treatments_wizard_bgunits"
@@ -84,40 +59,15 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/treatments_wizard_carbs_label"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
 
-            <ImageView
-                android:id="@+id/treatments_wizard_carbsinput_minus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
-                android:tint="#ffffff" />
-
-            <EditText
+            <info.nightscout.utils.NumberPicker
                 android:id="@+id/treatments_wizard_carbsinput"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="0.5"
-                android:gravity="center_horizontal"
-                android:inputType="numberDecimal"
-                android:minWidth="200dp"
-                android:padding="10dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:layout_width="130dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal" />
 
-            <ImageView
-                android:id="@+id/treatments_wizard_carbsinput_plus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_add"
-                android:tint="#ffffff" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -143,42 +93,16 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/treatments_wizard_correction_label"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
 
-            <ImageView
-                android:id="@+id/treatments_wizard_correctioninput_minus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
-                android:tint="#ffffff" />
-
-            <EditText
+            <info.nightscout.utils.NumberPicker
                 android:id="@+id/treatments_wizard_correctioninput"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="0.5"
-                android:gravity="center_horizontal"
-                android:inputType="numberSigned|numberDecimal"
-                android:minWidth="200dp"
-                android:padding="10dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:layout_width="130dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal" />
 
-            <ImageView
-                android:id="@+id/treatments_wizard_correctioninput_plus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_add"
-                android:tint="#ffffff" />
-
-            <TextView
+             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -194,50 +118,23 @@
             android:id="@+id/treatments_wizard_carbtime_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
             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_carbtime_label"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
 
-            <ImageView
-                android:id="@+id/treatments_wizard_carbtime_minus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
-                android:tint="#ffffff" />
-
-
-            <EditText
+            <info.nightscout.utils.NumberPicker
                 android:id="@+id/treatments_wizard_carbtimeinput"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="0.5"
-                android:gravity="center_horizontal"
-                android:inputType="numberDecimal"
-                android:minWidth="200dp"
-                android:padding="10dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <ImageView
-                android:id="@+id/treatments_wizard_carbtime_plus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_add"
-                android:tint="#ffffff" />
+                android:layout_width="130dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -263,7 +160,8 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_profile_label"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
 
             <Spinner
                 android:id="@+id/treatments_wizard_profile"
@@ -284,32 +182,31 @@
 
         </LinearLayout>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:orientation="horizontal"
-            android:padding="10dp">
+            android:layout_gravity="center"
+            android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/treatments_wizard_deliverButton"
-                style="?android:attr/buttonStyle"
+            <TextView
+                android:id="@+id/treatments_wizard_total"
                 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" />
+                android:background="@drawable/background_darkgray"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="2.35U 28g"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
         </LinearLayout>
 
+        <include layout="@layout/mdtp_done_button" />
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_marginTop="-20dp"
             android:orientation="horizontal">
 
             <CheckBox
@@ -589,45 +486,5 @@
                 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:height="30dp"
-                android:gravity="center_vertical"
-                android:text="@string/treatments_wizard_total_label"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/accent_material_light"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/treatments_wizard_total"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:width="100dp"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <TextView
-                android:id="@+id/treatments_wizard_totalinsulin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:width="50dp"
-                android:gravity="center_vertical|end"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/accent_material_light"
-                android:textStyle="bold" />
-        </LinearLayout>
-
     </LinearLayout>
 </ScrollView>
\ No newline at end of file

From 491f0837c8c26524ea647b0c786c94bc3e94ee3a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 27 Jun 2017 23:23:44 +0200
Subject: [PATCH 05/17] allow manual input in NumberPicker

---
 app/src/main/res/layout/number_picker_layout.xml   | 1 -
 app/src/main/res/layout/overview_wizard_dialog.xml | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/number_picker_layout.xml b/app/src/main/res/layout/number_picker_layout.xml
index 6d6e945fce..2b143162a1 100644
--- a/app/src/main/res/layout/number_picker_layout.xml
+++ b/app/src/main/res/layout/number_picker_layout.xml
@@ -23,7 +23,6 @@
         android:layout_height="match_parent"
         android:text="1"
         android:textColor="@android:color/black"
-        android:focusable="false"
         android:inputType="number"
         android:gravity="center"
         android:imeOptions="actionDone"
diff --git a/app/src/main/res/layout/overview_wizard_dialog.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
index f8534b2506..fdf1e4dac0 100644
--- a/app/src/main/res/layout/overview_wizard_dialog.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:gravity="left"
-                android:minWidth="40dp"
+                android:minWidth="45dp"
                 android:paddingLeft="5dp"
                 android:text="mg/dl"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -107,7 +107,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:gravity="left"
-                android:minWidth="40dp"
+                android:minWidth="45dp"
                 android:paddingLeft="5dp"
                 android:text="@string/treatments_wizard_unit_label"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -141,7 +141,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:gravity="left"
-                android:minWidth="40dp"
+                android:minWidth="45dp"
                 android:paddingLeft="5dp"
                 android:text="min"
                 android:textAppearance="?android:attr/textAppearanceSmall" />

From ea06a90453479072fb1fd42c0fd330876658bdbb Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 27 Jun 2017 23:24:30 +0200
Subject: [PATCH 06/17] 1.5a

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d656fa97d9..928720ee95 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 23
         versionCode 1500
-        version "1.5"
+        version "1.5a"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
     }

From 5c5c4243bc37451a7b7a14d59ca2b6e960b09f76 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 28 Jun 2017 09:09:19 +0200
Subject: [PATCH 07/17] check for missing bg direction

---
 .../main/java/info/nightscout/androidaps/db/BgReading.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
index da129b41cc..cbe1850958 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
@@ -69,7 +69,9 @@ public class BgReading implements DataPointWithLabelInterface {
 
     public String directionToSymbol() {
         String symbol = "";
-        if (direction.compareTo("DoubleDown") == 0) {
+        if (direction == null) {
+            symbol = "??";
+        } else if (direction.compareTo("DoubleDown") == 0) {
             symbol = "\u21ca";
         } else if (direction.compareTo("SingleDown") == 0) {
             symbol = "\u2193";

From 39e83f0cfeaed2e7cf32c029722122c4815a017b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 28 Jun 2017 10:24:42 +0200
Subject: [PATCH 08/17] clean context after fragment is destroyed

---
 .../plugins/Careportal/Dialogs/NewNSTreatmentDialog.java    | 6 ++++++
 .../plugins/Overview/Dialogs/CalibrationDialog.java         | 6 ++++++
 .../androidaps/plugins/Overview/Dialogs/WizardDialog.java   | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
index 8158111cf6..f440311d18 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
@@ -141,6 +141,12 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         super.onAttach(activity);
     }
 
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        this.context = null;
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
index 96ec8f2ba4..fdc58e92f4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
@@ -46,6 +46,12 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
         this.context = context;
     }
 
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        this.context = null;
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index b1edad4de4..b50ea56d89 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -123,6 +123,12 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         this.context = context;
     }
 
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        this.context = null;
+    }
+
     @Override
     public void onResume() {
         super.onPause();

From f58f70bdca2e389467a7abaae87fd20fde939b96 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 28 Jun 2017 23:11:17 +0200
Subject: [PATCH 09/17] wizard tweaking

---
 .../plugins/Overview/Dialogs/WizardDialog.java           | 4 +---
 app/src/main/res/layout/openapsama_fragment.xml          | 4 ++--
 app/src/main/res/layout/openapsma_fragment.xml           | 4 ++--
 app/src/main/res/layout/overview_wizard_dialog.xml       | 9 ++++++++-
 app/src/main/res/values-bg/strings.xml                   | 2 +-
 app/src/main/res/values-cs/strings.xml                   | 2 +-
 app/src/main/res/values-de/strings.xml                   | 2 +-
 app/src/main/res/values-es/strings.xml                   | 2 +-
 app/src/main/res/values-it/strings.xml                   | 2 +-
 app/src/main/res/values-ko/strings.xml                   | 2 +-
 app/src/main/res/values-ru/strings.xml                   | 2 +-
 app/src/main/res/values/strings.xml                      | 2 +-
 12 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index b50ea56d89..0a1b5417a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -21,7 +21,6 @@ import android.widget.ArrayAdapter;
 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;
@@ -62,7 +61,6 @@ import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.OKDialog;
-import info.nightscout.utils.PlusMinusEditText;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
@@ -521,7 +519,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
             String insulinText = calculatedTotalInsulin > 0d ? (DecimalFormatter.to2Decimal(calculatedTotalInsulin) + "U") : "";
             String carbsText = calculatedCarbs > 0d ? (DecimalFormatter.to0Decimal(calculatedCarbs) + "g") : "";
-            total.setText(getString(R.string.send) + " " + insulinText + " " + carbsText);
+            total.setText(getString(R.string.result) + ": " + insulinText + " " + carbsText);
             okButton.setVisibility(View.VISIBLE);
         } else {
             total.setText(getString(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
diff --git a/app/src/main/res/layout/openapsama_fragment.xml b/app/src/main/res/layout/openapsama_fragment.xml
index 83c9012022..f1f4f364ec 100644
--- a/app/src/main/res/layout/openapsama_fragment.xml
+++ b/app/src/main/res/layout/openapsama_fragment.xml
@@ -380,7 +380,7 @@
                     android:layout_weight="2"
                     android:gravity="center_horizontal"
                     android:paddingRight="5dp"
-                    android:text="@string/openapsma_result_label"
+                    android:text="@string/result"
                     android:textColor="@android:color/white"
                     android:textSize="14sp" />
 
@@ -451,7 +451,7 @@
                     android:layout_weight="2"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/openapsma_result_label"
+                    android:text="@string/result"
                     android:textSize="14sp" />
 
                 <TextView
diff --git a/app/src/main/res/layout/openapsma_fragment.xml b/app/src/main/res/layout/openapsma_fragment.xml
index 10705c1841..2068bc3338 100644
--- a/app/src/main/res/layout/openapsma_fragment.xml
+++ b/app/src/main/res/layout/openapsma_fragment.xml
@@ -335,7 +335,7 @@
                     android:layout_weight="2"
                     android:gravity="center_horizontal"
                     android:paddingRight="5dp"
-                    android:text="@string/openapsma_result_label"
+                    android:text="@string/result"
                     android:textColor="@android:color/white"
                     android:textSize="14sp" />
 
@@ -361,7 +361,7 @@
                     android:layout_weight="2"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/openapsma_result_label"
+                    android:text="@string/result"
                     android:textSize="14sp" />
 
                 <TextView
diff --git a/app/src/main/res/layout/overview_wizard_dialog.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
index fdf1e4dac0..c57dd26fe9 100644
--- a/app/src/main/res/layout/overview_wizard_dialog.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -202,11 +202,18 @@
 
         <include layout="@layout/mdtp_done_button" />
 
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="-15dp"
+            android:background="@color/listdelimiter" />
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="-20dp"
             android:orientation="horizontal">
 
             <CheckBox
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 98da61a559..cc3ff2d8c9 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -111,7 +111,7 @@
     <string name="openapsma_nopump">Няма данни за помпа</string>
     <string name="openapsma_profile_label">Профил</string>
     <string name="openapsma_request_label">Искане</string>
-    <string name="openapsma_result_label">Резултат</string>
+    <string name="result">Резултат</string>
     <string name="openapsma_run">Старт сега</string>
     <string name="openloop_newsuggestion">Достъпно е ново предложение</string>
     <string name="overview">Преглед</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2d50065133..ca4ead6453 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -111,7 +111,7 @@
     <string name="openapsma_nopump">Žádná pumpa</string>
     <string name="openapsma_profile_label">Profil</string>
     <string name="openapsma_request_label">Požadavek</string>
-    <string name="openapsma_result_label">Výsledek</string>
+    <string name="result">Výsledek</string>
     <string name="openapsma_run">Sputit teď</string>
     <string name="openloop_newsuggestion">Dostupné nové doporučení</string>
     <string name="overview">Přehled</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c9e986b3e1..cba1fcd6a1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -124,7 +124,7 @@
     <string name="overview_extendedbolus_button">Extended Bolus</string>
     <string name="overview">Übersicht</string>
     <string name="openloop_newsuggestion">Neue Empfehlung verfügbar</string>
-    <string name="openapsma_result_label">Ergebnis</string>
+    <string name="result">Ergebnis</string>
     <string name="openapsma_request_label">Anfrage</string>
     <string name="openapsma_run">Run now</string>
     <string name="openapsma_nopump">Keine Pumpe verfügbar</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0e38aff05e..a85131b68b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -60,7 +60,7 @@
     <string name="openapsma_iobdata_label">IOB datos</string>
     <string name="openapsma_profile_label">Perfil</string>
     <string name="openapsma_mealdata_label">Datos de comidas</string>
-    <string name="openapsma_result_label">Resultado</string>
+    <string name="result">Resultado</string>
     <string name="openapsma_noglucosedata">No hay disponibles datos de glucosa</string>
     <string name="openapsma_noprofile">Sin perfil disponible</string>
     <string name="openapsma_nopump">No se dispone de bomba</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 767d9435ca..0ddc48199d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -299,7 +299,7 @@
     <string name="dont_show_again">Non mostrarlo più</string>
     <string name="enablesuperbolus_summary">Abilita funzionalità superbolus nella procedura guidata. Non abilitare fino a quando non impari quello che realmente fa. PUÒ CAUSARE L\'INVERTIMENTO INSULINO SE USATO BLINDLY!</string>
     <string name="openapsma_request_label">Richiesta</string>
-    <string name="openapsma_result_label">Esito</string>
+    <string name="result">Esito</string>
     <string name="openapsma_run">Avvia ora</string>
     <string name="openloop">Apertura Loop</string>
     <string name="othersettings_title">Altro</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 874507c316..f2ecad0bbd 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -62,7 +62,7 @@
     <string name="openapsma_iobdata_label">IOB 데이터</string>
     <string name="openapsma_profile_label">프로파일</string>
     <string name="openapsma_mealdata_label">식사 데이터</string>
-    <string name="openapsma_result_label">결과</string>
+    <string name="result">결과</string>
     <string name="openapsma_noglucosedata">혈당 데이터 없음</string>
     <string name="openapsma_noprofile">프로파일 없음</string>
     <string name="openapsma_nopump">No pump available</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8099777ba4..3cb46ac4ea 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -366,7 +366,7 @@
     <string name="openapsma_nopump">помпа недоступна</string>
     <string name="openapsma_profile_label">профиль</string>
     <string name="openapsma_request_label">запрос</string>
-    <string name="openapsma_result_label">результат</string>
+    <string name="result">результат</string>
     <string name="openapsma_run">выполнить сейчас</string>
     <string name="openapsma_scriptdebugdata_label">отладка скрипта</string>
     <string name="openapsma_target_bg">целевое значение для расчетов</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0da74e858f..80f77c562c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@
     <string name="openapsma_iobdata_label">IOB data</string>
     <string name="openapsma_profile_label">Profile</string>
     <string name="openapsma_mealdata_label">Meal data</string>
-    <string name="openapsma_result_label">Result</string>
+    <string name="result">Result</string>
     <string name="openapsma_noglucosedata">No glucose data available</string>
     <string name="openapsma_noprofile">No profile available</string>
     <string name="openapsma_nopump">No pump available</string>

From a8338b2dd1b91c620d95aea9dd0ff4842a035fda Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 29 Jun 2017 01:37:58 +0200
Subject: [PATCH 10/17] careportal dialog number picker

---
 .../plugins/Actions/ActionsFragment.java      |   4 +-
 .../Careportal/CareportalFragment.java        |  40 +-
 .../Dialogs/NewNSTreatmentDialog.java         | 278 +++----
 .../plugins/Overview/OverviewFragment.java    |   4 +-
 .../CircadianPercentageProfileFragment.java   |   2 +-
 .../ProfileLocal/LocalProfileFragment.java    |   2 +-
 .../ProfileSimple/SimpleProfileFragment.java  |   2 +-
 .../careportal_newnstreatment_dialog.xml      | 769 ++++--------------
 .../layout/overview_calibration_dialog.xml    |  54 +-
 .../res/layout/overview_wizard_dialog.xml     |   1 -
 10 files changed, 357 insertions(+), 799 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
index 6e0bf61add..bc2c0adb86 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
@@ -169,14 +169,14 @@ public class ActionsFragment extends Fragment implements View.OnClickListener {
                 NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
                 final OptionsToShow profileswitch = CareportalFragment.profileswitch;
                 profileswitch.executeProfileSwitch = true;
-                newDialog.setOptions(profileswitch);
+                newDialog.setOptions(profileswitch, R.string.careportal_profileswitch);
                 newDialog.show(manager, "NewNSTreatmentDialog");
                 break;
             case R.id.actions_temptarget:
                 NewNSTreatmentDialog newTTDialog = new NewNSTreatmentDialog();
                 final OptionsToShow temptarget = CareportalFragment.temptarget;
                 temptarget.executeTempTarget = true;
-                newTTDialog.setOptions(temptarget);
+                newTTDialog.setOptions(temptarget, R.string.careportal_temporarytarget);
                 newTTDialog.show(manager, "NewNSTreatmentDialog");
                 break;
             case R.id.actions_extendedbolus:
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
index d9a7621a56..309ccecb6e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
@@ -100,66 +100,66 @@ public class CareportalFragment extends Fragment implements View.OnClickListener
         NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
         switch (id) {
             case R.id.careportal_bgcheck:
-                newDialog.setOptions(bgcheck);
+                newDialog.setOptions(bgcheck, R.string.careportal_bgcheck);
                 break;
             case R.id.careportal_announcement:
-                newDialog.setOptions(announcement);
+                newDialog.setOptions(announcement, R.string.careportal_announcement);
                 break;
             case R.id.careportal_cgmsensorinsert:
-                newDialog.setOptions(sensorchange);
+                newDialog.setOptions(sensorchange, R.string.careportal_cgmsensorinsert);
                 break;
             case R.id.careportal_cgmsensorstart:
-                newDialog.setOptions(sensorstart);
+                newDialog.setOptions(sensorstart, R.string.careportal_cgmsensorstart);
                 break;
             case R.id.careportal_combobolus:
-                newDialog.setOptions(combobolus);
+                newDialog.setOptions(combobolus, R.string.careportal_combobolus);
                 break;
             case R.id.careportal_correctionbolus:
-                newDialog.setOptions(correctionbolus);
+                newDialog.setOptions(correctionbolus, R.string.careportal_correctionbolus);
                 break;
             case R.id.careportal_carbscorrection:
-                newDialog.setOptions(carbcorrection);
+                newDialog.setOptions(carbcorrection, R.string.careportal_carbscorrection);
                 break;
             case R.id.careportal_exercise:
-                newDialog.setOptions(exercise);
+                newDialog.setOptions(exercise, R.string.careportal_exercise);
                 break;
             case R.id.careportal_insulincartridgechange:
-                newDialog.setOptions(insulinchange);
+                newDialog.setOptions(insulinchange, R.string.careportal_insulincartridgechange);
                 break;
             case R.id.careportal_pumpbatterychange:
-                newDialog.setOptions(pumpbatterychange);
+                newDialog.setOptions(pumpbatterychange, R.string.careportal_pumpbatterychange);
                 break;
             case R.id.careportal_mealbolus:
-                newDialog.setOptions(mealbolus);
+                newDialog.setOptions(mealbolus, R.string.careportal_mealbolus);
                 break;
             case R.id.careportal_note:
-                newDialog.setOptions(note);
+                newDialog.setOptions(note, R.string.careportal_note);
                 break;
             case R.id.careportal_profileswitch:
                 profileswitch.executeProfileSwitch = false;
-                newDialog.setOptions(profileswitch);
+                newDialog.setOptions(profileswitch, R.string.careportal_profileswitch);
                 break;
             case R.id.careportal_pumpsitechange:
-                newDialog.setOptions(sitechange);
+                newDialog.setOptions(sitechange, R.string.careportal_pumpsitechange);
                 break;
             case R.id.careportal_question:
-                newDialog.setOptions(question);
+                newDialog.setOptions(question, R.string.careportal_question);
                 break;
             case R.id.careportal_snackbolus:
-                newDialog.setOptions(snackbolus);
+                newDialog.setOptions(snackbolus, R.string.careportal_snackbolus);
                 break;
             case R.id.careportal_tempbasalstart:
-                newDialog.setOptions(tempbasalstart);
+                newDialog.setOptions(tempbasalstart, R.string.careportal_tempbasalstart);
                 break;
             case R.id.careportal_tempbasalend:
-                newDialog.setOptions(tempbasalend);
+                newDialog.setOptions(tempbasalend, R.string.careportal_tempbasalend);
                 break;
             case R.id.careportal_openapsoffline:
-                newDialog.setOptions(openapsoffline);
+                newDialog.setOptions(openapsoffline, R.string.careportal_openapsoffline);
                 break;
             case R.id.careportal_temporarytarget:
                 temptarget.executeTempTarget = false;
-                newDialog.setOptions(temptarget);
+                newDialog.setOptions(temptarget, R.string.careportal_temporarytarget);
                 break;
             default:
                 newDialog = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
index f440311d18..ff1811b3ed 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
@@ -15,12 +15,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
-import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -44,6 +42,8 @@ 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.Profile;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.Source;
@@ -52,12 +52,10 @@ import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.plugins.ProfileCircadianPercentage.CircadianPercentageProfilePlugin;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.NSUpload;
-import info.nightscout.utils.PlusMinusEditText;
+import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.Translator;
@@ -68,53 +66,44 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
     private Activity context;
 
     private static OptionsToShow options;
+    private static String event;
 
     Profile profile;
     ProfileStore profileStore;
     String units;
 
-    RelativeLayout layoutBg;
+    TextView eventTypeText;
+    LinearLayout layoutBg;
     LinearLayout layoutBgSource;
-    RelativeLayout layoutInsulin;
-    RelativeLayout layoutCarbs;
-    RelativeLayout layoutSplit;
-    RelativeLayout layoutDuration;
-    RelativeLayout layoutPercent;
-    RelativeLayout layoutAbsolute;
-    RelativeLayout layoutCarbTime;
-    RelativeLayout layoutProfile;
+    LinearLayout layoutInsulin;
+    LinearLayout layoutCarbs;
+    LinearLayout layoutSplit;
+    LinearLayout layoutDuration;
+    LinearLayout layoutPercent;
+    LinearLayout layoutAbsolute;
+    LinearLayout layoutCarbTime;
+    LinearLayout layoutProfile;
     LinearLayout layoutTempTarget;
-    Button dateButton;
-    Button timeButton;
-    Button okButton;
-    Button cancelButton;
+    TextView dateButton;
+    TextView timeButton;
 
     TextView bgUnitsView;
     RadioButton meterRadioButton;
     RadioButton sensorRadioButton;
     RadioButton otherRadioButton;
     EditText notesEdit;
-    EditText bgInputEdit;
-    EditText insulinEdit;
-    EditText carbsEdit;
-    EditText percentEdit;
-    EditText absoluteEdit;
-    EditText durationeEdit;
-    EditText carbTimeEdit;
-    EditText splitEdit;
     Spinner profileSpinner;
-    EditText low;
-    EditText high;
     Spinner reasonSpinner;
 
-    PlusMinusEditText editBg;
-    PlusMinusEditText editCarbs;
-    PlusMinusEditText editInsulin;
-    PlusMinusEditText editSplit;
-    PlusMinusEditText editDuration;
-    PlusMinusEditText editPercent;
-    PlusMinusEditText editAbsolute;
-    PlusMinusEditText editCarbTime;
+    NumberPicker editBg;
+    NumberPicker editCarbs;
+    NumberPicker editInsulin;
+    NumberPicker editSplit;
+    NumberPicker editDuration;
+    NumberPicker editPercent;
+    NumberPicker editAbsolute;
+    NumberPicker editCarbTime;
+    NumberPicker editTemptarget;
 
     Date eventTime;
 
@@ -122,8 +111,9 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
     private static HandlerThread sHandlerThread;
 
 
-    public void setOptions(OptionsToShow options) {
+    public void setOptions(OptionsToShow options, int event) {
         this.options = options;
+        this.event = MainApp.sResources.getString(event);
     }
 
     public NewNSTreatmentDialog() {
@@ -154,88 +144,44 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         setStyle(DialogFragment.STYLE_NORMAL, getTheme());
         View view = inflater.inflate(R.layout.careportal_newnstreatment_dialog, container, false);
 
-        layoutBg = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_bg_layout);
+        layoutBg = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_bg_layout);
         layoutBgSource = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_bgsource_layout);
-        layoutInsulin = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_insulin_layout);
-        layoutCarbs = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_carbs_layout);
-        layoutSplit = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_split_layout);
-        layoutDuration = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_duration_layout);
-        layoutPercent = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_percent_layout);
-        layoutAbsolute = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
-        layoutCarbTime = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_carbtime_layout);
-        layoutProfile = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_profile_layout);
+        layoutInsulin = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_insulin_layout);
+        layoutCarbs = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_carbs_layout);
+        layoutSplit = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_split_layout);
+        layoutDuration = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_duration_layout);
+        layoutPercent = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_percent_layout);
+        layoutAbsolute = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
+        layoutCarbTime = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_carbtime_layout);
+        layoutProfile = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_profile_layout);
         layoutTempTarget = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_temptarget_layout);
 
+        eventTypeText = (TextView) view.findViewById(R.id.careportal_newnstreatment_eventtype);
+        eventTypeText.setText(event);
         bgUnitsView = (TextView) view.findViewById(R.id.careportal_newnstreatment_bgunits);
         meterRadioButton = (RadioButton) view.findViewById(R.id.careportal_newnstreatment_meter);
         sensorRadioButton = (RadioButton) view.findViewById(R.id.careportal_newnstreatment_sensor);
         otherRadioButton = (RadioButton) view.findViewById(R.id.careportal_newnstreatment_other);
         profileSpinner = (Spinner) view.findViewById(R.id.careportal_newnstreatment_profile);
 
-        bgInputEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_bginput);
-        insulinEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_insulininput);
-        carbsEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_carbsinput);
-        percentEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_percentinput);
-        percentEdit.addTextChangedListener(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) {
-                layoutPercent.setVisibility(View.VISIBLE);
-                layoutAbsolute.setVisibility(View.GONE);
-            }
-        });
-        absoluteEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_absoluteinput);
-        absoluteEdit.addTextChangedListener(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) {
-                layoutPercent.setVisibility(View.GONE);
-                layoutAbsolute.setVisibility(View.VISIBLE);
-            }
-        });
-        durationeEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_durationinput);
-        carbTimeEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_carbtimeinput);
         notesEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_notes);
-        splitEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_splitinput);
 
         reasonSpinner = (Spinner) view.findViewById(R.id.careportal_newnstreatment_temptarget_reason);
-        low = (EditText) view.findViewById(R.id.careportal_temptarget_low);
-        high = (EditText) view.findViewById(R.id.careportal_temptarget_high);
 
         eventTime = new Date();
-        dateButton = (Button) view.findViewById(R.id.careportal_newnstreatment_eventdate);
-        timeButton = (Button) view.findViewById(R.id.careportal_newnstreatment_eventtime);
+        dateButton = (TextView) view.findViewById(R.id.careportal_newnstreatment_eventdate);
+        timeButton = (TextView) view.findViewById(R.id.careportal_newnstreatment_eventtime);
         dateButton.setText(DateUtil.dateString(eventTime));
         timeButton.setText(DateUtil.timeString(eventTime));
         dateButton.setOnClickListener(this);
         timeButton.setOnClickListener(this);
 
-        okButton = (Button) view.findViewById(R.id.ok);
-        okButton.setOnClickListener(this);
-        cancelButton = (Button) view.findViewById(R.id.cancel);
-        cancelButton.setOnClickListener(this);
+        view.findViewById(R.id.ok).setOnClickListener(this);
+        view.findViewById(R.id.cancel).setOnClickListener(this);
 
         // profile
         profile = MainApp.getConfigBuilder().getProfile();
-        profileStore = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile();
+        profileStore = ConfigBuilderPlugin.getActiveProfileInterface().getProfile();
         ArrayList<CharSequence> profileList;
         units = profile.getUnits();
         profileList = profileStore.getProfileList();
@@ -260,25 +206,20 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         // bg
         bgUnitsView.setText(units);
 
-        // Set BG if not old
-//        BgReading lastBg = MainApp.getDbHelper().lastBg();
-//        Double lastBgValue = 0d;
-//        if (lastBg != null) {
-//            lastBgValue = lastBg.valueToUnits(units);
-//            sensorRadioButton.setChecked(true);
-//        } else {
-//            meterRadioButton.setChecked(true);
-//        }
-
         Double bg = Profile.fromMgdlToUnits(GlucoseStatus.getGlucoseStatusData() != null ? GlucoseStatus.getGlucoseStatusData().glucose : 0d, profile != null ? profile.getUnits() : Constants.MGDL);
-        if (profile == null)
-            editBg = new PlusMinusEditText(view, R.id.careportal_newnstreatment_bginput, R.id.careportal_newnstreatment_bg_plus, R.id.careportal_newnstreatment_bg_minus, bg, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false);
-        else if (profile.getUnits().equals(Constants.MMOL))
-            editBg = new PlusMinusEditText(view, R.id.careportal_newnstreatment_bginput, R.id.careportal_newnstreatment_bg_plus, R.id.careportal_newnstreatment_bg_minus, bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false);
-        else
-            editBg = new PlusMinusEditText(view, R.id.careportal_newnstreatment_bginput, R.id.careportal_newnstreatment_bg_plus, R.id.careportal_newnstreatment_bg_minus, bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
-        bgInputEdit.addTextChangedListener(new TextWatcher() {
-
+        editBg = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_bginput);
+        editTemptarget = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_temptarget);
+        if (profile == null) {
+            editBg.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false);
+            editTemptarget.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false);
+        } else if (profile.getUnits().equals(Constants.MMOL)) {
+            editBg.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false);
+            editTemptarget.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false);
+        } else {
+            editBg.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
+            editTemptarget.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
+        }
+        editBg.addTextChangedListener(new TextWatcher() {
             public void afterTextChanged(Editable s) {
             }
 
@@ -289,6 +230,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                 if (sensorRadioButton.isChecked()) meterRadioButton.setChecked(true);
             }
         });
+
         sensorRadioButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -298,21 +240,63 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         });
 
         Integer maxCarbs = MainApp.getConfigBuilder().applyCarbsConstraints(Constants.carbsOnlyForCheckLimit);
-        editCarbs = new PlusMinusEditText(view, R.id.careportal_newnstreatment_carbsinput, R.id.careportal_newnstreatment_carbs_plus, R.id.careportal_newnstreatment_carbs_minus, 0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false);
+        editCarbs = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_carbsinput);
+        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false);
 
         Double maxInsulin = MainApp.getConfigBuilder().applyBolusConstraints(Constants.bolusOnlyForCheckLimit);
-        editInsulin = new PlusMinusEditText(view, R.id.careportal_newnstreatment_insulininput, R.id.careportal_newnstreatment_insulin_plus, R.id.careportal_newnstreatment_insulin_minus, 0d, 0d, maxInsulin, 0.05d, new DecimalFormat("0.00"), false);
+        editInsulin = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_insulininput);
+        editInsulin.setParams(0d, 0d, maxInsulin, 0.05d, new DecimalFormat("0.00"), false);
 
-        editSplit = new PlusMinusEditText(view, R.id.careportal_newnstreatment_splitinput, R.id.careportal_newnstreatment_split_plus, R.id.careportal_newnstreatment_split_minus, 100d, 0d, 100d, 5d, new DecimalFormat("0"), true);
-        editDuration = new PlusMinusEditText(view, R.id.careportal_newnstreatment_durationinput, R.id.careportal_newnstreatment_duration_plus, R.id.careportal_newnstreatment_duration_minus, 0d, 0d, 24 * 60d, 10d, new DecimalFormat("0"), false);
+        editSplit = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_splitinput);
+        editSplit.setParams(100d, 0d, 100d, 5d, new DecimalFormat("0"), true);
+        editDuration = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_durationinput);
+        editDuration.setParams(0d, 0d, 24 * 60d, 10d, new DecimalFormat("0"), false);
 
         Integer maxPercent = MainApp.getConfigBuilder().applyBasalConstraints(Constants.basalPercentOnlyForCheckLimit);
-        editPercent = new PlusMinusEditText(view, R.id.careportal_newnstreatment_percentinput, R.id.careportal_newnstreatment_percent_plus, R.id.careportal_newnstreatment_percent_minus, 0d, 0d, (double) maxPercent, 5d, new DecimalFormat("0"), true);
+        editPercent = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_percentinput);
+        editPercent.setParams(0d, 0d, (double) maxPercent, 5d, new DecimalFormat("0"), true);
+        editPercent.addTextChangedListener(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) {
+                layoutPercent.setVisibility(View.VISIBLE);
+                layoutAbsolute.setVisibility(View.GONE);
+            }
+        });
 
         Double maxAbsolute = MainApp.getConfigBuilder().applyBasalConstraints(Constants.basalAbsoluteOnlyForCheckLimit);
-        editAbsolute = new PlusMinusEditText(view, R.id.careportal_newnstreatment_absoluteinput, R.id.careportal_newnstreatment_absolute_plus, R.id.careportal_newnstreatment_absolute_minus, 0d, 0d, maxAbsolute, 0.05d, new DecimalFormat("0.00"), true);
+        editAbsolute = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_absoluteinput);
+        editAbsolute.setParams(0d, 0d, maxAbsolute, 0.05d, new DecimalFormat("0.00"), true);
+        editAbsolute.addTextChangedListener(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) {
+                layoutPercent.setVisibility(View.GONE);
+                layoutAbsolute.setVisibility(View.VISIBLE);
+            }
+        });
+
+        editCarbTime = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_carbtimeinput);
+        editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
 
-        editCarbTime = new PlusMinusEditText(view, R.id.careportal_newnstreatment_carbtimeinput, R.id.careportal_newnstreatment_carbtime_plus, R.id.careportal_newnstreatment_carbtime_minus, 0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
 
         showOrHide(layoutBg, options.bg);
         showOrHide(layoutBgSource, options.bg);
@@ -329,13 +313,6 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         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) {
         Calendar calendar = Calendar.getInstance();
@@ -353,7 +330,6 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                 dpd.show(context.getFragmentManager(), "Datepickerdialog");
                 break;
             case R.id.careportal_newnstreatment_eventtime:
-                android.text.format.DateFormat df = new android.text.format.DateFormat();
                 TimePickerDialog tpd = TimePickerDialog.newInstance(
                         this,
                         calendar.get(Calendar.HOUR_OF_DAY),
@@ -417,8 +393,8 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                     data.put("eventType", "Sensor Start");
                     break;
                 case R.id.careportal_combobolus:
-                    data.put("splitNow", SafeParse.stringToDouble(splitEdit.getText().toString()));
-                    data.put("splitExt", 100 - SafeParse.stringToDouble(splitEdit.getText().toString()));
+                    data.put("splitNow", SafeParse.stringToDouble(editSplit.getText()));
+                    data.put("splitExt", 100 - SafeParse.stringToDouble(editSplit.getText()));
                     data.put("eventType", CareportalEvent.COMBOBOLUS);
                     break;
                 case R.id.careportal_correctionbolus:
@@ -468,42 +444,42 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                     data.put("eventType", CareportalEvent.TEMPORARYTARGET);
                     if (!reasonSpinner.getSelectedItem().toString().equals(""))
                         data.put("reason", reasonSpinner.getSelectedItem().toString());
-                    if (SafeParse.stringToDouble(low.getText().toString()) != 0d)
-                        data.put("targetBottom", SafeParse.stringToDouble(low.getText().toString()));
-                    if (SafeParse.stringToDouble(high.getText().toString()) != 0d)
-                        data.put("targetTop", SafeParse.stringToDouble(high.getText().toString()));
+                    if (SafeParse.stringToDouble(editTemptarget.getText()) != 0d) {
+                        data.put("targetBottom", SafeParse.stringToDouble(editTemptarget.getText()));
+                        data.put("targetTop", SafeParse.stringToDouble(editTemptarget.getText()));
+                    }
                     allowZeroDuration = true;
                     break;
             }
-            if (SafeParse.stringToDouble(bgInputEdit.getText().toString()) != 0d) {
-                data.put("glucose", SafeParse.stringToDouble(bgInputEdit.getText().toString()));
+            if (SafeParse.stringToDouble(editBg.getText()) != 0d) {
+                data.put("glucose", SafeParse.stringToDouble(editBg.getText()));
                 if (meterRadioButton.isChecked()) data.put("glucoseType", "Finger");
                 if (sensorRadioButton.isChecked()) data.put("glucoseType", "Sensor");
                 if (otherRadioButton.isChecked()) data.put("glucoseType", "Manual");
             }
-            if (SafeParse.stringToDouble(carbsEdit.getText().toString()) != 0d)
-                data.put("carbs", SafeParse.stringToDouble(carbsEdit.getText().toString()));
-            if (SafeParse.stringToDouble(insulinEdit.getText().toString()) != 0d)
-                data.put("insulin", SafeParse.stringToDouble(insulinEdit.getText().toString()));
-            if (allowZeroDuration || SafeParse.stringToDouble(durationeEdit.getText().toString()) != 0d)
-                data.put("duration", SafeParse.stringToDouble(durationeEdit.getText().toString()));
+            if (SafeParse.stringToDouble(editCarbs.getText()) != 0d)
+                data.put("carbs", SafeParse.stringToDouble(editCarbs.getText()));
+            if (SafeParse.stringToDouble(editInsulin.getText()) != 0d)
+                data.put("insulin", SafeParse.stringToDouble(editInsulin.getText()));
+            if (allowZeroDuration || SafeParse.stringToDouble(editDuration.getText()) != 0d)
+                data.put("duration", SafeParse.stringToDouble(editDuration.getText()));
             if (layoutPercent.getVisibility() != View.GONE)
-                data.put("percent", SafeParse.stringToDouble(percentEdit.getText().toString()));
+                data.put("percent", SafeParse.stringToDouble(editPercent.getText()));
             if (layoutAbsolute.getVisibility() != View.GONE)
-                data.put("absolute", SafeParse.stringToDouble(absoluteEdit.getText().toString()));
+                data.put("absolute", SafeParse.stringToDouble(editAbsolute.getText()));
             if (options.profile && profileSpinner.getSelectedItem() != null)
                 data.put("profile", profileSpinner.getSelectedItem().toString());
-            if (SafeParse.stringToDouble(carbTimeEdit.getText().toString()) != 0d)
-                data.put("preBolus", SafeParse.stringToDouble(carbTimeEdit.getText().toString()));
+            if (SafeParse.stringToDouble(editCarbTime.getText()) != 0d)
+                data.put("preBolus", SafeParse.stringToDouble(editCarbTime.getText()));
             if (!notesEdit.getText().toString().equals(""))
                 data.put("notes", notesEdit.getText().toString());
             data.put("units", units);
             if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
             if (options.eventType == R.id.careportal_combobolus) {
-                Double enteredInsulin = SafeParse.stringToDouble(insulinEdit.getText().toString());
+                Double enteredInsulin = SafeParse.stringToDouble(editInsulin.getText());
                 data.put("enteredinsulin", enteredInsulin);
-                data.put("insulin", enteredInsulin * SafeParse.stringToDouble(splitEdit.getText().toString()) / 100);
-                data.put("relative", enteredInsulin * (100 - SafeParse.stringToDouble(splitEdit.getText().toString())) / 100 / SafeParse.stringToDouble(durationeEdit.getText().toString()) * 60);
+                data.put("insulin", enteredInsulin * SafeParse.stringToDouble(editInsulin.getText()) / 100);
+                data.put("relative", enteredInsulin * (100 - SafeParse.stringToDouble(editSplit.getText())) / 100 / SafeParse.stringToDouble(editDuration.getText()) * 60);
             }
         } catch (JSONException e) {
             e.printStackTrace();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index 04ce6f535a..5c7c0afe11 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -1038,7 +1038,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
                 final OptionsToShow profileswitch = CareportalFragment.profileswitch;
                 profileswitch.executeProfileSwitch = true;
-                newDialog.setOptions(profileswitch);
+                newDialog.setOptions(profileswitch, R.string.careportal_profileswitch);
                 newDialog.show(getFragmentManager(), "NewNSTreatmentDialog");
                 return true;
             }
@@ -1053,7 +1053,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 NewNSTreatmentDialog newTTDialog = new NewNSTreatmentDialog();
                 final OptionsToShow temptarget = CareportalFragment.temptarget;
                 temptarget.executeTempTarget = true;
-                newTTDialog.setOptions(temptarget);
+                newTTDialog.setOptions(temptarget, R.string.careportal_temporarytarget);
                 newTTDialog.show(getFragmentManager(), "NewNSTreatmentDialog");
                 return true;
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java
index 05cb4b5a40..112ead21fa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java
@@ -143,7 +143,7 @@ public class CircadianPercentageProfileFragment extends Fragment {
                 NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
                 final OptionsToShow profileswitch = CareportalFragment.profileswitch;
                 profileswitch.executeProfileSwitch = true;
-                newDialog.setOptions(profileswitch);
+                newDialog.setOptions(profileswitch, R.string.careportal_profileswitch);
                 newDialog.show(getFragmentManager(), "NewNSTreatmentDialog");
             }
         });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java
index 4080d67ba8..97f32e232a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java
@@ -104,7 +104,7 @@ public class LocalProfileFragment extends Fragment {
                 NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
                 final OptionsToShow profileswitch = CareportalFragment.profileswitch;
                 profileswitch.executeProfileSwitch = true;
-                newDialog.setOptions(profileswitch);
+                newDialog.setOptions(profileswitch, R.string.careportal_profileswitch);
                 newDialog.show(getFragmentManager(), "NewNSTreatmentDialog");
             }
         });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java
index 3490e15873..7d1f829849 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java
@@ -102,7 +102,7 @@ public class SimpleProfileFragment extends Fragment {
                 NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
                 final OptionsToShow profileswitch = CareportalFragment.profileswitch;
                 profileswitch.executeProfileSwitch = true;
-                newDialog.setOptions(profileswitch);
+                newDialog.setOptions(profileswitch, R.string.careportal_profileswitch);
                 newDialog.show(getFragmentManager(), "NewNSTreatmentDialog");
             }
         });
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index 59c43c3cad..5128262950 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -17,72 +17,49 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <RelativeLayout
+            <TextView
+                android:id="@+id/careportal_newnstreatment_eventtype"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:paddingBottom="10dp"
+                android:text="Temp target"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_bg_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/treatments_wizard_bg_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_bg_data_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_bg_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-                    <EditText
-                        android:id="@+id/careportal_newnstreatment_bginput"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:width="80dp"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:padding="10dp"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_bg_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/careportal_newnstreatment_bginput"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
 
                 <TextView
                     android:id="@+id/careportal_newnstreatment_bgunits"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@+id/careportal_newnstreatment_bg_data_layout"
+                    android:layout_gravity="center_vertical"
                     android:gravity="left"
-                    android:paddingLeft="20dp"
+                    android:minWidth="45dp"
+                    android:paddingLeft="5dp"
                     android:text="mg/dl"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-            </RelativeLayout>
+
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/careportal_newnstreatment_bgsource_layout"
@@ -94,7 +71,8 @@
                 <RadioGroup
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="end"
+                    android:layout_marginRight="20dp"
                     android:orientation="horizontal">
 
                     <RadioButton
@@ -118,606 +96,263 @@
                         android:text="@string/careportal_newnstreatment_other" />
                 </RadioGroup>
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
-
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_carbs_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/treatments_wizard_carbs_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_carbs_data_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="center_horizontal"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_carbs_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-
-                    <EditText
-                        android:id="@+id/careportal_newnstreatment_carbsinput"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:width="80dp"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:padding="10dp"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_carbs_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/careportal_newnstreatment_carbsinput"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
                     android:layout_gravity="center_vertical"
-                    android:layout_toRightOf="@+id/careportal_newnstreatment_carbs_data_layout"
                     android:gravity="left"
-                    android:paddingLeft="20dp"
+                    android:minWidth="45dp"
+                    android:paddingLeft="5dp"
                     android:text="g"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+            </LinearLayout>
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_insulin_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_insulin_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_insulin_data_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_insulin_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-
-                    <EditText
-                        android:id="@+id/careportal_newnstreatment_insulininput"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:width="80dp"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_insulin_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/careportal_newnstreatment_insulininput"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
                     android:layout_gravity="center_vertical"
-                    android:layout_toEndOf="@+id/careportal_newnstreatment_insulin_data_layout"
                     android:gravity="left"
-                    android:paddingLeft="20dp"
+                    android:minWidth="45dp"
+                    android:paddingLeft="5dp"
                     android:text="U"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+            </LinearLayout>
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_split_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_split_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_split_data_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_split_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-
-                    <EditText
-                        android:id="@+id/careportal_newnstreatment_splitinput"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:width="80dp"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_split_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/careportal_newnstreatment_splitinput"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@+id/careportal_newnstreatment_split_data_layout"
+                    android:layout_gravity="center_vertical"
                     android:gravity="left"
-                    android:paddingLeft="20dp"
+                    android:minWidth="45dp"
+                    android:paddingLeft="5dp"
                     android:text="%"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+            </LinearLayout>
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_duration_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    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" />
 
-
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_duration_data_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_duration_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-
-                    <EditText
-                        android:id="@+id/careportal_newnstreatment_durationinput"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:width="80dp"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_duration_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/careportal_newnstreatment_durationinput"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
 
                 <TextView
-                    android:id="@+id/careportal_newnstreatment_duration_min"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
                     android:layout_gravity="center_vertical"
-                    android:layout_toEndOf="@+id/careportal_newnstreatment_duration_data_layout"
                     android:gravity="left"
-                    android:paddingLeft="20dp"
-                    android:text="@string/careportal_newnstreatment_minutes"
+                    android:minWidth="45dp"
+                    android:paddingLeft="5dp"
+                    android:text="min"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+            </LinearLayout>
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_percent_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_percent_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_percent_data_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_percent_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-
-                    <EditText
-                        android:id="@+id/careportal_newnstreatment_percentinput"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:width="80dp"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_percent_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/careportal_newnstreatment_percentinput"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@+id/careportal_newnstreatment_percent_data_layout"
+                    android:layout_gravity="center_vertical"
                     android:gravity="left"
-                    android:paddingLeft="20dp"
+                    android:minWidth="45dp"
+                    android:paddingLeft="5dp"
                     android:text="%"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+            </LinearLayout>
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_absolute_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_absolute_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_absolute_data_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_absolute_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-
-                    <EditText
-                        android:id="@+id/careportal_newnstreatment_absoluteinput"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:width="80dp"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_absolute_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/careportal_newnstreatment_absoluteinput"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@+id/careportal_newnstreatment_absolute_data_layout"
+                    android:layout_gravity="center_vertical"
                     android:gravity="left"
-                    android:paddingLeft="20dp"
+                    android:minWidth="45dp"
+                    android:paddingLeft="5dp"
                     android:text="U/h"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+            </LinearLayout>
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_carbtime_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_carbtime_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_carbtime_data_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_carbtime_minus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_minus"
-                        android:tint="#ffffff" />
-
-
-                    <EditText
-                        android:id="@+id/careportal_newnstreatment_carbtimeinput"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:width="80dp"
-                        android:gravity="center_horizontal"
-                        android:inputType="numberDecimal"
-                        android:padding="10dp"
-                        android:text=""
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <ImageView
-                        android:id="@+id/careportal_newnstreatment_carbtime_plus"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle"
-                        android:backgroundTint="#ffffff"
-                        android:src="@drawable/ic_action_add"
-                        android:tint="#ffffff" />
-
-                </LinearLayout>
+                <info.nightscout.utils.NumberPicker
+                    android:id="@+id/careportal_newnstreatment_carbtimeinput"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
                     android:layout_gravity="center_vertical"
-                    android:layout_toEndOf="@+id/careportal_newnstreatment_carbtime_data_layout"
                     android:gravity="left"
-                    android:paddingLeft="20dp"
-                    android:text="@string/careportal_newnstreatment_minutes"
+                    android:minWidth="45dp"
+                    android:paddingLeft="5dp"
+                    android:text="min"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+            </LinearLayout>
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_profile_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_profile_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-
                 <Spinner
                     android:id="@+id/careportal_newnstreatment_profile"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true" />
+                    android:layout_centerInParent="true"
+                    android:layout_gravity="center_vertical" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
-
-            </RelativeLayout>
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/careportal_newnstreatment_temptarget_layout"
@@ -725,86 +360,55 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <RelativeLayout
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:layout_marginRight="10dp"
-                        android:text="@string/reason"
-                        android:textAppearance="@android:style/TextAppearance.Material.Small"
-                        android:textStyle="bold" />
-
-                    <Spinner
-                        android:id="@+id/careportal_newnstreatment_temptarget_reason"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:text="@string/target_range"
-                        android:textAppearance="@android:style/TextAppearance.Material.Small"
-                        android:textStyle="bold" />
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:orientation="horizontal">
+                        android:minWidth="120dp"
+                        android:orientation="vertical"
+                        android:padding="10dp">
 
-                        <EditText
-                            android:id="@+id/careportal_temptarget_low"
+                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:width="70dp"
-                            android:ems="10"
-                            android:inputType="numberDecimal" />
+                            android:text="@string/target_range"
+                            android:textAppearance="@android:style/TextAppearance.Material.Small"
+                            android:textStyle="bold" />
 
-                        <EditText
-                            android:id="@+id/careportal_temptarget_high"
+                        <Spinner
+                            android:id="@+id/careportal_newnstreatment_temptarget_reason"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:width="70dp"
-                            android:ems="10"
-                            android:inputType="numberDecimal" />
+                            android:layout_centerHorizontal="true" />
 
                     </LinearLayout>
 
-                </RelativeLayout>
+                    <info.nightscout.utils.NumberPicker
+                        android:id="@+id/careportal_newnstreatment_temptarget"
+                        android:layout_width="130dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center_vertical" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+                </LinearLayout>
 
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_notes_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_notes_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
@@ -813,61 +417,44 @@
                     android:id="@+id/careportal_newnstreatment_notes"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:width="200dp" />
+                    android:width="180dp" />
 
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/listdelimiter" />
+            </LinearLayout>
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/careportal_newnstreatment_eventtime_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentStart="true"
-                    android:paddingBottom="5dp"
+                    android:layout_gravity="center_horizontal"
+                    android:width="120dp"
+                    android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_eventtime_label"
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <LinearLayout
+
+                <TextView
+                    android:id="@+id/careportal_newnstreatment_eventdate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:orientation="horizontal">
+                    android:layout_gravity="center_horizontal"
+                    android:padding="10dp"
+                    android:text="2017/05/05" />
 
-                    <Button
-                        android:id="@+id/careportal_newnstreatment_eventdate"
-                        android:layout_width="106dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:width="120dp"
-                        android:text="" />
+                <TextView
+                    android:id="@+id/careportal_newnstreatment_eventtime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:padding="10dp"
+                    android:text="08:20pm" />
 
-                    <Button
-                        android:id="@+id/careportal_newnstreatment_eventtime"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:width="50dp"
-                        android:text="" />
-
-                </LinearLayout>
-
-            </RelativeLayout>
+            </LinearLayout>
 
             <include layout="@layout/mdtp_done_button" />
 
diff --git a/app/src/main/res/layout/overview_calibration_dialog.xml b/app/src/main/res/layout/overview_calibration_dialog.xml
index 2a29b06062..54e3b1d198 100644
--- a/app/src/main/res/layout/overview_calibration_dialog.xml
+++ b/app/src/main/res/layout/overview_calibration_dialog.xml
@@ -9,47 +9,43 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:padding="10dp">
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_gravity="center_horizontal"
+                android:padding="10dp"
+                android:text="@string/overview_calibration_bg_label"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:padding="10dp"
-                    android:text="@string/overview_calibration_bg_label"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+            <TextView
+                android:id="@+id/overview_calibration_units"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="10dp"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <TextView
-                    android:id="@+id/overview_calibration_units"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="10dp"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <info.nightscout.utils.NumberPicker
-                    android:id="@+id/overview_calibration_bg"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="20dp"
-                    android:layout_marginLeft="30dp"
-                    android:layout_marginRight="30dp" />
+            <info.nightscout.utils.NumberPicker
+                android:id="@+id/overview_calibration_bg"
+                android:layout_width="130dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="20dp"
+                android:layout_marginLeft="30dp"
+                android:layout_marginRight="30dp" />
 
 
-                <include layout="@layout/mdtp_done_button" />
-
-            </LinearLayout>
+            <include layout="@layout/mdtp_done_button" />
 
         </LinearLayout>
+
     </ScrollView>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/overview_wizard_dialog.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
index c57dd26fe9..c7b764faba 100644
--- a/app/src/main/res/layout/overview_wizard_dialog.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -11,7 +11,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
         android:orientation="vertical">
 
         <LinearLayout

From 16e360f2009f39953698cb8879fc8c4c6615a3a4 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Thu, 29 Jun 2017 14:13:22 +0200
Subject: [PATCH 11/17] visualize absolute rate emulation as percentage

---
 .../info/nightscout/androidaps/db/TemporaryBasal.java | 11 +++++++++++
 app/src/main/res/values/strings.xml                   |  2 ++
 app/src/main/res/xml/pref_danar.xml                   |  5 +++++
 3 files changed, 18 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index 85ab07edaf..0f441f5deb 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -10,6 +10,7 @@ import java.util.Date;
 import java.util.Objects;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
@@ -18,6 +19,7 @@ import info.nightscout.androidaps.interfaces.Interval;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.utils.SP;
 
 /**
  * Created by mike on 21.05.2017.
@@ -271,6 +273,15 @@ public class TemporaryBasal implements Interval {
 
     public String toStringShort() {
         if (isAbsolute) {
+            if(SP.getBoolean(R.string.key_danar_visualizeextendedaspercentage, false)){
+                Profile profile = MainApp.getConfigBuilder().getProfile();
+                if(profile != null) {
+                    double basal = profile.getBasal(System.currentTimeMillis());
+                    if(basal != 0){
+                        return Math.round(absoluteRate*100d/basal) + "% ";
+                    }
+                }
+            }
             return DecimalFormatter.to2Decimal(absoluteRate) + "U/h ";
         } else { // percent
             return percentRate + "% ";
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 80f77c562c..e93552be01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -532,6 +532,7 @@
     <string name="key_danar_bt_name" translatable="false">danar_bt_name</string>
     <string name="key_danar_password" translatable="false">danar_password</string>
     <string name="key_danar_useextended" translatable="false">danar_useextended</string>
+    <string name="key_danar_visualizeextendedaspercentage" translatable="false">danar_visualizeextendedaspercentage"</string>
     <string name="key_danarprofile_dia" translatable="false">danarprofile_dia</string>
     <string name="clearlog">Clear log</string>
     <string name="key_nsclientinternal_autoscroll" translatable="false">nsclientinternal_autoscroll</string>
@@ -650,4 +651,5 @@
     <string name="openaps">OpenAPS</string>
     <string name="device">Device</string>
     <string name="uploader">Uploader</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualize extended bolus as %</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_danar.xml b/app/src/main/res/xml/pref_danar.xml
index b430e2915d..e57a211a16 100644
--- a/app/src/main/res/xml/pref_danar.xml
+++ b/app/src/main/res/xml/pref_danar.xml
@@ -17,6 +17,11 @@
             android:defaultValue="false"
             android:key="@string/key_danar_useextended"
             android:title="@string/danar_useextended_title" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:dependency="@string/key_danar_useextended"
+            android:key="@string/key_danar_visualizeextendedaspercentage"
+            android:title="@string/danar_visualizeextendedaspercentage_title" />
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file

From 1f9ed574b7b0d4813064dd011e027305f4878481 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Thu, 29 Jun 2017 16:23:21 +0200
Subject: [PATCH 12/17] DanaRStats adapt to history and work around gaps

---
 .../activities/DanaRStatsActivity.java        | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRStatsActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRStatsActivity.java
index 808c827ccd..fbe828a25f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRStatsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRStatsActivity.java
@@ -35,7 +35,9 @@ import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
@@ -73,6 +75,7 @@ public class DanaRStatsActivity extends Activity {
     DecimalFormat decimalFormat;
 
     List<DanaRHistoryRecord> historyList = new ArrayList<>();
+    List<DanaRHistoryRecord> dummies;
 
     public DanaRStatsActivity() {
         super();
@@ -302,6 +305,34 @@ public class DanaRStatsActivity extends Activity {
     private void loadDataFromDB(byte type) {
         historyList = MainApp.getDbHelper().getDanaRHistoryRecordsByType(type);
 
+        //only use newest 10
+        historyList = historyList.subList(0, Math.min(10, historyList.size()));
+
+        //fill single gaps
+        dummies = new LinkedList();
+        DateFormat df = new SimpleDateFormat("dd.MM.");
+        for(int i = 0; i < historyList.size()-1; i++){
+            DanaRHistoryRecord elem1 = historyList.get(i);
+            DanaRHistoryRecord elem2 = historyList.get(i+1);
+
+            if (!df.format(new Date(elem1.recordDate)).equals(df.format(new Date(elem2.recordDate + 25*60*60*1000)))){
+                DanaRHistoryRecord dummy = new DanaRHistoryRecord();
+                dummy.recordDate = elem1.recordDate - 24*60*60*1000;
+                dummy.recordDailyBasal = elem1.recordDailyBasal/2;
+                dummy.recordDailyBolus = elem1.recordDailyBolus/2;
+                dummies.add(dummy);
+                elem1.recordDailyBasal /= 2;
+                elem1.recordDailyBolus /= 2;
+            }
+        }
+        historyList.addAll(dummies);
+        Collections.sort(historyList, new Comparator<DanaRHistoryRecord>() {
+            @Override
+            public int compare(DanaRHistoryRecord lhs, DanaRHistoryRecord rhs) {
+                return (int) (rhs.recordDate-lhs.recordDate);
+            }
+        });
+
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -332,6 +363,9 @@ public class DanaRStatsActivity extends Activity {
                     // Create the table row
                     TableRow tr = new TableRow(DanaRStatsActivity.this);
                     if (i % 2 != 0) tr.setBackgroundColor(Color.DKGRAY);
+                    if(dummies.contains(record)){
+                        tr.setBackgroundColor(Color.argb(125, 255, 0, 0));
+                    }
                     tr.setId(100 + i);
                     tr.setLayoutParams(new TableLayout.LayoutParams(
                             TableLayout.LayoutParams.MATCH_PARENT,

From d81bb9bf23c398d3831e66aae4b9f4c94cfcbd73 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 29 Jun 2017 19:21:34 +0200
Subject: [PATCH 13/17] fix bolusprogress dialog size

---
 .../plugins/Overview/Dialogs/BolusProgressDialog.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
index c58e462c2a..f536af5860 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
@@ -71,7 +71,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     public void onResume() {
         super.onResume();
         if (getDialog() != null)
-            getDialog().getWindow().setLayout(1000, ViewGroup.LayoutParams.WRAP_CONTENT);
+            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         MainApp.bus().register(this);
         running = true;
         if (bolusEnded) dismiss();

From fcab1a267bbf420662a67155943e8fbbf284d631 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Thu, 29 Jun 2017 19:38:38 +0200
Subject: [PATCH 14/17] adapt diadivisor

---
 .../androidaps/plugins/Treatments/TreatmentsPlugin.java     | 2 +-
 app/src/main/res/xml/pref_advanced.xml                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
index 97fe9070dd..a40eb749b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
@@ -182,7 +182,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
             Iob tIOB = t.iobCalc(time, dia);
             total.iob += tIOB.iobContrib;
             total.activity += tIOB.activityContrib;
-            Iob bIOB = t.iobCalc(time, dia / SP.getInt("openapsama_bolussnooze_dia_divisor", 2));
+            Iob bIOB = t.iobCalc(time, dia / SP.getDouble("openapsama_bolussnooze_dia_divisor", 2.0));
             total.bolussnooze += bIOB.iobContrib;
         }
 
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 05898654fe..168f260841 100644
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -103,14 +103,14 @@
                     android:title="@string/openapsama_autosens_adjusttargets"
                     android:summary="@string/openapsama_autosens_adjusttargets_summary"/>
                 <com.andreabaccega.widget.ValidatingEditTextPreference
-                    validate:testType="numericRange"
+                    validate:testType="floatNumericRange"
                     validate:minNumber="1"
-                    validate:maxNumber="5"
+                    validate:maxNumber="10"
                     android:digits="0123456789.,"
                     android:defaultValue="2"
                     android:selectAllOnFocus="true"
                     android:singleLine="true"
-                    android:inputType="number"
+                    android:inputType="numberDecimal"
                     android:maxLines="20"
                     android:title="@string/openapsama_bolussnooze_dia_divisor"
                     android:dialogMessage="@string/openapsama_bolussnooze_dia_divisor_summary"

From 72fbb73c65429cbb16c1f7467b546c212b013daf Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Thu, 29 Jun 2017 20:23:26 +0200
Subject: [PATCH 15/17] bolusprogress without context

---
 .../plugins/ConfigBuilder/ConfigBuilderPlugin.java       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
index c444603090..8d80124a62 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.ConfigBuilder;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
@@ -44,6 +45,7 @@ import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
+import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressHelperActivity;
 import info.nightscout.androidaps.plugins.Overview.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
@@ -459,8 +461,15 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
             bolusProgressDialog = new BolusProgressDialog();
             bolusProgressDialog.setInsulin(detailedBolusInfo.insulin);
             bolusProgressDialog.show(((AppCompatActivity) detailedBolusInfo.context).getSupportFragmentManager(), "BolusProgress");
+        } else {
+            Intent i = new Intent();
+            i.putExtra("insulin", detailedBolusInfo.insulin);
+            i.setClass(MainApp.instance(), BolusProgressHelperActivity.class);
+            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            MainApp.instance().startActivity(i);
         }
 
+
         MainApp.bus().post(new EventBolusRequested(detailedBolusInfo.insulin));
 
         result = activePump.deliverTreatment(detailedBolusInfo);

From 6bbec3411ac1ab17db88171d29fe87cc1cd9e243 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Thu, 29 Jun 2017 23:30:18 +0200
Subject: [PATCH 16/17] absolute as percentage update

---
 .../main/java/info/nightscout/androidaps/db/TemporaryBasal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index 0f441f5deb..4f7c662b05 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -273,7 +273,7 @@ public class TemporaryBasal implements Interval {
 
     public String toStringShort() {
         if (isAbsolute) {
-            if(SP.getBoolean(R.string.key_danar_visualizeextendedaspercentage, false)){
+            if(SP.getBoolean(R.string.key_danar_visualizeextendedaspercentage, false) && SP.getBoolean(R.string.key_danar_useextended, false)){
                 Profile profile = MainApp.getConfigBuilder().getProfile();
                 if(profile != null) {
                     double basal = profile.getBasal(System.currentTimeMillis());

From f0521c01974cf6c916896bcc66652b91849a6123 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Fri, 30 Jun 2017 01:48:12 +0200
Subject: [PATCH 17/17] nighttime watchface

---
 wear/build.gradle                             |   2 +
 wear/src/main/AndroidManifest.xml             |  18 +
 .../androidaps/watchfaces/NOChart.java        | 520 ++++++++++++++++++
 .../main/res/drawable/watchface_nochart.png   | Bin 0 -> 13392 bytes
 wear/src/main/res/layout/activity_nochart.xml |  12 +
 .../main/res/layout/rect_activity_nochart.xml | 108 ++++
 .../res/layout/round_activity_nochart.xml     | 108 ++++
 7 files changed, 768 insertions(+)
 create mode 100644 wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
 create mode 100755 wear/src/main/res/drawable/watchface_nochart.png
 create mode 100644 wear/src/main/res/layout/activity_nochart.xml
 create mode 100644 wear/src/main/res/layout/rect_activity_nochart.xml
 create mode 100644 wear/src/main/res/layout/round_activity_nochart.xml

diff --git a/wear/build.gradle b/wear/build.gradle
index 241fedbe9a..26779263e2 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -27,6 +27,7 @@ android {
             resValue "string", "label_xdrip", "AAPS"
             resValue "string", "label_xdrip_large", "AAPS(Large)"
             resValue "string", "label_xdrip_big_chart", "AAPS(BigChart)"
+            resValue "string", "label_xdrip_no_chart", "AAPS(NoChart)"
             resValue "string", "label_xdrip_circle", "AAPS(Circle)"
             resValue "string", "label_xdrip_activity", "AAPS Prefs."
             resValue "string", "app_settings", "AAPS Settings"
@@ -39,6 +40,7 @@ android {
             resValue "string", "label_xdrip", "AAPS"
             resValue "string", "label_xdrip_large", "AAPS(Large)"
             resValue "string", "label_xdrip_big_chart", "AAPS(BigChart)"
+            resValue "string", "label_xdrip_no_chart", "AAPS(NoChart)"
             resValue "string", "label_xdrip_circle", "AAPS(Circle)"
             resValue "string", "label_xdrip_activity", "AAPS Prefs."
             resValue "string", "app_settings", "AAPS Settings"
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 8909f8a3f8..fc40e930cd 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -34,6 +34,24 @@
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
             </intent-filter>
         </service>
+        <service
+            android:name=".watchfaces.NOChart"
+            android:allowEmbedded="true"
+            android:label="@string/label_xdrip_no_chart"
+            android:permission="android.permission.BIND_WALLPAPER">
+            <meta-data
+                android:name="android.service.wallpaper"
+                android:resource="@xml/watch_face" />
+            <meta-data
+                android:name="com.google.android.wearable.watchface.preview"
+                android:resource="@drawable/watchface_nochart" />
+
+            <intent-filter>
+                <action android:name="android.service.wallpaper.WallpaperService" />
+
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+            </intent-filter>
+        </service>
         <service
             android:name=".watchfaces.Home"
             android:allowEmbedded="true"
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
new file mode 100644
index 0000000000..ab283e8656
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
@@ -0,0 +1,520 @@
+package info.nightscout.androidaps.watchfaces;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.LinearGradient;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.Shader;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.preference.PreferenceManager;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.content.LocalBroadcastManager;
+import android.support.wearable.view.WatchViewStub;
+import android.support.wearable.watchface.WatchFaceStyle;
+import android.text.format.DateFormat;
+import android.util.Log;
+import android.view.Display;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.google.android.gms.wearable.DataMap;
+import com.ustwo.clockwise.common.WatchFaceTime;
+import com.ustwo.clockwise.common.WatchMode;
+import com.ustwo.clockwise.common.WatchShape;
+import com.ustwo.clockwise.wearable.WatchFace;
+
+import java.util.ArrayList;
+
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.BasalWatchData;
+import info.nightscout.androidaps.data.BgWatchData;
+import info.nightscout.androidaps.data.ListenerService;
+import info.nightscout.androidaps.data.TempWatchData;
+import info.nightscout.androidaps.interaction.menus.MainMenuActivity;
+import lecho.lib.hellocharts.view.LineChartView;
+
+/**
+ * Created by adrianLxM.
+ */
+public class NOChart extends WatchFace implements SharedPreferences.OnSharedPreferenceChangeListener {
+    public final static IntentFilter INTENT_FILTER;
+    public TextView mTime, mSgv, mTimestamp, mDelta, mAvgDelta;
+    public RelativeLayout mRelativeLayout;
+    public long sgvLevel = 0;
+    public int batteryLevel = 1;
+    public int ageLevel = 1;
+    public boolean lowResMode = false;
+    public boolean layoutSet = false;
+    public double datetime;
+    public ArrayList<BgWatchData> bgDataList = new ArrayList<>();
+    public ArrayList<TempWatchData> tempWatchDataList = new ArrayList<>();
+    public ArrayList<BasalWatchData> basalWatchDataList = new ArrayList<>();
+    public PowerManager.WakeLock wakeLock;
+    public View layoutView;
+    private final Point displaySize = new Point();
+    private int specW, specH;
+    private int animationAngle = 0;
+    private boolean isAnimated = false;
+
+    private LocalBroadcastManager localBroadcastManager;
+    private MessageReceiver messageReceiver;
+
+    protected SharedPreferences sharedPrefs;
+    private String sgvString = "--";
+    private String externalStatusString = "no status";
+    private TextView statusView;
+    private long sgvTapTime = 0l;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE))
+                .getDefaultDisplay();
+        display.getSize(displaySize);
+        wakeLock = ((PowerManager) getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Clock");
+
+        specW = View.MeasureSpec.makeMeasureSpec(displaySize.x,
+                View.MeasureSpec.EXACTLY);
+        specH = View.MeasureSpec.makeMeasureSpec(displaySize.y,
+                View.MeasureSpec.EXACTLY);
+        sharedPrefs = PreferenceManager
+                .getDefaultSharedPreferences(this);
+        sharedPrefs.registerOnSharedPreferenceChangeListener(this);
+        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        layoutView = inflater.inflate(R.layout.activity_nochart, null);
+        performViewSetup();
+    }
+
+    @Override
+    protected void onLayout(WatchShape shape, Rect screenBounds, WindowInsets screenInsets) {
+        super.onLayout(shape, screenBounds, screenInsets);
+        layoutView.onApplyWindowInsets(screenInsets);
+    }
+
+    public void performViewSetup() {
+        final WatchViewStub stub = (WatchViewStub) layoutView.findViewById(R.id.watch_view_stub);
+        IntentFilter messageFilter = new IntentFilter(Intent.ACTION_SEND);
+
+        messageReceiver = new MessageReceiver();
+        localBroadcastManager = LocalBroadcastManager.getInstance(this);
+        localBroadcastManager.registerReceiver(messageReceiver, messageFilter);
+
+        stub.setOnLayoutInflatedListener(new WatchViewStub.OnLayoutInflatedListener() {
+            @Override
+            public void onLayoutInflated(WatchViewStub stub) {
+                mTime = (TextView) stub.findViewById(R.id.watch_time);
+                mSgv = (TextView) stub.findViewById(R.id.sgv);
+                mTimestamp = (TextView) stub.findViewById(R.id.timestamp);
+                mDelta = (TextView) stub.findViewById(R.id.delta);
+                mAvgDelta = (TextView) stub.findViewById(R.id.avgdelta);
+                mRelativeLayout = (RelativeLayout) stub.findViewById(R.id.main_layout);
+                statusView = (TextView) stub.findViewById(R.id.aps_status);
+                layoutSet = true;
+                showAgeAndStatus();
+                mRelativeLayout.measure(specW, specH);
+                mRelativeLayout.layout(0, 0, mRelativeLayout.getMeasuredWidth(),
+                        mRelativeLayout.getMeasuredHeight());
+            }
+        });
+        ListenerService.requestData(this);
+        wakeLock.acquire(50);
+    }
+
+    @Override
+    protected void onTapCommand(int tapType, int x, int y, long eventTime) {
+
+        int extra = mSgv!=null?(mSgv.getRight() - mSgv.getLeft())/2:0;
+
+        if (tapType == TAP_TYPE_TAP&&
+                x + extra >=mSgv.getLeft() &&
+                x - extra <= mSgv.getRight()&&
+                y >= mSgv.getTop() &&
+                y <= mSgv.getBottom()){
+            if (eventTime - sgvTapTime < 800){
+                Intent intent = new Intent(this, MainMenuActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+            sgvTapTime = eventTime;
+        }
+    }
+
+    protected void onWatchModeChanged(WatchMode watchMode) {
+
+        if(lowResMode ^ isLowRes(watchMode)){ //if there was a change in lowResMode
+            lowResMode = isLowRes(watchMode);
+            setColor();
+        } else if (! sharedPrefs.getBoolean("dark", true)){
+            //in bright mode: different colours if active:
+            setColor();
+        }
+    }
+
+    private boolean isLowRes(WatchMode watchMode) {
+        return (watchMode == WatchMode.LOW_BIT) || (watchMode == WatchMode.LOW_BIT_BURN_IN) || (watchMode == WatchMode.LOW_BIT_BURN_IN);
+    }
+
+
+    @Override
+    protected WatchFaceStyle getWatchFaceStyle(){
+        return new WatchFaceStyle.Builder(this).setAcceptsTapEvents(true).build();
+    }
+
+
+
+    public int ageLevel() {
+        if(timeSince() <= (1000 * 60 * 12)) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    public double timeSince() {
+        return System.currentTimeMillis() - datetime;
+    }
+
+    public String readingAge(boolean shortString) {
+        if (datetime == 0) { return shortString?"--'":"-- Minute ago"; }
+        int minutesAgo = (int) Math.floor(timeSince()/(1000*60));
+        if (minutesAgo == 1) {
+            return minutesAgo + (shortString?"'":" Minute ago");
+        }
+        return minutesAgo + (shortString?"'":" Minutes ago");
+    }
+
+    @Override
+    public void onDestroy() {
+        if(localBroadcastManager != null && messageReceiver != null){
+            localBroadcastManager.unregisterReceiver(messageReceiver);}
+        if (sharedPrefs != null){
+            sharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
+        }
+        super.onDestroy();
+    }
+
+    static {
+        INTENT_FILTER = new IntentFilter();
+        INTENT_FILTER.addAction(Intent.ACTION_TIME_TICK);
+        INTENT_FILTER.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+        INTENT_FILTER.addAction(Intent.ACTION_TIME_CHANGED);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if(layoutSet) {
+            this.mRelativeLayout.draw(canvas);
+            Log.d("onDraw", "draw");
+        }
+    }
+
+    @Override
+    protected void onTimeChanged(WatchFaceTime oldTime, WatchFaceTime newTime) {
+        if (layoutSet && (newTime.hasHourChanged(oldTime) || newTime.hasMinuteChanged(oldTime))) {
+            wakeLock.acquire(50);
+            final java.text.DateFormat timeFormat = DateFormat.getTimeFormat(NOChart.this);
+            mTime.setText(timeFormat.format(System.currentTimeMillis()));
+            showAgeAndStatus();
+
+            if(ageLevel()<=0) {
+                mSgv.setPaintFlags(mSgv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+            } else {
+                mSgv.setPaintFlags(mSgv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
+            }
+
+            missedReadingAlert();
+            mRelativeLayout.measure(specW, specH);
+            mRelativeLayout.layout(0, 0, mRelativeLayout.getMeasuredWidth(),
+                    mRelativeLayout.getMeasuredHeight());
+        }
+    }
+
+    public class MessageReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Bundle bundle = intent.getBundleExtra("data");
+            if (layoutSet && bundle !=null) {
+                DataMap dataMap = DataMap.fromBundle(bundle);
+                wakeLock.acquire(50);
+                sgvLevel = dataMap.getLong("sgvLevel");
+                batteryLevel = dataMap.getInt("batteryLevel");
+                datetime = dataMap.getDouble("timestamp");
+                sgvString = dataMap.getString("sgvString");
+                mSgv.setText(dataMap.getString("sgvString"));
+
+                if(ageLevel()<=0) {
+                    mSgv.setPaintFlags(mSgv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+                } else {
+                    mSgv.setPaintFlags(mSgv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
+                }
+
+                final java.text.DateFormat timeFormat = DateFormat.getTimeFormat(NOChart.this);
+                mTime.setText(timeFormat.format(System.currentTimeMillis()));
+
+                showAgeAndStatus();
+
+                String delta = dataMap.getString("delta");
+
+                if (delta.endsWith(" mg/dl")) {
+                    mDelta.setText(delta.substring(0, delta.length() - 6));
+                } else if (delta.endsWith(" mmol/l")||delta.endsWith(" mmol")) {
+                    mDelta.setText(delta.substring(0, delta.length() - 5));
+                } else {
+                    mDelta.setText(delta);
+                }
+
+
+                String avgDelta = dataMap.getString("avgDelta");
+
+                if (delta.endsWith(" mg/dl")) {
+                    mAvgDelta.setText(avgDelta.substring(0, avgDelta.length() - 6));
+                } else if (avgDelta.endsWith(" mmol/l")||avgDelta.endsWith(" mmol")) {
+                    mAvgDelta.setText(avgDelta.substring(0, avgDelta.length() - 5));
+                } else {
+                    mAvgDelta.setText(avgDelta);
+                }
+
+                mRelativeLayout.measure(specW, specH);
+                mRelativeLayout.layout(0, 0, mRelativeLayout.getMeasuredWidth(),
+                        mRelativeLayout.getMeasuredHeight());
+                invalidate();
+                setColor();
+
+                //start animation?
+                // dataMap.getDataMapArrayList("entries") == null -> not on "resend data".
+                if (!lowResMode && (sharedPrefs.getBoolean("animation", false) && dataMap.getDataMapArrayList("entries") == null && (sgvString.equals("100") || sgvString.equals("5.5") || sgvString.equals("5,5")))) {
+                    startAnimation();
+                }
+            }
+            //status
+            bundle = intent.getBundleExtra("status");
+            if (layoutSet && bundle != null) {
+                DataMap dataMap = DataMap.fromBundle(bundle);
+                wakeLock.acquire(50);
+                externalStatusString = dataMap.getString("externalStatusString");
+
+                showAgeAndStatus();
+
+                mRelativeLayout.measure(specW, specH);
+                mRelativeLayout.layout(0, 0, mRelativeLayout.getMeasuredWidth(),
+                        mRelativeLayout.getMeasuredHeight());
+                invalidate();
+                setColor();
+            }
+            //basals and temps
+            bundle = intent.getBundleExtra("basals");
+            if (layoutSet && bundle != null) {
+                DataMap dataMap = DataMap.fromBundle(bundle);
+                wakeLock.acquire(500);
+
+                loadBasalsAndTemps(dataMap);
+
+                mRelativeLayout.measure(specW, specH);
+                mRelativeLayout.layout(0, 0, mRelativeLayout.getMeasuredWidth(),
+                        mRelativeLayout.getMeasuredHeight());
+                invalidate();
+                setColor();
+            }
+        }
+    }
+
+    private void loadBasalsAndTemps(DataMap dataMap) {
+        ArrayList<DataMap> temps = dataMap.getDataMapArrayList("temps");
+        if (temps != null) {
+            tempWatchDataList = new ArrayList<>();
+            for (DataMap temp : temps) {
+                TempWatchData twd = new TempWatchData();
+                twd.startTime = temp.getLong("starttime");
+                twd.startBasal =  temp.getDouble("startBasal");
+                twd.endTime = temp.getLong("endtime");
+                twd.endBasal = temp.getDouble("endbasal");
+                twd.amount = temp.getDouble("amount");
+                tempWatchDataList.add(twd);
+            }
+        }
+        ArrayList<DataMap> basals = dataMap.getDataMapArrayList("basals");
+        if (basals != null) {
+            basalWatchDataList = new ArrayList<>();
+            for (DataMap basal : basals) {
+                BasalWatchData bwd = new BasalWatchData();
+                bwd.startTime = basal.getLong("starttime");
+                bwd.endTime = basal.getLong("endtime");
+                bwd.amount = basal.getDouble("amount");
+                basalWatchDataList.add(bwd);
+            }
+        }
+    }
+
+    private void showAgeAndStatus() {
+
+        if( mTimestamp != null){
+            mTimestamp.setText(readingAge(true));
+        }
+        boolean showAvgDelta = sharedPrefs.getBoolean("showAvgDelta", true);
+
+        if(showAvgDelta){
+            mAvgDelta.setVisibility(View.VISIBLE);
+        } else {
+            mAvgDelta.setVisibility(View.GONE);
+        }
+            statusView.setText(externalStatusString);
+            statusView.setVisibility(View.VISIBLE);
+    }
+
+    public void setColor() {
+        if(lowResMode){
+            setColorLowRes();
+        } else if (sharedPrefs.getBoolean("dark", true)) {
+            setColorDark();
+        } else {
+            setColorBright();
+        }
+
+    }
+
+
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key){
+        setColor();
+        if(layoutSet){
+            showAgeAndStatus();
+            mRelativeLayout.measure(specW, specH);
+            mRelativeLayout.layout(0, 0, mRelativeLayout.getMeasuredWidth(),
+                    mRelativeLayout.getMeasuredHeight());
+        }
+        invalidate();
+    }
+
+    protected void updateRainbow() {
+        animationAngle = (animationAngle + 1) % 360;
+        //Animation matrix:
+        int[] rainbow = {Color.RED, Color.YELLOW, Color.GREEN, Color.BLUE
+                , Color.CYAN};
+        Shader shader = new LinearGradient(0, 0, 0, 20, rainbow,
+                null, Shader.TileMode.MIRROR);
+        Matrix matrix = new Matrix();
+        matrix.setRotate(animationAngle);
+        shader.setLocalMatrix(matrix);
+        mSgv.getPaint().setShader(shader);
+        invalidate();
+    }
+
+    private synchronized void setIsAnimated(boolean isAnimated) {
+        this.isAnimated = isAnimated;
+    }
+
+    void startAnimation() {
+        Log.d("CircleWatchface", "start startAnimation");
+
+        Thread animator = new Thread() {
+
+
+            public void run() {
+                setIsAnimated(true);
+                for (int i = 0; i <= 8 * 1000 / 40; i++) {
+                    updateRainbow();
+                    try {
+                        Thread.sleep(40);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+                mSgv.getPaint().setShader(null);
+                setIsAnimated(false);
+                invalidate();
+                setColor();
+
+                System.gc();
+            }
+        };
+
+        animator.start();
+    }
+
+    protected void setColorLowRes() {
+        mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mTime));
+        statusView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_statusView));
+        mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_background));
+        mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
+        mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
+        mAvgDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
+        mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_Timestamp));
+    }
+
+    protected void setColorDark() {
+        mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mTime));
+        statusView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_statusView));
+        mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_background));
+        if (sgvLevel == 1) {
+            mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
+            mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
+            mAvgDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
+        } else if (sgvLevel == 0) {
+            mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
+            mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
+            mAvgDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
+        } else if (sgvLevel == -1) {
+            mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
+            mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
+            mAvgDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
+        }
+
+        if (ageLevel == 1) {
+            mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_Timestamp));
+        } else {
+            mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_TimestampOld));
+        }
+    }
+
+
+    protected void setColorBright() {
+
+        if (getCurrentWatchMode() == WatchMode.INTERACTIVE) {
+            mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_bigchart_time));
+            statusView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_bigchart_status));
+            mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_background));
+            if (sgvLevel == 1) {
+                mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
+                mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
+                mAvgDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
+            } else if (sgvLevel == 0) {
+                mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
+                mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
+                mAvgDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
+            } else if (sgvLevel == -1) {
+                mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
+                mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
+                mAvgDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
+            }
+
+            if (ageLevel == 1) {
+                mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_mTimestamp1));
+            } else {
+                mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_mTimestamp));
+            }
+        } else {
+            setColorDark();
+        }
+    }
+
+    public void missedReadingAlert() {
+        int minutes_since   = (int) Math.floor(timeSince()/(1000*60));
+        if(minutes_since >= 16 && ((minutes_since - 16) % 5) == 0) {
+            ListenerService.requestData(this); // attempt endTime recover missing data
+        }
+    }
+}
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/watchface_nochart.png b/wear/src/main/res/drawable/watchface_nochart.png
new file mode 100755
index 0000000000000000000000000000000000000000..c0e9e677474496a2670521664e933171d6eb7d8e
GIT binary patch
literal 13392
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

literal 0
HcmV?d00001

diff --git a/wear/src/main/res/layout/activity_nochart.xml b/wear/src/main/res/layout/activity_nochart.xml
new file mode 100644
index 0000000000..4b7198aa78
--- /dev/null
+++ b/wear/src/main/res/layout/activity_nochart.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.wearable.view.WatchViewStub
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/watch_view_stub"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:rectLayout="@layout/rect_activity_nochart"
+        app:roundLayout="@layout/round_activity_nochart"
+        tools:context=".watchfaces.Home"
+        tools:deviceIds="wear"/>
diff --git a/wear/src/main/res/layout/rect_activity_nochart.xml b/wear/src/main/res/layout/rect_activity_nochart.xml
new file mode 100644
index 0000000000..47938873b2
--- /dev/null
+++ b/wear/src/main/res/layout/rect_activity_nochart.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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=".watchfaces.Home" tools:deviceIds="wear_square"
+    android:background="@color/black"
+    android:id="@+id/main_layout">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textAlignment="center"
+        android:gravity="center_horizontal">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:paddingTop="5dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="-5dp"
+            android:gravity="center_horizontal">
+
+            <TextView
+                android:id="@+id/delta"
+                android:textSize="40sp"
+                android:text="---"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="bottom"
+                android:gravity="center_horizontal|bottom"
+                android:layout_marginRight="5dp" />
+
+            <TextView
+                android:id="@+id/sgv"
+                android:textSize="55sp"
+                android:text="---"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal" />
+
+            <TextView
+                android:id="@+id/avgdelta"
+                android:textSize="40sp"
+                android:text="---"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="bottom"
+                android:gravity="center_horizontal|bottom"
+                android:layout_marginLeft="5dp" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/aps_status"
+            android:textSize="24sp"
+            android:text="E xU/h  IOB: x (x+x)"
+            android:layout_width="wrap_content"
+            android:textAlignment="center"
+            android:textColor="#FFFFFF"
+            android:layout_gravity="center_horizontal"
+            android:layout_height="wrap_content"/>
+
+        <View
+            android:id="@+id/chart"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_gravity="bottom"
+            android:layout_weight="1"
+            android:gravity="center_horizontal" />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:gravity="center_horizontal|bottom">
+
+            <TextView
+                android:id="@+id/watch_time"
+                android:textSize="47sp"
+                android:text="12:00"
+                android:textColor="#FFFFFF"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:layout_marginRight="6dp"
+                android:layout_gravity="center_horizontal" />
+
+            <TextView
+                android:id="@+id/timestamp"
+                android:textSize="35sp"
+                android:text="-- '"
+                android:layout_width="wrap_content"
+                android:textAlignment="center"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="center_horizontal"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/wear/src/main/res/layout/round_activity_nochart.xml b/wear/src/main/res/layout/round_activity_nochart.xml
new file mode 100644
index 0000000000..47938873b2
--- /dev/null
+++ b/wear/src/main/res/layout/round_activity_nochart.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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=".watchfaces.Home" tools:deviceIds="wear_square"
+    android:background="@color/black"
+    android:id="@+id/main_layout">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textAlignment="center"
+        android:gravity="center_horizontal">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:paddingTop="5dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="-5dp"
+            android:gravity="center_horizontal">
+
+            <TextView
+                android:id="@+id/delta"
+                android:textSize="40sp"
+                android:text="---"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="bottom"
+                android:gravity="center_horizontal|bottom"
+                android:layout_marginRight="5dp" />
+
+            <TextView
+                android:id="@+id/sgv"
+                android:textSize="55sp"
+                android:text="---"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal" />
+
+            <TextView
+                android:id="@+id/avgdelta"
+                android:textSize="40sp"
+                android:text="---"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="bottom"
+                android:gravity="center_horizontal|bottom"
+                android:layout_marginLeft="5dp" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/aps_status"
+            android:textSize="24sp"
+            android:text="E xU/h  IOB: x (x+x)"
+            android:layout_width="wrap_content"
+            android:textAlignment="center"
+            android:textColor="#FFFFFF"
+            android:layout_gravity="center_horizontal"
+            android:layout_height="wrap_content"/>
+
+        <View
+            android:id="@+id/chart"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_gravity="bottom"
+            android:layout_weight="1"
+            android:gravity="center_horizontal" />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:gravity="center_horizontal|bottom">
+
+            <TextView
+                android:id="@+id/watch_time"
+                android:textSize="47sp"
+                android:text="12:00"
+                android:textColor="#FFFFFF"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:layout_marginRight="6dp"
+                android:layout_gravity="center_horizontal" />
+
+            <TextView
+                android:id="@+id/timestamp"
+                android:textSize="35sp"
+                android:text="-- '"
+                android:layout_width="wrap_content"
+                android:textAlignment="center"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="center_horizontal"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>