diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java index 98029379f..a42cfdbcf 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java @@ -29,8 +29,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackRecordedActivity; @@ -114,10 +112,6 @@ public class StatisticsRecordedFragment extends Fragment { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { viewBinding = StatisticsRecordedBinding.inflate(inflater, container, false); - RecyclerView sensorsRecyclerView = viewBinding.statsSensorsRecyclerView; - sensorsRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2)); -// sensorsRecyclerView.setAdapter(sensorsAdapter); - return viewBinding.getRoot(); } @@ -258,6 +252,28 @@ public class StatisticsRecordedFragment extends Fragment { if (sensorStatistics == null) { return; } - //TODO + + if (sensorStatistics.hasHeartRate()) { + String maxBPM = String.valueOf(Math.round(sensorStatistics.getMaxHeartRate().getBPM())); + String avgBPM = String.valueOf(Math.round(sensorStatistics.getAvgHeartRate().getBPM())); + + viewBinding.statsHeartRateGroup.setVisibility(View.VISIBLE); + viewBinding.statsMaxHeartRateValue.setText(maxBPM); + viewBinding.statsAvgHeartRateValue.setText(avgBPM); + } + if (sensorStatistics.hasCadence()) { + String maxRPM = String.valueOf(Math.round(sensorStatistics.getMaxCadence().getRPM())); + String avgRPM = String.valueOf(Math.round(sensorStatistics.getAvgCadence().getRPM())); + + viewBinding.statsCadenceGroup.setVisibility(View.VISIBLE); + viewBinding.statsMaxCadenceValue.setText(maxRPM); + viewBinding.statsAvgCadenceValue.setText(avgRPM); + } + if (sensorStatistics.hasPower()) { + String W = String.valueOf(Math.round(sensorStatistics.getAvgPower().getW())); + + viewBinding.statsPowerGroup.setVisibility(View.VISIBLE); + viewBinding.statsPowerValue.setText(W); + } } } diff --git a/src/main/res/layout/statistics_recorded.xml b/src/main/res/layout/statistics_recorded.xml index 670b7e31f..62b9e34b2 100644 --- a/src/main/res/layout/statistics_recorded.xml +++ b/src/main/res/layout/statistics_recorded.xml @@ -30,7 +30,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:orientation="vertical" - app:layout_constraintGuide_percent="0.5" /> + app:layout_constraintGuide_begin="206dp" /> - + - - + + + app:layout_constraintEnd_toStartOf="@id/guideline2" + app:layout_constraintTop_toBottomOf="@id/stats_heart_rate_horizontal_line" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 8495cda25..b35c5f4f1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -328,12 +328,15 @@ limitations under the License. Avg Cadence Max Cadence + rpm Heart rate Avg Heart rate Max Heart rate + bpm %1$d bpm Power Avg Power + W Could not scan for Bluetooth devices (error %1$i). Please enable Bluetooth.