caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Added insulin descriptions to SW screen

Browse source
This commit is contained in:
Roumen Georgiev 2018-05-10 13:56:50 +03:00
parent 2fa77d2a8c
commit 016aa1c069
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
View file

@ -62,9 +62,6 @@ public class SWDefinition {
SWDefinition() { SWDefinition() {
// Don't allow for screens to add up
if(screens.size() >0)
screens = new ArrayList<>();
// List all the screens here // List all the screens here
add(new SWScreen(R.string.nav_setupwizard) add(new SWScreen(R.string.nav_setupwizard)
.add(new SWInfotext() .add(new SWInfotext()

2
app/src/main/java/info/nightscout/androidaps/startupwizard/SWRadioButton.java
View file

@ -64,4 +64,4 @@ public class SWRadioButton extends SWItem {
layout.addView(radioGroup); layout.addView(radioGroup);
super.generateDialog(view, layout); super.generateDialog(view, layout);
} }
} }

1
app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
View file

@ -38,6 +38,7 @@ public class SetupWizardActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
LocaleHelper.onCreate(this, "en"); LocaleHelper.onCreate(this, "en");
setContentView(R.layout.activity_setupwizard); setContentView(R.layout.activity_setupwizard);
Intent intent = getIntent(); Intent intent = getIntent();
currentWizardPage = intent.getIntExtra(SetupWizardActivity.INTENT_MESSAGE, 0); currentWizardPage = intent.getIntExtra(SetupWizardActivity.INTENT_MESSAGE, 0);
if (screens.size() > 0 && currentWizardPage < screens.size()) { if (screens.size() > 0 && currentWizardPage < screens.size()) {

4
app/src/main/res/values/strings.xml
View file

@ -1022,7 +1022,6 @@
<string name="setupwizard_skip">Skip</string> <string name="setupwizard_skip">Skip</string>
<string name="setupwizard_finish">FINISH</string> <string name="setupwizard_finish">FINISH</string>
<string name="setupwizard_language_prompt">Select your language</string> <string name="setupwizard_language_prompt">Select your language</string>
<string name="setupwizard_pump_test">Test pump connection</string>
<string name="key_language" translatable="false">language</string> <string name="key_language" translatable="false">language</string>
<string name="key_openapsama_min_5m_carbimpact" translatable="false">openapsama_min_5m_carbimpact</string> <string name="key_openapsama_min_5m_carbimpact" translatable="false">openapsama_min_5m_carbimpact</string>
<string name="boluserrorcode">Asked: %.2fU Delivered: %.2fU Error code: %d</string> <string name="boluserrorcode">Asked: %.2fU Delivered: %.2fU Error code: %d</string>
@ -1061,9 +1060,6 @@
<string name="wear_wizard_settings_summary">Calculations included in the Wizard result:</string> <string name="wear_wizard_settings_summary">Calculations included in the Wizard result:</string>
<string name="wear_display_settings">Display Settings</string> <string name="wear_display_settings">Display Settings</string>
<string name="wear_general_settings">General Settings</string> <string name="wear_general_settings">General Settings</string>
<string name="dummy_content">DUMMY\nCONTENT</string>
<string name="nsclient_prefs">Additional NSClient options</string>
<string name="settings_incorrect">Incorrect settings! Press \'BACK\' and try again</string>
<string name="enable_nsclient">Enable NSClient</string> <string name="enable_nsclient">Enable NSClient</string>
<string name="welcometosetupwizard">Welcome to setup wizard. It will guide you through the setup process</string> <string name="welcometosetupwizard">Welcome to setup wizard. It will guide you through the setup process</string>
<string name="pumpsetup">Pump setup</string> <string name="pumpsetup">Pump setup</string>