From a5393eff84de80e03b29acbf620958db0f0f5adc Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jan 2020 22:52:21 +0100
Subject: [PATCH] revert TRB displaying

---
 .../androidaps/db/TemporaryBasal.java         |  4 ----
 .../general/overview/OverviewFragment.java    | 22 ++++++++-----------
 app/src/main/res/values/colors.xml            |  1 +
 3 files changed, 10 insertions(+), 17 deletions(-)

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 2d46091d93..add3474652 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
@@ -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 = "";
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 @@
 
     <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>