Replace "lower" with "lesser"
This commit is contained in:
parent
236349a063
commit
9b19907388
2 changed files with 10 additions and 10 deletions
|
@ -22,8 +22,8 @@ import info.nightscout.androidaps.R;
|
||||||
public abstract class Trigger {
|
public abstract class Trigger {
|
||||||
|
|
||||||
public enum Comparator {
|
public enum Comparator {
|
||||||
IS_LOWER,
|
IS_LESSER,
|
||||||
IS_EQUAL_OR_LOWER,
|
IS_EQUAL_OR_LESSER,
|
||||||
IS_EQUAL,
|
IS_EQUAL,
|
||||||
IS_EQUAL_OR_GREATER,
|
IS_EQUAL_OR_GREATER,
|
||||||
IS_GREATER,
|
IS_GREATER,
|
||||||
|
@ -31,10 +31,10 @@ public abstract class Trigger {
|
||||||
|
|
||||||
public @StringRes int getStringRes() {
|
public @StringRes int getStringRes() {
|
||||||
switch (this) {
|
switch (this) {
|
||||||
case IS_LOWER:
|
case IS_LESSER:
|
||||||
return R.string.islower;
|
return R.string.islesser;
|
||||||
case IS_EQUAL_OR_LOWER:
|
case IS_EQUAL_OR_LESSER:
|
||||||
return R.string.isequalorlower;
|
return R.string.isequalorlesser;
|
||||||
case IS_EQUAL:
|
case IS_EQUAL:
|
||||||
return R.string.isequal;
|
return R.string.isequal;
|
||||||
case IS_EQUAL_OR_GREATER:
|
case IS_EQUAL_OR_GREATER:
|
||||||
|
@ -54,9 +54,9 @@ public abstract class Trigger {
|
||||||
|
|
||||||
int comparison = obj1.compareTo(obj2);
|
int comparison = obj1.compareTo(obj2);
|
||||||
switch (this) {
|
switch (this) {
|
||||||
case IS_LOWER:
|
case IS_LESSER:
|
||||||
return comparison < 0;
|
return comparison < 0;
|
||||||
case IS_EQUAL_OR_LOWER:
|
case IS_EQUAL_OR_LESSER:
|
||||||
return comparison <= 0;
|
return comparison <= 0;
|
||||||
case IS_EQUAL:
|
case IS_EQUAL:
|
||||||
return comparison == 0;
|
return comparison == 0;
|
||||||
|
|
|
@ -1330,8 +1330,8 @@
|
||||||
<string name="resumeloop">Resume loop</string>
|
<string name="resumeloop">Resume loop</string>
|
||||||
<string name="notsuspended">Not suspended</string>
|
<string name="notsuspended">Not suspended</string>
|
||||||
<string name="starttemptarget">Start temp target</string>
|
<string name="starttemptarget">Start temp target</string>
|
||||||
<string name="islower">is lower than</string>
|
<string name="islesser">is lesser than</string>
|
||||||
<string name="isequalorlower">is equal or lower than</string>
|
<string name="isequalorlesser">is equal or lesser than</string>
|
||||||
<string name="isequal">is equal to</string>
|
<string name="isequal">is equal to</string>
|
||||||
<string name="isequalorgreater">is equal or greater than</string>
|
<string name="isequalorgreater">is equal or greater than</string>
|
||||||
<string name="isgreater">is greater than</string>
|
<string name="isgreater">is greater than</string>
|
||||||
|
|
Loading…
Reference in a new issue