From 793518581221f0bb591bccfd067227210a4e9295 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Wed, 29 Mar 2023 21:50:42 +0200
Subject: [PATCH] UI: split stats_item between generic and sensor (some
 bugfixes).

Part of #24.
---
 .../fragments/StatisticsRecordingFragment.java        |  2 +-
 .../ui/customRecordingLayout/DataField.java           | 10 ++++++++++
 .../viewmodels/SensorStatisticsViewHolder.java        | 11 +++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
index 6b2c73866..d6998cf40 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
@@ -162,7 +162,7 @@ public class StatisticsRecordingFragment extends Fragment {
 
                 viewBinding.statsLayout.addView(viewHolder.getView(), param);
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                throw new RuntimeException("Could not add " + dataField.getKey(), e);
             }
         }
     }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/DataField.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/DataField.java
index 0850de611..d3c94fb05 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/DataField.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/DataField.java
@@ -87,4 +87,14 @@ public class DataField implements Parcelable {
     public int hashCode() {
         return Objects.hash(key, isVisible, isPrimary, isWide);
     }
+
+    @Override
+    public String toString() {
+        return "DataField{" +
+                "key='" + key + '\'' +
+                ", isVisible=" + isVisible +
+                ", isPrimary=" + isPrimary +
+                ", isWide=" + isWide +
+                '}';
+    }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/SensorStatisticsViewHolder.java b/src/main/java/de/dennisguse/opentracks/viewmodels/SensorStatisticsViewHolder.java
index ed8cdd61f..e5e4eafab 100644
--- a/src/main/java/de/dennisguse/opentracks/viewmodels/SensorStatisticsViewHolder.java
+++ b/src/main/java/de/dennisguse/opentracks/viewmodels/SensorStatisticsViewHolder.java
@@ -3,8 +3,6 @@ package de.dennisguse.opentracks.viewmodels;
 import android.util.Pair;
 import android.view.LayoutInflater;
 
-import androidx.core.content.ContextCompat;
-
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.HeartRateZones;
 import de.dennisguse.opentracks.databinding.StatsSensorItemBinding;
@@ -19,12 +17,13 @@ public abstract class SensorStatisticsViewHolder extends StatisticViewHolder<Sta
 
     @Override
     protected StatsSensorItemBinding createViewBinding(LayoutInflater inflater) {
-        return null;
+        return StatsSensorItemBinding.inflate(inflater);
     }
 
     @Override
     public void configureUI(DataField dataField) {
-
+        getBinding().statsValue.setTextAppearance(getContext(), dataField.isPrimary() ? R.style.TextAppearance_OpenTracks_PrimaryValue : R.style.TextAppearance_OpenTracks_SecondaryValue);
+        getBinding().statsDescriptionMain.setTextAppearance(getContext(), dataField.isPrimary() ? R.style.TextAppearance_OpenTracks_PrimaryHeader : R.style.TextAppearance_OpenTracks_SecondaryHeader);
     }
 
     public static class SensorHeartRate extends SensorStatisticsViewHolder {
@@ -45,7 +44,7 @@ public abstract class SensorStatisticsViewHolder extends StatisticViewHolder<Sta
             //TODO Loads preference every time
             HeartRateZones zones = PreferencesUtils.getHeartRateZones();
             int textColor;
-            if (sensorDataSet != null) {
+            if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
                 textColor = zones.getTextColorForZone(getContext(), sensorDataSet.getHeartRate().first);
             } else {
                 textColor = zones.getTextColorForZone(getContext(), null);
@@ -57,7 +56,7 @@ public abstract class SensorStatisticsViewHolder extends StatisticViewHolder<Sta
 
             getBinding().statsDescriptionSecondary.setText(sensorName);
 
-            getBinding().statsValue.setTextColor(ContextCompat.getColor(getContext(), textColor));
+            getBinding().statsValue.setTextColor(textColor);
         }
     }