caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

SW warn if exported configuration is missing

Browse source
This commit is contained in:
Milos Kozak 2018-05-11 13:04:17 +02:00
parent 337a3d9776
commit ff2cc04408
4 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/info/nightscout/androidaps/startupwizard/SWButton.java
View file

@ -11,13 +11,13 @@ import org.slf4j.LoggerFactory;
public class SWButton extends SWItem { public class SWButton extends SWItem {
private static Logger log = LoggerFactory.getLogger(SWButton.class); private static Logger log = LoggerFactory.getLogger(SWButton.class);
Runnable buttonRunnable; private Runnable buttonRunnable;
int buttonText; private int buttonText;
SWValidator buttonValidator; private SWValidator buttonValidator;
Button button; private Button button;
public SWButton() { SWButton() {
super(Type.BUTTON); super(Type.BUTTON);
} }

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

@ -74,6 +74,9 @@ public class SWDefinition {
.text(R.string.nav_import) .text(R.string.nav_import)
.action(() -> ImportExportPrefs.importSharedPreferences(getActivity())) .action(() -> ImportExportPrefs.importSharedPreferences(getActivity()))
.visibility(ImportExportPrefs.file::exists)) .visibility(ImportExportPrefs.file::exists))
.add(new SWInfotext()
.label(R.string.backupismissing)
.visibility(() -> !ImportExportPrefs.file.exists()))
.add(new SWButton() .add(new SWButton()
.text(R.string.exitwizard) .text(R.string.exitwizard)
.action(() -> getActivity().finish())) .action(() -> getActivity().finish()))

30
app/src/main/java/info/nightscout/androidaps/startupwizard/SWInfotext.java
View file

@ -1,11 +1,7 @@
package info.nightscout.androidaps.startupwizard; package info.nightscout.androidaps.startupwizard;
import android.content.Context; import android.content.Context;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
@ -17,21 +13,34 @@ public class SWInfotext extends SWItem {
private static Logger log = LoggerFactory.getLogger(SWInfotext.class); private static Logger log = LoggerFactory.getLogger(SWInfotext.class);
private String textLabel = null; private String textLabel = null;
public SWInfotext() { private TextView l;
private SWValidator visibilityValidator;
SWInfotext() {
super(Type.TEXT); super(Type.TEXT);
} }
public SWInfotext label(int label) {
this.label = label;
return this;
}
public SWInfotext label(String newLabel){ public SWInfotext label(String newLabel){
this.textLabel = newLabel; this.textLabel = newLabel;
return this; return this;
} }
public SWInfotext visibility(SWValidator visibilityValidator) {
this.visibilityValidator = visibilityValidator;
return this;
}
@Override @Override
public void generateDialog(View view, LinearLayout layout) { public void generateDialog(View view, LinearLayout layout) {
Context context = view.getContext(); Context context = view.getContext();
TextView l = new TextView(context); l = new TextView(context);
l.setId(view.generateViewId()); l.setId(View.generateViewId());
if(textLabel != null) if(textLabel != null)
l.setText(textLabel); l.setText(textLabel);
else else
@ -40,4 +49,11 @@ public class SWInfotext extends SWItem {
} }
@Override
public void processVisibility() {
if (visibilityValidator != null && !visibilityValidator.isValid())
l.setVisibility(View.GONE);
else
l.setVisibility(View.VISIBLE);
}
} }

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

@ -1059,15 +1059,16 @@
<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="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\n</string>
<string name="pumpsetup">Pump setup</string> <string name="pumpsetup">Pump setup</string>
<string name="readstatus">Read status</string> <string name="readstatus">Read status</string>
<string name="adjustprofileinns">Changes must be done in NS</string> <string name="adjustprofileinns">Changes must be done in NS</string>
<string name="exitwizard">Skip setup wizard</string> <string name="exitwizard">Skip setup wizard</string>
<string name="setupwizard_bgsource_description">Where should blood glucose(BG) data be comming from ?</string> <string name="setupwizard_bgsource_description">Where should blood glucose(BG) data be comming from ?\n</string>
<string name="setupwizard_loop_description">Press the button below to enable AndroidAPS to suggest/make basal changes</string> <string name="setupwizard_loop_description">Press the button below to enable AndroidAPS to suggest/make basal changes\n</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.</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="enableobjectives">Enable Objectives</string>
<string name="apssetup">Configure APS plugin</string> <string name="apssetup">Configure APS plugin</string>
<string name="backupismissing">Exported configuration is missing thus import configuration is not possible.\n</string>
</resources> </resources>