remove code redundancy

app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java

@@ -2,14 +2,11 @@ package info.nightscout.androidaps.setupwizard;
 
 import android.Manifest;
 import android.content.Intent;
-import android.os.Build;
+
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,18 +18,19 @@ import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment;
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog;
-import info.nightscout.androidaps.plugins.general.careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment;
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment;
+import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog;
+import info.nightscout.androidaps.plugins.general.careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs;
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus;
+import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
 import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment;
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin;
 import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment;
@@ -56,8 +54,6 @@ import info.nightscout.androidaps.utils.PasswordProtection;
 import info.nightscout.androidaps.utils.SP;
 
 public class SWDefinition {
-    private static Logger log = LoggerFactory.getLogger(SWDefinition.class);
-
     private AppCompatActivity activity;
     private List<SWScreen> screens = new ArrayList<>();
 
@@ -69,11 +65,11 @@ public class SWDefinition {
         return activity;
     }
 
-    public List<SWScreen> getScreens() {
+    List<SWScreen> getScreens() {
         return screens;
     }
 
-    SWDefinition add(SWScreen newScreen) {
+    private SWDefinition add(SWScreen newScreen) {
         screens.add(newScreen);
         return this;
     }
@@ -85,13 +81,11 @@ public class SWDefinition {
             SWDefinitionNSClient();
     }
 
-    private void SWDefinitionFull() {
+    private SWScreen screenSetupWizard = new SWScreen(R.string.nav_setupwizard)
-        // List all the screens here
-        add(new SWScreen(R.string.nav_setupwizard)
             .add(new SWInfotext()
-                        .label(R.string.welcometosetupwizard))
+                    .label(R.string.welcometosetupwizard));
-         )
+
-        .add(new SWScreen(R.string.language)
+    private SWScreen screenLanguage = new SWScreen(R.string.language)
             .skippable(false)
             .add(new SWRadioButton()
                     .option(R.array.languagesArray, R.array.languagesValues)
@@ -101,9 +95,9 @@ public class SWDefinition {
                 String lang = SP.getString("language", "en");
                 LocaleHelper.setLocale(MainApp.instance().getApplicationContext(), lang);
                 return SP.contains(R.string.key_language);
-                })
+            });
-        )
+
-        .add(new SWScreen(R.string.end_user_license_agreement)
+    private SWScreen screenEula = new SWScreen(R.string.end_user_license_agreement)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.end_user_license_agreement_text))
@@ -116,9 +110,9 @@ public class SWDefinition {
                         MainApp.bus().post(new EventSWUpdate(false));
                     }))
             .visibility(() -> !SP.getBoolean(R.string.key_i_understand, false))
-                .validator(() -> SP.getBoolean(R.string.key_i_understand, false))
+            .validator(() -> SP.getBoolean(R.string.key_i_understand, false));
-        )
+
-        .add(new SWScreen(R.string.permission)
+    private SWScreen screenPermissionBattery = new SWScreen(R.string.permission)
             .skippable(false)
             .add(new SWInfotext()
                     .label(String.format(MainApp.gs(R.string.needwhitelisting), MainApp.gs(R.string.app_name))))
@@ -128,9 +122,9 @@ public class SWDefinition {
                     .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS))
                     .action(() -> AndroidPermission.askForPermission(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, AndroidPermission.CASE_BATTERY)))
             .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS))
-                .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)))
+            .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)));
-        )
+
-        .add(new SWScreen(R.string.permission)
+    private SWScreen screenPermissionBt = new SWScreen(R.string.permission)
             .skippable(false)
             .add(new SWInfotext()
                     .label(MainApp.gs(R.string.needlocationpermission)))
@@ -140,9 +134,9 @@ public class SWDefinition {
                     .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION))
                     .action(() -> AndroidPermission.askForPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION, AndroidPermission.CASE_LOCATION)))
             .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION))
