colored predictions

app/src/main/java/info/nightscout/androidaps/db/BgReading.java

@@ -17,7 +17,6 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
-import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.SP;
 
@@ -43,7 +42,10 @@ public class BgReading implements DataPointWithLabelInterface {
     @DatabaseField
     public String _id = null; // NS _id
 
-    public boolean isPrediction = false; // true when drawing predictions as bg points
+    public boolean isCOBPrediction = false; // true when drawing predictions as bg points (COB)
+    public boolean isaCOBPrediction = false; // true when drawing predictions as bg points (aCOB)
+    public boolean isIOBPrediction = false; // true when drawing predictions as bg points (IOB)
+    public boolean isUAMPrediction = false; // true when drawing predictions as bg points (UAM)
 
     public BgReading() {
     }
@@ -181,7 +183,10 @@ public class BgReading implements DataPointWithLabelInterface {
 
     @Override
     public PointsWithLabelGraphSeries.Shape getShape() {
-        return PointsWithLabelGraphSeries.Shape.POINT;
+        if (isPrediction())
+            return PointsWithLabelGraphSeries.Shape.PREDICTION;
+        else
+            return PointsWithLabelGraphSeries.Shape.BG;
     }
 
     @Override
@@ -202,7 +207,7 @@ public class BgReading implements DataPointWithLabelInterface {
             highLine = Profile.fromMgdlToUnits(OverviewPlugin.bgTargetHigh, units);
         }
         int color = MainApp.sResources.getColor(R.color.inrange);
-        if (isPrediction)
+        if (isPrediction())
             color = MainApp.sResources.getColor(R.color.prediction);
         else if (valueToUnits(units) < lowLine)
             color = MainApp.sResources.getColor(R.color.low);
@@ -211,4 +216,21 @@ public class BgReading implements DataPointWithLabelInterface {
         return color;
     }
 
+    @Override
+    public int getSecondColor() {
+        if (isIOBPrediction)
+            return MainApp.sResources.getColor(R.color.iob);
+        if (isCOBPrediction)
+            return MainApp.sResources.getColor(R.color.cob);
+        if (isaCOBPrediction)
+            return 0x80FFFFFF & MainApp.sResources.getColor(R.color.cob);
+        if (isUAMPrediction)
+            return MainApp.sResources.getColor(R.color.uam);
+        return R.color.mdtp_white;
+    }
+
+    private boolean isPrediction() {
+        return isaCOBPrediction || isCOBPrediction || isIOBPrediction || isUAMPrediction;
+    }
+
 }

app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java

@@ -242,4 +242,9 @@ public class CareportalEvent implements DataPointWithLabelInterface {
             return Color.GRAY;
         return Color.GRAY;
     }
+
+    @Override
+    public int getSecondColor() {
+        return 0;
+    }
 }

app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java

@@ -280,4 +280,9 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
     public int getColor() {
         return Color.CYAN;
     }
+
+    @Override
+    public int getSecondColor() {
+        return 0;
+    }
 }

app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java

@@ -202,6 +202,11 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
         return Color.CYAN;
     }
 
+    @Override
+    public int getSecondColor() {
+        return 0;
+    }
+
     public String toString() {
         return "ProfileSwitch{" +
                 "date=" + date +

app/src/main/java/info/nightscout/androidaps/db/Treatment.java

@@ -173,6 +173,11 @@ public class Treatment implements DataPointWithLabelInterface {
         return Color.CYAN;
     }
 
+    @Override
+    public int getSecondColor() {
+        return 0;
+    }
+
     @Override
     public void setY(double y) {
         yValue = y;

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

@@ -104,7 +104,7 @@ public class APSResult {
                         BgReading bg = new BgReading();
                         bg.value = iob.getInt(i);
                         bg.date = startTime + i * 5 * 60 * 1000L;
-                        bg.isPrediction = true;
+                        bg.isIOBPrediction = true;
                         array.add(bg);
                     }
                 }
@@ -114,7 +114,7 @@ public class APSResult {
                         BgReading bg = new BgReading();
                         bg.value = iob.getInt(i);
                         bg.date = startTime + i * 5 * 60 * 1000L;
-                        bg.isPrediction = true;
+                        bg.isaCOBPrediction = true;
                         array.add(bg);
                     }
                 }
