caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

basal profile on overview

Browse source
This commit is contained in:
AdrianLxM 2016-11-10 21:00:50 +01:00
parent 80e875b821
commit 4ee87d1cca
2 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -84,6 +84,8 @@ public class OverviewFragment extends Fragment {
TextView timeAgoView; TextView timeAgoView;
TextView deltaView; TextView deltaView;
TextView runningTempView; TextView runningTempView;
TextView baseBasalView;
TextView activeProfileView;
TextView iobView; TextView iobView;
TextView apsModeView; TextView apsModeView;
GraphView bgGraph; GraphView bgGraph;
@ -120,6 +122,9 @@ public class OverviewFragment extends Fragment {
timeAgoView = (TextView) view.findViewById(R.id.overview_timeago); timeAgoView = (TextView) view.findViewById(R.id.overview_timeago);
deltaView = (TextView) view.findViewById(R.id.overview_delta); deltaView = (TextView) view.findViewById(R.id.overview_delta);
runningTempView = (TextView) view.findViewById(R.id.overview_runningtemp); runningTempView = (TextView) view.findViewById(R.id.overview_runningtemp);
baseBasalView = (TextView) view.findViewById(R.id.overview_basebasal);
activeProfileView = (TextView) view.findViewById(R.id.overview_activeprofile);
iobView = (TextView) view.findViewById(R.id.overview_iob); iobView = (TextView) view.findViewById(R.id.overview_iob);
apsModeView = (TextView) view.findViewById(R.id.overview_apsmode); apsModeView = (TextView) view.findViewById(R.id.overview_apsmode);
bgGraph = (GraphView) view.findViewById(R.id.overview_bggraph); bgGraph = (GraphView) view.findViewById(R.id.overview_bggraph);
@ -464,12 +469,14 @@ public class OverviewFragment extends Fragment {
TempBasal activeTemp = pump.getTempBasal(); TempBasal activeTemp = pump.getTempBasal();
cancelTempLayout.setVisibility(View.VISIBLE); cancelTempLayout.setVisibility(View.VISIBLE);
cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + ": " + activeTemp.toString()); cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + ": " + activeTemp.toString());
runningTempView.setText(activeTemp.toString() + "\n(" + DecimalFormatter.to2Decimal(pump.getBaseBasalRate()) + " U/h" + ")"); runningTempView.setVisibility(View.VISIBLE);
runningTempView.setText(activeTemp.toString());
} else { } else {
cancelTempLayout.setVisibility(View.GONE); cancelTempLayout.setVisibility(View.GONE);
Double currentBasal = pump.getBaseBasalRate(); runningTempView.setVisibility(View.GONE);
runningTempView.setText(DecimalFormatter.to2Decimal(currentBasal) + " U/h");
} }
baseBasalView.setText(DecimalFormatter.to2Decimal(pump.getBaseBasalRate()) + " U/h");
activeProfileView.setText(profile.getActiveProfile());
if (profile == null) { if (profile == null) {
// disable all treatment buttons because we are not able to check constraints without profile // disable all treatment buttons because we are not able to check constraints without profile

19
app/src/main/res/layout/overview_fragment.xml
View file

@ -78,6 +78,25 @@
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/overview_basebasal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/overview_activeprofile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textColor="@color/colorProfileSwitchButton"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>