From 2d776a3864b160de9de04a00e471119ef9b3aaf2 Mon Sep 17 00:00:00 2001 From: jannis Date: Fri, 17 Jan 2020 21:42:28 +0100 Subject: [PATCH] #42 Imperial units wrong --- .../de/tadris/fitness/util/unit/UnitUtils.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/de/tadris/fitness/util/unit/UnitUtils.java b/app/src/main/java/de/tadris/fitness/util/unit/UnitUtils.java index e8d4e56..e58c834 100644 --- a/app/src/main/java/de/tadris/fitness/util/unit/UnitUtils.java +++ b/app/src/main/java/de/tadris/fitness/util/unit/UnitUtils.java @@ -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(); } }