@@ -124,7 +124,7 @@ public class APSResult {
                         BgReading bg = new BgReading();
                         bg.value = iob.getInt(i);
                         bg.date = startTime + i * 5 * 60 * 1000L;
-                        bg.isPrediction = true;
+                        bg.isCOBPrediction = true;
                         array.add(bg);
                     }
                 }
@@ -134,7 +134,7 @@ public class APSResult {
                         BgReading bg = new BgReading();
                         bg.value = iob.getInt(i);
                         bg.date = startTime + i * 5 * 60 * 1000L;
-                        bg.isPrediction = true;
+                        bg.isUAMPrediction = true;
                         array.add(bg);
                     }
                 }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/DataPointWithLabelInterface.java

@@ -55,4 +55,5 @@ public interface DataPointWithLabelInterface extends DataPointInterface{
     PointsWithLabelGraphSeries.Shape getShape();
     float getSize();
     int getColor();
+    int getSecondColor();
 }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/PointsWithLabelGraphSeries.java

@@ -50,14 +50,8 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
      * You can also render a custom drawing via {@link com.jjoe64.graphview.series.PointsGraphSeries.CustomShape}
      */
     public enum Shape {
-        /**
+        BG,
-         * draws a point / circle
+        PREDICTION,
-         */
-        POINT,
-
-        /**
-         * draws a triangle
-         */
         TRIANGLE,
         RECTANGLE,
         BOLUS,
@@ -191,9 +185,19 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
 
             // draw data point
             if (!overdraw) {
-                if (value.getShape() == Shape.POINT) {
+                if (value.getShape() == Shape.BG) {
+                    mPaint.setStyle(Paint.Style.FILL);
                     mPaint.setStrokeWidth(0);
                     canvas.drawCircle(endX, endY, value.getSize(), mPaint);
+                } else if (value.getShape() == Shape.PREDICTION) {
+                    mPaint.setColor(value.getColor());
+                    mPaint.setStyle(Paint.Style.FILL);
+                    mPaint.setStrokeWidth(0);
+                    canvas.drawCircle(endX, endY, value.getSize(), mPaint);
+                    mPaint.setColor(value.getSecondColor());
+                    mPaint.setStyle(Paint.Style.FILL);
+                    mPaint.setStrokeWidth(0);
+                    canvas.drawCircle(endX, endY, value.getSize() / 3, mPaint);
                 } else if (value.getShape() == Shape.RECTANGLE) {
                     canvas.drawRect(endX-value.getSize(), endY-value.getSize(), endX+value.getSize(), endY+value.getSize(), mPaint);
                 } else if (value.getShape() == Shape.TRIANGLE) {
@@ -244,7 +248,6 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                 } else if (value.getShape() == Shape.MBG) {
                     mPaint.setStyle(Paint.Style.STROKE);
                     mPaint.setStrokeWidth(5);
-                    float w = mPaint.getStrokeWidth();
                     canvas.drawCircle(endX, endY, value.getSize(), mPaint);
                 } else if (value.getShape() == Shape.BGCHECK) {
                     mPaint.setStyle(Paint.Style.FILL_AND_STROKE);

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

@@ -4,6 +4,7 @@
     <color name="basal">#00ffff</color>
     <color name="iob">#FFFB8C00</color>
     <color name="cob">#8BC34A</color>
+    <color name="uam">#ffea00</color>
     <color name="ratio">#FFFFFF</color>
     <color name="inrange">#00FF00</color>
     <color name="low">#FF0000</color>