-                .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION)))
+            .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION)));
-        )
+
-        .add(new SWScreen(R.string.permission)
+    private SWScreen screenPermissionStore = new SWScreen(R.string.permission)
             .skippable(false)
             .add(new SWInfotext()
                     .label(MainApp.gs(R.string.needstoragepermission)))
@@ -152,18 +146,18 @@ public class SWDefinition {
                     .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE))
                     .action(() -> AndroidPermission.askForPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, AndroidPermission.CASE_STORAGE)))
             .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE))
-                .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)))
+            .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)));
-        )
+
-        .add(new SWScreen(R.string.nav_import)
+    private SWScreen screenImport = new SWScreen(R.string.nav_import)
             .add(new SWInfotext()
                     .label(R.string.storedsettingsfound))
             .add(new SWBreak())
             .add(new SWButton()
                     .text(R.string.nav_import)
                     .action(() -> ImportExportPrefs.importSharedPreferences(getActivity())))
-                .visibility(() -> ImportExportPrefs.file.exists() && !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)))
+            .visibility(() -> ImportExportPrefs.file.exists() && !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)));
-        )
+
-        .add(new SWScreen(R.string.nsclientinternal_title)
+    private SWScreen screenNsClient = new SWScreen(R.string.nsclientinternal_title)
             .skippable(true)
             .add(new SWInfotext()
                     .label(R.string.nsclientinfotext))
@@ -202,10 +196,10 @@ public class SWDefinition {
                     })
             )
             .add(new SWBreak())
-                .validator(() -> NSClientPlugin.getPlugin().nsClientService != null && NSClientPlugin.getPlugin().nsClientService.isConnected && NSClientPlugin.getPlugin().nsClientService.hasWriteAuth)
+            .validator(() -> NSClientPlugin.getPlugin().nsClientService != null && NSClientService.isConnected && NSClientService.hasWriteAuth)
-                .visibility(() -> !(NSClientPlugin.getPlugin().nsClientService != null && NSClientPlugin.getPlugin().nsClientService.isConnected && NSClientPlugin.getPlugin().nsClientService.hasWriteAuth))
+            .visibility(() -> !(NSClientPlugin.getPlugin().nsClientService != null && NSClientService.isConnected && NSClientService.hasWriteAuth));
-        )
+
-        .add(new SWScreen(R.string.patientage)
+    private SWScreen screenAge = new SWScreen(R.string.patientage)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.patientage_summary))
@@ -215,9 +209,9 @@ public class SWDefinition {
                     .preferenceId(R.string.key_age)
                     .label(R.string.patientage)
                     .comment(R.string.patientage_summary))
-                .validator(() -> SP.contains(R.string.key_age))
+            .validator(() -> SP.contains(R.string.key_age));
-        )
+
-        .add(new SWScreen(R.string.configbuilder_insulin)
+    private SWScreen screenInsulin = new SWScreen(R.string.configbuilder_insulin)
             .skippable(false)
             .add(new SWPlugin()
                     .option(PluginType.INSULIN, R.string.configbuilder_insulin_description)
@@ -231,16 +225,18 @@ public class SWDefinition {
                     .text(R.string.insulinsourcesetup)
                     .action(() -> {
                         final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin();
+                        if (plugin != null) {
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
+                        }
                     })
                     .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin()).getPreferencesId() > 0))
-                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null)
+            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null);
-        )
+
-        .add(new SWScreen(R.string.configbuilder_bgsource)
+    private SWScreen screenBgSource = new SWScreen(R.string.configbuilder_bgsource)
             .skippable(false)
             .add(new SWPlugin()
                     .option(PluginType.BGSOURCE, R.string.configbuilder_bgsource_description)
@@ -250,16 +246,18 @@ public class SWDefinition {
                     .text(R.string.bgsourcesetup)
                     .action(() -> {
                         final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource();
+                        if (plugin != null) {
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
+                        }
                     })
                     .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource()).getPreferencesId() > 0))
