3-Schweinehunde
/
encrateia
Archived
3
0
Fork 0
Code Issues 17 Pull Requests Projects Releases Wiki Activity

wip: null safety

upgrade-2021-project
Stefan Haslinger 2022-02-28 19:16:55 +01:00
parent 8a441fc726
commit c7819c9b67
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/utils/graph_utils.dart
View File

@ -9,24 +9,25 @@ import '/models/power_zone.dart';
// ignore: avoid_classes_with_only_static_members
class GraphUtils {
static List<RangeAnnotationSegment<int?>> rangeAnnotations({required List<Lap> laps}) {
static List<RangeAnnotationSegment<int>> rangeAnnotations(
{required List<Lap> laps}) {
final List<Color> colorArray = <Color>[
MaterialPalette.white,
MaterialPalette.gray.shade200,
];
return <RangeAnnotationSegment<int?>>[
return <RangeAnnotationSegment<int>>[
for (int index = 0; index < laps.length; index++)
RangeAnnotationSegment<int?>(
RangeAnnotationSegment<int>(
laps
.sublist(0, index + 1)
.map((Lap lap) => lap.totalDistance)
.reduce((int? a, int? b) => a! + b!)! -
.map((Lap lap) => lap.totalDistance ?? 0)
.reduce((int a, int b) => a + b) -
laps[index].totalDistance!,
laps
.sublist(0, index + 1)
.map((Lap lap) => lap.totalDistance)
.reduce((int? a, int? b) => a! + b!),
.map((Lap lap) => lap.totalDistance ?? 0)
.reduce((int a, int b) => a + b),
RangeAnnotationAxisType.domain,
color: colorArray[index % 2],
endLabel: 'Lap ${laps[index].index}',
@ -69,17 +70,17 @@ class GraphUtils {
];
}
static List<RangeAnnotationSegment<int?>> powerZoneAnnotations(
static List<RangeAnnotationSegment<int>> powerZoneAnnotations(
{List<PowerZone>? powerZones}) {
List<RangeAnnotationSegment<int?>> rangeAnnotationSegmentList =
List<RangeAnnotationSegment<int>> rangeAnnotationSegmentList =
<RangeAnnotationSegment<int>>[];
if (powerZones != null) {
rangeAnnotationSegmentList = <RangeAnnotationSegment<int?>>[
rangeAnnotationSegmentList = <RangeAnnotationSegment<int>>[
for (PowerZone powerZone in powerZones)
RangeAnnotationSegment<int?>(
powerZone.lowerLimit,
powerZone.upperLimit,
RangeAnnotationSegment<int>(
powerZone.lowerLimit ?? 0,
powerZone.upperLimit ?? 0,
RangeAnnotationAxisType.measure,
startLabel: powerZone.name,
color: convertedColor(dbColor: powerZone.color!),
@ -89,17 +90,17 @@ class GraphUtils {
return rangeAnnotationSegmentList;
}
static List<RangeAnnotationSegment<int?>> heartRateZoneAnnotations(
static List<RangeAnnotationSegment<int>> heartRateZoneAnnotations(
{List<HeartRateZone>? heartRateZones}) {
List<RangeAnnotationSegment<int?>> rangeAnnotationSegmentList =
List<RangeAnnotationSegment<int>> rangeAnnotationSegmentList =
<RangeAnnotationSegment<int>>[];
if (heartRateZones != null) {
rangeAnnotationSegmentList = <RangeAnnotationSegment<int?>>[
rangeAnnotationSegmentList = <RangeAnnotationSegment<int>>[
for (HeartRateZone heartRateZone in heartRateZones)
RangeAnnotationSegment<int?>(
heartRateZone.lowerLimit,
heartRateZone.upperLimit,
RangeAnnotationSegment<int>(
heartRateZone.lowerLimit ?? 0,
heartRateZone.upperLimit ?? 0,
RangeAnnotationAxisType.measure,
startLabel: heartRateZone.name,
color: convertedColor(dbColor: heartRateZone.color!),

2
lib/utils/my_line_chart.dart
View File

@ -52,7 +52,7 @@ class MyLineChart extends LineChart {
) +
GraphUtils.heartRateZoneAnnotations(
heartRateZones: heartRateZones,
) as List<RangeAnnotationSegment<Object>>,
),
),
ChartTitle<num>(
domainTitle,

3
lib/widgets/charts/lap_charts/lap_heart_rate_chart.dart
View File

@ -53,8 +53,7 @@ class LapHeartRateChart extends StatelessWidget {
behaviors: <ChartBehavior<num>>[
RangeAnnotation<num>(
GraphUtils.heartRateZoneAnnotations(
heartRateZones: heartRateZones)
as List<RangeAnnotationSegment<Object>>,
heartRateZones: heartRateZones),
),
] +
GraphUtils.axis(

3
lib/widgets/charts/lap_charts/lap_power_chart.dart
View File

@ -52,8 +52,7 @@ class LapPowerChart extends StatelessWidget {
animate: false,
behaviors: <ChartBehavior<num>>[
RangeAnnotation<num>(
GraphUtils.powerZoneAnnotations(powerZones: powerZones)
as List<RangeAnnotationSegment<Object>>,
GraphUtils.powerZoneAnnotations(powerZones: powerZones),
),
] +
GraphUtils.axis(