caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

trying pump followup screen

Browse source
This commit is contained in:
Roumen Georgiev 2018-05-08 17:09:37 +03:00
parent e357c7fd1b
commit 85d4ef4419
2 changed files with 63 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,11 +9,11 @@ import java.util.List;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
import info.nightscout.androidaps.events.EventConfigBuilderChange; import info.nightscout.androidaps.events.EventConfigBuilderChange;
import info.nightscout.androidaps.events.EventRefreshGui;
import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment; import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin; import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin;
import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin; import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin; import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
import info.nightscout.androidaps.startupwizard.events.EventSWUpdate; import info.nightscout.androidaps.startupwizard.events.EventSWUpdate;
@ -48,7 +48,7 @@ public class SWDefinition {
add(new SWScreen(R.string.language) add(new SWScreen(R.string.language)
.skippable(false) .skippable(false)
.add(new SWRadioButton() .add(new SWRadioButton()
.option(R.array.languagesArray, R.array.languagesValues) .option("", R.array.languagesArray, R.array.languagesValues)
.preferenceId(R.string.key_language).label(R.string.language) .preferenceId(R.string.key_language).label(R.string.language)
.comment(R.string.setupwizard_language_prompt)) .comment(R.string.setupwizard_language_prompt))
.validator(() -> { .validator(() -> {
@ -90,33 +90,41 @@ public class SWDefinition {
.validator(() -> MainApp.getSpecificPluginsList(PluginType.PUMP) != null) .validator(() -> MainApp.getSpecificPluginsList(PluginType.PUMP) != null)
) )
.add(new SWScreen(R.string.setupwizard_pump_test) .add(new SWScreen(R.string.setupwizard_pump_test)
.skippable(true) .skippable(false)
// Adding DanaR specific fields // Adding DanaR specific fields
.add(DanaRPlugin.getPlugin().isEnabled(PluginType.PUMP)?new SWString() .add(DanaRPlugin.getPlugin().isEnabled(PluginType.PUMP)?new SWString()
.preferenceId(R.string.key_danar_bt_name) .preferenceId(R.string.key_danar_bt_name)
.label(R.string.danar_bt_name_title) .label(R.string.danar_bt_name_title)
.comment(R.string.danar_bt_name_title) : new SWItem(SWItem.Type.STRING) .comment(R.string.danar_bt_name_title) : new SWItem(SWItem.Type.STRING)
) )
.add(DanaRPlugin.getPlugin().isEnabled(PluginType.PUMP)?new SWString() .add(DanaRPlugin.getPlugin().isEnabled(PluginType.PUMP)?new SWString()
.preferenceId(R.string.key_danar_password) .preferenceId(R.string.key_danar_password)
.label(R.string.danar_password_title) .label(R.string.danar_password_title)
.comment(R.string.danar_password_title): new SWItem(SWItem.Type.STRING) .comment(R.string.danar_password_title): new SWItem(SWItem.Type.STRING)
) )
// Virtual pump // Virtual pump
.add(VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP)? .add(VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP)?
new SWRadioButton() // TODO: Replace with checkbox
.option(R.array.trueFalseArray, R.array.trueFalseValues) new SWRadioButton()
.preferenceId(R.string.key_virtualpump_uploadstatus) .option(MainApp.instance().getApplicationContext().getResources().getString(R.string.virtualpump_uploadstatus_title), R.array.trueFalseArray, R.array.trueFalseValues)
.label(R.string.virtualpump_uploadstatus_title) .preferenceId(R.string.key_virtualpump_uploadstatus)
.comment(R.string.virtualpump_uploadstatus_title): new SWItem(SWItem.Type.STRING) .label(R.string.virtualpump_uploadstatus_title)
) .comment(R.string.virtualpump_uploadstatus_title): new SWItem(SWItem.Type.STRING)
.validator(() -> MainApp.getSpecificPluginsList(PluginType.PUMP) != null) )
// Combo pump
.add(ComboPlugin.getPlugin().isEnabled(PluginType.PUMP)?
new SWString()
.preferenceId(R.string.combo_pump_alerts)
.label(R.string.combo_pump_state_label)
.comment(R.string.combo_pump_state_label): new SWItem(SWItem.Type.STRING)
)
.validator(() -> ConfigBuilderPlugin.getActivePump() != null)
) )
.add(new SWScreen(R.string.patientage) .add(new SWScreen(R.string.patientage)
.skippable(false) .skippable(false)
.add(new SWRadioButton() .add(new SWRadioButton()
.option(R.array.ageArray, R.array.ageValues) .option("", R.array.ageArray, R.array.ageValues)
.preferenceId(R.string.key_age) .preferenceId(R.string.key_age)
.label(R.string.patientage) .label(R.string.patientage)
.comment(R.string.patientage_summary)) .comment(R.string.patientage_summary))

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

@ -5,12 +5,22 @@ import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.TextView;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
import info.nightscout.utils.SP; import info.nightscout.utils.SP;
public class SWRadioButton extends SWItem { public class SWRadioButton extends SWItem {
@ -18,13 +28,15 @@ public class SWRadioButton extends SWItem {
int labelsArray; int labelsArray;
int valuesArray; int valuesArray;
String groupLabel = "";
private RadioGroup radioGroup; private RadioGroup radioGroup;
public SWRadioButton() { public SWRadioButton() {
super(Type.RADIOBUTTON); super(Type.RADIOBUTTON);
} }
public SWRadioButton option(int labels, int values) { public SWRadioButton option(String groupLabel, int labels, int values) {
this.groupLabel = groupLabel;
this.labelsArray = labels; this.labelsArray = labels;
this.valuesArray = values; this.valuesArray = values;
return this; return this;
@ -49,11 +61,30 @@ public class SWRadioButton extends SWItem {
} else { } else {
previousValue = SP.getString(preferenceId, "none"); previousValue = SP.getString(preferenceId, "none");
} }
if(!groupLabel.equals("")) {
TextView groupName = new TextView(context);
groupName.setText(groupLabel);
layout.addView(groupName);
}
radioGroup = new RadioGroup(context); radioGroup = new RadioGroup(context);
radioGroup.clearCheck(); radioGroup.clearCheck();
radioGroup.setOrientation(LinearLayout.VERTICAL); radioGroup.setOrientation(LinearLayout.VERTICAL);
radioGroup.setVisibility(View.VISIBLE); radioGroup.setVisibility(View.VISIBLE);
ArrayList<PluginBase> pluginsInCategory;
pluginsInCategory = MainApp.getSpecificPluginsList(PluginType.PUMP);
PluginBase found = null;
for (PluginBase p : pluginsInCategory) {
if (p.isEnabled(PluginType.PUMP) && found == null) {
found = p;
} else if (p.isEnabled(PluginType.PUMP)) {
// set others disabled
p.setPluginEnabled(PluginType.PUMP, false);
}
}
log.debug("Pump selected: DanaR:"+DanaRPlugin.getPlugin().isEnabled(PluginType.PUMP));
log.debug("Pump selected: Virtual:"+VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP));
log.debug("Pump selected: Combo:"+ ComboPlugin.getPlugin().isEnabled(PluginType.PUMP));
log.debug("Pump selected: "+ found.getNameShort());
for (int i = 0; i < labels().length; i++) { for (int i = 0; i < labels().length; i++) {
RadioButton rdbtn = new RadioButton(context); RadioButton rdbtn = new RadioButton(context);
rdbtn.setId(View.generateViewId()); rdbtn.setId(View.generateViewId());