From 4df3561b4baffa7a55a7264171bb2ddf45e38b2a Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 26 Jun 2018 12:53:43 +0200 Subject: [PATCH] setup wizard cleanup --- .../PumpDanaRKorean/DanaRKoreanPlugin.java | 3 +- .../plugins/PumpDanaRv2/DanaRv2Plugin.java | 2 + .../androidaps/setupwizard/SWDefinition.java | 45 +++++++------------ .../setupwizard/elements/SWPlugin.java | 13 +++++- app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values/strings.xml | 8 ++-- 6 files changed, 34 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java index b7b100a3a6..4ae239cab9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java @@ -45,7 +45,8 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin { } public DanaRKoreanPlugin() { - super(); + pluginDescription.description(R.string.description_pump_dana_r_korean); + log = LoggerFactory.getLogger(DanaRKoreanPlugin.class); useExtendedBoluses = SP.getBoolean("danar_useextended", false); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java index b4004fecb3..5b529d1fa7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java @@ -44,6 +44,8 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin { } private DanaRv2Plugin() { + pluginDescription.description(R.string.description_pump_dana_r_v2); + log = LoggerFactory.getLogger(DanaRv2Plugin.class); useExtendedBoluses = false; diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java index 0e7ba0e623..ccca95440a 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java @@ -223,21 +223,14 @@ public class SWDefinition { ) .add(new SWScreen(R.string.configbuilder_insulin) .skippable(false) - .add(new SWInfotext() - .label(MainApp.gs(R.string.rapid_acting_oref) + ": " + MainApp.gs(R.string.fastactinginsulincomment))) - .add(new SWInfotext() - .label(MainApp.gs(R.string.ultrarapid_oref) + ": " + MainApp.gs(R.string.ultrafastactinginsulincomment))) - .add(new SWInfotext() - .label(MainApp.gs(R.string.free_peak_oref) + ": " + MainApp.gs(R.string.free_peak_oref_description))) + .add(new SWPlugin() + .option(PluginType.INSULIN, R.string.configbuilder_insulin_description) + .makeVisible(false) + .label(R.string.configbuilder_insulin)) .add(new SWBreak()) .add(new SWInfotext() .label(R.string.diawarning)) .add(new SWBreak()) - .add(new SWPlugin() - .option(PluginType.INSULIN) - .makeVisible(false) - .label(R.string.configbuilder_insulin)) - .add(new SWBreak()) .add(new SWButton() .text(R.string.insulinsourcesetup) .action(() -> { @@ -253,10 +246,8 @@ public class SWDefinition { ) .add(new SWScreen(R.string.configbuilder_bgsource) .skippable(false) - .add(new SWInfotext() - .label(R.string.setupwizard_bgsource_description)) .add(new SWPlugin() - .option(PluginType.BGSOURCE) + .option(PluginType.BGSOURCE, R.string.configbuilder_bgsource_description) .label(R.string.configbuilder_bgsource)) .add(new SWBreak()) .add(new SWButton() @@ -278,7 +269,7 @@ public class SWDefinition { .label(R.string.setupwizard_profile_description)) .add(new SWBreak()) .add(new SWPlugin() - .option(PluginType.PROFILE) + .option(PluginType.PROFILE, R.string.configbuilder_profile_description) .label(R.string.configbuilder_profile)) .validator(() -> MainApp.getConfigBuilder().getActiveProfileInterface() != null) ) @@ -324,8 +315,9 @@ public class SWDefinition { .add(new SWScreen(R.string.configbuilder_pump) .skippable(false) .add(new SWPlugin() - .option(PluginType.PUMP) + .option(PluginType.PUMP, R.string.configbuilder_pump_description) .label(R.string.configbuilder_pump)) + .add(new SWBreak()) .add(new SWButton() .text(R.string.pumpsetup) .action(() -> { @@ -360,7 +352,7 @@ public class SWDefinition { .label("https://openaps.readthedocs.io/en/latest/")) .add(new SWBreak()) .add(new SWPlugin() - .option(PluginType.APS) + .option(PluginType.APS, R.string.configbuilder_aps_description) .label(R.string.configbuilder_aps)) .add(new SWButton() .text(R.string.apssetup) @@ -402,7 +394,7 @@ public class SWDefinition { .label(R.string.setupwizard_sensitivity_url)) .add(new SWBreak()) .add(new SWPlugin() - .option(PluginType.SENSITIVITY) + .option(PluginType.SENSITIVITY, R.string.configbuilder_sensitivity_description) .label(R.string.configbuilder_sensitivity)) .add(new SWBreak()) .add(new SWButton() @@ -567,21 +559,14 @@ public class SWDefinition { ) .add(new SWScreen(R.string.configbuilder_insulin) .skippable(false) - .add(new SWInfotext() - .label(MainApp.gs(R.string.rapid_acting_oref) + ": " + MainApp.gs(R.string.fastactinginsulincomment))) - .add(new SWInfotext() - .label(MainApp.gs(R.string.ultrarapid_oref) + ": " + MainApp.gs(R.string.ultrafastactinginsulincomment))) - .add(new SWInfotext() - .label(MainApp.gs(R.string.free_peak_oref) + ": " + MainApp.gs(R.string.free_peak_oref_description))) + .add(new SWPlugin() + .option(PluginType.INSULIN, R.string.configbuilder_insulin_description) + .makeVisible(false) + .label(R.string.configbuilder_insulin)) .add(new SWBreak()) .add(new SWInfotext() .label(R.string.diawarning)) .add(new SWBreak()) - .add(new SWPlugin() - .option(PluginType.INSULIN) - .makeVisible(false) - .label(R.string.configbuilder_insulin)) - .add(new SWBreak()) .add(new SWButton() .text(R.string.insulinsourcesetup) .action(() -> { @@ -603,7 +588,7 @@ public class SWDefinition { .label(R.string.setupwizard_sensitivity_url)) .add(new SWBreak()) .add(new SWPlugin() - .option(PluginType.SENSITIVITY) + .option(PluginType.SENSITIVITY, R.string.configbuilder_sensitivity_description) .label(R.string.configbuilder_sensitivity)) .add(new SWBreak()) .add(new SWButton() diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java index 15c9befdc2..80f60eb678 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java @@ -26,6 +26,7 @@ public class SWPlugin extends SWItem { private PluginType pType; private RadioGroup radioGroup; + private int pluginDescription; private boolean makeVisible = true; @@ -33,8 +34,9 @@ public class SWPlugin extends SWItem { super(Type.PLUGIN); } - public SWPlugin option(PluginType pType) { + public SWPlugin option(PluginType pType, int pluginDescription) { this.pType = pType; + this.pluginDescription = pluginDescription; return this; } @@ -55,6 +57,13 @@ public class SWPlugin extends SWItem { radioGroup.setOrientation(LinearLayout.VERTICAL); radioGroup.setVisibility(View.VISIBLE); + TextView pdesc = new TextView(context); + pdesc.setText(pluginDescription); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + params.setMargins(0, 0, 0, 40); + pdesc.setLayoutParams(params); + layout.addView(pdesc); + for (int i = 0; i < pluginsInCategory.size(); i++) { RadioButton rdbtn = new RadioButton(context); PluginBase p = pluginsInCategory.get(i); @@ -64,7 +73,7 @@ public class SWPlugin extends SWItem { rdbtn.setChecked(true); rdbtn.setTag(p); radioGroup.addView(rdbtn); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); params.setMargins(80, 0, 0, 0); TextView desc = new TextView(context); desc.setText(p.getDescription()); diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index f50e2bb919..8cd757d949 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -614,7 +614,6 @@ Oref Fără-Vârf Oref Insulină-Rapidă Oref Insulină-UltraRapidă - Insulină personalizată DIA din %f prea scurtă - se folosește %f în schimb! Activează profil Data @@ -955,7 +954,6 @@ Citire stare Schimbările trebuie făcute în NS Ignoră asistentul pentru setări - Care este sursa de glicemii? Apăsați butonul pentru a permite AndroidAPS să sugereze/facă schimbări ale bazalei Apăsați butonul pentru a activa Obiectivele. După terminarea procesului de setare, alegeți fereastra Obiective pentru a face AndroidAPS complet funcțional. Activați Obiectivele diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc3ea04674..c903f341a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ Synchronizes your data with Nightscout State of the algorithm in 2016 State of the algorithm in 2017 - Most recent and most stable + Most recent algorithm for advanced users Displays the current state of your loop and buttons for most common actions Shows an ongoing notification with a short overview of what your loop is doing Define a profile which is offline available. @@ -33,13 +33,15 @@ Define a profile with only one time block. Pump integration for Accu-Chek Combo pumps, requires having ruffy installed Pump integration for DANA Diabecare R pumps + Pump integration for domestic DANA Diabecare R pumps + Pump integration for DANA Diabecare R pumps with upgraded firmware Pump integration for DANA Diabecare RS pumps Pump integration for Accu-Chek Insight pumps, requires having SightRemote installed Pump integration for people who do multiple daily injections for their diabetes therapy Pump integration for pumps which don\'t have any driver yet (Open Loop) Sensitivity is calculated the same way like Oref0, but you can specify timeframe to the past. Minimal carb absorption is calculated from max carb absorption time from preferences. Sensitivity is calculated from 24h data in the past and carbs (if not absorbed) are cut after time specified in preferences. - Sensitivity is calculated from 24h data in the past and carbs (if not absorbed) are cut after time specified in preferences. Plugin also calculates UAM. + Sensitivity is calculated from 8h data in the past and carbs (if not absorbed) are cut after time specified in preferences. Plugin also calculates UAM. Sensitivity is calculated as a weighted average from deviations. Newer deviations have higher weight. Minimal carb absorption is calculated from max carb absorption time from preferences. This algorithm is the fastest in following sensitivity changes. Receive BG values from the patched Dexcom G5 app. Receive BG values from Glimp. @@ -717,7 +719,6 @@ Free-Peak Oref Rapid-Acting Oref Ultra-Rapid Oref - Custom insulin DIA of %f too short - using %f instead! Activate profile Date @@ -1117,7 +1118,6 @@ Read status Changes must be done in NS Skip setup wizard - Where should blood glucose(BG) data be coming from ?\n Press the button below to enable AndroidAPS to suggest/make basal changes Press the button below to enable Objectives. Look in the Objectives tab, after you finish this wizard, to make AndroidAPS completely functional.\n Enable Objectives