Bugfix: CustomLayout - title for pace was speed/GPS.

Introduced in d70e7b8788
2023-04-26 07:19:02 +02:00
parent 96fb65b6b0
commit 32dc6fef82
2 changed files with 28 additions and 7 deletions
@@ -65,15 +65,20 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
        }
    }

-    public static class SpeedOrPace extends GenericStatisticsViewHolder {
+    public abstract static class SpeedOrPace extends GenericStatisticsViewHolder {
+
+        private final boolean reportSpeed;
+
+        public SpeedOrPace(boolean reportSpeed) {
+            this.reportSpeed = reportSpeed;
+        }

        @Override
        public void onChanged(UnitSystem unitSystem, RecordingData data) {
-            // TODO Pace wont work for now
-            boolean reportSpeed = true;
            SpeedFormatter localSpeedFormatter = SpeedFormatter.Builder()
                    .setUnit(unitSystem)
-                    .setReportSpeedOrPace(reportSpeed).build(getContext());
+                    .setReportSpeedOrPace(reportSpeed)
+                    .build(getContext());

            Pair<String, String> valueAndUnit;

@@ -85,7 +90,9 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
            } else {
                Speed speed = latestTrackPoint != null && latestTrackPoint.hasSpeed() ? latestTrackPoint.getSpeed() : null;
                valueAndUnit = localSpeedFormatter.getSpeedParts(speed);
-                getBinding().statsDescriptionMain.setText(getContext().getString(R.string.description_speed_source_gps));
+
+                String title = reportSpeed ? getContext().getString(R.string.stats_speed) : getContext().getString(R.string.stats_pace);
+                getBinding().statsDescriptionMain.setText(title);
            }

            getBinding().statsValue.setText(valueAndUnit.first);
@@ -93,6 +100,20 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
        }
    }

+    public static class SpeedVH extends SpeedOrPace {
+
+        public SpeedVH() {
+            super(true);
+        }
+    }
+
+    public static class PaceVH extends SpeedOrPace {
+
+        public PaceVH() {
+            super(false);
+        }
+    }
+
    public static class AverageMovingSpeed extends GenericStatisticsViewHolder {

        @Override