caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

used isOlderThan

Browse source
This commit is contained in:
Roumen Georgiev 2018-04-04 09:37:08 +03:00 committed by GitHub
parent d50f31e7a6
commit f284483500
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
View file

@ -217,12 +217,11 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
if (sage != null) {
careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.SENSORCHANGE);
if(careportalEvent != null) {
isOld = careportalEvent.age(7).substring(0, 5);
if(isOld.equals("isOLD")){
if(careportalEvent.isOlderThan(7)){
sage.setTextColor(MainApp.sResources.getColor(R.color.low));
sage.setText(careportalEvent.age(7).substring(5));
sage.setText(careportalEvent.age());
} else {
sage.setText(careportalEvent.age(7));
sage.setText(careportalEvent.age());
}
} else {
@ -232,12 +231,11 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
if (iage != null) {
careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.INSULINCHANGE);
if(careportalEvent != null) {
isOld = careportalEvent.age(7).substring(0, 5);
if(isOld.equals("isOLD")){
if(careportalEvent.isOlderThan(5)){
iage.setTextColor(MainApp.sResources.getColor(R.color.low));
iage.setText(careportalEvent.age(7).substring(5));
iage.setText(careportalEvent.age());
} else {
iage.setText(careportalEvent.age(7));
iage.setText(careportalEvent.age());
}
} else {
@ -247,12 +245,11 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
if (cage != null) {
careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.SITECHANGE);
if (careportalEvent != null) {
isOld = careportalEvent.age(3).substring(0, 5);
if(isOld.equals("isOLD")){
if(careportalEvent.isOlderThan(3)){
cage.setTextColor(MainApp.sResources.getColor(R.color.low));
cage.setText(careportalEvent.age(3).substring(5));
cage.setText(careportalEvent.age());
} else {
cage.setText(careportalEvent.age(3));
cage.setText(careportalEvent.age());
}
} else {
@ -262,12 +259,11 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
if (pbage != null) {
careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.PUMPBATTERYCHANGE);
if(careportalEvent != null) {
isOld = careportalEvent.age(15).substring(0, 5);
if(isOld.equals("isOLD")){
if(careportalEvent.isOlderThan(15)){
pbage.setTextColor(MainApp.sResources.getColor(R.color.low));
pbage.setText(careportalEvent.age(15).substring(5));
pbage.setText(careportalEvent.age());
} else {
pbage.setText(careportalEvent.age(15));
pbage.setText(careportalEvent.age());
}
} else {