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

IntervalStatisticsUpdater exposes Statistics (instead of Interval).

Browse Source
This commit is contained in:
Dennis Guse
2025-10-31 18:35:45 +01:00
parent 95b27f66fb
commit 53240c3d1a
9 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java
+12 -17
View File
@@ -7,18 +7,20 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.List;
import de.dennisguse.opentracks.data.models.Distance;
import de.dennisguse.opentracks.data.models.DistanceFormatter;
import de.dennisguse.opentracks.data.models.SpeedFormatter;
import de.dennisguse.opentracks.data.models.Statistics;
import de.dennisguse.opentracks.databinding.IntervalStatsListItemBinding;
import de.dennisguse.opentracks.settings.UnitSystem;
import de.dennisguse.opentracks.util.StringUtils;
public class IntervalStatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private List<IntervalStatisticsUpdater.Interval> intervalList;
private List<Statistics> intervalList = new ArrayList<>();
private final Context context;
private final StackMode stackMode;
private UnitSystem unitSystem;
@@ -43,46 +45,39 @@ public class IntervalStatisticsAdapter extends RecyclerView.Adapter<RecyclerView
int nextPosition = actualPosition + 1;
boolean isLast = actualPosition == getItemCount() - 1;
IntervalStatisticsAdapter.ViewHolder viewHolder = (IntervalStatisticsAdapter.ViewHolder) holder;
IntervalStatisticsUpdater.Interval interval = intervalList.get(actualPosition);
Statistics interval = intervalList.get(actualPosition);
viewHolder.itemView.setTag(actualPosition);
Distance sumDistance;
if (isLast && actualPosition > 0) {
sumDistance = intervalList.get(actualPosition - 1).getDistance()
sumDistance = intervalList.get(actualPosition - 1).totalDistance()
.multipliedBy(actualPosition)
.plus(interval.getDistance());
.plus(interval.totalDistance());
} else {
sumDistance = interval.getDistance().multipliedBy(nextPosition);
sumDistance = interval.totalDistance().multipliedBy(nextPosition);
}
viewHolder.viewBinding.intervalItemDistance.setText(DistanceFormatter.Builder()
.setUnit(unitSystem)
.build(context).formatDistance(sumDistance));
SpeedFormatter formatter = SpeedFormatter.Builder().setUnit(unitSystem).setReportSpeedOrPace(isReportSpeed).build(context);
viewHolder.viewBinding.intervalItemRate.setText(formatter.formatSpeed(interval.getSpeed()));
viewHolder.viewBinding.intervalItemRate.setText(formatter.formatSpeed(interval.getAverageSpeed()));
viewHolder.viewBinding.intervalItemGain.setText(StringUtils.formatAltitude(context, interval.getGain_m(), unitSystem));
viewHolder.viewBinding.intervalItemLoss.setText(StringUtils.formatAltitude(context, interval.getLoss_m(), unitSystem));
viewHolder.viewBinding.intervalItemGain.setText(StringUtils.formatAltitude(context, interval.altitudeGainLoss() != null ? interval.altitudeGainLoss().gain_m() : null, unitSystem));
viewHolder.viewBinding.intervalItemLoss.setText(StringUtils.formatAltitude(context, interval.altitudeGainLoss() != null ? interval.altitudeGainLoss().loss_m() : null, unitSystem));
}
@Override
public int getItemCount() {
if (intervalList == null) {
return 0;
}
return intervalList.size();
}
public List<IntervalStatisticsUpdater.Interval> swapData(List<IntervalStatisticsUpdater.Interval> data, UnitSystem unitSystem, boolean isReportSpeed) {
public void swapData(@NonNull List<Statistics> data, UnitSystem unitSystem, boolean isReportSpeed) {
this.unitSystem = unitSystem;
this.isReportSpeed = isReportSpeed;
intervalList = data;
if (data != null) {
this.notifyDataSetChanged();
}
return data;
this.notifyDataSetChanged();
}
/**
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java
+3 -2
View File
@@ -18,6 +18,7 @@ import java.util.concurrent.Executors;
import de.dennisguse.opentracks.data.ContentProviderUtils;
import de.dennisguse.opentracks.data.models.Distance;
import de.dennisguse.opentracks.data.models.Statistics;
import de.dennisguse.opentracks.data.models.Track;
import de.dennisguse.opentracks.data.models.TrackPoint;
import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
@@ -32,7 +33,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
private static final String TAG = IntervalStatisticsModel.class.getSimpleName();
private MutableLiveData<List<IntervalStatisticsUpdater.Interval>> intervalsLiveData;
private MutableLiveData<List<Statistics>> intervalsLiveData;
private IntervalStatisticsUpdater intervalStatistics;
private Distance distanceInterval;
private final ContentResolver contentResolver;
@@ -65,7 +66,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
handler = null;
}
public MutableLiveData<List<IntervalStatisticsUpdater.Interval>> getIntervalStats(Track.Id trackId, UnitSystem unitSystem, @Nullable IntervalOption interval) {
public MutableLiveData<List<Statistics>> getIntervalStats(Track.Id trackId, UnitSystem unitSystem, @Nullable IntervalOption interval) {
if (intervalsLiveData == null) {
if (interval == null) {
interval = IntervalOption.OPTION_1;
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java
+23 -17
View File
@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import de.dennisguse.opentracks.data.models.AltitudeGainLoss;
import de.dennisguse.opentracks.data.models.Distance;
import de.dennisguse.opentracks.data.models.HeartRate;
import de.dennisguse.opentracks.data.models.Power;
@@ -74,8 +75,8 @@ public class IntervalStatisticsUpdater {
return trackPoint != null ? trackPoint.getId() : null;
}
public List<Interval> getIntervalList() {
return intervalList;
public List<Statistics> getIntervalList() {
return intervalList.stream().map(Interval::toStatistics).toList();
}
/**
@@ -84,14 +85,15 @@ public class IntervalStatisticsUpdater {
*
* @return the interval object or null if any interval is completed.
*/
public Interval getLastInterval() {
@Nullable
public Statistics getLastInterval() {
if (intervalList.size() == 1 && intervalList.get(0).getDistance().lessThan(distanceInterval)) {
return null;
}
for (int i = intervalList.size() - 1; i >= 0; i--) {
if (intervalList.get(i).getDistance().greaterOrEqualThan(distanceInterval)) {
return this.intervalList.get(i);
return this.intervalList.get(i).toStatistics();
}
}
@@ -99,7 +101,8 @@ public class IntervalStatisticsUpdater {
}
//TODO Could be replaced with Statistics?
public static class Interval {
@Deprecated
private static class Interval {
private Distance distance = Distance.of(0);
private Duration time = Duration.ofSeconds(0);
private Float gain_m;
@@ -145,18 +148,6 @@ public class IntervalStatisticsUpdater {
return gain_m != null;
}
public Float getGain_m() {
return gain_m;
}
public boolean hasLoss() {
return loss_m != null;
}
public Float getLoss_m() {
return loss_m;
}
public boolean hasAverageHeartRate() {
return avgHeartRate != null;
}
@@ -201,5 +192,20 @@ public class IntervalStatisticsUpdater {
avgHeartRate = trackStatistics.avgHeartRate();
avgPower = trackStatistics.avgPower();
}
private Statistics toStatistics() {
return new Statistics(
null,
null,
time,
null,
distance,
null,
null,
gain_m != null ? new AltitudeGainLoss(gain_m, loss_m) : null,
avgHeartRate,
avgPower
);
}
}
}
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java
+2 -1
View File
@@ -21,6 +21,7 @@ import java.util.Objects;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.ContentProviderUtils;
import de.dennisguse.opentracks.data.models.DistanceFormatter;
import de.dennisguse.opentracks.data.models.Statistics;
import de.dennisguse.opentracks.data.models.Track;
import de.dennisguse.opentracks.databinding.IntervalListViewBinding;
import de.dennisguse.opentracks.settings.PreferencesUtils;
@@ -192,7 +193,7 @@ public class IntervalsFragment extends Fragment {
}
viewBinding.intervalRate.setText(isReportSpeed ? getString(R.string.stats_speed) : getString(R.string.stats_pace));
LiveData<List<IntervalStatisticsUpdater.Interval>> liveData = viewModel.getIntervalStats(trackId, unitSystem, selectedInterval);
LiveData<List<Statistics>> liveData = viewModel.getIntervalStats(trackId, unitSystem, selectedInterval);
liveData.observe(getActivity(), intervalList -> adapter.swapData(intervalList, unitSystem, isReportSpeed));
setIntervalsDropdownText();