diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java index fa5ee6f70a..285f1521d0 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java @@ -83,7 +83,7 @@ public class CPPActivity extends ViewSelectorActivity { def = SafeParse.stringToDouble(editTimeshift.editText.getText().toString()); } editTimeshift = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 23d, 1d, new DecimalFormat("0"), true, true); - setLabelToPlusMinusView(view, "timeshift"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_timeshift)); container.addView(view); return view; } else if(col == 1){ @@ -93,7 +93,7 @@ public class CPPActivity extends ViewSelectorActivity { def = SafeParse.stringToDouble(editPercentage.editText.getText().toString()); } editPercentage = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 50d, 150d, 1d, new DecimalFormat("0"), false); - setLabelToPlusMinusView(view, "percentage"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_percentage)); container.addView(view); return view; } else { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java index a598a39c2c..bd00f3ba15 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java @@ -71,7 +71,7 @@ public class ECarbActivity extends ViewSelectorActivity { def = SafeParse.stringToDouble(editCarbs.editText.getText().toString()); } editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 150d, 1d, new DecimalFormat("0"), true); - setLabelToPlusMinusView(view, "carbs"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_carbs)); container.addView(view); return view; } else if(col == 1){ @@ -81,7 +81,7 @@ public class ECarbActivity extends ViewSelectorActivity { def = SafeParse.stringToDouble(editStartTime.editText.getText().toString()); } editStartTime = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 300d, 15d, new DecimalFormat("0"), false); - setLabelToPlusMinusView(view, "start [min]"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_start_min)); container.addView(view); return view; } else if(col == 2){ @@ -91,7 +91,7 @@ public class ECarbActivity extends ViewSelectorActivity { def = SafeParse.stringToDouble(editDuration.editText.getText().toString()); } editDuration = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 8d, 1d, new DecimalFormat("0"), false); - setLabelToPlusMinusView(view, "duration [h]"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_duration_h)); container.addView(view); return view; } else { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.java index 694dc0283c..3fb463b3c8 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.java @@ -70,7 +70,7 @@ public class FillActivity extends ViewSelectorActivity { def = SafeParse.stringToDouble(editInsulin.editText.getText().toString()); } editInsulin = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 30d, 0.1d, new DecimalFormat("#0.0"), false); - setLabelToPlusMinusView(view, "insulin"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_insulin)); container.addView(view); return view; } else { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java index 4b04a72cdc..b23672b12f 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java @@ -85,7 +85,7 @@ public class TempTargetActivity extends ViewSelectorActivity { double def = SafeParse.stringToDouble(time.editText.getText().toString()); time = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 24 * 60d, 5d, new DecimalFormat("0"), false); } - setLabelToPlusMinusView(view, "duration"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_duration)); container.addView(view); return view; @@ -105,9 +105,9 @@ public class TempTargetActivity extends ViewSelectorActivity { lowRange = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 4d, 10d, 0.1d, new DecimalFormat("#0.0"), false); } if(isSingleTarget){ - setLabelToPlusMinusView(view, "target"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_target)); } else { - setLabelToPlusMinusView(view, "low"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_low)); } container.addView(view); return view; @@ -126,7 +126,7 @@ public class TempTargetActivity extends ViewSelectorActivity { } highRange = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 4d, 10d, 0.1d, new DecimalFormat("#0.0"), false); } - setLabelToPlusMinusView(view, "high"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_high)); container.addView(view); return view; }else { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java index 5c16063bb2..f2b4e3cc0b 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java @@ -80,7 +80,7 @@ public class WizardActivity extends ViewSelectorActivity { editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 150d, 1d, new DecimalFormat("0"), false); } - setLabelToPlusMinusView(view, "carbs"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_carbs)); container.addView(view); return view; } else if(col == 1 && hasPercentage){ @@ -91,7 +91,7 @@ public class WizardActivity extends ViewSelectorActivity { double def = SafeParse.stringToDouble(editPercentage.editText.getText().toString()); editPercentage = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 50d, 150d, 1d, new DecimalFormat("0"), false); } - setLabelToPlusMinusView(view, "percentage"); + setLabelToPlusMinusView(view, getResources().getString(R.string.action_percentage)); container.addView(view); return view; } else { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java index a4d1a3d181..e8abb24088 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java @@ -2,6 +2,7 @@ package info.nightscout.androidaps.interaction.menus; import android.content.Intent; +import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.ListenerService; import info.nightscout.androidaps.interaction.actions.FillActivity; import info.nightscout.androidaps.interaction.utils.MenuListActivity; @@ -15,10 +16,10 @@ public class FillMenuActivity extends MenuListActivity { @Override protected String[] getElements() { return new String[]{ - "Preset 1", - "Preset 2", - "Preset 3", - "Free amount" + getResources().getString(R.string.action_preset_1), + getResources().getString(R.string.action_preset_2), + getResources().getString(R.string.action_preset_3), + getResources().getString(R.string.action_free_amount) }; } 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 0692f273fb..ccd2e432f1 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 @@ -7,6 +7,7 @@ import android.preference.PreferenceManager; import java.util.Vector; +import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.ListenerService; import info.nightscout.androidaps.interaction.AAPSPreferences; import info.nightscout.androidaps.interaction.actions.AcceptActivity; @@ -46,13 +47,13 @@ public class MainMenuActivity extends MenuListActivity { boolean showWizard = sp.getBoolean("showWizard", true); Vector menuitems = new Vector(); - menuitems.add("TempT"); - if(showWizard) menuitems.add("Wizard"); - menuitems.add("eCarb"); - menuitems.add("Bolus"); - menuitems.add("Settings"); - menuitems.add("Status"); - if (showPrimeFill) menuitems.add("Prime/Fill"); + menuitems.add(getResources().getString(R.string.menu_tempt)); + if(showWizard) menuitems.add(getResources().getString(R.string.menu_wizard)); + menuitems.add(getResources().getString(R.string.menu_ecarb)); + menuitems.add(getResources().getString(R.string.menu_bolus)); + menuitems.add(getResources().getString(R.string.menu_settings)); + menuitems.add(getResources().getString(R.string.menu_status)); + if (showPrimeFill) menuitems.add(getResources().getString(R.string.menu_prime_fill)); return menuitems.toArray(new String[menuitems.size()]); } @@ -62,33 +63,33 @@ public class MainMenuActivity extends MenuListActivity { Intent intent; - if ("Settings".equals(action)) { + if (getResources().getString(R.string.menu_settings).equals(action)) { intent = new Intent(this, AAPSPreferences.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); } else if ("Re-Sync".equals(action)) { ListenerService.requestData(this); - } else if ("TempT".equals(action)) { + } else if (getResources().getString(R.string.menu_tempt).equals(action)) { intent = new Intent(this, TempTargetActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); - } else if ("Bolus".equals(action)) { + } else if (getResources().getString(R.string.menu_bolus).equals(action)) { intent = new Intent(this, BolusActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); - } else if ("Wizard".equals(action)) { + } else if (getResources().getString(R.string.menu_wizard).equals(action)) { intent = new Intent(this, WizardActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); - } else if ("Status".equals(action)) { + } else if (getResources().getString(R.string.menu_status).equals(action)) { intent = new Intent(this, StatusMenuActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); - } else if ("Prime/Fill".equals(action)) { + } else if (getResources().getString(R.string.menu_prime_fill).equals(action)) { intent = new Intent(this, FillMenuActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); - } else if ("eCarb".equals(action)) { + } else if (getResources().getString(R.string.menu_ecarb).equals(action)) { intent = new Intent(this, ECarbActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java index f17bc23e46..8aae40478e 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java @@ -1,5 +1,6 @@ package info.nightscout.androidaps.interaction.menus; +import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.ListenerService; import info.nightscout.androidaps.interaction.utils.MenuListActivity; @@ -12,23 +13,23 @@ public class StatusMenuActivity extends MenuListActivity { @Override protected String[] getElements() { return new String[] { - "Pump", - "Loop", - "CPP", - "TDD"}; + getResources().getString(R.string.status_pump), + getResources().getString(R.string.status_loop), + getResources().getString(R.string.status_cpp), + getResources().getString(R.string.status_tdd)}; } @Override protected void doAction(String action) { - if ("Pump".equals(action)) { + if (getResources().getString(R.string.status_pump).equals(action)) { ListenerService.initiateAction(this, "status pump"); - } else if ("Loop".equals(action)) { + } else if (getResources().getString(R.string.status_loop).equals(action)) { ListenerService.initiateAction(this, "status loop"); - } else if ("CPP".equals(action)) { + } else if (getResources().getString(R.string.status_cpp).equals(action)) { ListenerService.initiateAction(this, "opencpp"); - } else if ("TDD".equals(action)) { + } else if (getResources().getString(R.string.status_tdd).equals(action)) { ListenerService.initiateAction(this, "tddstats"); } } diff --git a/wear/src/main/res/values/arrays.xml b/wear/src/main/res/values/arrays.xml index 9985ab6e7d..281da2427c 100644 --- a/wear/src/main/res/values/arrays.xml +++ b/wear/src/main/res/values/arrays.xml @@ -2,11 +2,11 @@ - 1 hour - 2 hours - 3 hours - 4 hours - 5 hours + @string/pref_1_hour + @string/pref_2_hours + @string/pref_3_hours + @string/pref_4_hours + @string/pref_5_hours @@ -18,9 +18,9 @@ - Low - Medium - High + @string/pref_low + @string/pref_medium + @string/pref_high @@ -30,10 +30,10 @@ - Default - Quick righty - Quick lefty - Modern Sparse + @string/pref_default + @string/pref_quick_righty + @string/pref_quick_lefty + @string/pref_modern_sparse @@ -44,13 +44,13 @@ - Default - Menu - Wizard - Bolus - eCarb - Status - None + @string/menu_default + @string/menu_menu + @string/menu_wizard + @string/menu_bolus + @string/menu_ecarb + @string/menu_status + @string/menu_none diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml index 0dd0f8b27e..7755aeacd4 100644 --- a/wear/src/main/res/values/strings.xml +++ b/wear/src/main/res/values/strings.xml @@ -4,7 +4,6 @@ AAPS AAPS - AAPS AAPS(Large) AAPS(BigChart) @@ -26,8 +25,6 @@ Off Vibrate on Bolus Units for Actions - mg/dl - mmol/l Show Date Show IOB Show COB @@ -77,8 +74,12 @@ Settings Status Prime/Fill + None + Default + Menu duration + target low high carbs @@ -105,17 +106,16 @@ Carb IOB - g - U no status + mg/dl + mmol/l + g + U + U/h + h + d + w/s - No data! - Old data! - Since %1$s - Sync with AAPS! - - No data received since %1$s! Check if AAPS on the phone sends data to watch - AAPS data is %1$s old! Check your sensor, xDrip+, NS, AAPS config or other! diff --git a/wear/src/main/res/xml/preferences.xml b/wear/src/main/res/xml/preferences.xml index c52ab52e8a..5899f43cab 100644 --- a/wear/src/main/res/xml/preferences.xml +++ b/wear/src/main/res/xml/preferences.xml @@ -204,6 +204,7 @@ android:title="@string/pref_wizard_in_menu" app:wear_iconOff="@drawable/settings_off" app:wear_iconOn="@drawable/settings_on"/> + + + + + - - +