forked from upstream-mirrors/OpenTracks
@@ -48,7 +48,8 @@ public class ChartValueSeriesTest {
|
|||||||
R.string.description_elevation_metric,
|
R.string.description_elevation_metric,
|
||||||
R.string.description_elevation_imperial,
|
R.string.description_elevation_imperial,
|
||||||
R.color.chart_elevation_fill,
|
R.color.chart_elevation_fill,
|
||||||
R.color.chart_elevation_border) {
|
R.color.chart_elevation_border,
|
||||||
|
1) {
|
||||||
@Override
|
@Override
|
||||||
double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
||||||
return chartPoint.getElevation();
|
return chartPoint.getElevation();
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ abstract class ChartValueSeries {
|
|||||||
* @param fillColor the fill color
|
* @param fillColor the fill color
|
||||||
* @param strokeColor the stroke color
|
* @param strokeColor the stroke color
|
||||||
*/
|
*/
|
||||||
ChartValueSeries(Context context, int absoluteMin, int absoluteMax, int[] intervalValues, int metricTitleId, int imperialTitleId, int fillColor, int strokeColor) {
|
ChartValueSeries(Context context, int absoluteMin, int absoluteMax, int[] intervalValues, int metricTitleId, int imperialTitleId, int fillColor, int strokeColor, float fontScale) {
|
||||||
this.absoluteMin = absoluteMin;
|
this.absoluteMin = absoluteMin;
|
||||||
this.absoluteMax = absoluteMax;
|
this.absoluteMax = absoluteMax;
|
||||||
this.intervalValues = intervalValues;
|
this.intervalValues = intervalValues;
|
||||||
@@ -85,16 +85,14 @@ abstract class ChartValueSeries {
|
|||||||
strokePaint.setColor(context.getResources().getColor(strokeColor));
|
strokePaint.setColor(context.getResources().getColor(strokeColor));
|
||||||
strokePaint.setAntiAlias(true);
|
strokePaint.setAntiAlias(true);
|
||||||
|
|
||||||
float scale = context.getResources().getDisplayMetrics().density;
|
|
||||||
|
|
||||||
// Make copies of the stroke paint with the default thickness
|
// Make copies of the stroke paint with the default thickness
|
||||||
titlePaint = new Paint(strokePaint);
|
titlePaint = new Paint(strokePaint);
|
||||||
titlePaint.setTextSize(ChartView.MEDIUM_TEXT_SIZE * scale);
|
titlePaint.setTextSize(ChartView.MEDIUM_TEXT_SIZE * fontScale);
|
||||||
titlePaint.setTextAlign(Align.CENTER);
|
titlePaint.setTextAlign(Align.CENTER);
|
||||||
titlePaint.setStyle(Style.FILL_AND_STROKE);
|
titlePaint.setStyle(Style.FILL_AND_STROKE);
|
||||||
|
|
||||||
markerPaint = new Paint(strokePaint);
|
markerPaint = new Paint(strokePaint);
|
||||||
markerPaint.setTextSize(ChartView.SMALL_TEXT_SIZE * scale);
|
markerPaint.setTextSize(ChartView.SMALL_TEXT_SIZE * fontScale);
|
||||||
markerPaint.setTextAlign(Align.RIGHT);
|
markerPaint.setTextAlign(Align.RIGHT);
|
||||||
markerPaint.setStyle(Style.FILL_AND_STROKE);
|
markerPaint.setStyle(Style.FILL_AND_STROKE);
|
||||||
|
|
||||||
|
|||||||
@@ -193,6 +193,10 @@ public class ChartView extends View {
|
|||||||
public ChartView(Context context, final boolean chartByDistance) {
|
public ChartView(Context context, final boolean chartByDistance) {
|
||||||
super(context);
|
super(context);
|
||||||
this.chartByDistance = chartByDistance;
|
this.chartByDistance = chartByDistance;
|
||||||
|
float fontScale = context.getResources().getDisplayMetrics().density
|
||||||
|
* context.getResources().getConfiguration().fontScale;
|
||||||
|
|
||||||
|
|
||||||
seriesList.add(new ChartValueSeries(context,
|
seriesList.add(new ChartValueSeries(context,
|
||||||
Integer.MIN_VALUE,
|
Integer.MIN_VALUE,
|
||||||
Integer.MAX_VALUE,
|
Integer.MAX_VALUE,
|
||||||
@@ -200,7 +204,8 @@ public class ChartView extends View {
|
|||||||
R.string.description_elevation_metric,
|
R.string.description_elevation_metric,
|
||||||
R.string.description_elevation_imperial,
|
R.string.description_elevation_imperial,
|
||||||
R.color.chart_elevation_fill,
|
R.color.chart_elevation_fill,
|
||||||
R.color.chart_elevation_border) {
|
R.color.chart_elevation_border,
|
||||||
|
fontScale) {
|
||||||
@Override
|
@Override
|
||||||
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
||||||
return chartPoint.getElevation();
|
return chartPoint.getElevation();
|
||||||
@@ -219,7 +224,8 @@ public class ChartView extends View {
|
|||||||
R.string.description_speed_metric,
|
R.string.description_speed_metric,
|
||||||
R.string.description_speed_imperial,
|
R.string.description_speed_imperial,
|
||||||
R.color.chart_speed_fill,
|
R.color.chart_speed_fill,
|
||||||
R.color.chart_speed_border) {
|
R.color.chart_speed_border,
|
||||||
|
fontScale) {
|
||||||
@Override
|
@Override
|
||||||
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
||||||
return chartPoint.getSpeed();
|
return chartPoint.getSpeed();
|
||||||
@@ -239,7 +245,8 @@ public class ChartView extends View {
|
|||||||
R.string.description_pace_metric,
|
R.string.description_pace_metric,
|
||||||
R.string.description_pace_imperial,
|
R.string.description_pace_imperial,
|
||||||
R.color.chart_pace_fill,
|
R.color.chart_pace_fill,
|
||||||
R.color.chart_pace_border) {
|
R.color.chart_pace_border,
|
||||||
|
fontScale) {
|
||||||
@Override
|
@Override
|
||||||
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
||||||
return chartPoint.getPace();
|
return chartPoint.getPace();
|
||||||
@@ -259,7 +266,8 @@ public class ChartView extends View {
|
|||||||
R.string.description_sensor_heart_rate,
|
R.string.description_sensor_heart_rate,
|
||||||
R.string.description_sensor_heart_rate,
|
R.string.description_sensor_heart_rate,
|
||||||
R.color.chart_heart_rate_fill,
|
R.color.chart_heart_rate_fill,
|
||||||
R.color.chart_heart_rate_border) {
|
R.color.chart_heart_rate_border,
|
||||||
|
fontScale) {
|
||||||
@Override
|
@Override
|
||||||
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
||||||
return chartPoint.getHeartRate();
|
return chartPoint.getHeartRate();
|
||||||
@@ -278,7 +286,8 @@ public class ChartView extends View {
|
|||||||
R.string.description_sensor_cadence,
|
R.string.description_sensor_cadence,
|
||||||
R.string.description_sensor_cadence,
|
R.string.description_sensor_cadence,
|
||||||
R.color.chart_cadence_fill,
|
R.color.chart_cadence_fill,
|
||||||
R.color.chart_cadence_border) {
|
R.color.chart_cadence_border,
|
||||||
|
fontScale) {
|
||||||
@Override
|
@Override
|
||||||
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
||||||
return chartPoint.getCadence();
|
return chartPoint.getCadence();
|
||||||
@@ -296,7 +305,9 @@ public class ChartView extends View {
|
|||||||
R.string.description_sensor_power,
|
R.string.description_sensor_power,
|
||||||
R.string.description_sensor_power,
|
R.string.description_sensor_power,
|
||||||
R.color.chart_power_fill,
|
R.color.chart_power_fill,
|
||||||
R.color.chart_power_border) {
|
R.color.chart_power_border,
|
||||||
|
fontScale
|
||||||
|
) {
|
||||||
@Override
|
@Override
|
||||||
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
|
||||||
return chartPoint.getPower();
|
return chartPoint.getPower();
|
||||||
@@ -310,13 +321,11 @@ public class ChartView extends View {
|
|||||||
|
|
||||||
backgroundColor = ThemeUtils.getBackgroundColor(context);
|
backgroundColor = ThemeUtils.getBackgroundColor(context);
|
||||||
|
|
||||||
float scale = context.getResources().getDisplayMetrics().density;
|
|
||||||
|
|
||||||
axisPaint = new Paint();
|
axisPaint = new Paint();
|
||||||
axisPaint.setStyle(Style.FILL_AND_STROKE);
|
axisPaint.setStyle(Style.FILL_AND_STROKE);
|
||||||
axisPaint.setColor(ThemeUtils.getTextColorPrimary(context));
|
axisPaint.setColor(ThemeUtils.getTextColorPrimary(context));
|
||||||
axisPaint.setAntiAlias(true);
|
axisPaint.setAntiAlias(true);
|
||||||
axisPaint.setTextSize(SMALL_TEXT_SIZE * scale);
|
axisPaint.setTextSize(SMALL_TEXT_SIZE * fontScale);
|
||||||
|
|
||||||
xAxisMarkerPaint = new Paint(axisPaint);
|
xAxisMarkerPaint = new Paint(axisPaint);
|
||||||
xAxisMarkerPaint.setTextAlign(Align.CENTER);
|
xAxisMarkerPaint.setTextAlign(Align.CENTER);
|
||||||
@@ -882,6 +891,7 @@ public class ChartView extends View {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Finds the index of the first data point containing data for a series.
|
* Finds the index of the first data point containing data for a series.
|
||||||
|
*
|
||||||
* @return -1 if no data point contains data for the series.
|
* @return -1 if no data point contains data for the series.
|
||||||
*/
|
*/
|
||||||
private int getFirstPopulatedChartDataIndex(ChartValueSeries chartValueSeries) {
|
private int getFirstPopulatedChartDataIndex(ChartValueSeries chartValueSeries) {
|
||||||
|
|||||||
Reference in New Issue
Block a user