forked from upstream-mirrors/OpenTracks
UI: split stats_item between generic and sensor (some bugfixes).
Part of #24.
This commit is contained in:
@@ -162,7 +162,7 @@ public class StatisticsRecordingFragment extends Fragment {
|
|||||||
|
|
||||||
viewBinding.statsLayout.addView(viewHolder.getView(), param);
|
viewBinding.statsLayout.addView(viewHolder.getView(), param);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException("Could not add " + dataField.getKey(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,4 +87,14 @@ public class DataField implements Parcelable {
|
|||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return Objects.hash(key, isVisible, isPrimary, isWide);
|
return Objects.hash(key, isVisible, isPrimary, isWide);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "DataField{" +
|
||||||
|
"key='" + key + '\'' +
|
||||||
|
", isVisible=" + isVisible +
|
||||||
|
", isPrimary=" + isPrimary +
|
||||||
|
", isWide=" + isWide +
|
||||||
|
'}';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ package de.dennisguse.opentracks.viewmodels;
|
|||||||
import android.util.Pair;
|
import android.util.Pair;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
|
||||||
import androidx.core.content.ContextCompat;
|
|
||||||
|
|
||||||
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.databinding.StatsSensorItemBinding;
|
import de.dennisguse.opentracks.databinding.StatsSensorItemBinding;
|
||||||
@@ -19,12 +17,13 @@ public abstract class SensorStatisticsViewHolder extends StatisticViewHolder<Sta
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected StatsSensorItemBinding createViewBinding(LayoutInflater inflater) {
|
protected StatsSensorItemBinding createViewBinding(LayoutInflater inflater) {
|
||||||
return null;
|
return StatsSensorItemBinding.inflate(inflater);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void configureUI(DataField dataField) {
|
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 {
|
public static class SensorHeartRate extends SensorStatisticsViewHolder {
|
||||||
@@ -45,7 +44,7 @@ public abstract class SensorStatisticsViewHolder extends StatisticViewHolder<Sta
|
|||||||
//TODO Loads preference every time
|
//TODO Loads preference every time
|
||||||
HeartRateZones zones = PreferencesUtils.getHeartRateZones();
|
HeartRateZones zones = PreferencesUtils.getHeartRateZones();
|
||||||
int textColor;
|
int textColor;
|
||||||
if (sensorDataSet != null) {
|
if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
|
||||||
textColor = zones.getTextColorForZone(getContext(), sensorDataSet.getHeartRate().first);
|
textColor = zones.getTextColorForZone(getContext(), sensorDataSet.getHeartRate().first);
|
||||||
} else {
|
} else {
|
||||||
textColor = zones.getTextColorForZone(getContext(), null);
|
textColor = zones.getTextColorForZone(getContext(), null);
|
||||||
@@ -57,7 +56,7 @@ public abstract class SensorStatisticsViewHolder extends StatisticViewHolder<Sta
|
|||||||
|
|
||||||
getBinding().statsDescriptionSecondary.setText(sensorName);
|
getBinding().statsDescriptionSecondary.setText(sensorName);
|
||||||
|
|
||||||
getBinding().statsValue.setTextColor(ContextCompat.getColor(getContext(), textColor));
|
getBinding().statsValue.setTextColor(textColor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user