diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb68289f4..5d19981032 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/IobTotal.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/IobTotal.java
index eb76758449..7dcb1d04f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/IobTotal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/IobTotal.java
@@ -64,12 +64,10 @@ public class IobTotal {
public JSONObject json() {
JSONObject json = new JSONObject();
try {
- json.put("iob", iob);
- json.put("bolussnooze", bolussnooze);
- json.put("basaliob", iob);
+ json.put("iob", iob + basaliob);
+ json.put("basaliob", basaliob);
json.put("activity", activity);
- json.put("hightempinsulin", hightempinsulin);
- json.put("netbasalinsulin", netbasalinsulin);
+ json.put("time", DateUtil.toISOString(new Date()));
} 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 cd015ca904..1ce12c6a03 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
@@ -415,14 +415,13 @@ public class OverviewFragment extends Fragment implements PluginBase {
// iob
MainApp.getConfigBuilder().getActiveTreatments().updateTotalIOB();
- IobTotal bolusIob = MainApp.getConfigBuilder().getActiveTreatments().getLastCalculation();
+ IobTotal bolusIob = MainApp.getConfigBuilder().getActiveTreatments().getLastCalculation().round();
if (bolusIob == null) bolusIob = new IobTotal();
MainApp.getConfigBuilder().getActiveTempBasals().updateTotalIOB();
- IobTotal basalIob = MainApp.getConfigBuilder().getActiveTempBasals().getLastCalculation();
+ IobTotal basalIob = MainApp.getConfigBuilder().getActiveTempBasals().getLastCalculation().round();
if (basalIob == null) basalIob = new IobTotal();
- IobTotal iobTotal = IobTotal.combine(bolusIob, basalIob).round();
- String iobtext = getString(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(iobTotal.iob) + "U ("
+ String iobtext = getString(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
+ getString(R.string.bolus) + ": " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
+ getString(R.string.basal) + ": " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)";
iobView.setText(iobtext);
@@ -455,6 +454,20 @@ public class OverviewFragment extends Fragment implements PluginBase {
// remove old data from graph
bgGraph.removeAllSeries();
+ // **** HIGH and LOW targets graph ****
+ DataPoint[] lowDataPoints = new DataPoint[]{
+ new DataPoint(fromTime, lowLine),
+ new DataPoint(toTime, lowLine)
+ };
+ DataPoint[] highDataPoints = new DataPoint[]{
+ new DataPoint(fromTime, highLine),
+ new DataPoint(toTime, highLine)
+ };
+ bgGraph.addSeries(seriesLow = new LineGraphSeries(lowDataPoints));
+ seriesLow.setColor(Color.RED);
+ bgGraph.addSeries(seriesHigh = new LineGraphSeries(highDataPoints));
+ seriesHigh.setColor(Color.RED);
+
// **** TEMP BASALS graph ****
class BarDataPoint extends DataPoint {
public BarDataPoint(double x, double y, boolean isTempBasal) {
@@ -537,20 +550,6 @@ public class OverviewFragment extends Fragment implements PluginBase {
seriesOutOfRange.setColor(Color.RED);
}
- // **** HIGH and LOW targets graph ****
- DataPoint[] lowDataPoints = new DataPoint[]{
- new DataPoint(fromTime, lowLine),
- new DataPoint(toTime, lowLine)
- };
- DataPoint[] highDataPoints = new DataPoint[]{
- new DataPoint(fromTime, highLine),
- new DataPoint(toTime, highLine)
- };
- bgGraph.addSeries(seriesLow = new LineGraphSeries(lowDataPoints));
- seriesLow.setColor(Color.RED);
- bgGraph.addSeries(seriesHigh = new LineGraphSeries(highDataPoints));
- seriesHigh.setColor(Color.RED);
-
// **** NOW line ****
DataPoint[] nowPoints = new DataPoint[]{
new DataPoint(now, 0),
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 526f2c54b3..7731e7b4d4 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -19,43 +19,45 @@
android:id="@+id/overview_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="left|top"
+ android:layout_gravity="top|left"
+ android:gravity="center_vertical"
+ android:text="00.0"
android:textSize="80dp"
- android:textStyle="bold"
- android:text="00.0" />
+ android:textStyle="bold" />
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ android:layout_weight="0.5"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:text="Medium Text"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -73,32 +75,38 @@
android:layout_marginLeft="10dp"
android:textAppearance="?android:attr/textAppearanceSmall" />
-
+
+
+ android:orientation="horizontal">
@@ -115,7 +123,10 @@
style="?android:attr/buttonStyle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
+ android:layout_marginBottom="3dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="Cancel temp basal"
android:textColor="@color/colorCancelTempButton" />
@@ -133,7 +144,10 @@
style="?android:attr/buttonStyle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
+ android:layout_marginBottom="3dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/overview_tempbasal_button"
android:textColor="@color/colorSetTempButton" />
@@ -143,7 +157,10 @@
style="?android:attr/buttonStyle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
+ android:layout_marginBottom="3dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/overview_extendedbolus_button"
android:textColor="@color/colorSetExtendedButton" />
@@ -159,7 +176,10 @@
style="?android:attr/buttonStyle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
+ android:layout_marginBottom="3dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/overview_bolus_label"
android:textColor="@color/colorTreatmentButton" />
@@ -169,7 +189,10 @@
style="?android:attr/buttonStyle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
+ android:layout_marginBottom="3dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/overview_calculator_label"
android:textColor="@color/colorWizardButton" />