Skip to content

Commit 8932e60

Browse files
domesticmousedomesticmouse
authored
web/charts: Migrate to null safety (flutter#921)
1 parent d14e79b commit 8932e60

File tree

106 files changed

+355
-346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+355
-346
lines changed

‎web/charts/lib/a11y/domain_a11y_explore_bar_chart.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
3838
import 'package:flutter/material.dart';
3939

4040
class DomainA11yExploreBarChart extends StatelessWidget {
41-
final List<charts.Series> seriesList;
42-
final bool animate;
41+
final List<charts.Series<dynamic, String>> seriesList;
42+
final bool? animate;
4343

44-
const DomainA11yExploreBarChart(this.seriesList, {this.animate, Key key})
44+
const DomainA11yExploreBarChart(this.seriesList, {this.animate, Key? key})
4545
: super(key: key);
4646

4747
/// Creates a [BarChart] with sample data and no transition.

‎web/charts/lib/app_config.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ class AppConfig {
2222
final ThemeData theme;
2323
final bool showPerformanceOverlay;
2424

25-
AppConfig(
26-
{this.appName, this.appLink, this.theme, this.showPerformanceOverlay});
25+
AppConfig({
26+
required this.appName,
27+
required this.appLink,
28+
required this.theme,
29+
required this.showPerformanceOverlay,
30+
});
2731
}
2832

2933
/// The default configuration of the app.

‎web/charts/lib/axes/bar_secondary_axis.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
3636
/// RTL.flipAxisLocations is set.
3737
class BarChartWithSecondaryAxis extends StatelessWidget {
3838
static const secondaryMeasureAxisId = 'secondaryMeasureAxisId';
39-
final List<charts.Series> seriesList;
40-
final bool animate;
39+
final List<charts.Series<dynamic, String>> seriesList;
40+
final bool? animate;
4141

42-
const BarChartWithSecondaryAxis(this.seriesList, {this.animate, Key key})
42+
const BarChartWithSecondaryAxis(this.seriesList, {this.animate, Key? key})
4343
: super(key: key);
4444

4545
factory BarChartWithSecondaryAxis.withSampleData() {

‎web/charts/lib/axes/bar_secondary_axis_only.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
3030
/// RTL.flipAxisLocations is set.
3131
class BarChartWithSecondaryAxisOnly extends StatelessWidget {
3232
static const secondaryMeasureAxisId = 'secondaryMeasureAxisId';
33-
final List<charts.Series> seriesList;
34-
final bool animate;
33+
final List<charts.Series<dynamic, String>> seriesList;
34+
final bool? animate;
3535

36-
const BarChartWithSecondaryAxisOnly(this.seriesList, {this.animate, Key key})
36+
const BarChartWithSecondaryAxisOnly(this.seriesList, {this.animate, Key? key})
3737
: super(key: key);
3838

3939
factory BarChartWithSecondaryAxisOnly.withSampleData() {

‎web/charts/lib/axes/custom_axis_tick_formatters.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import 'package:flutter/material.dart';
2222
import 'package:intl/intl.dart';
2323

2424
class CustomAxisTickFormatters extends StatelessWidget {
25-
final List<charts.Series> seriesList;
26-
final bool animate;
25+
final List<charts.Series<dynamic, DateTime>> seriesList;
26+
final bool? animate;
2727

28-
const CustomAxisTickFormatters(this.seriesList, {this.animate, Key key})
28+
const CustomAxisTickFormatters(this.seriesList, {this.animate, Key? key})
2929
: super(key: key);
3030

3131
/// Creates a [TimeSeriesChart] with sample data and no transition.

‎web/charts/lib/axes/custom_font_size_and_color.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2626
/// There are many axis styling options in the SmallTickRenderer allowing you
2727
/// to customize the font, tick lengths, and offsets.
2828
class CustomFontSizeAndColor extends StatelessWidget {
29-
final List<charts.Series> seriesList;
30-
final bool animate;
29+
final List<charts.Series<dynamic, String>> seriesList;
30+
final bool? animate;
3131

32-
const CustomFontSizeAndColor(this.seriesList, {this.animate, Key key})
32+
const CustomFontSizeAndColor(this.seriesList, {this.animate, Key? key})
3333
: super(key: key);
3434

3535
factory CustomFontSizeAndColor.withSampleData() {

‎web/charts/lib/axes/custom_measure_tick_count.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2525
import 'package:flutter/material.dart';
2626

2727
class CustomMeasureTickCount extends StatelessWidget {
28-
final List<charts.Series> seriesList;
29-
final bool animate;
28+
final List<charts.Series<dynamic, DateTime>> seriesList;
29+
final bool? animate;
3030

31-
const CustomMeasureTickCount(this.seriesList, {this.animate, Key key})
31+
const CustomMeasureTickCount(this.seriesList, {this.animate, Key? key})
3232
: super(key: key);
3333

3434
/// Creates a [TimeSeriesChart] with sample data and no transition.

‎web/charts/lib/axes/flipped_vertical_axis.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2929
/// Note: primary and secondary may flip left and right positioning when
3030
/// RTL.flipAxisLocations is set.
3131
class FlippedVerticalAxis extends StatelessWidget {
32-
final List<charts.Series> seriesList;
33-
final bool animate;
32+
final List<charts.Series<dynamic, String>> seriesList;
33+
final bool? animate;
3434

35-
const FlippedVerticalAxis(this.seriesList, {this.animate, Key key})
35+
const FlippedVerticalAxis(this.seriesList, {this.animate, Key? key})
3636
: super(key: key);
3737

3838
factory FlippedVerticalAxis.withSampleData() {

‎web/charts/lib/axes/gridline_dash_pattern.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2121
import 'package:flutter/material.dart';
2222

2323
class GridlineDashPattern extends StatelessWidget {
24-
final List<charts.Series> seriesList;
25-
final bool animate;
24+
final List<charts.Series<dynamic, DateTime>> seriesList;
25+
final bool? animate;
2626

27-
const GridlineDashPattern(this.seriesList, {this.animate, Key key})
27+
const GridlineDashPattern(this.seriesList, {this.animate, Key? key})
2828
: super(key: key);
2929

3030
/// Creates a [TimeSeriesChart] with sample data and no transition.

‎web/charts/lib/axes/hidden_ticks_and_labels_axis.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2222

2323
/// Example of hiding both axis.
2424
class HiddenTicksAndLabelsAxis extends StatelessWidget {
25-
final List<charts.Series> seriesList;
26-
final bool animate;
25+
final List<charts.Series<dynamic, String>> seriesList;
26+
final bool? animate;
2727

28-
const HiddenTicksAndLabelsAxis(this.seriesList, {this.animate, Key key})
28+
const HiddenTicksAndLabelsAxis(this.seriesList, {this.animate, Key? key})
2929
: super(key: key);
3030

3131
factory HiddenTicksAndLabelsAxis.withSampleData() {

‎web/charts/lib/axes/horizontal_bar_secondary_axis.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import 'package:charts_flutter/flutter.dart' as charts;
3636
/// RTL.flipAxisLocations is set.
3737
class HorizontalBarChartWithSecondaryAxis extends StatelessWidget {
3838
static const secondaryMeasureAxisId = 'secondaryMeasureAxisId';
39-
final List<charts.Series> seriesList;
40-
final bool animate;
39+
final List<charts.Series<dynamic, String>> seriesList;
40+
final bool? animate;
4141

4242
const HorizontalBarChartWithSecondaryAxis(this.seriesList,
43-
{this.animate, Key key})
43+
{this.animate, Key? key})
4444
: super(key: key);
4545

4646
factory HorizontalBarChartWithSecondaryAxis.withSampleData() {

‎web/charts/lib/axes/integer_only_measure_axis.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2626
import 'package:flutter/material.dart';
2727

2828
class IntegerOnlyMeasureAxis extends StatelessWidget {
29-
final List<charts.Series> seriesList;
30-
final bool animate;
29+
final List<charts.Series<dynamic, DateTime>> seriesList;
30+
final bool? animate;
3131

32-
const IntegerOnlyMeasureAxis(this.seriesList, {this.animate, Key key})
32+
const IntegerOnlyMeasureAxis(this.seriesList, {this.animate, Key? key})
3333
: super(key: key);
3434

3535
/// Creates a [TimeSeriesChart] with sample data and no transition.

‎web/charts/lib/axes/line_disjoint_axis.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2828
import 'package:flutter/material.dart';
2929

3030
class DisjointMeasureAxisLineChart extends StatelessWidget {
31-
final List<charts.Series> seriesList;
32-
final bool animate;
31+
final List<charts.Series<dynamic, num>> seriesList;
32+
final bool? animate;
3333

34-
const DisjointMeasureAxisLineChart(this.seriesList, {this.animate, Key key})
34+
const DisjointMeasureAxisLineChart(this.seriesList, {this.animate, Key? key})
3535
: super(key: key);
3636

3737
/// Creates a [LineChart] with sample data and no transition.
@@ -263,8 +263,8 @@ class DisjointMeasureAxisLineChart extends StatelessWidget {
263263
/// Sample linear data type.
264264
class LinearClicks {
265265
final int year;
266-
final int clickCount;
267-
final double clickRate;
266+
final int? clickCount;
267+
final double? clickRate;
268268

269269
LinearClicks(this.year, {this.clickCount, this.clickRate});
270270
}

‎web/charts/lib/axes/measure_axis_label_alignment.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2323
/// Example of using a custom primary measure replacing the renderSpec with one
2424
/// that aligns the text under the tick and left justifies.
2525
class MeasureAxisLabelAlignment extends StatelessWidget {
26-
final List<charts.Series> seriesList;
27-
final bool animate;
26+
final List<charts.Series<dynamic, String>> seriesList;
27+
final bool? animate;
2828

29-
const MeasureAxisLabelAlignment(this.seriesList, {this.animate, Key key})
29+
const MeasureAxisLabelAlignment(this.seriesList, {this.animate, Key? key})
3030
: super(key: key);
3131

3232
factory MeasureAxisLabelAlignment.withSampleData() {

‎web/charts/lib/axes/nonzero_bound_measure_axis.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2222
import 'package:flutter/material.dart';
2323

2424
class NonzeroBoundMeasureAxis extends StatelessWidget {
25-
final List<charts.Series> seriesList;
26-
final bool animate;
25+
final List<charts.Series<dynamic, DateTime>> seriesList;
26+
final bool? animate;
2727

28-
const NonzeroBoundMeasureAxis(this.seriesList, {this.animate, Key key})
28+
const NonzeroBoundMeasureAxis(this.seriesList, {this.animate, Key? key})
2929
: super(key: key);
3030

3131
/// Creates a [TimeSeriesChart] with sample data and no transition.

‎web/charts/lib/axes/numeric_initial_viewport.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2929
import 'package:flutter/material.dart';
3030

3131
class NumericInitialViewport extends StatelessWidget {
32-
final List<charts.Series> seriesList;
33-
final bool animate;
32+
final List<charts.Series<dynamic, num>> seriesList;
33+
final bool? animate;
3434

35-
const NumericInitialViewport(this.seriesList, {this.animate, Key key})
35+
const NumericInitialViewport(this.seriesList, {this.animate, Key? key})
3636
: super(key: key);
3737

3838
/// Creates a [LineChart] with sample data and no transition.

‎web/charts/lib/axes/ordinal_initial_viewport.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2929
import 'package:flutter/material.dart';
3030

3131
class OrdinalInitialViewport extends StatelessWidget {
32-
final List<charts.Series> seriesList;
33-
final bool animate;
32+
final List<charts.Series<dynamic, String>> seriesList;
33+
final bool? animate;
3434

35-
const OrdinalInitialViewport(this.seriesList, {this.animate, Key key})
35+
const OrdinalInitialViewport(this.seriesList, {this.animate, Key? key})
3636
: super(key: key);
3737

3838
/// Creates a [BarChart] with sample data and no transition.

‎web/charts/lib/axes/short_tick_length_axis.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2727
/// There are many axis styling options in the SmallTickRenderer allowing you
2828
/// to customize the font, tick lengths, and offsets.
2929
class ShortTickLengthAxis extends StatelessWidget {
30-
final List<charts.Series> seriesList;
31-
final bool animate;
30+
final List<charts.Series<dynamic, String>> seriesList;
31+
final bool? animate;
3232

33-
const ShortTickLengthAxis(this.seriesList, {this.animate, Key key})
33+
const ShortTickLengthAxis(this.seriesList, {this.animate, Key? key})
3434
: super(key: key);
3535

3636
factory ShortTickLengthAxis.withSampleData() {

‎web/charts/lib/axes/statically_provided_ticks.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
3434
/// For datetime axis, the [StaticDateTimeTickProviderSpec] can be used by
3535
/// passing in a list of ticks defined with [TickSpec] of datetime.
3636
class StaticallyProvidedTicks extends StatelessWidget {
37-
final List<charts.Series> seriesList;
38-
final bool animate;
37+
final List<charts.Series<dynamic, String>> seriesList;
38+
final bool? animate;
3939

40-
const StaticallyProvidedTicks(this.seriesList, {this.animate, Key key})
40+
const StaticallyProvidedTicks(this.seriesList, {this.animate, Key? key})
4141
: super(key: key);
4242

4343
factory StaticallyProvidedTicks.withSampleData() {

‎web/charts/lib/bar_chart/custom_rounded_bars.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2121
import 'package:flutter/material.dart';
2222

2323
class CustomRoundedBars extends StatelessWidget {
24-
final List<charts.Series> seriesList;
25-
final bool animate;
24+
final List<charts.Series<dynamic, String>> seriesList;
25+
final bool? animate;
2626

27-
const CustomRoundedBars(this.seriesList, {this.animate, Key key})
27+
const CustomRoundedBars(this.seriesList, {this.animate, Key? key})
2828
: super(key: key);
2929

3030
/// Creates a [BarChart] with custom rounded bars.

‎web/charts/lib/bar_chart/grouped.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import 'package:flutter/material.dart';
2121
import 'package:charts_flutter/flutter.dart' as charts;
2222

2323
class GroupedBarChart extends StatelessWidget {
24-
final List<charts.Series> seriesList;
25-
final bool animate;
24+
final List<charts.Series<dynamic, String>> seriesList;
25+
final bool? animate;
2626

27-
const GroupedBarChart(this.seriesList, {this.animate, Key key})
27+
const GroupedBarChart(this.seriesList, {this.animate, Key? key})
2828
: super(key: key);
2929

3030
factory GroupedBarChart.withSampleData() {

‎web/charts/lib/bar_chart/grouped_fill_color.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2323
/// Example of a grouped bar chart with three series, each rendered with
2424
/// different fill colors.
2525
class GroupedFillColorBarChart extends StatelessWidget {
26-
final List<charts.Series> seriesList;
27-
final bool animate;
26+
final List<charts.Series<dynamic, String>> seriesList;
27+
final bool? animate;
2828

29-
const GroupedFillColorBarChart(this.seriesList, {this.animate, Key key})
29+
const GroupedFillColorBarChart(this.seriesList, {this.animate, Key? key})
3030
: super(key: key);
3131

3232
factory GroupedFillColorBarChart.withSampleData() {

‎web/charts/lib/bar_chart/grouped_single_target_line.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import 'package:flutter/material.dart';
2121
import 'package:charts_flutter/flutter.dart' as charts;
2222

2323
class GroupedBarSingleTargetLineChart extends StatelessWidget {
24-
final List<charts.Series> seriesList;
25-
final bool animate;
24+
final List<charts.Series<dynamic, String>> seriesList;
25+
final bool? animate;
2626

2727
const GroupedBarSingleTargetLineChart(this.seriesList,
28-
{this.animate, Key key})
28+
{this.animate, Key? key})
2929
: super(key: key);
3030

3131
factory GroupedBarSingleTargetLineChart.withSampleData() {

‎web/charts/lib/bar_chart/grouped_stacked.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import 'package:flutter/material.dart';
2121
import 'package:charts_flutter/flutter.dart' as charts;
2222

2323
class GroupedStackedBarChart extends StatelessWidget {
24-
final List<charts.Series> seriesList;
25-
final bool animate;
24+
final List<charts.Series<dynamic, String>> seriesList;
25+
final bool? animate;
2626

27-
const GroupedStackedBarChart(this.seriesList, {this.animate, Key key})
27+
const GroupedStackedBarChart(this.seriesList, {this.animate, Key? key})
2828
: super(key: key);
2929

3030
factory GroupedStackedBarChart.withSampleData() {

‎web/charts/lib/bar_chart/grouped_stacked_weight_pattern.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import 'package:flutter/material.dart';
2525
import 'package:charts_flutter/flutter.dart' as charts;
2626

2727
class GroupedStackedWeightPatternBarChart extends StatelessWidget {
28-
final List<charts.Series> seriesList;
29-
final bool animate;
28+
final List<charts.Series<dynamic, String>> seriesList;
29+
final bool? animate;
3030

3131
const GroupedStackedWeightPatternBarChart(this.seriesList,
32-
{this.animate, Key key})
32+
{this.animate, Key? key})
3333
: super(key: key);
3434

3535
factory GroupedStackedWeightPatternBarChart.withSampleData() {

‎web/charts/lib/bar_chart/grouped_target_line.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import 'package:flutter/material.dart';
2121
import 'package:charts_flutter/flutter.dart' as charts;
2222

2323
class GroupedBarTargetLineChart extends StatelessWidget {
24-
final List<charts.Series> seriesList;
25-
final bool animate;
24+
final List<charts.Series<dynamic, String>> seriesList;
25+
final bool? animate;
2626

27-
const GroupedBarTargetLineChart(this.seriesList, {this.animate, Key key})
27+
const GroupedBarTargetLineChart(this.seriesList, {this.animate, Key? key})
2828
: super(key: key);
2929

3030
factory GroupedBarTargetLineChart.withSampleData() {

‎web/charts/lib/bar_chart/horizontal.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import 'package:charts_flutter/flutter.dart' as charts;
2121
import 'package:flutter/material.dart';
2222

2323
class HorizontalBarChart extends StatelessWidget {
24-
final List<charts.Series> seriesList;
25-
final bool animate;
24+
final List<charts.Series<dynamic, String>> seriesList;
25+
final bool? animate;
2626

27-
const HorizontalBarChart(this.seriesList, {this.animate, Key key})
27+
const HorizontalBarChart(this.seriesList, {this.animate, Key? key})
2828
: super(key: key);
2929

3030
/// Creates a [BarChart] with sample data and no transition.

0 commit comments

Comments
 (0)