From d70c9673d58346330f0a350b036ef0d4a156813f Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 28 Dec 2016 22:38:22 +0100 Subject: [PATCH] average delta --- .../plugins/Overview/OverviewFragment.java | 7 ++++++- app/src/main/res/layout/overview_fragment.xml | 12 ++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) 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 62d68ebb23..2df6dfc6be 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 @@ -99,6 +99,7 @@ public class OverviewFragment extends Fragment { TextView arrowView; TextView timeAgoView; TextView deltaView; + TextView avgdeltaView; TextView runningTempView; TextView baseBasalView; TextView activeProfileView; @@ -143,6 +144,7 @@ public class OverviewFragment extends Fragment { arrowView = (TextView) view.findViewById(R.id.overview_arrow); timeAgoView = (TextView) view.findViewById(R.id.overview_timeago); deltaView = (TextView) view.findViewById(R.id.overview_delta); + avgdeltaView = (TextView) view.findViewById(R.id.overview_avgdelta); runningTempView = (TextView) view.findViewById(R.id.overview_runningtemp); baseBasalView = (TextView) view.findViewById(R.id.overview_basebasal); activeProfileView = (TextView) view.findViewById(R.id.overview_activeprofile); @@ -570,8 +572,11 @@ public class OverviewFragment extends Fragment { bgView.setText(lastBG.valueToUnitsToString(profile.getUnits())); arrowView.setText(lastBG.directionToSymbol()); DatabaseHelper.GlucoseStatus glucoseStatus = MainApp.getDbHelper().getGlucoseStatusData(); - if (glucoseStatus != null) + if (glucoseStatus != null){ deltaView.setText("Δ " + NSProfile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units); + avgdeltaView.setText("øΔ " + NSProfile.toUnitsString(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units) + " " + units); + } + BgReading.units = profile.getUnits(); } else return; diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml index 0ed8929ff2..c6ba630b63 100644 --- a/app/src/main/res/layout/overview_fragment.xml +++ b/app/src/main/res/layout/overview_fragment.xml @@ -32,7 +32,7 @@ android:layout_gravity="top|left" android:gravity="center_vertical" android:text="00.0" - android:textSize="80dp" + android:textSize="70dp" android:textStyle="bold" /> + + +