caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

setup wizard for pumpcontrol

Browse source
This commit is contained in:
Milos Kozak 2018-07-02 12:18:49 +02:00
parent bb30171777
commit 4919986dc0
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
View file

@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.Config;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.PreferencesActivity; import info.nightscout.androidaps.PreferencesActivity;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
@ -87,7 +88,7 @@ public class SWDefinition {
} }
SWDefinition() { SWDefinition() {
if (BuildConfig.FLAVOR.equals("full")) if (BuildConfig.FLAVOR.equals("full") || BuildConfig.FLAVOR.equals("pumpcontrol"))
SWDefinitionFull(); SWDefinitionFull();
else if (BuildConfig.FLAVOR.equals("nsclient")) else if (BuildConfig.FLAVOR.equals("nsclient"))
SWDefinitionNSClient(); SWDefinitionNSClient();
@ -368,6 +369,7 @@ public class SWDefinition {
}) })
.visibility(() -> MainApp.getConfigBuilder().getActiveAPS() != null && ((PluginBase) MainApp.getConfigBuilder().getActiveAPS()).getPreferencesId() > 0)) .visibility(() -> MainApp.getConfigBuilder().getActiveAPS() != null && ((PluginBase) MainApp.getConfigBuilder().getActiveAPS()).getPreferencesId() > 0))
.validator(() -> MainApp.getConfigBuilder().getActiveAPS() != null) .validator(() -> MainApp.getConfigBuilder().getActiveAPS() != null)
.visibility(() -> Config.APS)
) )
.add(new SWScreen(R.string.configbuilder_loop) .add(new SWScreen(R.string.configbuilder_loop)
.skippable(false) .skippable(false)
@ -386,7 +388,7 @@ public class SWDefinition {
}) })
.visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))) .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)))
.validator(() -> LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)) .validator(() -> LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
.visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)) .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP) && Config.APS)
) )
.add(new SWScreen(R.string.configbuilder_sensitivity) .add(new SWScreen(R.string.configbuilder_sensitivity)
.skippable(false) .skippable(false)
@ -428,18 +430,18 @@ public class SWDefinition {
}) })
.visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible())) .visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible()))
.validator(() -> ObjectivesPlugin.getPlugin().isEnabled(PluginType.CONSTRAINTS)) .validator(() -> ObjectivesPlugin.getPlugin().isEnabled(PluginType.CONSTRAINTS))
.visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible()) .visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible() && Config.APS)
) )
.add(new SWScreen(R.string.objectives) .add(new SWScreen(R.string.objectives)
.skippable(false) .skippable(false)
.add(new SWInfotext() .add(new SWInfotext()
.label(R.string.startobjective)) .label(R.string.startobjective))
.add(new SWBreak()) .add(new SWBreak())
.add(new SWFragment(this) .add(new SWFragment(this)
.add(new ObjectivesFragment())) .add(new ObjectivesFragment()))
.validator(() -> ObjectivesPlugin.getPlugin().objectives.get(0).isStarted()) .validator(() -> ObjectivesPlugin.getPlugin().objectives.get(0).isStarted())
.visibility(() -> !ObjectivesPlugin.getPlugin().objectives.get(0).isStarted()) .visibility(() -> !ObjectivesPlugin.getPlugin().objectives.get(0).isStarted() && Config.APS)
) )
; ;
} }