-                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null)
+            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null);
-        )
+
-        .add(new SWScreen(R.string.configbuilder_profile)
+    private SWScreen screenProfile = new SWScreen(R.string.configbuilder_profile)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.setupwizard_profile_description))
@@ -267,32 +265,32 @@ public class SWDefinition {
             .add(new SWPlugin()
                     .option(PluginType.PROFILE, R.string.configbuilder_profile_description)
                     .label(R.string.configbuilder_profile))
-                        .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null)
+            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null);
-                )
+
-        .add(new SWScreen(R.string.nsprofile)
+    private SWScreen screenNsProfile = new SWScreen(R.string.nsprofile)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.adjustprofileinns))
             .add(new SWFragment(this)
                     .add(new NSProfileFragment()))
-                        .validator(() -> NSProfilePlugin.getPlugin().getProfile() != null && NSProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid("StartupWizard"))
+            .validator(() -> NSProfilePlugin.getPlugin().getProfile() != null && NSProfilePlugin.getPlugin().getProfile().getDefaultProfile() != null && NSProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid("StartupWizard"))
-                        .visibility(() -> NSProfilePlugin.getPlugin().isEnabled(PluginType.PROFILE))
+            .visibility(() -> NSProfilePlugin.getPlugin().isEnabled(PluginType.PROFILE));
-                )
+
-        .add(new SWScreen(R.string.localprofile)
+    private SWScreen screenLocalProfile = new SWScreen(R.string.localprofile)
             .skippable(false)
             .add(new SWFragment(this)
                     .add(new LocalProfileFragment()))
-                        .validator(() -> LocalProfilePlugin.getPlugin().getProfile() != null && LocalProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid("StartupWizard"))
+            .validator(() -> LocalProfilePlugin.getPlugin().getProfile() != null && LocalProfilePlugin.getPlugin().getProfile().getDefaultProfile() != null && LocalProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid("StartupWizard"))
-                        .visibility(() -> LocalProfilePlugin.getPlugin().isEnabled(PluginType.PROFILE))
+            .visibility(() -> LocalProfilePlugin.getPlugin().isEnabled(PluginType.PROFILE));
-                )
+
-        .add(new SWScreen(R.string.simpleprofile)
+    private SWScreen screenSimpleProfile = new SWScreen(R.string.simpleprofile)
             .skippable(false)
             .add(new SWFragment(this)
                     .add(new SimpleProfileFragment()))
-                        .validator(() -> SimpleProfilePlugin.getPlugin().getProfile() != null && SimpleProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid("StartupWizard"))
+            .validator(() -> SimpleProfilePlugin.getPlugin().getProfile() != null && SimpleProfilePlugin.getPlugin().getProfile().getDefaultProfile() != null && SimpleProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid("StartupWizard"))
-                        .visibility(() -> SimpleProfilePlugin.getPlugin().isEnabled(PluginType.PROFILE))
+            .visibility(() -> SimpleProfilePlugin.getPlugin().isEnabled(PluginType.PROFILE));
-                )
+
-        .add(new SWScreen(R.string.profileswitch)
+    private SWScreen screenProfileSwitch = new SWScreen(R.string.profileswitch)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.profileswitch_ismissing))
@@ -300,15 +298,15 @@ public class SWDefinition {
                     .text(R.string.profileswitch)
                     .action(() -> {
                         NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
-                                    final OptionsToShow profileswitch = CareportalFragment.PROFILESWITCHDIRECT;
+                        final OptionsToShow profileSwitch = CareportalFragment.PROFILESWITCHDIRECT;
-                                    profileswitch.executeProfileSwitch = true;
+                        profileSwitch.executeProfileSwitch = true;
-                                    newDialog.setOptions(profileswitch, R.string.careportal_profileswitch);
+                        newDialog.setOptions(profileSwitch, R.string.careportal_profileswitch);
                         newDialog.show(getActivity().getSupportFragmentManager(), "NewNSTreatmentDialog");
                     }))
             .validator(() -> ProfileFunctions.getInstance().getProfile() != null)
