forked from upstream-mirrors/OpenTracks
Gain and loss are integers.
This commit is contained in:
@@ -59,8 +59,8 @@ public class IntervalStatisticsAdapter extends RecyclerView.Adapter<RecyclerView
|
|||||||
|
|
||||||
viewHolder.rate.setText(StringUtils.formatSpeed(context, interval.getSpeed(), metricUnits, isReportSpeed));
|
viewHolder.rate.setText(StringUtils.formatSpeed(context, interval.getSpeed(), metricUnits, isReportSpeed));
|
||||||
|
|
||||||
viewHolder.gain.setText(StringUtils.formatAltitude(context, interval.getGain_m(), metricUnits));
|
viewHolder.gain.setText(StringUtils.formatAltitudeChange(context, interval.getGain_m(), metricUnits));
|
||||||
viewHolder.loss.setText(StringUtils.formatAltitude(context, interval.getLoss_m(), metricUnits));
|
viewHolder.loss.setText(StringUtils.formatAltitudeChange(context, interval.getLoss_m(), metricUnits));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -243,11 +243,11 @@ public class StatisticsRecordedFragment extends Fragment {
|
|||||||
|
|
||||||
Pair<String, String> parts;
|
Pair<String, String> parts;
|
||||||
|
|
||||||
parts = StringUtils.getAltitudeParts(getContext(), altitudeGain_m, preferenceMetricUnits);
|
parts = StringUtils.getAltitudeChangeParts(getContext(), altitudeGain_m, preferenceMetricUnits);
|
||||||
viewBinding.statsAltitudeGainValue.setText(parts.first);
|
viewBinding.statsAltitudeGainValue.setText(parts.first);
|
||||||
viewBinding.statsAltitudeGainUnit.setText(parts.second);
|
viewBinding.statsAltitudeGainUnit.setText(parts.second);
|
||||||
|
|
||||||
parts = StringUtils.getAltitudeParts(getContext(), altitudeLoss_m, preferenceMetricUnits);
|
parts = StringUtils.getAltitudeChangeParts(getContext(), altitudeLoss_m, preferenceMetricUnits);
|
||||||
viewBinding.statsAltitudeLossValue.setText(parts.first);
|
viewBinding.statsAltitudeLossValue.setText(parts.first);
|
||||||
viewBinding.statsAltitudeLossUnit.setText(parts.second);
|
viewBinding.statsAltitudeLossUnit.setText(parts.second);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -66,7 +66,7 @@ public class SharePictureTrackExporter implements TrackExporter {
|
|||||||
|
|
||||||
viewBinding.sharePictureTotalTime.setText(StringUtils.formatElapsedTimeWithHour(track.getTrackStatistics().getTotalTime()));
|
viewBinding.sharePictureTotalTime.setText(StringUtils.formatElapsedTimeWithHour(track.getTrackStatistics().getTotalTime()));
|
||||||
viewBinding.sharePictureTotalDistance.setText(StringUtils.formatDistance(context, track.getTrackStatistics().getTotalDistance(), metricUnits));
|
viewBinding.sharePictureTotalDistance.setText(StringUtils.formatDistance(context, track.getTrackStatistics().getTotalDistance(), metricUnits));
|
||||||
viewBinding.sharePictureGain.setText(StringUtils.formatAltitude(context, trackStatistics.getTotalAltitudeGain(), metricUnits));
|
viewBinding.sharePictureGain.setText(StringUtils.formatAltitudeChange(context, trackStatistics.getTotalAltitudeGain(), metricUnits));
|
||||||
|
|
||||||
// prepare rendering
|
// prepare rendering
|
||||||
View view = viewBinding.getRoot();
|
View view = viewBinding.getRoot();
|
||||||
|
|||||||
@@ -341,6 +341,21 @@ public class StringUtils {
|
|||||||
return context.getString(R.string.altitude_with_unit, distanceParts.first, distanceParts.second);
|
return context.getString(R.string.altitude_with_unit, distanceParts.first, distanceParts.second);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the formatted altitudeDifference_m (or null) and it's unit as {@link Pair}
|
||||||
|
*/
|
||||||
|
public static Pair<String, String> getAltitudeChangeParts(Context context, Float altitudeDifference_m, boolean metricUnits) {
|
||||||
|
String formattedValue = altitudeDifference_m != null ? String.valueOf((int) Distance.of(altitudeDifference_m).toM_FT(metricUnits)) : context.getString(R.string.value_unknown);
|
||||||
|
String unit = context.getString(metricUnits ? R.string.unit_meter : R.string.unit_feet);
|
||||||
|
return new Pair<>(formattedValue, unit);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String formatAltitudeChange(Context context, Float altitude_m, boolean metricUnits) {
|
||||||
|
Pair<String, String> distanceParts = getAltitudeChangeParts(context, altitude_m, metricUnits);
|
||||||
|
|
||||||
|
return context.getString(R.string.altitude_with_unit, distanceParts.first, distanceParts.second);
|
||||||
|
}
|
||||||
|
|
||||||
public static String valueInParentheses(String text) {
|
public static String valueInParentheses(String text) {
|
||||||
return "(" + text + ")";
|
return "(" + text + ")";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,10 +84,10 @@ public class StatisticDataBuilder {
|
|||||||
description = latestTrackPoint != null && latestTrackPoint.hasAltitude() ? context.getString(latestTrackPoint.getAltitude().getLabelId()) : null;
|
description = latestTrackPoint != null && latestTrackPoint.hasAltitude() ? context.getString(latestTrackPoint.getAltitude().getLabelId()) : null;
|
||||||
valueAndUnit = StringUtils.getAltitudeParts(context, altitude, metricUnits);
|
valueAndUnit = StringUtils.getAltitudeParts(context, altitude, metricUnits);
|
||||||
} else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_gain_key))) {
|
} else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_gain_key))) {
|
||||||
valueAndUnit = StringUtils.getAltitudeParts(context, recordingData.getTrackStatistics().getTotalAltitudeGain(), metricUnits);
|
valueAndUnit = StringUtils.getAltitudeChangeParts(context, recordingData.getTrackStatistics().getTotalAltitudeGain(), metricUnits);
|
||||||
title = context.getString(R.string.stats_gain);
|
title = context.getString(R.string.stats_gain);
|
||||||
} else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_loss_key))) {
|
} else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_loss_key))) {
|
||||||
valueAndUnit = StringUtils.getAltitudeParts(context, recordingData.getTrackStatistics().getTotalAltitudeLoss(), metricUnits);
|
valueAndUnit = StringUtils.getAltitudeChangeParts(context, recordingData.getTrackStatistics().getTotalAltitudeLoss(), metricUnits);
|
||||||
title = context.getString(R.string.stats_loss);
|
title = context.getString(R.string.stats_loss);
|
||||||
} else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_coordinates_key))) {
|
} else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_coordinates_key))) {
|
||||||
title = context.getString(R.string.stats_coordinates);
|
title = context.getString(R.string.stats_coordinates);
|
||||||
|
|||||||
Reference in New Issue
Block a user