caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix code after merge

Browse source
This commit is contained in:
Milos Kozak 2019-07-23 13:32:21 +02:00
parent e02681ac31
commit f778e0ac0d
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.java
View file

@ -55,7 +55,7 @@ public class InputBg extends Element {
@Override @Override
public void addToLayout(LinearLayout root) { public void addToLayout(LinearLayout root) {
NumberPicker numberPicker = new NumberPicker(root.getContext(), null); NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, textWatcher); numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, textWatcher);
numberPicker.setOnValueChangedListener(value -> this.value = value); numberPicker.setOnValueChangedListener(value -> this.value = value);
root.addView(numberPicker); root.addView(numberPicker);
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.java
View file

@ -122,7 +122,7 @@ public class InputDelta extends Element {
spinner.setSelection(this.deltaType.ordinal()); spinner.setSelection(this.deltaType.ordinal());
// root.addView(spinner); // root.addView(spinner);
numberPicker = new NumberPicker(root.getContext(), null); numberPicker = new NumberPicker(root.getContext(), null);
numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, textWatcher); numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, textWatcher);
numberPicker.setOnValueChangedListener(value -> this.value = value); numberPicker.setOnValueChangedListener(value -> this.value = value);
LinearLayout l = new LinearLayout(root.getContext()); LinearLayout l = new LinearLayout(root.getContext());
l.setOrientation(LinearLayout.VERTICAL); l.setOrientation(LinearLayout.VERTICAL);

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.java
View file

@ -58,7 +58,7 @@ public class InputDouble extends Element {
@Override @Override
public void addToLayout(LinearLayout root) { public void addToLayout(LinearLayout root) {
numberPicker = new NumberPicker(root.getContext(), null); numberPicker = new NumberPicker(root.getContext(), null);
numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, textWatcher); numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, textWatcher);
numberPicker.setOnValueChangedListener(value -> this.value = value); numberPicker.setOnValueChangedListener(value -> this.value = value);
root.addView(numberPicker); root.addView(numberPicker);
} }

4
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.java
View file

@ -25,10 +25,10 @@ public class InputDuration extends Element {
NumberPicker numberPicker = new NumberPicker(root.getContext(), null); NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
if (unit.equals(TimeUnit.MINUTES)) { if (unit.equals(TimeUnit.MINUTES)) {
// Minutes // Minutes
numberPicker.setParams(0d, 0d, 24 * 60d, 10d, new DecimalFormat("0"), false); numberPicker.setParams(0d, 0d, 24 * 60d, 10d, new DecimalFormat("0"), false, null);
} else { } else {
// Hours // Hours
numberPicker.setParams(0d, 0d, 24d, 1d, new DecimalFormat("0"), false); numberPicker.setParams(0d, 0d, 24d, 1d, new DecimalFormat("0"), false, null);
} }
numberPicker.setValue((double) value); numberPicker.setValue((double) value);
numberPicker.setOnValueChangedListener(value -> this.value = (int) value); numberPicker.setOnValueChangedListener(value -> this.value = (int) value);

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.java
View file

@ -40,7 +40,7 @@ public class InputInsulin extends Element {
@Override @Override
public void addToLayout(LinearLayout root) { public void addToLayout(LinearLayout root) {
NumberPicker numberPicker = new NumberPicker(root.getContext(), null); NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
numberPicker.setParams(0d, -20d, 20d, 0.1, new DecimalFormat("0.0"), true, textWatcher); numberPicker.setParams(0d, -20d, 20d, 0.1, new DecimalFormat("0.0"), true, null, textWatcher);
numberPicker.setValue(value); numberPicker.setValue(value);
numberPicker.setOnValueChangedListener(value -> this.value = value); numberPicker.setOnValueChangedListener(value -> this.value = value);
root.addView(numberPicker); root.addView(numberPicker);

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.java
View file

@ -41,7 +41,7 @@ public class InputPercent extends Element {
@Override @Override
public void addToLayout(LinearLayout root) { public void addToLayout(LinearLayout root) {
NumberPicker numberPicker = new NumberPicker(root.getContext(), null); NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
numberPicker.setParams(100d, 70d, 130d, 5d, new DecimalFormat("0"), true, textWatcher); numberPicker.setParams(100d, 70d, 130d, 5d, new DecimalFormat("0"), true, null, textWatcher);
numberPicker.setValue(value); numberPicker.setValue(value);
numberPicker.setOnValueChangedListener(value -> this.value = value); numberPicker.setOnValueChangedListener(value -> this.value = value);
root.addView(numberPicker); root.addView(numberPicker);