forked from upstream-mirrors/OpenTracks
@@ -244,22 +244,6 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Altitude extends GenericStatisticsViewHolder {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onChanged(UnitSystem unitSystem, RecordingData data) {
|
|
||||||
TrackPoint latestTrackPoint = data.latestTrackPoint();
|
|
||||||
Float altitude = latestTrackPoint != null && latestTrackPoint.position().hasAltitude() ? (float) latestTrackPoint.position().altitude().toM() : null;
|
|
||||||
String altitudeReference = latestTrackPoint != null && latestTrackPoint.position().hasAltitude() ? getContext().getString(latestTrackPoint.position().altitude().getLabelId()) : null;
|
|
||||||
Pair<String, String> valueAndUnit = StringUtils.getAltitudeParts(getContext(), altitude, unitSystem);
|
|
||||||
|
|
||||||
getBinding().statsValue.setText(valueAndUnit.first);
|
|
||||||
getBinding().statsUnit.setText(valueAndUnit.second);
|
|
||||||
getBinding().statsDescriptionMain.setText(R.string.stats_altitude);
|
|
||||||
getBinding().statsDescriptionSecondary.setText(altitudeReference);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class Gain extends GenericStatisticsViewHolder {
|
public static class Gain extends GenericStatisticsViewHolder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class Mapping {
|
|||||||
m.put(context.getString(R.string.stats_custom_layout_elapsed_segment_time_key), GenericStatisticsViewHolder.ElapsedSegmentTime::new);
|
m.put(context.getString(R.string.stats_custom_layout_elapsed_segment_time_key), GenericStatisticsViewHolder.ElapsedSegmentTime::new);
|
||||||
m.put(context.getString(R.string.stats_custom_layout_fastest_pace_key), GenericStatisticsViewHolder.FastestPace::new);
|
m.put(context.getString(R.string.stats_custom_layout_fastest_pace_key), GenericStatisticsViewHolder.FastestPace::new);
|
||||||
|
|
||||||
m.put(context.getString(R.string.stats_custom_layout_altitude_key), GenericStatisticsViewHolder.Altitude::new);
|
m.put(context.getString(R.string.stats_custom_layout_altitude_key), SensorStatisticsViewHolder.Altitude::new);
|
||||||
m.put(context.getString(R.string.stats_custom_layout_gain_key), GenericStatisticsViewHolder.Gain::new);
|
m.put(context.getString(R.string.stats_custom_layout_gain_key), GenericStatisticsViewHolder.Gain::new);
|
||||||
m.put(context.getString(R.string.stats_custom_layout_loss_key), GenericStatisticsViewHolder.Loss::new);
|
m.put(context.getString(R.string.stats_custom_layout_loss_key), GenericStatisticsViewHolder.Loss::new);
|
||||||
m.put(context.getString(R.string.stats_custom_layout_coordinates_key), GenericStatisticsViewHolder.Coordinates::new);
|
m.put(context.getString(R.string.stats_custom_layout_coordinates_key), GenericStatisticsViewHolder.Coordinates::new);
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
|
|||||||
|
|
||||||
import de.dennisguse.opentracks.R;
|
import de.dennisguse.opentracks.R;
|
||||||
import de.dennisguse.opentracks.data.models.HeartRateZones;
|
import de.dennisguse.opentracks.data.models.HeartRateZones;
|
||||||
|
import de.dennisguse.opentracks.data.models.TrackPoint;
|
||||||
import de.dennisguse.opentracks.databinding.StatsSensorItemBinding;
|
import de.dennisguse.opentracks.databinding.StatsSensorItemBinding;
|
||||||
import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
|
import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
|
||||||
import de.dennisguse.opentracks.services.RecordingData;
|
import de.dennisguse.opentracks.services.RecordingData;
|
||||||
@@ -128,4 +129,20 @@ public abstract class SensorStatisticsViewHolder extends StatisticViewHolder<Sta
|
|||||||
getBinding().statsDescriptionSecondary.setText(sensorName);
|
getBinding().statsDescriptionSecondary.setText(sensorName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class Altitude extends SensorStatisticsViewHolder {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onChanged(UnitSystem unitSystem, RecordingData data) {
|
||||||
|
TrackPoint latestTrackPoint = data.latestTrackPoint();
|
||||||
|
Float altitude = latestTrackPoint != null && latestTrackPoint.position().hasAltitude() ? (float) latestTrackPoint.position().altitude().toM() : null;
|
||||||
|
String altitudeReference = latestTrackPoint != null && latestTrackPoint.position().hasAltitude() ? getContext().getString(latestTrackPoint.position().altitude().getLabelId()) : null;
|
||||||
|
Pair<String, String> valueAndUnit = StringUtils.getAltitudeParts(getContext(), altitude, unitSystem);
|
||||||
|
|
||||||
|
getBinding().statsValue.setText(valueAndUnit.first);
|
||||||
|
getBinding().statsUnit.setText(valueAndUnit.second);
|
||||||
|
getBinding().statsDescriptionMain.setText(R.string.stats_altitude);
|
||||||
|
getBinding().statsDescriptionSecondary.setText(altitudeReference);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user