caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of github.com:Tornado-Tim/AndroidAPS into AS0ref

Browse source
This commit is contained in:
Tim Gunn 2020-01-09 16:44:04 +13:00
parent 3486ee8b56 a5393eff84
commit 2554185119
No known key found for this signature in database
GPG key ID: C9BC1E9D0D0AED8C
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
View file

@ -108,10 +108,6 @@ public class TemporaryBasal implements Interval, DbObjectBase {
this.pumpId = extendedBolus.pumpId;
}
public String toDuration() {
return "(" + getRealDuration() + "/" + durationInMinutes + "')";
}
public TemporaryBasal clone() {
TemporaryBasal t = new TemporaryBasal();
t.date = date;

22
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
View file

@ -182,7 +182,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
boolean smallWidth;
boolean smallHeight;
public static boolean shorttextmode = true;
public static boolean shorttextmode = false;
private boolean accepted;
@ -1151,12 +1151,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
String basalText = "";
if (shorttextmode) {
if (activeTemp != null) {
basalText = activeTemp.percentRate + "% " + activeTemp.toDuration() + " " + DecimalFormatter.to2Decimal(profile.getBasal()) + "U/h";
basalText = "T: " + activeTemp.toStringVeryShort();
} else {
basalText = DecimalFormatter.to2Decimal(profile.getBasal()) + "U/h";
basalText = MainApp.gs(R.string.pump_basebasalrate,profile.getBasal());
}
baseBasalView.setOnClickListener(v -> {
String fullText = MainApp.gs(R.string.pump_basebasalrate_label) + ": " + DecimalFormatter.to2Decimal(profile.getBasal()) + "U/h\n";
String fullText = MainApp.gs(R.string.pump_basebasalrate_label) + ": " + MainApp.gs(R.string.pump_basebasalrate,profile.getBasal()) + "\n";
if (activeTemp != null) {
fullText += MainApp.gs(R.string.pump_tempbasal_label) + ": " + activeTemp.toStringFull();
}
@ -1165,22 +1165,18 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
} else {
if (activeTemp != null) {
basalText = activeTemp.toStringFull() + " ";
}
if (Config.NSCLIENT)
basalText += "(" + DecimalFormatter.to2Decimal(profile.getBasal()) + " U/h)";
else if (pump.getPumpDescription().isTempBasalCapable) {
basalText += "(" + DecimalFormatter.to2Decimal(pump.getBaseBasalRate()) + "U/h)";
basalText = activeTemp.toStringFull();
} else {
basalText = MainApp.gs(R.string.pump_basebasalrate,profile.getBasal());
}
}
baseBasalView.setText(basalText);
if (activeTemp != null) {
baseBasalView.setTextColor(MainApp.gc(R.color.basal));
} else {
baseBasalView.setTextColor(android.R.attr.textColor);
baseBasalView.setTextColor(MainApp.gc(R.color.defaulttextcolor));
}
baseBasalView.setText(basalText);
final ExtendedBolus extendedBolus = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
String extendedBolusText = "";

1
app/src/main/res/values/colors.xml
View file

@ -33,6 +33,7 @@
<color name="defaultbackground">#424242</color>
<color name="defaulttext">#BBBBBB</color>
<color name="defaulttextcolor">#B3FFFFFF</color>
<color name="tempTargetBackground">#77dd77</color>
<color name="tempTargetConfirmation">#77dd77</color>