diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 1640dc254c..10a6a6b642 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -568,9 +568,9 @@
android:name=".interaction.menus.StatusMenuActivity"
android:label="@string/menu_status" />
+ android:label="@string/menu_treatment" />
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
index 444b7702f0..158ad0f3e1 100644
--- a/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
@@ -15,7 +15,7 @@ import javax.inject.Inject;
import dagger.android.DaggerBroadcastReceiver;
import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interaction.actions.BolusActivity;
+import info.nightscout.androidaps.interaction.actions.TreatmentActivity;
import info.nightscout.androidaps.interaction.actions.ECarbActivity;
import info.nightscout.androidaps.interaction.actions.WizardActivity;
import info.nightscout.androidaps.interaction.menus.MainMenuActivity;
@@ -77,7 +77,7 @@ public class ComplicationTapBroadcastReceiver extends DaggerBroadcastReceiver {
intentOpen = new Intent(context, WizardActivity.class);
break;
case BOLUS:
- intentOpen = new Intent(context, BolusActivity.class);
+ intentOpen = new Intent(context, TreatmentActivity.class);
break;
case ECARB:
intentOpen = new Intent(context, ECarbActivity.class);
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.java
similarity index 98%
rename from wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java
rename to wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.java
index 9b570d23ca..211d9cb93a 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.java
@@ -18,7 +18,7 @@ import info.nightscout.shared.SafeParse;
* Created by adrian on 09/02/17.
*/
-public class BolusActivity extends ViewSelectorActivity {
+public class TreatmentActivity extends ViewSelectorActivity {
PlusMinusEditText editCarbs;
PlusMinusEditText editInsulin;
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java
index 126f7a2ceb..b56649f336 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java
@@ -11,7 +11,7 @@ import java.util.List;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.ListenerService;
import info.nightscout.androidaps.interaction.AAPSPreferences;
-import info.nightscout.androidaps.interaction.actions.BolusActivity;
+import info.nightscout.androidaps.interaction.actions.TreatmentActivity;
import info.nightscout.androidaps.interaction.actions.ECarbActivity;
import info.nightscout.androidaps.interaction.actions.TempTargetActivity;
import info.nightscout.androidaps.interaction.actions.WizardActivity;
@@ -49,7 +49,7 @@ public class MainMenuActivity extends MenuListActivity {
if (showWizard) menuItems.add(new MenuItem(R.drawable.ic_calculator, getString(R.string.menu_wizard)));
menuItems.add(new MenuItem(R.drawable.ic_e_carbs, getString(R.string.menu_ecarb)));
- menuItems.add(new MenuItem(R.drawable.ic_bolus, getString(R.string.menu_bolus)));
+ menuItems.add(new MenuItem(R.drawable.ic_bolus, getString(R.string.menu_treatment)));
menuItems.add(new MenuItem(R.drawable.ic_temptarget, getString(R.string.menu_tempt)));
menuItems.add(new MenuItem(R.drawable.ic_settings, getString(R.string.menu_settings)));
menuItems.add(new MenuItem(R.drawable.ic_status, getString(R.string.menu_status)));
@@ -73,8 +73,8 @@ public class MainMenuActivity extends MenuListActivity {
intent = new Intent(this, TempTargetActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
this.startActivity(intent);
- } else if (getString(R.string.menu_bolus).equals(action)) {
- intent = new Intent(this, BolusActivity.class);
+ } else if (getString(R.string.menu_treatment).equals(action)) {
+ intent = new Intent(this, TreatmentActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
this.startActivity(intent);
} else if (getString(R.string.menu_wizard).equals(action)) {
diff --git a/wear/src/main/java/info/nightscout/androidaps/tile/ActionSource.kt b/wear/src/main/java/info/nightscout/androidaps/tile/ActionSource.kt
index 0cb9370b3a..9c8a60a47b 100644
--- a/wear/src/main/java/info/nightscout/androidaps/tile/ActionSource.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/tile/ActionSource.kt
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.tile
import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interaction.actions.BolusActivity
+import info.nightscout.androidaps.interaction.actions.TreatmentActivity
import info.nightscout.androidaps.interaction.actions.ECarbActivity
import info.nightscout.androidaps.interaction.actions.TempTargetActivity
import info.nightscout.androidaps.interaction.actions.WizardActivity
@@ -24,7 +24,7 @@ object ActionSource : TileSource {
settingName = "bolus",
nameRes = R.string.action_bolus,
iconRes = R.drawable.ic_bolus_carbs,
- activityClass = BolusActivity::class.java.getName(),
+ activityClass = TreatmentActivity::class.java.getName(),
background = false,
actionString = "",
),
diff --git a/wear/src/main/res/values/arrays.xml b/wear/src/main/res/values/arrays.xml
index befafd83ef..ce4ef4c702 100644
--- a/wear/src/main/res/values/arrays.xml
+++ b/wear/src/main/res/values/arrays.xml
@@ -49,7 +49,7 @@
- @string/menu_default
- @string/menu_menu
- @string/menu_wizard
- - @string/menu_bolus
+ - @string/menu_treatment
- @string/menu_ecarb
- @string/menu_status
- @string/menu_none
@@ -81,7 +81,7 @@
- @string/menu_wizard
- - @string/menu_bolus
+ - @string/menu_treatment
- @string/menu_ecarb
- @string/menu_tempt
- @string/tile_none
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index 86a939f6de..31b61d0691 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -74,7 +74,7 @@
TempT
Wizard
- Bolus
+ Treatment
eCarb
Settings
Status