-                        .visibility(() -> ProfileFunctions.getInstance().getProfile() == null)
+            .visibility(() -> ProfileFunctions.getInstance().getProfile() == null);
-                )
+
-        .add(new SWScreen(R.string.configbuilder_pump)
+    private SWScreen screenPump = new SWScreen(R.string.configbuilder_pump)
             .skippable(false)
             .add(new SWPlugin()
                     .option(PluginType.PUMP, R.string.configbuilder_pump_description)
@@ -318,13 +316,15 @@ public class SWDefinition {
                     .text(R.string.pumpsetup)
                     .action(() -> {
                         final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActivePump();
+                        if (plugin != null) {
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
+                        }
                     })
-                        .visibility(() -> ((PluginBase) ConfigBuilderPlugin.getPlugin().getActivePump()).getPreferencesId() > 0))
+                    .visibility(() -> (ConfigBuilderPlugin.getPlugin().getActivePump() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActivePump()).getPreferencesId() > 0)))
             .add(new SWButton()
                     .text(R.string.readstatus)
                     .action(() -> ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Clicked connect to pump", null))
@@ -337,9 +337,9 @@ public class SWDefinition {
                         }
                     })
             )
-                .validator(() -> ConfigBuilderPlugin.getPlugin().getActivePump() != null && ConfigBuilderPlugin.getPlugin().getActivePump().isInitialized())
+            .validator(() -> ConfigBuilderPlugin.getPlugin().getActivePump() != null && ConfigBuilderPlugin.getPlugin().getActivePump().isInitialized());
-        )
+
-        .add(new SWScreen(R.string.configbuilder_aps)
+    private SWScreen screenAps = new SWScreen(R.string.configbuilder_aps)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.setupwizard_aps_description))
@@ -354,25 +354,27 @@ public class SWDefinition {
                     .text(R.string.apssetup)
                     .action(() -> {
                         final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveAPS();
+                        if (plugin != null) {
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
+                        }
                     })
                     .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveAPS() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveAPS()).getPreferencesId() > 0))
             .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveAPS() != null)
-                .visibility(() -> Config.APS)
+            .visibility(() -> Config.APS);
-        )
+
-        .add(new SWScreen(R.string.apsmode_title)
+    private SWScreen screenApsMode = new SWScreen(R.string.apsmode_title)
             .skippable(false)
             .add(new SWRadioButton()
                     .option(R.array.aps_modeArray, R.array.aps_modeValues)
                     .preferenceId(R.string.key_aps_mode).label(R.string.apsmode_title)
                     .comment(R.string.setupwizard_preferred_aps_mode))
-                .validator(() -> SP.contains(R.string.key_aps_mode))
+            .validator(() -> SP.contains(R.string.key_aps_mode));
-        )
+
-        .add(new SWScreen(R.string.configbuilder_loop)
+    private SWScreen screenLoop = new SWScreen(R.string.configbuilder_loop)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.setupwizard_loop_description))
@@ -389,9 +391,9 @@ public class SWDefinition {
                     })
                     .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)))
             .validator(() -> LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
-                .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP) && Config.APS)
+            .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP) && Config.APS);
-        )
+
-        .add(new SWScreen(R.string.configbuilder_sensitivity)
+    private SWScreen screenSensitivity = new SWScreen(R.string.configbuilder_sensitivity)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.setupwizard_sensitivity_description))
@@ -406,34 +408,18 @@ public class SWDefinition {
                     .text(R.string.sensitivitysetup)
                     .action(() -> {
                         final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity();
+                        if (plugin != null) {
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
+                        }
                     })
                     .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity()).getPreferencesId() > 0))
