diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java index 08421682d..8561e77c5 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java @@ -59,7 +59,7 @@ import de.dennisguse.opentracks.util.UnitConversions; */ public class StatsFragment extends Fragment implements TrackDataListener { - public static final String STATS_FRAGMENT_TAG = "statsFragment"; + public static final String STATS_FRAGMENT_TAG = StatsFragment.class.getSimpleName(); private TrackDataHub trackDataHub; private Handler handlerUpdateUI; diff --git a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java index 29ed559a2..1ab78d1f4 100644 --- a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java @@ -17,7 +17,6 @@ package de.dennisguse.opentracks.util; import android.app.Activity; -import android.content.Context; import android.location.Location; import android.util.Pair; import android.view.View; @@ -77,7 +76,7 @@ public class StatsUtils { if (showGradeElevation) { double altitude = location != null && location.hasAltitude() ? location.getAltitude() : Double.NaN; - Pair parts = formatElevation(activity, altitude, metricUnits); + Pair parts = StringUtils.formatElevation(activity, altitude, metricUnits); TextView elevationValue = activity.findViewById(R.id.stats_elevation_current_value); elevationValue.setText(parts.first); @@ -250,7 +249,7 @@ public class StatsUtils { if (showElevation) { { double elevation = tripStatistics == null ? Double.NaN : tripStatistics.getMinElevation(); - Pair parts = formatElevation(activity, elevation, metricUnits); + Pair parts = StringUtils.formatElevation(activity, elevation, metricUnits); TextView elevationValue = activity.findViewById(R.id.stats_elevation_min_value); elevationValue.setText(parts.first); @@ -260,7 +259,7 @@ public class StatsUtils { { double elevation = tripStatistics == null ? Double.NaN : tripStatistics.getMaxElevation(); - Pair parts = formatElevation(activity, elevation, metricUnits); + Pair parts = StringUtils.formatElevation(activity, elevation, metricUnits); TextView elevationValue = activity.findViewById(R.id.stats_elevation_max_value); elevationValue.setText(parts.first); @@ -270,26 +269,4 @@ public class StatsUtils { } } } - - /** - * Sets an elevation value. - * - * @param context the context - * @param elevation the elevation in meters - * @param metricUnits true if metric units - * @return the formatted elevation (or null) and it's unit as {@link Pair} - */ - // TODO Move to StringUtils - private static Pair formatElevation(Context context, double elevation, boolean metricUnits) { - String value = context.getString(R.string.value_unknown); - String unit = context.getString(metricUnits ? R.string.unit_meter : R.string.unit_feet); - if (!Double.isNaN(elevation) && !Double.isInfinite(elevation)) { - if (metricUnits) { - value = StringUtils.formatDecimal(elevation); - } else { - value = StringUtils.formatDecimal(elevation * UnitConversions.M_TO_FT); - } - } - return new Pair<>(value, unit); - } } \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java index 989713897..6d58b7661 100644 --- a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java @@ -361,4 +361,25 @@ public class StringUtils { } return options; } + + /** + * Sets an elevation value. + * + * @param context the context + * @param elevation the elevation in meters + * @param metricUnits true if metric units + * @return the formatted elevation (or null) and it's unit as {@link Pair} + */ + public static Pair formatElevation(Context context, double elevation, boolean metricUnits) { + String value = context.getString(R.string.value_unknown); + String unit = context.getString(metricUnits ? R.string.unit_meter : R.string.unit_feet); + if (!Double.isNaN(elevation) && !Double.isInfinite(elevation)) { + if (metricUnits) { + value = StringUtils.formatDecimal(elevation); + } else { + value = StringUtils.formatDecimal(elevation * UnitConversions.M_TO_FT); + } + } + return new Pair<>(value, unit); + } }