caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Combo tab: we have set a TBR duration, we're not showing how much time is remaing, but what has been set.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-07-17 16:41:37 +02:00
parent e9fa9b1788
commit 7fa59c6c16
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
View file

@ -33,7 +33,7 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
private Button refresh; private Button refresh;
private TextView status; private TextView status;
private TextView tbrPercentage; private TextView tbrPercentage;
private TextView tbrDurationRemaining; private TextView tbrDuration;
private TextView tbrRate; private TextView tbrRate;
private TextView lastCmd; private TextView lastCmd;
private TextView lastCmdTime; private TextView lastCmdTime;
@ -47,7 +47,7 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
refresh = (Button) view.findViewById(R.id.combo_refresh); refresh = (Button) view.findViewById(R.id.combo_refresh);
status = (TextView) view.findViewById(R.id.combo_status); status = (TextView) view.findViewById(R.id.combo_status);
tbrPercentage = (TextView) view.findViewById(R.id.combo_tbr_percentage); tbrPercentage = (TextView) view.findViewById(R.id.combo_tbr_percentage);
tbrDurationRemaining = (TextView) view.findViewById(R.id.combo_tbr_duration_remaining); tbrDuration = (TextView) view.findViewById(R.id.combo_tbr_duration);
tbrRate = (TextView) view.findViewById(R.id.combo_tbr_rate); tbrRate = (TextView) view.findViewById(R.id.combo_tbr_rate);
lastCmd = (TextView) view.findViewById(R.id.combo_last_command); lastCmd = (TextView) view.findViewById(R.id.combo_last_command);
lastCmdTime = (TextView) view.findViewById(R.id.combo_last_command_time); lastCmdTime = (TextView) view.findViewById(R.id.combo_last_command_time);
@ -103,11 +103,11 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
boolean tbrActive = ps.tbrPercent != -1 && ps.tbrPercent != 100; boolean tbrActive = ps.tbrPercent != -1 && ps.tbrPercent != 100;
if (tbrActive) { if (tbrActive) {
tbrPercentage.setText("" + ps.tbrPercent + "%"); tbrPercentage.setText("" + ps.tbrPercent + "%");
tbrDurationRemaining.setText("" + ps.tbrRemainingDuration + " min"); tbrDuration.setText("" + ps.tbrRemainingDuration + " min");
tbrRate.setText("" + ps.tbrRate + " U/h"); tbrRate.setText("" + ps.tbrRate + " U/h");
} else { } else {
tbrPercentage.setText("Default basal rate running"); tbrPercentage.setText("Default basal rate running");
tbrDurationRemaining.setText(""); tbrDuration.setText("");
tbrRate.setText("" + getPlugin().getBaseBasalRate() + " U/h"); tbrRate.setText("" + getPlugin().getBaseBasalRate() + " U/h");
} }
if (getPlugin().lastCmd != null) { if (getPlugin().lastCmd != null) {

4
app/src/main/res/layout/combopump_fragment.xml
View file

@ -122,7 +122,7 @@
android:layout_weight="2" android:layout_weight="2"
android:gravity="end" android:gravity="end"
android:paddingRight="5dp" android:paddingRight="5dp"
android:text="TBR duration remaining" android:text="TBR duration"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -136,7 +136,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/combo_tbr_duration_remaining" android:id="@+id/combo_tbr_duration"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"