caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Wear: reanme BolusActivity to TreatmentActivity

Browse source
This commit is contained in:
Andries Smit 2022-01-11 22:45:22 +01:00
parent 6675da7779
commit b823a2f5a7
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wear/src/main/AndroidManifest.xml
View file

@ -568,9 +568,9 @@
android:name=".interaction.menus.StatusMenuActivity"
android:label="@string/menu_status" />
<activity
android:name=".interaction.actions.BolusActivity"
android:name=".interaction.actions.TreatmentActivity"
android:exported="true"
android:label="@string/action_bolus" />
android:label="@string/menu_treatment" />
<activity
android:name=".interaction.actions.CPPActivity"
android:label="@string/status_cpp" />

4
wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
View file

@ -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);

2
wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java → wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.java
View file

@ -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;

8
wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java
View file

@ -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)) {

4
wear/src/main/java/info/nightscout/androidaps/tile/ActionSource.kt
View file

@ -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 = "",
),

4
wear/src/main/res/values/arrays.xml
View file

@ -49,7 +49,7 @@
<item>@string/menu_default</item>
<item>@string/menu_menu</item>
<item>@string/menu_wizard</item>
<item>@string/menu_bolus</item>
<item>@string/menu_treatment</item>
<item>@string/menu_ecarb</item>
<item>@string/menu_status</item>
<item>@string/menu_none</item>
@ -81,7 +81,7 @@
<string-array name="tile_action_names">
<item>@string/menu_wizard</item>
<item>@string/menu_bolus</item>
<item>@string/menu_treatment</item>
<item>@string/menu_ecarb</item>
<item>@string/menu_tempt</item>
<item>@string/tile_none</item>

2
wear/src/main/res/values/strings.xml
View file

@ -74,7 +74,7 @@
<string name="menu_tempt">TempT</string>
<string name="menu_wizard">Wizard</string>
<string name="menu_bolus">Bolus</string>
<string name="menu_treatment">Treatment</string>
<string name="menu_ecarb">eCarb</string>
<string name="menu_settings">Settings</string>
<string name="menu_status">Status</string>