karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup.

Browse Source
This commit is contained in:
Dennis Guse
2019-10-23 18:47:20 +02:00
parent 0dd7f74a11
commit e9d5718495
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java
+1 -1
View File
@@ -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;
src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
+3 -26
View File
@@ -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<String, String> parts = formatElevation(activity, altitude, metricUnits);
Pair<String, String> 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<String, String> parts = formatElevation(activity, elevation, metricUnits);
Pair<String, String> 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<String, String> parts = formatElevation(activity, elevation, metricUnits);
Pair<String, String> 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<String, String> 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);
}
}
src/main/java/de/dennisguse/opentracks/util/StringUtils.java
+21
View File
@@ -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<String, String> 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);
}
}