Merge branch 'dev' into master

CONTRIBUTING.md

@@ -21,6 +21,11 @@ an issue before starting writing your code. This helps us and the
 community to discuss the issue and choose what is deemed to be the
 best solution.
 
+## Switch to `dev` branch
+
+You should make your changes upon the `dev` branch (All development changes happen in the `dev` branch, then I publish a new version and merge them into the `master`)
+
+
 ## Drawing architecture
 We have a *_chart_painter.dart class per each chart type. It draws elements into the Canvas.
 We made the CanvasWrapper class, because we wanted to test draw functions.
@@ -49,6 +54,8 @@ Congratulations! Your code meets all of our guidelines :100:. Now you have to
 submit a pull request (or PR for short) to us. These are the steps you should
 follow when creating a PR:
 
+- Make sure you select `dev` branch as your target branch.
+
 - Make a descriptive title that summarizes what changes were in the PR.
 
 - Link to issues that this PR will fix (if any).

analysis_options.yaml

@@ -1,3 +1,4 @@
+include: package:pedantic/analysis_options.1.9.0.yaml
 analyzer:
   strong-mode:
     implicit-dynamic: false
@@ -19,140 +20,4 @@ analyzer:
     - 'lib/i18n/stock_messages_*.dart'
     - 'lib/src/http/**'
     - 'example/**'
-
-linter:
-  rules:
-    # these rules are documented on and in the same order as
-    # the Dart Lint rules page to make maintenance easier
-    # https://github.com/dart-lang/linter/blob/master/example/all.yaml
-    - always_declare_return_types
-    - always_put_control_body_on_new_line
-    # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
-    - always_require_non_null_named_parameters
-    - annotate_overrides
-    # - avoid_annotating_with_dynamic # conflicts with always_specify_types
-    - avoid_as
-    # - avoid_bool_literals_in_conditional_expressions # not yet tested
-    # - avoid_catches_without_on_clauses # we do this commonly
-    # - avoid_catching_errors # we do this commonly
-    - avoid_classes_with_only_static_members
-    # - avoid_double_and_int_checks # only useful when targeting JS runtime
-    - avoid_empty_else
-    - avoid_field_initializers_in_const_classes
-    - avoid_function_literals_in_foreach_calls
-    # - avoid_implementing_value_types # not yet tested
-    - avoid_init_to_null
-    # - avoid_js_rounded_ints # only useful when targeting JS runtime
-    - avoid_null_checks_in_equality_operators
-    # - avoid_positional_boolean_parameters # not yet tested
-    # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
-    - avoid_relative_lib_imports
-    - avoid_renaming_method_parameters
-    - avoid_return_types_on_setters
-    # - avoid_returning_null # there are plenty of valid reasons to return null
-    # - avoid_returning_null_for_future # not yet tested
-    - avoid_returning_null_for_void
-    # - avoid_returning_this # there are plenty of valid reasons to return this
-    # - avoid_setters_without_getters # not yet tested
-    # - avoid_shadowing_type_parameters # not yet tested
-    # - avoid_single_cascade_in_expression_statements # not yet tested
-    - avoid_slow_async_io
-    - avoid_types_as_parameter_names
-    # - avoid_types_on_closure_parameters # conflicts with always_specify_types
-    - avoid_unused_constructor_parameters
-    - avoid_void_async
-    - await_only_futures
-    - camel_case_types
-    - cancel_subscriptions
-    # - cascade_invocations # not yet tested
-    # - close_sinks # not reliable enough
-    # - comment_references # blocked on https://github.com/flutter/flutter/issues/20765
-    # - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
-    - control_flow_in_finally
-    # - curly_braces_in_flow_control_structures # not yet tested
-#    - directives_ordering
-    - empty_catches
-    - empty_constructor_bodies
-    - empty_statements
-    # - file_names # not yet tested
-    - flutter_style_todos
-    - hash_and_equals
-    - implementation_imports
-    # - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
-    - iterable_contains_unrelated_type
-    # - join_return_with_assignment # not yet tested
-    - library_names
-    - library_prefixes
-    # - lines_longer_than_80_chars # not yet tested
-    - list_remove_unrelated_type
-    # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181
-    - no_adjacent_strings_in_list
-    - no_duplicate_case_values
-    - non_constant_identifier_names
-    # - null_closures  # not yet tested
-    # - omit_local_variable_types # opposite of always_specify_types
-    # - one_member_abstracts # too many false positives
-    # - only_throw_errors # https://github.com/flutter/flutter/issues/5792
-    - overridden_fields
-    - package_api_docs
-    - package_names
-    - package_prefixed_library_names
-    # - parameter_assignments # we do this commonly
-    - prefer_adjacent_string_concatenation
-    - prefer_asserts_in_initializer_lists
-    - prefer_collection_literals
-    - prefer_conditional_assignment
-    - prefer_const_constructors
-    - prefer_const_constructors_in_immutables
-    - prefer_const_declarations
-    - prefer_const_literals_to_create_immutables
-    # - prefer_constructors_over_static_methods # not yet tested
-    - prefer_contains
-    - prefer_equal_for_default_values
-    # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
-    - prefer_final_fields
-    - prefer_final_locals
-    - prefer_foreach
-    # - prefer_function_declarations_over_variables # not yet tested
-    - prefer_generic_function_type_aliases
-    # - prefer_initializing_formals # Fucked up with Equatable, because it's added props field, then we couldn't have const constructor.
-    # - prefer_int_literals # not yet tested
-    # - prefer_interpolation_to_compose_strings # not yet tested
-    - prefer_is_empty
-    - prefer_is_not_empty
-    - prefer_iterable_whereType
-    # - prefer_mixin # https://github.com/dart-lang/language/issues/32
-    # - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932
-    - prefer_single_quotes
-    - prefer_typing_uninitialized_variables
-    - prefer_void_to_null
-    # - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml
-    - recursive_getters
-    - slash_for_doc_comments
-    - sort_pub_dependencies
-    # - super_goes_last # no longer needed w/ Dart 2
-    - test_types_in_equals
-    - throw_in_finally
-    # - type_annotate_public_apis # subset of always_specify_types
-    - type_init_formals
-    # - unawaited_futures # too many false positives
-    # - unnecessary_await_in_return # not yet tested
-    - unnecessary_brace_in_string_interps
-    - unnecessary_const
-    - unnecessary_getters_setters
-    # - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498
-    - unnecessary_new
-    - unnecessary_null_aware_assignments
-    - unnecessary_null_in_if_null_operators
-    - unnecessary_overrides
-    - unnecessary_parenthesis
-    - unnecessary_statements
-    - unnecessary_this
-    - unrelated_type_equality_checks
-    # - use_function_type_syntax_for_parameters # not yet tested
-    - use_rethrow_when_possible
-    # - use_setters_to_change_properties # not yet tested
-    # - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182
-    # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
-    - valid_regexps
-    # - void_checks # not yet tested
+    - 'test/**'

lib/src/chart/bar_chart/bar_chart.dart

