luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-28 00:02:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

#42 Imperial units wrong

Browse Source
This commit is contained in:
jannis 2020-01-17 21:42:28 +01:00
parent d75e84d8d9
commit 2d776a3864
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/de/tadris/fitness/util/unit/UnitUtils.java
View File

@ -90,17 +90,11 @@ public class UnitUtils {
return round(consumption / one, 2) + " kcal/" + CHOSEN_SYSTEM.getLongDistanceUnit();
}
/**
*
* @param distance Distance in meters
* @return String in preferred unit
*/
public static String getDistance(int distance){
double units= CHOSEN_SYSTEM.getDistanceFromMeters(distance);
if(units >= 1000){
return round(units / 1000, 1) + " " + CHOSEN_SYSTEM.getLongDistanceUnit();
public static String getDistance(int distanceInMeters) {
if (distanceInMeters >= 1000) {
return round(CHOSEN_SYSTEM.getDistanceFromKilometers((double) distanceInMeters / 1000d), 1) + " " + CHOSEN_SYSTEM.getLongDistanceUnit();
}else{
return (int)units + " " + CHOSEN_SYSTEM.getShortDistanceUnit();
return (int) CHOSEN_SYSTEM.getDistanceFromMeters(distanceInMeters) + " " + CHOSEN_SYSTEM.getShortDistanceUnit();
}
}