caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Improved leftover time display

Browse source
This commit is contained in:
TebbeUbben 2018-06-09 23:15:46 +02:00
parent 6bc13d9cc0
commit 97984f8ef3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java
View file

@ -123,13 +123,17 @@ public abstract class Objective {
@Override @Override
public String getProgress() { public String getProgress() {
long timeLeftover = minimumDuration - (System.currentTimeMillis() - getObjective().getStartedOn().getTime()); long timeLeftover = minimumDuration - (System.currentTimeMillis() - getObjective().getStartedOn().getTime());
int days = (int) (minimumDuration / (24L * 60L * 60L * 1000L)); return getDurationText(timeLeftover) + " / " + getDurationText(minimumDuration);
int hours = (int) (minimumDuration / (60L * 60L * 1000L)); }
int minutes = (int) (minimumDuration / (60L * 1000L));
private String getDurationText(long duration) {
int days = (int) (duration / (24L * 60L * 60L * 1000L));
int hours = (int) (duration / (60L * 60L * 1000L));
int minutes = (int) (duration / (60L * 1000L));
if (days > 0) return MainApp.gq(R.plurals.objective_days, days, days); if (days > 0) return MainApp.gq(R.plurals.objective_days, days, days);
else if (hours > 0) return MainApp.gq(R.plurals.objective_hours, hours, hours); else if (hours > 0) return MainApp.gq(R.plurals.objective_hours, hours, hours);
else if (minutes > 0) return MainApp.gq(R.plurals.objective_minutes, minutes, minutes); else if (minutes > 0) return MainApp.gq(R.plurals.objective_minutes, minutes, minutes);
else if (timeLeftover > 0) return MainApp.gq(R.plurals.objective_minutes, 1, 1); else if (duration > 0) return MainApp.gq(R.plurals.objective_minutes, 1, 1);
else return MainApp.gs(R.string.time_none); else return MainApp.gs(R.string.time_none);
} }
} }