caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Wear: Allign action names with phone app

Browse source
This commit is contained in:
Andries Smit 2022-01-11 23:39:27 +01:00
parent 38d4133df2
commit 3212a79eb9
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -574,7 +574,7 @@
<activity
android:name=".interaction.actions.BolusActivity"
android:exported="true"
android:label="@string/menu_bolus" />
android:label="@string/action_insulin" />
<activity
android:name=".interaction.actions.CPPActivity"
android:label="@string/status_cpp" />

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

@ -14,7 +14,7 @@ object ActionSource : TileSource {
Action(
id = 0,
settingName = "wizzard",
nameRes = R.string.menu_wizard,
nameRes = R.string.menu_wizard_short,
iconRes = R.drawable.ic_calculator_green,
activityClass = WizardActivity::class.java.getName(),
background = false,
@ -23,7 +23,7 @@ object ActionSource : TileSource {
Action(
id = 1,
settingName = "treatment",
nameRes = R.string.menu_treatment,
nameRes = R.string.menu_treatment_short,
iconRes = R.drawable.ic_bolus_carbs,
activityClass = TreatmentActivity::class.java.getName(),
background = false,
@ -32,7 +32,7 @@ object ActionSource : TileSource {
Action(
id = 2,
settingName = "bolus",
nameRes = R.string.action_bolus,
nameRes = R.string.action_Insulin,
iconRes = R.drawable.ic_bolus,
activityClass = BolusActivity::class.java.getName(),
background = false,

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

@ -62,10 +62,10 @@
<string name="pref_ring_history">Ring History</string>
<string name="pref_light_ring_history">Light Ring History</string>
<string name="pref_animations">Animations</string>
<string name="pref_wizard_in_menu">Wizard in Menu</string>
<string name="pref_wizard_in_menu">Calculator in Menu</string>
<string name="pref_prime_in_menu">Prime in Menu</string>
<string name="pref_single_target">Single Target</string>
<string name="pref_wizard_percentage">Wizard Percentage</string>
<string name="pref_wizard_percentage">Calculator Percentage</string>
<string name="pref_complication_tap_action">Complication Tap Action</string>
<string name="pref_unicode_in_complications">Unicode in Complications</string>
<string name="pref_version">Version:</string>
@ -73,8 +73,10 @@
<string name="pref_lookInYourWatchfaceConfiguration">Look into Watchface configuration, please.</string>
<string name="menu_tempt">TempT</string>
<string name="menu_wizard">Wizard</string>
<string name="menu_wizard">Calculator</string>
<string name="menu_wizard_short">Calc</string>
<string name="menu_treatment">Treatment</string>
<string name="menu_treatment_short">Treat</string>
<string name="menu_bolus">Bolus</string>
<string name="menu_ecarb">Carbs</string>
<string name="menu_settings">Settings</string>
@ -85,17 +87,17 @@
<string name="menu_default">Default</string>
<string name="menu_menu">Menu</string>
<string name="action_duration">duration</string>
<string name="action_duration">Duration</string>
<string name="action_tempt_confirmation">Temp Target Requested</string>
<string name="action_treatment_confirmation">Treatment Requested</string>
<string name="action_bolus_confirmation">Bolus Requested</string>
<string name="action_wizard_confirmation">Updated Requested</string>
<string name="action_wizard_confirmation">Calculation Requested</string>
<string name="action_fill_confirmation">Fill Requested</string>
<string name="action_ecarb_confirmation">Carbs Requested</string>
<string name="action_cpp_confirmation">CPP Requested</string>
<string name="action_target" comment="In temp target menu, single target value">target</string>
<string name="action_low" comment="In temp target menu, lower value from range">low</string>
<string name="action_high" comment="In temp target menu, higher value from range">high</string>
<string name="action_target" comment="In temp target menu, single target value">Target</string>
<string name="action_low" comment="In temp target menu, lower value from range">Low</string>
<string name="action_high" comment="In temp target menu, higher value from range">High</string>
<string name="action_carbs">Carbs</string>
<string name="action_percentage">Percentage</string>
<string name="action_start_min">Start [min]</string>
@ -108,6 +110,7 @@
<string name="action_confirm">CONFIRM</string>
<string name="action_timeshift">timeshift</string>
<string name="action_bolus">Bolus</string>
<string name="action_insulin">Insulin</string>
<string name="bolus_progress">Bolus Progress</string>
<string name="press_to_cancel">press to cancel</string>

2
wear/src/main/res/xml/preferences.xml
View file

@ -121,7 +121,7 @@
<CheckBoxPreference
android:defaultValue="true"
android:key="showWizard"
android:summary="Wizard from watch possible"
android:summary="Calculator from watch possible"
android:title="@string/pref_wizard_in_menu"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />