web/chart: fix sample (flutter#909)

Author: domesticmouse

web/charts/analysis_options.yaml

@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    avoid_print: false
+    prefer_single_quotes: true
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

web/charts/lib/a11y/a11y_gallery.dart

@@ -18,12 +18,12 @@ import 'domain_a11y_explore_bar_chart.dart';
 
 List<GalleryScaffold> buildGallery() {
   return [
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.accessibility),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.accessibility),
       title: 'Screen reader enabled bar chart',
       subtitle: 'Requires TalkBack or Voiceover turned on to work. '
           'Bar chart with domain selection explore mode behavior.',
-      childBuilder: () => new DomainA11yExploreBarChart.withRandomData(),
+      childBuilder: () => DomainA11yExploreBarChart.withRandomData(),
     ),
   ];
 }

web/charts/lib/a11y/domain_a11y_explore_bar_chart.dart

@@ -41,11 +41,12 @@ class DomainA11yExploreBarChart extends StatelessWidget {
   final List<charts.Series> seriesList;
   final bool animate;
 
-  DomainA11yExploreBarChart(this.seriesList, {this.animate});
+  const DomainA11yExploreBarChart(this.seriesList, {this.animate, Key key})
+      : super(key: key);
 
   /// Creates a [BarChart] with sample data and no transition.
   factory DomainA11yExploreBarChart.withSampleData() {
-    return new DomainA11yExploreBarChart(
+    return DomainA11yExploreBarChart(
       _createSampleData(),
       // Disable animations for image tests.
       animate: false,
@@ -57,36 +58,36 @@ class DomainA11yExploreBarChart extends StatelessWidget {
   // It is used for creating random series data to demonstrate animation in
   // the example app only.
   factory DomainA11yExploreBarChart.withRandomData() {
-    return new DomainA11yExploreBarChart(_createRandomData());
+    return DomainA11yExploreBarChart(_createRandomData());
   }
 
   /// Create random data.
   static List<charts.Series<OrdinalSales, String>> _createRandomData() {
-    final random = new Random();
+    final random = Random();
 
     final mobileData = [
-      new OrdinalSales('2014', random.nextInt(100)),
-      new OrdinalSales('2015', random.nextInt(100)),
-      new OrdinalSales('2016', random.nextInt(100)),
-      new OrdinalSales('2017', random.nextInt(100)),
+      OrdinalSales('2014', random.nextInt(100)),
+      OrdinalSales('2015', random.nextInt(100)),
+      OrdinalSales('2016', random.nextInt(100)),
+      OrdinalSales('2017', random.nextInt(100)),
     ];
 
     final tabletData = [
       // Purposely missing data to show that only measures that are available
       // are vocalized.
-      new OrdinalSales('2016', random.nextInt(100)),
-      new OrdinalSales('2017', random.nextInt(100)),
+      OrdinalSales('2016', random.nextInt(100)),
+      OrdinalSales('2017', random.nextInt(100)),
     ];
 
     return [
-      new charts.Series<OrdinalSales, String>(
+      charts.Series<OrdinalSales, String>(
         id: 'Mobile Sales',
         colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
         domainFn: (OrdinalSales sales, _) => sales.year,
         measureFn: (OrdinalSales sales, _) => sales.sales,
         data: mobileData,
       ),
-      new charts.Series<OrdinalSales, String>(
+      charts.Series<OrdinalSales, String>(
         id: 'Tablet Sales',
         colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
         domainFn: (OrdinalSales sales, _) => sales.year,
@@ -106,7 +107,7 @@ class DomainA11yExploreBarChart extends StatelessWidget {
   /// domain, it vocalizes the series display name and the measure and a
   /// description of that measure.
   String vocalizeDomainAndMeasures(List<charts.SeriesDatum> seriesDatums) {
-    final buffer = new StringBuffer();
+    final buffer = StringBuffer();
 
     // The datum's type in this case is [OrdinalSales].
     // So we can access year and sales information here.
@@ -125,13 +126,13 @@ class DomainA11yExploreBarChart extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return new Semantics(
+    return Semantics(
         // Describe your chart
         label: 'Yearly sales bar chart',
         // Optionally provide a hint for the user to know how to trigger
         // explore mode.
         hint: 'Press and hold to enable explore',
-        child: new charts.BarChart(
+        child: charts.BarChart(
           seriesList,
           animate: animate,
           // To prevent conflict with the select nearest behavior that uses the
@@ -140,7 +141,7 @@ class DomainA11yExploreBarChart extends StatelessWidget {
           // with the application.
           defaultInteractions: !MediaQuery.of(context).accessibleNavigation,
           behaviors: [
-            new charts.DomainA11yExploreBehavior(
+            charts.DomainA11yExploreBehavior(
               // Callback for generating the message that is vocalized.
               // An example of how to use is in [vocalizeDomainAndMeasures].
               // If none is set, the default only vocalizes the domain value.
@@ -166,36 +167,36 @@ class DomainA11yExploreBarChart extends StatelessWidget {
             // This behavior is included in this example to show that when an
             // a11y node has focus, the chart's internal selection model is
             // also updated.
-            new charts.DomainHighlighter(charts.SelectionModelType.info),
+            charts.DomainHighlighter(charts.SelectionModelType.info),
           ],
         ));
   }
 
   /// Create one series with sample hard coded data.
   static List<charts.Series<OrdinalSales, String>> _createSampleData() {
     final mobileData = [
-      new OrdinalSales('2014', 5),
-      new OrdinalSales('2015', 25),
-      new OrdinalSales('2016', 100),
-      new OrdinalSales('2017', 75),
+      OrdinalSales('2014', 5),
+      OrdinalSales('2015', 25),
+      OrdinalSales('2016', 100),
+      OrdinalSales('2017', 75),
     ];
 
     final tabletData = [
       // Purposely missing data to show that only measures that are available
       // are vocalized.
-      new OrdinalSales('2016', 25),
-      new OrdinalSales('2017', 50),
+      OrdinalSales('2016', 25),
+      OrdinalSales('2017', 50),
     ];
 
     return [
-      new charts.Series<OrdinalSales, String>(
+      charts.Series<OrdinalSales, String>(
         id: 'Mobile Sales',
         colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
         domainFn: (OrdinalSales sales, _) => sales.year,
         measureFn: (OrdinalSales sales, _) => sales.sales,
         data: mobileData,
       ),
-      new charts.Series<OrdinalSales, String>(
+      charts.Series<OrdinalSales, String>(
         id: 'Tablet Sales',
         colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
         domainFn: (OrdinalSales sales, _) => sales.year,

web/charts/lib/app_config.dart

@@ -28,10 +28,10 @@ class AppConfig {
 
 /// The default configuration of the app.
 AppConfig get defaultConfig {
-  return new AppConfig(
+  return AppConfig(
     appName: 'Charts Gallery',
     appLink: '',
-    theme: new ThemeData(
+    theme: ThemeData(
       brightness: Brightness.light,
       primarySwatch: Colors.lightBlue,
     ),

web/charts/lib/axes/axes_gallery.dart

@@ -34,104 +34,103 @@ import 'statically_provided_ticks.dart';
 
 List<GalleryScaffold> buildGallery() {
   return [
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.insert_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.insert_chart),
       title: 'Bar chart with Secondary Measure Axis',
       subtitle: 'Bar chart with a series using a secondary measure axis',
-      childBuilder: () => new BarChartWithSecondaryAxis.withRandomData(),
+      childBuilder: () => BarChartWithSecondaryAxis.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.insert_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.insert_chart),
       title: 'Bar chart with Secondary Measure Axis only',
       subtitle: 'Bar chart with both series using secondary measure axis',
-      childBuilder: () => new BarChartWithSecondaryAxisOnly.withRandomData(),
+      childBuilder: () => BarChartWithSecondaryAxisOnly.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Transform.rotate(
-          angle: 1.5708, child: new Icon(Icons.insert_chart)),
+    GalleryScaffold(
+      listTileIcon: Transform.rotate(
+          angle: 1.5708, child: const Icon(Icons.insert_chart)),
       title: 'Horizontal bar chart with Secondary Measure Axis',
       subtitle:
           'Horizontal Bar chart with a series using secondary measure axis',
-      childBuilder: () =>
-          new HorizontalBarChartWithSecondaryAxis.withRandomData(),
+      childBuilder: () => HorizontalBarChartWithSecondaryAxis.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.insert_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.insert_chart),
       title: 'Short Ticks Axis',
       subtitle: 'Bar chart with the primary measure axis having short ticks',
-      childBuilder: () => new ShortTickLengthAxis.withRandomData(),
+      childBuilder: () => ShortTickLengthAxis.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.insert_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.insert_chart),
       title: 'Custom Axis Fonts',
       subtitle: 'Bar chart with custom axis font size and color',
-      childBuilder: () => new CustomFontSizeAndColor.withRandomData(),
+      childBuilder: () => CustomFontSizeAndColor.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.insert_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.insert_chart),
       title: 'Label Alignment Axis',
       subtitle: 'Bar chart with custom measure axis label alignments',
-      childBuilder: () => new MeasureAxisLabelAlignment.withRandomData(),
+      childBuilder: () => MeasureAxisLabelAlignment.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.insert_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.insert_chart),
       title: 'No Axis',
       subtitle: 'Bar chart with only the axis line drawn',
-      childBuilder: () => new HiddenTicksAndLabelsAxis.withRandomData(),
+      childBuilder: () => HiddenTicksAndLabelsAxis.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.insert_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.insert_chart),
       title: 'Statically Provided Ticks',
       subtitle: 'Bar chart with statically provided ticks',
-      childBuilder: () => new StaticallyProvidedTicks.withRandomData(),
+      childBuilder: () => StaticallyProvidedTicks.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.show_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.show_chart),
       title: 'Custom Formatter',
       subtitle: 'Timeseries with custom domain and measure tick formatters',
-      childBuilder: () => new CustomAxisTickFormatters.withRandomData(),
+      childBuilder: () => CustomAxisTickFormatters.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.show_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.show_chart),
       title: 'Custom Tick Count',
       subtitle: 'Timeseries with custom measure axis tick count',
-      childBuilder: () => new CustomMeasureTickCount.withRandomData(),
+      childBuilder: () => CustomMeasureTickCount.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.show_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.show_chart),
       title: 'Integer Measure Ticks',
       subtitle: 'Timeseries with only whole number measure axis ticks',
-      childBuilder: () => new IntegerOnlyMeasureAxis.withRandomData(),
+      childBuilder: () => IntegerOnlyMeasureAxis.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.show_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.show_chart),
       title: 'Non-zero bound Axis',
       subtitle: 'Timeseries with measure axis that does not include zero',
-      childBuilder: () => new NonzeroBoundMeasureAxis.withRandomData(),
+      childBuilder: () => NonzeroBoundMeasureAxis.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.insert_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.insert_chart),
       title: 'Ordinal axis with initial viewport',
       subtitle: 'Single series with initial viewport',
-      childBuilder: () => new OrdinalInitialViewport.withRandomData(),
+      childBuilder: () => OrdinalInitialViewport.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.show_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.show_chart),
       title: 'Numeric axis with initial viewport',
       subtitle: 'Initial viewport is set to a subset of the data',
-      childBuilder: () => new NumericInitialViewport.withRandomData(),
+      childBuilder: () => NumericInitialViewport.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.show_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.show_chart),
       title: 'Gridline dash pattern',
       subtitle: 'Timeseries with measure gridlines that have a dash pattern',
-      childBuilder: () => new GridlineDashPattern.withRandomData(),
+      childBuilder: () => GridlineDashPattern.withRandomData(),
     ),
-    new GalleryScaffold(
-      listTileIcon: new Icon(Icons.show_chart),
+    GalleryScaffold(
+      listTileIcon: const Icon(Icons.show_chart),
       title: 'Disjoint Measure Axes',
       subtitle: 'Line chart with disjoint measure axes',
-      childBuilder: () => new DisjointMeasureAxisLineChart.withRandomData(),
+      childBuilder: () => DisjointMeasureAxisLineChart.withRandomData(),
     ),
   ];
 }