@@ -35,127 +35,117 @@ class _BarChartState extends AnimatedWidgetBaseState<BarChart> {
 
   @override
   Widget build(BuildContext context) {
-    final BarChartData showingData = _getData();
-    final BarTouchData touchData = showingData.barTouchData;
+    final showingData = _getData();
+    final touchData = showingData.barTouchData;
 
     return MouseRegion(
       onEnter: (e) {
-        final Size chartSize = _getChartSize();
+        final chartSize = _getChartSize();
         if (chartSize == null) {
           return;
         }
 
-        final BarTouchResponse response =
-            _touchHandler?.handleTouch(FlPanStart(e.localPosition), chartSize);
+        final BarTouchResponse response = _touchHandler?.handleTouch(FlPanStart(e.localPosition), chartSize);
         if (_canHandleTouch(response, touchData)) {
           touchData.touchCallback(response);
         }
       },
       onExit: (e) {
-        final Size chartSize = _getChartSize();
+        final chartSize = _getChartSize();
         if (chartSize == null) {
           return;
         }
 
-        final BarTouchResponse response = _touchHandler?.handleTouch(
-            FlPanEnd(Offset.zero, const Velocity(pixelsPerSecond: Offset.zero)), chartSize);
+        final BarTouchResponse response = _touchHandler?.handleTouch(FlPanEnd(Offset.zero, const Velocity(pixelsPerSecond: Offset.zero)), chartSize);
         if (_canHandleTouch(response, touchData)) {
           touchData.touchCallback(response);
         }
       },
       onHover: (e) {
-        final Size chartSize = _getChartSize();
+        final chartSize = _getChartSize();
         if (chartSize == null) {
           return;
         }
 
-        final BarTouchResponse response =
-            _touchHandler?.handleTouch(FlPanMoveUpdate(e.localPosition), chartSize);
+        final BarTouchResponse response = _touchHandler?.handleTouch(FlPanMoveUpdate(e.localPosition), chartSize);
         if (_canHandleTouch(response, touchData)) {
           touchData.touchCallback(response);
         }
       },
       child: GestureDetector(
         onLongPressStart: (d) {
-          final Size chartSize = _getChartSize();
+          final chartSize = _getChartSize();
           if (chartSize == null) {
             return;
           }
 
-          final BarTouchResponse response =
-              _touchHandler?.handleTouch(FlLongPressStart(d.localPosition), chartSize);
+          final BarTouchResponse response = _touchHandler?.handleTouch(FlLongPressStart(d.localPosition), chartSize);
           if (_canHandleTouch(response, touchData)) {
             touchData.touchCallback(response);
           }
         },
         onLongPressEnd: (d) {
-          final Size chartSize = _getChartSize();
+          final chartSize = _getChartSize();
           if (chartSize == null) {
             return;
           }
 
-          final BarTouchResponse response =
-              _touchHandler?.handleTouch(FlLongPressEnd(d.localPosition), chartSize);
+          final BarTouchResponse response = _touchHandler?.handleTouch(FlLongPressEnd(d.localPosition), chartSize);
           if (_canHandleTouch(response, touchData)) {
             touchData.touchCallback(response);
           }
         },
         onLongPressMoveUpdate: (d) {
-          final Size chartSize = _getChartSize();
+          final chartSize = _getChartSize();
           if (chartSize == null) {
             return;
           }
 
-          final BarTouchResponse response =
-              _touchHandler?.handleTouch(FlLongPressMoveUpdate(d.localPosition), chartSize);
+          final BarTouchResponse response = _touchHandler?.handleTouch(FlLongPressMoveUpdate(d.localPosition), chartSize);
           if (_canHandleTouch(response, touchData)) {
             touchData.touchCallback(response);
           }
         },
         onPanCancel: () {
-          final Size chartSize = _getChartSize();
+          final chartSize = _getChartSize();
           if (chartSize == null) {
             return;
           }
 
-          final BarTouchResponse response = _touchHandler?.handleTouch(
-              FlPanEnd(Offset.zero, const Velocity(pixelsPerSecond: Offset.zero)), chartSize);
+          final BarTouchResponse response = _touchHandler?.handleTouch(FlPanEnd(Offset.zero, const Velocity(pixelsPerSecond: Offset.zero)), chartSize);
           if (_canHandleTouch(response, touchData)) {
             touchData.touchCallback(response);
           }
         },
         onPanEnd: (DragEndDetails details) {
-          final Size chartSize = _getChartSize();
+          final chartSize = _getChartSize();
           if (chartSize == null) {
             return;
           }
 
-          final BarTouchResponse response =
-              _touchHandler?.handleTouch(FlPanEnd(Offset.zero, details.velocity), chartSize);
+          final BarTouchResponse response = _touchHandler?.handleTouch(FlPanEnd(Offset.zero, details.velocity), chartSize);
           if (_canHandleTouch(response, touchData)) {
             touchData.touchCallback(response);
           }
         },
         onPanDown: (DragDownDetails details) {
-          final Size chartSize = _getChartSize();
+          final chartSize = _getChartSize();
           if (chartSize == null) {
             return;
           }
 
-          final BarTouchResponse response =
-              _touchHandler?.handleTouch(FlPanStart(details.localPosition), chartSize);
+          final BarTouchResponse response = _touchHandler?.handleTouch(FlPanStart(details.localPosition), chartSize);
           if (_canHandleTouch(response, touchData)) {
             touchData.touchCallback(response);
           }
         },
         onPanUpdate: (DragUpdateDetails details) {
-          final Size chartSize = _getChartSize();
+          final chartSize = _getChartSize();
           if (chartSize == null) {
             return;
           }
 
-          final BarTouchResponse response =
-              _touchHandler?.handleTouch(FlPanMoveUpdate(details.localPosition), chartSize);
+          final BarTouchResponse response = _touchHandler?.handleTouch(FlPanMoveUpdate(details.localPosition), chartSize);
           if (_canHandleTouch(response, touchData)) {
             touchData.touchCallback(response);
           }
@@ -191,8 +181,8 @@ class _BarChartState extends AnimatedWidgetBaseState<BarChart> {
       return barChartData;
     }
 
-    final List<BarChartGroupData> newGroups = [];
-    for (int i = 0; i < barChartData.barGroups.length; i++) {
+    final newGroups = <BarChartGroupData>[];
+    for (var i = 0; i < barChartData.barGroups.length; i++) {
       final group = barChartData.barGroups[i];
 
       newGroups.add(

lib/src/chart/bar_chart/bar_chart_data.dart

@@ -83,8 +83,8 @@ class BarChartData extends AxisChartData with EquatableMixin {
     double maxY,
     double minY,
   ) {
-    for (int i = 0; i < barGroups.length; i++) {
-      final BarChartGroupData barData = barGroups[i];
+    for (var i = 0; i < barGroups.length; i++) {
+      final barData = barGroups[i];
       if (barData.barRods == null || barData.barRods.isEmpty) {
         throw Exception('barRods could not be null or empty');
       }
@@ -101,10 +101,10 @@ class BarChartData extends AxisChartData with EquatableMixin {
         minY = 0;
       }
 
-      for (int i = 0; i < barGroups.length; i++) {
-        final BarChartGroupData barGroup = barGroups[i];
-        for (int j = 0; j < barGroup.barRods.length; j++) {
-          final BarChartRodData rod = barGroup.barRods[j];
+      for (var i = 0; i < barGroups.length; i++) {
+        final barGroup = barGroups[i];
+        for (var j = 0; j < barGroup.barRods.length; j++) {
+          final rod = barGroup.barRods[j];
 
           if (canModifyMaxY && rod.y > maxY) {
             maxY = rod.y;
@@ -266,9 +266,9 @@ class BarChartGroupData with EquatableMixin {
       return 0;
     }
 
-    final double sumWidth =
+    final sumWidth =
         barRods.map((rodData) => rodData.width).reduce((first, second) => first + second);
-    final double spaces = (barRods.length - 1) * barsSpace;
+    final spaces = (barRods.length - 1) * barsSpace;
 
     return sumWidth + spaces;
   }
@@ -752,7 +752,7 @@ BarTooltipItem defaultBarTooltipItem(
   BarChartRodData rod,
   int rodIndex,
 ) {
-  const TextStyle textStyle = TextStyle(
+  const textStyle = TextStyle(
     color: Colors.black,
     fontWeight: FontWeight.bold,
     fontSize: 14,