From 9d3625e78c5dc38a7a823d7932c4fa26587dda97 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 18 Nov 2017 23:28:47 +0100
Subject: [PATCH] Show bolus/TBR percent and duration with activity.

---
 .../nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java | 5 +++--
 app/src/main/res/values-de/strings.xml                       | 4 ++--
 app/src/main/res/values/strings.xml                          | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index f1bd80e207..9688ac10de 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -417,7 +417,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
         Bolus lastKnownBolus = pump.lastBolus;
 
         try {
-            pump.activity = MainApp.sResources.getString(R.string.combo_pump_action_bolusing);
+            pump.activity = MainApp.sResources.getString(R.string.combo_pump_action_bolusing, detailedBolusInfo.insulin);
             MainApp.bus().post(new EventComboPumpUpdateGUI());
 
             // refresh pump data
@@ -538,7 +538,8 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
         }
 
         int finalAdjustedPercent = adjustedPercent;
-        CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_setting_tbr), 3, () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes));
+        CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_setting_tbr, percent, durationInMinutes),
+                3, () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes));
         if (!commandResult.success) {
             return new PumpEnactResult().success(false).enacted(false);
         }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6934f628ea..638e633fa9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -691,6 +691,6 @@
     <string name="combo_stats">Statistiken</string>
     <string name="combo_programming_bolus">Bolusabgabe wird vorbereitet</string>
     <string name="combo_pump_action_cancelling_tbr">TBR wird abgebrochen</string>
-    <string name="combo_pump_action_setting_tbr">TBR wird gesetzt</string>
-    <string name="combo_pump_action_bolusing">Bolus wird abgegeben</string>
+    <string name="combo_pump_action_setting_tbr">TBR wird gesetzt (%d%% / %d min)</string>
+    <string name="combo_pump_action_bolusing">Bolus (%.1f E) wird abgegeben</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d4d5701117..8f982ccd4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -779,8 +779,8 @@
     <string name="combo_pump_state_running">Running</string>
     <string name="combo_pump_action_checking_history">Checking pump history</string>
     <string name="combo_pump_action_cancelling_tbr">Cancelling TBR</string>
-    <string name="combo_pump_action_setting_tbr">Setting TBR</string>
-    <string name="combo_pump_action_bolusing">Bolusing</string>
+    <string name="combo_pump_action_setting_tbr">Setting TBR (%d%% / %d min)</string>
+    <string name="combo_pump_action_bolusing">Bolusing (%.1f U)</string>
     <string name="combo_pump_action_refreshing">Refreshing</string>
     <string name="key_raise_urgent_alarms_as_android_notification" translatable="false">raise_urgent_alarms_as_android_notification</string>
     <string name="raise_urgent_alarms_as_android_notification">Use system notifications for alerts</string>