-                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null)
+            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null);
-        )
+
-        .add(new SWScreen(R.string.objectives)
+    private SWScreen getScreenObjectives = new SWScreen(R.string.objectives)
-                .skippable(false)
-                .add(new SWInfotext()
-                        .label(R.string.setupwizard_objectives_description))
-                .add(new SWButton()
-                        .text(R.string.enableobjectives)
-                        .action(() -> {
-                            ObjectivesPlugin.getPlugin().setPluginEnabled(PluginType.CONSTRAINTS, true);
-                            ObjectivesPlugin.getPlugin().setFragmentVisible(PluginType.CONSTRAINTS, true);
-                            ConfigBuilderFragment.processOnEnabledCategoryChanged(ObjectivesPlugin.getPlugin(), PluginType.CONSTRAINTS);
-                            ConfigBuilderPlugin.getPlugin().storeSettings("SetupWizard");
-                            MainApp.bus().post(new EventConfigBuilderChange());
-                            MainApp.bus().post(new EventSWUpdate(true));
-                        })
-                        .visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible()))
-                .validator(() -> ObjectivesPlugin.getPlugin().isEnabled(PluginType.CONSTRAINTS))
-                .visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible() && Config.APS)
-        )
-        .add(new SWScreen(R.string.objectives)
             .skippable(false)
             .add(new SWInfotext()
                     .label(R.string.startobjective))
@@ -441,197 +427,48 @@ public class SWDefinition {
             .add(new SWFragment(this)
                     .add(new ObjectivesFragment()))
             .validator(() -> ObjectivesPlugin.getPlugin().objectives.get(0).isStarted())
-                .visibility(() -> !ObjectivesPlugin.getPlugin().objectives.get(0).isStarted() && Config.APS)
+            .visibility(() -> !ObjectivesPlugin.getPlugin().objectives.get(0).isStarted() && Config.APS);
-        )
+
+    private void SWDefinitionFull() {
+        // List all the screens here
+        add(screenSetupWizard)
+                .add(screenLanguage)
+                .add(screenEula)
+                .add(screenPermissionBattery)
+                .add(screenPermissionBt)
+                .add(screenPermissionStore)
+                .add(screenImport)
+                .add(screenNsClient)
+                .add(screenAge)
+                .add(screenInsulin)
+                .add(screenBgSource)
+                .add(screenProfile)
+                .add(screenNsProfile)
+                .add(screenLocalProfile)
+                .add(screenSimpleProfile)
+                .add(screenProfileSwitch)
+                .add(screenPump)
+                .add(screenAps)
+                .add(screenApsMode)
+                .add(screenLoop)
+                .add(screenSensitivity)
+                .add(getScreenObjectives)
         ;
     }
 
     private void SWDefinitionNSClient() {
         // List all the screens here
-        add(new SWScreen(R.string.nav_setupwizard)
+        add(screenSetupWizard)
-                .add(new SWInfotext()
+                .add(screenLanguage)
-                        .label(R.string.welcometosetupwizard))
+                .add(screenEula)
-        )
+                .add(screenPermissionBattery)
-        .add(new SWScreen(R.string.language)
+                .add(screenPermissionStore)
-                .skippable(false)
+                .add(screenImport)
-                .add(new SWRadioButton()
+                .add(screenNsClient)
-                        .option(R.array.languagesArray, R.array.languagesValues)
+                .add(screenBgSource)
-                        .preferenceId(R.string.key_language).label(R.string.language)
+                .add(screenAge)
-                        .comment(R.string.setupwizard_language_prompt))
+                .add(screenInsulin)
-                .validator(() -> {
+                .add(screenSensitivity)
-                    String lang = SP.getString("language", "en");
-                    LocaleHelper.setLocale(MainApp.instance().getApplicationContext(), lang);
-                    return SP.contains(R.string.key_language);
-                })
-        )
-        .add(new SWScreen(R.string.end_user_license_agreement)
-                .skippable(false)
-                .add(new SWInfotext()
-                        .label(R.string.end_user_license_agreement_text))
-                .add(new SWBreak())
-                .add(new SWButton()
-                        .text(R.string.end_user_license_agreement_i_understand)
-                        .visibility(() -> !SP.getBoolean(R.string.key_i_understand, false))
-                        .action(() -> {
-                            SP.putBoolean(R.string.key_i_understand, true);
-                            MainApp.bus().post(new EventSWUpdate(false));
-                        }))
-                .visibility(() -> !SP.getBoolean(R.string.key_i_understand, false))
-                .validator(() -> SP.getBoolean(R.string.key_i_understand, false))
-        )
-        .add(new SWScreen(R.string.permission)
-                .skippable(false)
-                .add(new SWInfotext()
-                        .label(String.format(MainApp.gs(R.string.needwhitelisting), MainApp.gs(R.string.app_name))))
-                .add(new SWBreak())
-                .add(new SWButton()
-                        .text(R.string.askforpermission)
-                        .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS))
-                        .action(() -> AndroidPermission.askForPermission(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, AndroidPermission.CASE_BATTERY)))
-                .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS))
-                .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)))
-        )
-        .add(new SWScreen(R.string.permission)
-                .skippable(false)
-                .add(new SWInfotext()
-                        .label(MainApp.gs(R.string.needstoragepermission)))
-                .add(new SWBreak())
-                .add(new SWButton()
-                        .text(R.string.askforpermission)
-                        .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE))
-                        .action(() -> AndroidPermission.askForPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, AndroidPermission.CASE_STORAGE)))
-                .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE))
-                .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)))
-        )
-        .add(new SWScreen(R.string.nav_import)
-                .add(new SWInfotext()
-                        .label(R.string.storedsettingsfound))
-                .add(new SWBreak())
-                .add(new SWButton()
-                        .text(R.string.nav_import)
-                        .action(() -> ImportExportPrefs.importSharedPreferences(getActivity())))
-                .visibility(() -> ImportExportPrefs.file.exists() && !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)))
-        )
-        .add(new SWScreen(R.string.nsclientinternal_title)
-                .skippable(true)
-                .add(new SWInfotext()
-                        .label(R.string.nsclientinfotext))
-                .add(new SWBreak())
-                .add(new SWButton()
-                        .text(R.string.enable_nsclient)
-                        .action(() -> {
-                            NSClientPlugin.getPlugin().setPluginEnabled(PluginType.GENERAL, true);
-                            NSClientPlugin.getPlugin().setFragmentVisible(PluginType.GENERAL, true);
-                            ConfigBuilderFragment.processOnEnabledCategoryChanged(NSClientPlugin.getPlugin(), PluginType.GENERAL);
-                            ConfigBuilderPlugin.getPlugin().storeSettings("SetupWizard");
-                            MainApp.bus().post(new EventConfigBuilderChange());
-                            MainApp.bus().post(new EventSWUpdate(true));
-                        })
-                        .visibility(() -> !NSClientPlugin.getPlugin().isEnabled(PluginType.GENERAL)))
-                .add(new SWEditUrl()
-                        .preferenceId(R.string.key_nsclientinternal_url)
-                        .updateDelay(5)
-                        .label(R.string.nsclientinternal_url_title)
-                        .comment(R.string.nsclientinternal_url_dialogmessage))
-                .add(new SWEditString()
-                        .validator(text -> text.length() >= 12)
-                        .updateDelay(5)
-                        .preferenceId(R.string.key_nsclientinternal_api_secret)
-                        .label(R.string.nsclientinternal_secret_dialogtitle)
-                        .comment(R.string.nsclientinternal_secret_dialogmessage))
-                .add(new SWBreak())
-                .add(new SWEventListener(this)
-                        .label(R.string.status)
-                        .initialStatus(NSClientPlugin.getPlugin().status)
-                        .listener(new Object() {
-                            @Subscribe
-                            public void onEventNSClientStatus(EventNSClientStatus event) {
-                                MainApp.bus().post(new EventSWLabel(event.status));
-                            }
-                        })
-                )
-                .add(new SWBreak())
-                .validator(() -> NSClientPlugin.getPlugin().nsClientService != null && NSClientPlugin.getPlugin().nsClientService.isConnected && NSClientPlugin.getPlugin().nsClientService.hasWriteAuth)
-                .visibility(() -> !(NSClientPlugin.getPlugin().nsClientService != null && NSClientPlugin.getPlugin().nsClientService.isConnected && NSClientPlugin.getPlugin().nsClientService.hasWriteAuth))
-        )
-        .add(new SWScreen(R.string.configbuilder_bgsource)
-                .skippable(false)
-                .add(new SWPlugin()
-                        .option(PluginType.BGSOURCE, R.string.configbuilder_bgsource_description)
-                        .label(R.string.configbuilder_bgsource))
-                .add(new SWBreak())
-                .add(new SWButton()
-                        .text(R.string.bgsourcesetup)
-                        .action(() -> {
-                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource();
-                            PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
-                                Intent i = new Intent(activity, PreferencesActivity.class);
-                                i.putExtra("id", plugin.getPreferencesId());
-                                activity.startActivity(i);
-                            }, null);
-                        })
-                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource()!= null  && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource()).getPreferencesId() > 0))
-                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null)
-        )
-        .add(new SWScreen(R.string.patientage)
-                .skippable(false)
-                .add(new SWInfotext()
-                        .label(R.string.patientage_summary))
-                .add(new SWBreak())
-                .add(new SWRadioButton()
-                        .option(R.array.ageArray, R.array.ageValues)
-                        .preferenceId(R.string.key_age)
-                        .label(R.string.patientage)
-                        .comment(R.string.patientage_summary))
-                .validator(() -> SP.contains(R.string.key_age))
-        )
-        .add(new SWScreen(R.string.configbuilder_insulin)
-                .skippable(false)
-                .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 SWButton()
-                        .text(R.string.insulinsourcesetup)
-                        .action(() -> {
-                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin();
-                            PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
-                                Intent i = new Intent(activity, PreferencesActivity.class);
-                                i.putExtra("id", plugin.getPreferencesId());
-                                activity.startActivity(i);
-                            }, null);
-                        })
-                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin()!= null  && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin()).getPreferencesId() > 0))
-                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null)
-        )
-        .add(new SWScreen(R.string.configbuilder_sensitivity)
-                .skippable(false)
-                .add(new SWInfotext()
-                        .label(R.string.setupwizard_sensitivity_description))
-                .add(new SWHtmlLink()
-                        .label(R.string.setupwizard_sensitivity_url))
-                .add(new SWBreak())
-                .add(new SWPlugin()
-                        .option(PluginType.SENSITIVITY, R.string.configbuilder_sensitivity_description)
-                        .label(R.string.configbuilder_sensitivity))
-                .add(new SWBreak())
-                .add(new SWButton()
-                        .text(R.string.sensitivitysetup)
-                        .action(() -> {
-                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity();
-                            PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
-                                Intent i = new Intent(activity, PreferencesActivity.class);
-                                i.putExtra("id", plugin.getPreferencesId());
-                                activity.startActivity(i);
-                            }, null);
-                        })
-                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity()).getPreferencesId() > 0))
-                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null)
-        )
         ;
     }
 

app/src/main/res/values/strings.xml

@@ -1150,7 +1150,6 @@
     <string name="adjustprofileinns">Changes must be done in NS</string>
     <string name="exitwizard">Skip setup wizard</string>
     <string name="setupwizard_loop_description">Press the button below to enable AndroidAPS to suggest/make basal changes</string>
-    <string name="setupwizard_objectives_description">Press the button below to enable Objectives. Look in the Objectives tab, after you finish this wizard, to make AndroidAPS completely functional.\n</string>
     <string name="enableobjectives">Enable Objectives</string>
     <string name="apssetup">Configure APS plugin</string>
     <string name="key_setupwizard_processed" translatable="false">startupwizard_processed</string>