format operator== according to flutter style guide (#48449)
diff --git a/dev/devicelab/lib/framework/running_processes.dart b/dev/devicelab/lib/framework/running_processes.dart index cb09cf5..399b957 100644 --- a/dev/devicelab/lib/framework/running_processes.dart +++ b/dev/devicelab/lib/framework/running_processes.dart
@@ -19,10 +19,10 @@ @override bool operator ==(Object other) { - return other is RunningProcessInfo && - other.pid == pid && - other.commandLine == commandLine && - other.creationDate == creationDate; + return other is RunningProcessInfo + && other.pid == pid + && other.commandLine == commandLine + && other.creationDate == creationDate; } @override
diff --git a/dev/tools/vitool/lib/vitool.dart b/dev/tools/vitool/lib/vitool.dart index df713c2..bd0bdfe 100644 --- a/dev/tools/vitool/lib/vitool.dart +++ b/dev/tools/vitool/lib/vitool.dart
@@ -268,7 +268,7 @@ @override bool operator ==(Object other) { - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is FrameData && other.size == size @@ -320,7 +320,7 @@ @override bool operator ==(Object other) { - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is SvgPath && other.id == id @@ -369,7 +369,7 @@ @override bool operator ==(Object other) { - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is SvgPathCommand && other.type == type
diff --git a/examples/flutter_gallery/lib/demo/transformations/transformations_demo_board.dart b/examples/flutter_gallery/lib/demo/transformations/transformations_demo_board.dart index 25db304..1ff5d6d 100644 --- a/examples/flutter_gallery/lib/demo/transformations/transformations_demo_board.dart +++ b/examples/flutter_gallery/lib/demo/transformations/transformations_demo_board.dart
@@ -266,7 +266,7 @@ // Only compares by location. @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) { return false; }
diff --git a/examples/flutter_gallery/lib/gallery/demos.dart b/examples/flutter_gallery/lib/gallery/demos.dart index 979dc7a..3b1c722 100644 --- a/examples/flutter_gallery/lib/gallery/demos.dart +++ b/examples/flutter_gallery/lib/gallery/demos.dart
@@ -17,13 +17,14 @@ final IconData icon; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is GalleryDemoCategory - && other.name == name && other.icon == icon; + && other.name == name + && other.icon == icon; } @override
diff --git a/examples/flutter_gallery/lib/gallery/options.dart b/examples/flutter_gallery/lib/gallery/options.dart index 841090e..c939fca 100644 --- a/examples/flutter_gallery/lib/gallery/options.dart +++ b/examples/flutter_gallery/lib/gallery/options.dart
@@ -55,8 +55,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is GalleryOptions && other.themeMode == themeMode
diff --git a/examples/flutter_gallery/lib/gallery/scales.dart b/examples/flutter_gallery/lib/gallery/scales.dart index b25b2c3..2554a8f 100644 --- a/examples/flutter_gallery/lib/gallery/scales.dart +++ b/examples/flutter_gallery/lib/gallery/scales.dart
@@ -11,8 +11,8 @@ final String label; @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is GalleryTextScaleValue && other.scale == scale @@ -44,12 +44,12 @@ final String label; @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is GalleryVisualDensityValue - && visualDensity == other.visualDensity - && label == other.label; + && other.visualDensity == visualDensity + && other.label == label; } @override
diff --git a/packages/flutter/lib/src/cupertino/colors.dart b/packages/flutter/lib/src/cupertino/colors.dart index 44cf7ad..282a4ab 100644 --- a/packages/flutter/lib/src/cupertino/colors.dart +++ b/packages/flutter/lib/src/cupertino/colors.dart
@@ -1000,20 +1000,21 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - - return other.runtimeType == runtimeType - && value == other.value - && color == other.color - && darkColor == other.darkColor - && highContrastColor == other.highContrastColor - && darkHighContrastColor == other.darkHighContrastColor - && elevatedColor == other.elevatedColor - && darkElevatedColor == other.darkElevatedColor - && highContrastElevatedColor == other.highContrastElevatedColor - && darkHighContrastElevatedColor == other.darkHighContrastElevatedColor; + if (other.runtimeType != runtimeType) + return false; + return other is CupertinoDynamicColor + && other.value == value + && other.color == color + && other.darkColor == darkColor + && other.highContrastColor == highContrastColor + && other.darkHighContrastColor == darkHighContrastColor + && other.elevatedColor == elevatedColor + && other.darkElevatedColor == darkElevatedColor + && other.highContrastElevatedColor == highContrastElevatedColor + && other.darkHighContrastElevatedColor == darkHighContrastElevatedColor; } @override
diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart index 724011e..61e88f6 100644 --- a/packages/flutter/lib/src/cupertino/route.dart +++ b/packages/flutter/lib/src/cupertino/route.dart
@@ -734,8 +734,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is _CupertinoEdgeShadowDecoration && other.edgeGradient == edgeGradient;
diff --git a/packages/flutter/lib/src/foundation/key.dart b/packages/flutter/lib/src/foundation/key.dart index 31d6e85..2c54957 100644 --- a/packages/flutter/lib/src/foundation/key.dart +++ b/packages/flutter/lib/src/foundation/key.dart
@@ -70,7 +70,7 @@ final T value; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is ValueKey<T>
diff --git a/packages/flutter/lib/src/foundation/stack_frame.dart b/packages/flutter/lib/src/foundation/stack_frame.dart index d0ffc93..a147453 100644 --- a/packages/flutter/lib/src/foundation/stack_frame.dart +++ b/packages/flutter/lib/src/foundation/stack_frame.dart
@@ -213,16 +213,16 @@ @override bool operator ==(Object other) { - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; - return other is StackFrame && - number == other.number && - package == other.package && - line == other.line && - column == other.column && - className == other.className && - method == other.method && - source == other.source; + return other is StackFrame + && other.number == number + && other.package == package + && other.line == line + && other.column == column + && other.className == className + && other.method == method + && other.source == source; } @override
diff --git a/packages/flutter/lib/src/gestures/velocity_tracker.dart b/packages/flutter/lib/src/gestures/velocity_tracker.dart index b5783f1..34d0247 100644 --- a/packages/flutter/lib/src/gestures/velocity_tracker.dart +++ b/packages/flutter/lib/src/gestures/velocity_tracker.dart
@@ -62,7 +62,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is Velocity && other.pixelsPerSecond == pixelsPerSecond; }
diff --git a/packages/flutter/lib/src/material/app_bar_theme.dart b/packages/flutter/lib/src/material/app_bar_theme.dart index e9cb2b7..f4758f9 100644 --- a/packages/flutter/lib/src/material/app_bar_theme.dart +++ b/packages/flutter/lib/src/material/app_bar_theme.dart
@@ -123,7 +123,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/banner_theme.dart b/packages/flutter/lib/src/material/banner_theme.dart index 9fea036..4e3d2b7 100644 --- a/packages/flutter/lib/src/material/banner_theme.dart +++ b/packages/flutter/lib/src/material/banner_theme.dart
@@ -89,7 +89,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/bottom_app_bar_theme.dart b/packages/flutter/lib/src/material/bottom_app_bar_theme.dart index c8bc83f..a05c15b 100644 --- a/packages/flutter/lib/src/material/bottom_app_bar_theme.dart +++ b/packages/flutter/lib/src/material/bottom_app_bar_theme.dart
@@ -87,7 +87,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/button_theme.dart b/packages/flutter/lib/src/material/button_theme.dart index fbe6d47..f4e0616 100644 --- a/packages/flutter/lib/src/material/button_theme.dart +++ b/packages/flutter/lib/src/material/button_theme.dart
@@ -904,7 +904,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is ButtonThemeData
diff --git a/packages/flutter/lib/src/material/card_theme.dart b/packages/flutter/lib/src/material/card_theme.dart index 37b2609..6f05f3f 100644 --- a/packages/flutter/lib/src/material/card_theme.dart +++ b/packages/flutter/lib/src/material/card_theme.dart
@@ -117,7 +117,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart index 16206ff..96cf9ad 100644 --- a/packages/flutter/lib/src/material/chip.dart +++ b/packages/flutter/lib/src/material/chip.dart
@@ -2180,7 +2180,7 @@ final bool canTapBody; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) { return true; }
diff --git a/packages/flutter/lib/src/material/dialog_theme.dart b/packages/flutter/lib/src/material/dialog_theme.dart index 68fb204..995bdde 100644 --- a/packages/flutter/lib/src/material/dialog_theme.dart +++ b/packages/flutter/lib/src/material/dialog_theme.dart
@@ -104,7 +104,7 @@ int get hashCode => shape.hashCode; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/divider_theme.dart b/packages/flutter/lib/src/material/divider_theme.dart index 4aa0135..399d24f 100644 --- a/packages/flutter/lib/src/material/divider_theme.dart +++ b/packages/flutter/lib/src/material/divider_theme.dart
@@ -105,7 +105,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/dropdown.dart b/packages/flutter/lib/src/material/dropdown.dart index 293d3a7..dfd0398 100644 --- a/packages/flutter/lib/src/material/dropdown.dart +++ b/packages/flutter/lib/src/material/dropdown.dart
@@ -366,7 +366,7 @@ final T result; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is _DropdownRouteResult<T> && other.result == result; }
diff --git a/packages/flutter/lib/src/material/expansion_panel.dart b/packages/flutter/lib/src/material/expansion_panel.dart index c9e794e..616aa69 100644 --- a/packages/flutter/lib/src/material/expansion_panel.dart +++ b/packages/flutter/lib/src/material/expansion_panel.dart
@@ -24,7 +24,7 @@ final V value; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is _SaltedKey<S, V>
diff --git a/packages/flutter/lib/src/material/input_border.dart b/packages/flutter/lib/src/material/input_border.dart index e225bd9..3371a8f 100644 --- a/packages/flutter/lib/src/material/input_border.dart +++ b/packages/flutter/lib/src/material/input_border.dart
@@ -235,10 +235,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is InputBorder && other.borderSide == borderSide; @@ -492,10 +492,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is OutlineInputBorder && other.borderSide == borderSide
diff --git a/packages/flutter/lib/src/material/input_decorator.dart b/packages/flutter/lib/src/material/input_decorator.dart index f9627d4..9894930 100644 --- a/packages/flutter/lib/src/material/input_decorator.dart +++ b/packages/flutter/lib/src/material/input_decorator.dart
@@ -39,10 +39,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is _InputBorderGap && other.start == start @@ -525,7 +525,7 @@ final Widget container; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType) @@ -3189,7 +3189,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/mergeable_material.dart b/packages/flutter/lib/src/material/mergeable_material.dart index e60d5fa..a6691d4 100644 --- a/packages/flutter/lib/src/material/mergeable_material.dart +++ b/packages/flutter/lib/src/material/mergeable_material.dart
@@ -631,7 +631,7 @@ final LocalKey value; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is _MergeableMaterialSliceKey && other.value == value; }
diff --git a/packages/flutter/lib/src/material/outline_button.dart b/packages/flutter/lib/src/material/outline_button.dart index 0b8cd05..ba81587 100644 --- a/packages/flutter/lib/src/material/outline_button.dart +++ b/packages/flutter/lib/src/material/outline_button.dart
@@ -552,10 +552,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is _OutlineBorder && other.side == side
diff --git a/packages/flutter/lib/src/material/page_transitions_theme.dart b/packages/flutter/lib/src/material/page_transitions_theme.dart index c50f5f6..e5a0566 100644 --- a/packages/flutter/lib/src/material/page_transitions_theme.dart +++ b/packages/flutter/lib/src/material/page_transitions_theme.dart
@@ -529,12 +529,12 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType) return false; - if (identical(builders, other.builders)) + if (other is PageTransitionsTheme && identical(builders, other.builders)) return true; return other is PageTransitionsTheme && listEquals<PageTransitionsBuilder>(_all(other.builders), _all(builders));
diff --git a/packages/flutter/lib/src/material/scaffold.dart b/packages/flutter/lib/src/material/scaffold.dart index 48ca12d..7d9870a 100644 --- a/packages/flutter/lib/src/material/scaffold.dart +++ b/packages/flutter/lib/src/material/scaffold.dart
@@ -314,7 +314,7 @@ // If the height of the bottom widgets has changed, even though the constraints' // min and max values have not, we still want performLayout to happen. @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (super != other) return false; return other is _BodyBoxConstraints
diff --git a/packages/flutter/lib/src/material/snack_bar_theme.dart b/packages/flutter/lib/src/material/snack_bar_theme.dart index a5281f0..33b3e8c 100644 --- a/packages/flutter/lib/src/material/snack_bar_theme.dart +++ b/packages/flutter/lib/src/material/snack_bar_theme.dart
@@ -156,7 +156,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/tab_bar_theme.dart b/packages/flutter/lib/src/material/tab_bar_theme.dart index 69963d8..8468562 100644 --- a/packages/flutter/lib/src/material/tab_bar_theme.dart +++ b/packages/flutter/lib/src/material/tab_bar_theme.dart
@@ -117,7 +117,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/text_theme.dart b/packages/flutter/lib/src/material/text_theme.dart index 13a4e89..870d4c2 100644 --- a/packages/flutter/lib/src/material/text_theme.dart +++ b/packages/flutter/lib/src/material/text_theme.dart
@@ -476,7 +476,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart index 087a183..5281031 100644 --- a/packages/flutter/lib/src/material/theme_data.dart +++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -1816,7 +1816,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) { return false; }
diff --git a/packages/flutter/lib/src/material/time.dart b/packages/flutter/lib/src/material/time.dart index c7e7243..2d93b89 100644 --- a/packages/flutter/lib/src/material/time.dart +++ b/packages/flutter/lib/src/material/time.dart
@@ -112,7 +112,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is TimeOfDay && other.hour == hour && other.minute == minute;
diff --git a/packages/flutter/lib/src/painting/_network_image_io.dart b/packages/flutter/lib/src/painting/_network_image_io.dart index 574188f..2c20305 100644 --- a/packages/flutter/lib/src/painting/_network_image_io.dart +++ b/packages/flutter/lib/src/painting/_network_image_io.dart
@@ -108,7 +108,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is NetworkImage
diff --git a/packages/flutter/lib/src/painting/_network_image_web.dart b/packages/flutter/lib/src/painting/_network_image_web.dart index 51bae08..1d63cc7 100644 --- a/packages/flutter/lib/src/painting/_network_image_web.dart +++ b/packages/flutter/lib/src/painting/_network_image_web.dart
@@ -65,7 +65,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) { return false; }
diff --git a/packages/flutter/lib/src/painting/alignment.dart b/packages/flutter/lib/src/painting/alignment.dart index 9ddf740..e8c1a70 100644 --- a/packages/flutter/lib/src/painting/alignment.dart +++ b/packages/flutter/lib/src/painting/alignment.dart
@@ -126,7 +126,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is AlignmentGeometry && other._x == _x && other._start == _start
diff --git a/packages/flutter/lib/src/painting/beveled_rectangle_border.dart b/packages/flutter/lib/src/painting/beveled_rectangle_border.dart index bb8fab0..945c6b1 100644 --- a/packages/flutter/lib/src/painting/beveled_rectangle_border.dart +++ b/packages/flutter/lib/src/painting/beveled_rectangle_border.dart
@@ -133,8 +133,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is BeveledRectangleBorder && other.side == side
diff --git a/packages/flutter/lib/src/painting/border_radius.dart b/packages/flutter/lib/src/painting/border_radius.dart index f6a2c8a..fa1b5de 100644 --- a/packages/flutter/lib/src/painting/border_radius.dart +++ b/packages/flutter/lib/src/painting/border_radius.dart
@@ -239,10 +239,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is BorderRadiusGeometry && other._topLeft == _topLeft
diff --git a/packages/flutter/lib/src/painting/borders.dart b/packages/flutter/lib/src/painting/borders.dart index 79341b0..260cd9a 100644 --- a/packages/flutter/lib/src/painting/borders.dart +++ b/packages/flutter/lib/src/painting/borders.dart
@@ -252,10 +252,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is BorderSide && other.color == color @@ -610,10 +610,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is _CompoundBorder && listEquals<ShapeBorder>(other.borders, borders);
diff --git a/packages/flutter/lib/src/painting/box_border.dart b/packages/flutter/lib/src/painting/box_border.dart index 30b425b..8dc27ca 100644 --- a/packages/flutter/lib/src/painting/box_border.dart +++ b/packages/flutter/lib/src/painting/box_border.dart
@@ -527,10 +527,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is Border && other.top == top @@ -831,10 +831,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is BorderDirectional && other.top == top
diff --git a/packages/flutter/lib/src/painting/box_decoration.dart b/packages/flutter/lib/src/painting/box_decoration.dart index afbd20c..e966dc2 100644 --- a/packages/flutter/lib/src/painting/box_decoration.dart +++ b/packages/flutter/lib/src/painting/box_decoration.dart
@@ -309,10 +309,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is BoxDecoration && other.color == color
diff --git a/packages/flutter/lib/src/painting/box_shadow.dart b/packages/flutter/lib/src/painting/box_shadow.dart index e3d3ea3..947b9b0 100644 --- a/packages/flutter/lib/src/painting/box_shadow.dart +++ b/packages/flutter/lib/src/painting/box_shadow.dart
@@ -113,10 +113,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is BoxShadow && other.color == color
diff --git a/packages/flutter/lib/src/painting/circle_border.dart b/packages/flutter/lib/src/painting/circle_border.dart index 1ecefbf..bb0c8f3 100644 --- a/packages/flutter/lib/src/painting/circle_border.dart +++ b/packages/flutter/lib/src/painting/circle_border.dart
@@ -81,8 +81,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is CircleBorder && other.side == side;
diff --git a/packages/flutter/lib/src/painting/colors.dart b/packages/flutter/lib/src/painting/colors.dart index 98fea46..ccb7c4c 100644 --- a/packages/flutter/lib/src/painting/colors.dart +++ b/packages/flutter/lib/src/painting/colors.dart
@@ -214,7 +214,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; return other is HSVColor @@ -398,7 +398,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; return other is HSLColor @@ -441,7 +441,7 @@ Color operator [](T index) => _swatch[index]; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/painting/continuous_rectangle_border.dart b/packages/flutter/lib/src/painting/continuous_rectangle_border.dart index 20ba150..38fbd67 100644 --- a/packages/flutter/lib/src/painting/continuous_rectangle_border.dart +++ b/packages/flutter/lib/src/painting/continuous_rectangle_border.dart
@@ -148,8 +148,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is ContinuousRectangleBorder && other.side == side
diff --git a/packages/flutter/lib/src/painting/decoration_image.dart b/packages/flutter/lib/src/painting/decoration_image.dart index e7dfe17..6f2e89b 100644 --- a/packages/flutter/lib/src/painting/decoration_image.dart +++ b/packages/flutter/lib/src/painting/decoration_image.dart
@@ -136,10 +136,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is DecorationImage && other.image == image
diff --git a/packages/flutter/lib/src/painting/edge_insets.dart b/packages/flutter/lib/src/painting/edge_insets.dart index ac331a3..8e508ce 100644 --- a/packages/flutter/lib/src/painting/edge_insets.dart +++ b/packages/flutter/lib/src/painting/edge_insets.dart
@@ -279,7 +279,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is EdgeInsetsGeometry && other._left == _left && other._right == _right
diff --git a/packages/flutter/lib/src/painting/flutter_logo.dart b/packages/flutter/lib/src/painting/flutter_logo.dart index 59b9da4..bc783fb 100644 --- a/packages/flutter/lib/src/painting/flutter_logo.dart +++ b/packages/flutter/lib/src/painting/flutter_logo.dart
@@ -206,7 +206,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { assert(debugAssertIsValid()); if (identical(this, other)) return true;
diff --git a/packages/flutter/lib/src/painting/gradient.dart b/packages/flutter/lib/src/painting/gradient.dart index db5c281..6d1ecb3 100644 --- a/packages/flutter/lib/src/painting/gradient.dart +++ b/packages/flutter/lib/src/painting/gradient.dart
@@ -493,10 +493,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is LinearGradient && other.begin == begin @@ -753,10 +753,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is RadialGradient && other.center == center @@ -999,10 +999,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is SweepGradient && other.center == center
diff --git a/packages/flutter/lib/src/painting/image_provider.dart b/packages/flutter/lib/src/painting/image_provider.dart index 1c51cc4..3c0672a 100644 --- a/packages/flutter/lib/src/painting/image_provider.dart +++ b/packages/flutter/lib/src/painting/image_provider.dart
@@ -91,7 +91,7 @@ static const ImageConfiguration empty = ImageConfiguration(); @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is ImageConfiguration @@ -436,7 +436,7 @@ final double scale; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is AssetBundleImageKey @@ -654,7 +654,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is FileImage @@ -715,7 +715,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is MemoryImage @@ -852,7 +852,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is ExactAssetImage
diff --git a/packages/flutter/lib/src/painting/image_resolution.dart b/packages/flutter/lib/src/painting/image_resolution.dart index 17e6eb8..66ebf36 100644 --- a/packages/flutter/lib/src/painting/image_resolution.dart +++ b/packages/flutter/lib/src/painting/image_resolution.dart
@@ -277,7 +277,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is AssetImage
diff --git a/packages/flutter/lib/src/painting/image_stream.dart b/packages/flutter/lib/src/painting/image_stream.dart index 4b062f9..79d257d 100644 --- a/packages/flutter/lib/src/painting/image_stream.dart +++ b/packages/flutter/lib/src/painting/image_stream.dart
@@ -116,7 +116,7 @@ int get hashCode => hashValues(onImage, onChunk, onError); @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is ImageStreamListener
diff --git a/packages/flutter/lib/src/painting/inline_span.dart b/packages/flutter/lib/src/painting/inline_span.dart index 90cd399..fa959d6 100644 --- a/packages/flutter/lib/src/painting/inline_span.dart +++ b/packages/flutter/lib/src/painting/inline_span.dart
@@ -84,11 +84,12 @@ final bool requiresOwnNode; @override - bool operator ==(dynamic other) { - if (other is! InlineSpanSemanticsInformation) { - return false; - } - return other.text == text && other.semanticsLabel == semanticsLabel && other.recognizer == recognizer && other.isPlaceholder == isPlaceholder; + bool operator ==(Object other) { + return other is InlineSpanSemanticsInformation + && other.text == text + && other.semanticsLabel == semanticsLabel + && other.recognizer == recognizer + && other.isPlaceholder == isPlaceholder; } @override @@ -354,7 +355,7 @@ RenderComparison compareTo(InlineSpan other); @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/painting/rounded_rectangle_border.dart b/packages/flutter/lib/src/painting/rounded_rectangle_border.dart index fcd388a..e90edff 100644 --- a/packages/flutter/lib/src/painting/rounded_rectangle_border.dart +++ b/packages/flutter/lib/src/painting/rounded_rectangle_border.dart
@@ -123,8 +123,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is RoundedRectangleBorder && other.side == side @@ -283,8 +283,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is _RoundedRectangleToCircleBorder && other.side == side
diff --git a/packages/flutter/lib/src/painting/shape_decoration.dart b/packages/flutter/lib/src/painting/shape_decoration.dart index 5e0fcac..6237e46 100644 --- a/packages/flutter/lib/src/painting/shape_decoration.dart +++ b/packages/flutter/lib/src/painting/shape_decoration.dart
@@ -246,10 +246,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is ShapeDecoration && other.color == color
diff --git a/packages/flutter/lib/src/painting/stadium_border.dart b/packages/flutter/lib/src/painting/stadium_border.dart index 77b69d3..a1c63fe 100644 --- a/packages/flutter/lib/src/painting/stadium_border.dart +++ b/packages/flutter/lib/src/painting/stadium_border.dart
@@ -110,8 +110,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is StadiumBorder && other.side == side; @@ -257,8 +257,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is _StadiumToCircleBorder && other.side == side @@ -399,8 +399,8 @@ } @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is _StadiumToRoundedRectangleBorder && other.side == side
diff --git a/packages/flutter/lib/src/painting/strut_style.dart b/packages/flutter/lib/src/painting/strut_style.dart index eb085bb..b156d48 100644 --- a/packages/flutter/lib/src/painting/strut_style.dart +++ b/packages/flutter/lib/src/painting/strut_style.dart
@@ -541,7 +541,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/painting/text_span.dart b/packages/flutter/lib/src/painting/text_span.dart index 5bd5e3f..91f8d80 100644 --- a/packages/flutter/lib/src/painting/text_span.dart +++ b/packages/flutter/lib/src/painting/text_span.dart
@@ -416,7 +416,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/painting/text_style.dart b/packages/flutter/lib/src/painting/text_style.dart index 19dd904..f6ac991 100644 --- a/packages/flutter/lib/src/painting/text_style.dart +++ b/packages/flutter/lib/src/painting/text_style.dart
@@ -1139,7 +1139,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/lib/src/rendering/box.dart b/packages/flutter/lib/src/rendering/box.dart index 47d6fd1..2edc25a 100644 --- a/packages/flutter/lib/src/rendering/box.dart +++ b/packages/flutter/lib/src/rendering/box.dart
@@ -581,11 +581,11 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { assert(debugAssertIsValid()); if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; assert(other is BoxConstraints && other.debugAssertIsValid()); return other is BoxConstraints @@ -855,7 +855,7 @@ final double argument; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is _IntrinsicDimensionsCacheEntry && other.dimension == dimension && other.argument == argument;
diff --git a/packages/flutter/lib/src/rendering/sliver.dart b/packages/flutter/lib/src/rendering/sliver.dart index a53d948..a6b775c 100644 --- a/packages/flutter/lib/src/rendering/sliver.dart +++ b/packages/flutter/lib/src/rendering/sliver.dart
@@ -466,7 +466,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other is! SliverConstraints)
diff --git a/packages/flutter/lib/src/rendering/stack.dart b/packages/flutter/lib/src/rendering/stack.dart index 75f334f..502588b 100644 --- a/packages/flutter/lib/src/rendering/stack.dart +++ b/packages/flutter/lib/src/rendering/stack.dart
@@ -151,7 +151,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; return other is RelativeRect
diff --git a/packages/flutter/lib/src/rendering/table_border.dart b/packages/flutter/lib/src/rendering/table_border.dart index 7fa0118..bb1ec1f 100644 --- a/packages/flutter/lib/src/rendering/table_border.dart +++ b/packages/flutter/lib/src/rendering/table_border.dart
@@ -260,10 +260,10 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; - if (runtimeType != other.runtimeType) + if (other.runtimeType != runtimeType) return false; return other is TableBorder && other.top == top
diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart index 6447128..904e35a 100644 --- a/packages/flutter/lib/src/semantics/semantics.dart +++ b/packages/flutter/lib/src/semantics/semantics.dart
@@ -126,7 +126,7 @@ int get hashCode => ui.hashValues(label, hint, action); @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is CustomSemanticsAction @@ -421,7 +421,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is SemanticsData && other.flags == flags && other.actions == actions @@ -559,7 +559,7 @@ int get hashCode => ui.hashValues(onTapHint, onLongPressHint); @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is SemanticsHintOverrides
diff --git a/packages/flutter/lib/src/services/keyboard_key.dart b/packages/flutter/lib/src/services/keyboard_key.dart index f70d9d3..3b95679 100644 --- a/packages/flutter/lib/src/services/keyboard_key.dart +++ b/packages/flutter/lib/src/services/keyboard_key.dart
@@ -167,7 +167,7 @@ int get hashCode => keyId.hashCode; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) { return false; } @@ -2069,7 +2069,7 @@ int get hashCode => usbHidUsage.hashCode; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) { return false; }
diff --git a/packages/flutter/lib/src/services/raw_keyboard.dart b/packages/flutter/lib/src/services/raw_keyboard.dart index 3a841c0..60bceac 100644 --- a/packages/flutter/lib/src/services/raw_keyboard.dart +++ b/packages/flutter/lib/src/services/raw_keyboard.dart
@@ -618,10 +618,12 @@ final KeyboardSide side; @override - bool operator ==(dynamic other) { - return runtimeType == other.runtimeType - && modifier == other.modifier - && side == other.side; + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) + return false; + return other is _ModifierSidePair + && other.modifier == modifier + && other.side == side; } @override
diff --git a/packages/flutter/lib/src/services/system_chrome.dart b/packages/flutter/lib/src/services/system_chrome.dart index 2cef6cd..bf60574 100644 --- a/packages/flutter/lib/src/services/system_chrome.dart +++ b/packages/flutter/lib/src/services/system_chrome.dart
@@ -193,7 +193,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is SystemUiOverlayStyle
diff --git a/packages/flutter/lib/src/services/text_editing.dart b/packages/flutter/lib/src/services/text_editing.dart index 9b10271..abd9d8c 100644 --- a/packages/flutter/lib/src/services/text_editing.dart +++ b/packages/flutter/lib/src/services/text_editing.dart
@@ -98,7 +98,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; return other is TextSelection
diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart index fac229b..cbcfd1d 100644 --- a/packages/flutter/lib/src/services/text_input.dart +++ b/packages/flutter/lib/src/services/text_input.dart
@@ -189,7 +189,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is TextInputType && other.index == index && other.signed == signed @@ -688,7 +688,7 @@ String toString() => '$runtimeType(text: \u2524$text\u251C, selection: $selection, composing: $composing)'; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; return other is TextEditingValue
diff --git a/packages/flutter/lib/src/widgets/async.dart b/packages/flutter/lib/src/widgets/async.dart index 71454b1..acfdafa 100644 --- a/packages/flutter/lib/src/widgets/async.dart +++ b/packages/flutter/lib/src/widgets/async.dart
@@ -265,7 +265,7 @@ String toString() => '$runtimeType($connectionState, $data, $error)'; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; return other is AsyncSnapshot<T>
diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart index cf8eb5d..1179cf6 100644 --- a/packages/flutter/lib/src/widgets/framework.dart +++ b/packages/flutter/lib/src/widgets/framework.dart
@@ -73,7 +73,7 @@ final Object value; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is ObjectKey @@ -325,7 +325,7 @@ final Object value; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is GlobalObjectKey<T> @@ -453,7 +453,7 @@ @override @nonVirtual - bool operator ==(dynamic other) => super==other; + bool operator ==(Object other) => super == other; @override @nonVirtual
diff --git a/packages/flutter/lib/src/widgets/icon_data.dart b/packages/flutter/lib/src/widgets/icon_data.dart index 0321d73..ef390df 100644 --- a/packages/flutter/lib/src/widgets/icon_data.dart +++ b/packages/flutter/lib/src/widgets/icon_data.dart
@@ -50,8 +50,8 @@ final bool matchTextDirection; @override - bool operator ==(dynamic other) { - if (runtimeType != other.runtimeType) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is IconData && other.codePoint == codePoint
diff --git a/packages/flutter/lib/src/widgets/icon_theme_data.dart b/packages/flutter/lib/src/widgets/icon_theme_data.dart index 06da4ea..f4b25cd 100644 --- a/packages/flutter/lib/src/widgets/icon_theme_data.dart +++ b/packages/flutter/lib/src/widgets/icon_theme_data.dart
@@ -100,7 +100,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is IconThemeData
diff --git a/packages/flutter/lib/src/widgets/page_storage.dart b/packages/flutter/lib/src/widgets/page_storage.dart index 137c55a..eab078d 100644 --- a/packages/flutter/lib/src/widgets/page_storage.dart +++ b/packages/flutter/lib/src/widgets/page_storage.dart
@@ -47,7 +47,7 @@ bool get isNotEmpty => keys.isNotEmpty; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is _StorageEntryIdentifier
diff --git a/packages/flutter/lib/src/widgets/widget_inspector.dart b/packages/flutter/lib/src/widgets/widget_inspector.dart index d113c75..4d021af 100644 --- a/packages/flutter/lib/src/widgets/widget_inspector.dart +++ b/packages/flutter/lib/src/widgets/widget_inspector.dart
@@ -2435,7 +2435,7 @@ final Matrix4 transform; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is _TransformedRect @@ -2467,7 +2467,7 @@ final TextDirection textDirection; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other.runtimeType != runtimeType) return false; return other is _InspectorOverlayRenderState
diff --git a/packages/flutter/lib/src/widgets/widget_span.dart b/packages/flutter/lib/src/widgets/widget_span.dart index ad34076..f1b89ea 100644 --- a/packages/flutter/lib/src/widgets/widget_span.dart +++ b/packages/flutter/lib/src/widgets/widget_span.dart
@@ -164,7 +164,7 @@ } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType)
diff --git a/packages/flutter/test/services/fake_platform_views.dart b/packages/flutter/test/services/fake_platform_views.dart index 02957cf..c08d359 100644 --- a/packages/flutter/test/services/fake_platform_views.dart +++ b/packages/flutter/test/services/fake_platform_views.dart
@@ -387,8 +387,8 @@ int layoutDirection; @override - bool operator ==(dynamic other) { - if (other.runtimeType != FakeAndroidPlatformView) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is FakeAndroidPlatformView && other.id == id @@ -415,9 +415,7 @@ @override - bool operator ==(dynamic other) { - if (other is! FakeAndroidMotionEvent) - return false; + bool operator ==(Object other) { return other is FakeAndroidMotionEvent && listEquals<int>(other.pointerIds, pointerIds) && other.action == action @@ -441,8 +439,8 @@ final Uint8List creationParams; @override - bool operator ==(dynamic other) { - if (other.runtimeType != FakeUiKitView) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is FakeUiKitView && other.id == id @@ -466,8 +464,8 @@ final String type; @override - bool operator ==(dynamic other) { - if (other.runtimeType != FakeHtmlPlatformView) + bool operator ==(Object other) { + if (other.runtimeType != runtimeType) return false; return other is FakeHtmlPlatformView && other.id == id
diff --git a/packages/flutter/test/widgets/key_test.dart b/packages/flutter/test/widgets/key_test.dart index 3dc59e3..6989b8c 100644 --- a/packages/flutter/test/widgets/key_test.dart +++ b/packages/flutter/test/widgets/key_test.dart
@@ -12,7 +12,7 @@ class NotEquals { const NotEquals(); @override - bool operator ==(dynamic other) => false; + bool operator ==(Object other) => false; @override int get hashCode => 0; }
diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart index 41938f9..cf12cab 100644 --- a/packages/flutter_driver/lib/src/driver/driver.dart +++ b/packages/flutter_driver/lib/src/driver/driver.dart
@@ -751,7 +751,7 @@ String toString() => '$runtimeType($dx, $dy)'; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return other is DriverOffset && other.dx == dx && other.dy == dy;
diff --git a/packages/flutter_test/test/matchers_test.dart b/packages/flutter_test/test/matchers_test.dart index 79af061..4fe0e99 100644 --- a/packages/flutter_test/test/matchers_test.dart +++ b/packages/flutter_test/test/matchers_test.dart
@@ -709,7 +709,7 @@ bool isEqual; @override - bool operator ==(dynamic other) => isEqual ?? super == other; + bool operator ==(Object other) => isEqual ?? super == other; @override int get hashCode => hashValues(super.hashCode, isEqual);
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index d1a4706..79b0694 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart
@@ -283,7 +283,7 @@ String toString() => 'asset: $entryUri'; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(other, this)) { return true; }
diff --git a/packages/flutter_tools/lib/src/base/fingerprint.dart b/packages/flutter_tools/lib/src/base/fingerprint.dart index 9ef80c7..45549ea 100644 --- a/packages/flutter_tools/lib/src/base/fingerprint.dart +++ b/packages/flutter_tools/lib/src/base/fingerprint.dart
@@ -140,7 +140,7 @@ }); @override - bool operator==(dynamic other) { + bool operator==(Object other) { if (identical(other, this)) { return true; }
diff --git a/packages/flutter_tools/lib/src/base/version.dart b/packages/flutter_tools/lib/src/base/version.dart index e89772c..04a91fe 100644 --- a/packages/flutter_tools/lib/src/base/version.dart +++ b/packages/flutter_tools/lib/src/base/version.dart
@@ -84,11 +84,11 @@ /// Two [Version]s are equal if their version numbers are. The version text /// is ignored. @override - bool operator ==(dynamic other) { - if (other is! Version) { - return false; - } - return major == other.major && minor == other.minor && patch == other.patch; + bool operator ==(Object other) { + return other is Version + && other.major == major + && other.minor == minor + && other.patch == patch; } @override
diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart index 9109845..debd75a 100644 --- a/packages/flutter_tools/lib/src/device.dart +++ b/packages/flutter_tools/lib/src/device.dart
@@ -440,14 +440,12 @@ int get hashCode => id.hashCode; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) { return true; } - if (other is! Device) { - return false; - } - return id == other.id; + return other is Device + && other.id == id; } @override
diff --git a/packages/flutter_tools/lib/src/emulator.dart b/packages/flutter_tools/lib/src/emulator.dart index 3cfcac6..7a91410 100644 --- a/packages/flutter_tools/lib/src/emulator.dart +++ b/packages/flutter_tools/lib/src/emulator.dart
@@ -228,14 +228,12 @@ int get hashCode => id.hashCode; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (identical(this, other)) { return true; } - if (other is! Emulator) { - return false; - } - return id == other.id; + return other is Emulator + && other.id == id; } Future<void> launch();