caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

validate on focus change

Browse source
This commit is contained in:
Milos Kozak 2019-07-19 11:44:43 +02:00
parent 1b937bfe08
commit 03bcdf82b3
2 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/Constants.java
View file

@ -31,7 +31,7 @@ public class Constants {
public static final long remoteBolusMinDistance = 15 * 60 * 1000L; public static final long remoteBolusMinDistance = 15 * 60 * 1000L;
// Circadian Percentage Profile // Circadian Percentage Profile
public static final int CPP_MIN_PERCENTAGE = 50; public static final int CPP_MIN_PERCENTAGE = 30;
public static final int CPP_MAX_PERCENTAGE = 200; public static final int CPP_MAX_PERCENTAGE = 200;
public static final int CPP_MIN_TIMESHIFT = -6; public static final int CPP_MIN_TIMESHIFT = -6;
public static final int CPP_MAX_TIMESHIFT = 23; public static final int CPP_MAX_TIMESHIFT = 23;

41
app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
View file

@ -14,7 +14,6 @@ import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -34,7 +33,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
View.OnTouchListener, View.OnClickListener { View.OnTouchListener, View.OnClickListener {
private static Logger log = LoggerFactory.getLogger(NumberPicker.class); private static Logger log = LoggerFactory.getLogger(NumberPicker.class);
TextView editText; EditText editText;
Button minusButton; Button minusButton;
Button plusButton; Button plusButton;
@ -56,7 +55,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
private final int doubleLimit = 5; private final int doubleLimit = 5;
public UpdateCounterTask(boolean inc) { UpdateCounterTask(boolean inc) {
mInc = inc; mInc = inc;
} }
@ -85,14 +84,10 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
public NumberPicker(Context context, AttributeSet attrs) { public NumberPicker(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
this.initialize(context, attrs); this.initialize(context);
} }
public NumberPicker(Context context, AttributeSet attrs, int defStyleAttr) { private void initialize(Context context) {
super(context, attrs, defStyleAttr);
}
private void initialize(Context context, AttributeSet attrs) {
// set layout view // set layout view
LayoutInflater.from(context).inflate(R.layout.number_picker_layout, this, true); LayoutInflater.from(context).inflate(R.layout.number_picker_layout, this, true);
@ -104,20 +99,17 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
editText = (EditText) findViewById(R.id.display); editText = (EditText) findViewById(R.id.display);
editText.setId(View.generateViewId()); editText.setId(View.generateViewId());
mHandler = new Handler() { mHandler = new Handler(msg -> {
@Override
public void handleMessage(Message msg) {
switch (msg.what) { switch (msg.what) {
case MSG_INC: case MSG_INC:
inc(msg.arg1); inc(msg.arg1);
return; return true;
case MSG_DEC: case MSG_DEC:
dec(msg.arg1); dec(msg.arg1);
return; return true;
} }
super.handleMessage(msg); return false;
} });
};
minusButton.setOnTouchListener(this); minusButton.setOnTouchListener(this);
minusButton.setOnKeyListener(this); minusButton.setOnKeyListener(this);
@ -146,6 +138,21 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
public void setTextWatcher(TextWatcher textWatcher) { public void setTextWatcher(TextWatcher textWatcher) {
this.textWatcher = textWatcher; this.textWatcher = textWatcher;
editText.addTextChangedListener(textWatcher); editText.addTextChangedListener(textWatcher);
editText.setOnFocusChangeListener((v, hasFocus) -> {
if (!hasFocus) {
value = SafeParse.stringToDouble(editText.getText().toString());
if (value > maxValue) {
value = maxValue;
ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.youareonallowedlimit));
updateEditText();
}
if (value < minValue) {
value = minValue;
ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.youareonallowedlimit));
updateEditText();
}
}
});
} }
public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero, TextWatcher textWatcher) { public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero, TextWatcher textWatcher) {