diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index b18d40d158..cf0eeab462 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -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;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index 5fe6138ca3..98a516c0b1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -204,7 +204,7 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
boolean smallWidth;
boolean smallHeight;
- public static boolean shorttextmode = true;
+ public static boolean shorttextmode = false;
private boolean accepted;
@@ -1165,12 +1165,12 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
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 = resourceHelper.gs(R.string.pump_basebasalrate_label) + ": " + DecimalFormatter.to2Decimal(profile.getBasal()) + "U/h\n";
+ String fullText = resourceHelper.gs(R.string.pump_basebasalrate_label) + ": " + resourceHelper.gs(R.string.pump_basebasalrate,profile.getBasal()) + "\n";
if (activeTemp != null) {
fullText += resourceHelper.gs(R.string.pump_tempbasal_label) + ": " + activeTemp.toStringFull();
}
@@ -1179,22 +1179,18 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
} 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 = resourceHelper.gs(R.string.pump_basebasalrate,profile.getBasal());
}
}
+ baseBasalView.setText(basalText);
if (activeTemp != null) {
baseBasalView.setTextColor(resourceHelper.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.getExtendedBolusFromHistory(System.currentTimeMillis());
String extendedBolusText = "";
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2ebd12c7a5..7d9e0c5896 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -33,6 +33,7 @@
#424242
#BBBBBB
+ #B3FFFFFF
#77dd77
#77dd77