Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove zeros from time formatting

Browse source
This commit is contained in:
nazar-kutz 2021-03-05 20:05:05 +02:00
parent 1c5d01f391
commit e1d1edee43
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
View file

@ -117,6 +117,13 @@ public class Algorithms {
}
return def;
}
public static String formatDoubleWithoutAdditionalZeros(double d) {
if(d == (long) d)
return String.format(Locale.US, "%d",(long)d);
else
return String.format("%s",d);
}
public static int parseIntSilently(String input, int def) {
if (input != null && input.length() > 0) {

12
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -121,13 +121,19 @@ public class OsmAndFormatter {
}
public static String getFormattedTimeInterval(OsmandApplication app, double interval) {
String units;
double intervalInUnits;
if (interval < 60) {
return interval + " " + app.getString(R.string.int_seconds);
units = app.getString(R.string.shared_string_sec);
intervalInUnits = interval;
} else if (interval % 60 == 0) {
return (interval / 60) + " " + app.getString(R.string.int_min);
units = app.getString(R.string.int_min);
intervalInUnits = (interval / 60);
} else {
return (interval / 60f) + " " + app.getString(R.string.int_min);
units = app.getString(R.string.int_min);
intervalInUnits = (interval / 60f);
}
return Algorithms.formatDoubleWithoutAdditionalZeros(intervalInUnits) + " " + units;
}
public static String getFormattedDistanceInterval(OsmandApplication app, double interval) {