diff --git a/doc/flame/examples/pubspec.yaml b/doc/flame/examples/pubspec.yaml index 3c413df93..958fbb276 100644 --- a/doc/flame/examples/pubspec.yaml +++ b/doc/flame/examples/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.0.0 publish_to: none environment: - sdk: ^2.16.0 - flutter: ^2.10.0 + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/doc/tutorials/klondike/app/pubspec.yaml b/doc/tutorials/klondike/app/pubspec.yaml index ddf274f15..0cc9cd272 100644 --- a/doc/tutorials/klondike/app/pubspec.yaml +++ b/doc/tutorials/klondike/app/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^2.15.0 + sdk: ^2.17.0 dependencies: flame: ^1.2.0 diff --git a/examples/games/padracing/lib/game_over.dart b/examples/games/padracing/lib/game_over.dart index 2b08d84db..023edca73 100644 --- a/examples/games/padracing/lib/game_over.dart +++ b/examples/games/padracing/lib/game_over.dart @@ -3,7 +3,7 @@ import 'package:padracing/menu_card.dart'; import 'package:padracing/padracing_game.dart'; class GameOver extends StatelessWidget { - const GameOver(this.game, {Key? key}) : super(key: key); + const GameOver(this.game, {super.key}); final PadRacingGame game; diff --git a/examples/games/padracing/lib/menu.dart b/examples/games/padracing/lib/menu.dart index 644ddf24b..5904a04f2 100644 --- a/examples/games/padracing/lib/menu.dart +++ b/examples/games/padracing/lib/menu.dart @@ -6,7 +6,7 @@ import 'package:padracing/padracing_game.dart'; import 'package:url_launcher/url_launcher.dart'; class Menu extends StatelessWidget { - const Menu(this.game, {Key? key}) : super(key: key); + const Menu(this.game, {super.key}); final PadRacingGame game; diff --git a/examples/games/padracing/lib/menu_card.dart b/examples/games/padracing/lib/menu_card.dart index 6997b3cfb..7ac10d87d 100644 --- a/examples/games/padracing/lib/menu_card.dart +++ b/examples/games/padracing/lib/menu_card.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart' hide Image, Gradient; import 'package:padracing/game_colors.dart'; class MenuCard extends StatelessWidget { - const MenuCard({Key? key, required this.children}) : super(key: key); + const MenuCard({super.key, required this.children}); final List children; diff --git a/examples/games/padracing/lib/padracing_widget.dart b/examples/games/padracing/lib/padracing_widget.dart index e52ba8315..055e3ed84 100644 --- a/examples/games/padracing/lib/padracing_widget.dart +++ b/examples/games/padracing/lib/padracing_widget.dart @@ -7,7 +7,7 @@ import 'package:padracing/menu.dart'; import 'package:padracing/padracing_game.dart'; class PadracingWidget extends StatelessWidget { - const PadracingWidget({Key? key}) : super(key: key); + const PadracingWidget({super.key}); @override Widget build(BuildContext context) { diff --git a/examples/games/padracing/pubspec.yaml b/examples/games/padracing/pubspec.yaml index 864856e8e..b066e2ac9 100644 --- a/examples/games/padracing/pubspec.yaml +++ b/examples/games/padracing/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flame: ^1.2.0 diff --git a/examples/games/trex/lib/trex_widget.dart b/examples/games/trex/lib/trex_widget.dart index 3d9796096..33907aebe 100644 --- a/examples/games/trex/lib/trex_widget.dart +++ b/examples/games/trex/lib/trex_widget.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart' hide Image, Gradient; import 'package:trex_game/trex_game.dart'; class TRexWidget extends StatelessWidget { - const TRexWidget({Key? key}) : super(key: key); + const TRexWidget({super.key}); @override Widget build(BuildContext context) { diff --git a/examples/games/trex/pubspec.yaml b/examples/games/trex/pubspec.yaml index b167b2a93..4622cd74c 100644 --- a/examples/games/trex/pubspec.yaml +++ b/examples/games/trex/pubspec.yaml @@ -6,8 +6,8 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/examples/lib/commons/ember.dart b/examples/lib/commons/ember.dart index 5416d2cd2..c30112b5c 100644 --- a/examples/lib/commons/ember.dart +++ b/examples/lib/commons/ember.dart @@ -4,11 +4,9 @@ import 'package:meta/meta.dart'; class Ember extends SpriteAnimationComponent with HasGameRef { - Ember({Vector2? position, Vector2? size, int? priority}) + Ember({super.position, Vector2? size, super.priority}) : super( - position: position, size: size ?? Vector2.all(50), - priority: priority, anchor: Anchor.center, ); diff --git a/examples/lib/stories/bridge_libraries/forge2d/composition_example.dart b/examples/lib/stories/bridge_libraries/forge2d/composition_example.dart index e08228c86..0f94bc1cc 100644 --- a/examples/lib/stories/bridge_libraries/forge2d/composition_example.dart +++ b/examples/lib/stories/bridge_libraries/forge2d/composition_example.dart @@ -69,7 +69,7 @@ class TappableBall extends Ball with Tappable { int counter = 0; late final TextPaint _textPaint; - TappableBall(Vector2 position) : super(position) { + TappableBall(super.position) { originalPaint = Paint()..color = Colors.amber; paint = originalPaint; } diff --git a/examples/lib/stories/bridge_libraries/forge2d/draggable_example.dart b/examples/lib/stories/bridge_libraries/forge2d/draggable_example.dart index 5b6265c59..84978f171 100644 --- a/examples/lib/stories/bridge_libraries/forge2d/draggable_example.dart +++ b/examples/lib/stories/bridge_libraries/forge2d/draggable_example.dart @@ -25,7 +25,7 @@ class DraggableExample extends Forge2DGame with HasDraggables { } class DraggableBall extends Ball with Draggable { - DraggableBall(Vector2 position) : super(position, radius: 5) { + DraggableBall(super.position) : super(radius: 5) { originalPaint = Paint()..color = Colors.amber; paint = originalPaint; } diff --git a/examples/lib/stories/bridge_libraries/forge2d/tappable_example.dart b/examples/lib/stories/bridge_libraries/forge2d/tappable_example.dart index 4ea1b4f99..66916f378 100644 --- a/examples/lib/stories/bridge_libraries/forge2d/tappable_example.dart +++ b/examples/lib/stories/bridge_libraries/forge2d/tappable_example.dart @@ -24,7 +24,7 @@ class TappableExample extends Forge2DGame with HasTappables { } class TappableBall extends Ball with Tappable { - TappableBall(Vector2 position) : super(position) { + TappableBall(super.position) { originalPaint = BasicPalette.white.paint(); paint = originalPaint; } diff --git a/examples/lib/stories/bridge_libraries/forge2d/utils/balls.dart b/examples/lib/stories/bridge_libraries/forge2d/utils/balls.dart index 149d2ffb0..2d5d0cf26 100644 --- a/examples/lib/stories/bridge_libraries/forge2d/utils/balls.dart +++ b/examples/lib/stories/bridge_libraries/forge2d/utils/balls.dart @@ -83,7 +83,7 @@ class Ball extends BodyComponent with ContactCallbacks { } class WhiteBall extends Ball with ContactCallbacks { - WhiteBall(Vector2 position) : super(position) { + WhiteBall(super.position) { originalPaint = BasicPalette.white.paint(); paint = originalPaint; } diff --git a/examples/lib/stories/bridge_libraries/forge2d/widget_example.dart b/examples/lib/stories/bridge_libraries/forge2d/widget_example.dart index 367158acf..638a08551 100644 --- a/examples/lib/stories/bridge_libraries/forge2d/widget_example.dart +++ b/examples/lib/stories/bridge_libraries/forge2d/widget_example.dart @@ -61,7 +61,7 @@ class WidgetExample extends Forge2DGame with TapDetector { } class BodyWidgetExample extends StatelessWidget { - const BodyWidgetExample({Key? key}) : super(key: key); + const BodyWidgetExample({super.key}); @override Widget build(BuildContext context) { @@ -87,8 +87,8 @@ class BodyButtonWidget extends StatefulWidget { const BodyButtonWidget( this._game, this._bodyId, { - Key? key, - }) : super(key: key); + super.key, + }); @override State createState() { diff --git a/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart b/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart index 54debd3a1..c6775384d 100644 --- a/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart +++ b/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart @@ -164,7 +164,7 @@ class CoordinateSystemsExample extends FlameGame /// on each direction (top, bottom, left and right) and allow adding /// or removing containers. class CoordinateSystemsWidget extends StatefulWidget { - const CoordinateSystemsWidget({Key? key}) : super(key: key); + const CoordinateSystemsWidget({super.key}); @override State createState() { diff --git a/examples/lib/stories/collision_detection/multiple_shapes_example.dart b/examples/lib/stories/collision_detection/multiple_shapes_example.dart index 8a8c957fa..bd9a0cb24 100644 --- a/examples/lib/stories/collision_detection/multiple_shapes_example.dart +++ b/examples/lib/stories/collision_detection/multiple_shapes_example.dart @@ -186,11 +186,11 @@ class CollidablePolygon extends MyCollidable { class CollidableRectangle extends MyCollidable { CollidableRectangle( - Vector2 position, - Vector2 size, - Vector2 velocity, - ScreenHitbox screenHitbox, - ) : super(position, size, velocity, screenHitbox) { + super.position, + super.size, + super.velocity, + super.screenHitbox, + ) { hitbox = RectangleHitbox()..renderShape = true; add(hitbox!); } @@ -198,11 +198,11 @@ class CollidableRectangle extends MyCollidable { class CollidableCircle extends MyCollidable { CollidableCircle( - Vector2 position, - Vector2 size, - Vector2 velocity, - ScreenHitbox screenHitbox, - ) : super(position, size, velocity, screenHitbox) { + super.position, + super.size, + super.velocity, + super.screenHitbox, + ) { hitbox = CircleHitbox()..renderShape = true; add(hitbox!); } diff --git a/examples/lib/stories/effects/remove_effect_example.dart b/examples/lib/stories/effects/remove_effect_example.dart index 41418c2e0..839aa6c69 100644 --- a/examples/lib/stories/effects/remove_effect_example.dart +++ b/examples/lib/stories/effects/remove_effect_example.dart @@ -24,8 +24,8 @@ class RemoveEffectExample extends FlameGame with HasTappables { } class _RandomCircle extends CircleComponent with Tappable { - _RandomCircle(double radius, {Vector2? position, Paint? paint}) - : super(radius: radius, position: position, paint: paint); + _RandomCircle(double radius, {super.position, super.paint}) + : super(radius: radius); factory _RandomCircle.random(Random rng) { final radius = rng.nextDouble() * 30 + 10; diff --git a/examples/lib/stories/input/gesture_hitboxes_example.dart b/examples/lib/stories/input/gesture_hitboxes_example.dart index 05ca8b018..d3c0403d6 100644 --- a/examples/lib/stories/input/gesture_hitboxes_example.dart +++ b/examples/lib/stories/input/gesture_hitboxes_example.dart @@ -66,13 +66,10 @@ class MyShapeComponent extends PositionComponent MyShapeComponent({ required this.hitbox, - Vector2? position, - Vector2? size, - double? angle, + super.position, + super.size, + super.angle, }) : super( - position: position, - size: size, - angle: angle, anchor: Anchor.center, ); diff --git a/examples/lib/stories/rendering/text_example.dart b/examples/lib/stories/rendering/text_example.dart index 39ac706d5..8ec7a8dc3 100644 --- a/examples/lib/stories/rendering/text_example.dart +++ b/examples/lib/stories/rendering/text_example.dart @@ -78,15 +78,13 @@ final _shaded = TextPaint( class MyTextBox extends TextBoxComponent { MyTextBox( String text, { - Anchor? align, - Vector2? size, + super.align, + super.size, double? timePerChar, double? margins, }) : super( text: text, textRenderer: _box, - align: align, - size: size, boxConfig: TextBoxConfig( maxWidth: 400, timePerChar: timePerChar ?? 0.05, diff --git a/examples/pubspec.yaml b/examples/pubspec.yaml index fc6f4b3fc..331935cb5 100644 --- a/examples/pubspec.yaml +++ b/examples/pubspec.yaml @@ -6,8 +6,8 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: dashbook: 0.1.6 diff --git a/packages/flame/example/pubspec.yaml b/packages/flame/example/pubspec.yaml index f64ff784b..7ad3f5b67 100644 --- a/packages/flame/example/pubspec.yaml +++ b/packages/flame/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: 'none' environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/packages/flame/lib/src/cache/assets_cache.dart b/packages/flame/lib/src/cache/assets_cache.dart index 9cc2a0bcb..1b9d5807e 100644 --- a/packages/flame/lib/src/cache/assets_cache.dart +++ b/packages/flame/lib/src/cache/assets_cache.dart @@ -76,9 +76,9 @@ class _Asset { } class _StringAsset extends _Asset { - _StringAsset(String value) : super(value); + _StringAsset(super.value); } class _BinaryAsset extends _Asset> { - _BinaryAsset(List value) : super(value); + _BinaryAsset(super.value); } diff --git a/packages/flame/lib/src/collisions/hitboxes/circle_hitbox.dart b/packages/flame/lib/src/collisions/hitboxes/circle_hitbox.dart index 339671d3b..439154afc 100644 --- a/packages/flame/lib/src/collisions/hitboxes/circle_hitbox.dart +++ b/packages/flame/lib/src/collisions/hitboxes/circle_hitbox.dart @@ -1,3 +1,5 @@ +// ignore_for_file: comment_references + import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; @@ -7,35 +9,23 @@ class CircleHitbox extends CircleComponent with ShapeHitbox { final bool shouldFillParent; CircleHitbox({ - double? radius, - Vector2? position, - double? angle, - Anchor? anchor, - }) : shouldFillParent = radius == null && position == null, - super( - radius: radius, - position: position, - angle: angle, - anchor: anchor, - ); + super.radius, + super.position, + super.angle, + super.anchor, + }) : shouldFillParent = radius == null && position == null; /// With this constructor you define the [CircleHitbox] in relation to the /// [parentSize]. For example having a [relation] of 0.5 would create a circle /// that fills half of the [parentSize]. CircleHitbox.relative( - double relation, { - Vector2? position, - required Vector2 parentSize, - double angle = 0, - Anchor? anchor, + super.relation, { + super.position, + required super.parentSize, + super.angle, + super.anchor, }) : shouldFillParent = false, - super.relative( - relation, - position: position, - parentSize: parentSize, - angle: angle, - anchor: anchor, - ); + super.relative(); @override void fillParent() { diff --git a/packages/flame/lib/src/collisions/hitboxes/composite_hitbox.dart b/packages/flame/lib/src/collisions/hitboxes/composite_hitbox.dart index 52e94e4dc..3ebaf2a0a 100644 --- a/packages/flame/lib/src/collisions/hitboxes/composite_hitbox.dart +++ b/packages/flame/lib/src/collisions/hitboxes/composite_hitbox.dart @@ -11,20 +11,12 @@ import 'package:flame/components.dart'; class CompositeHitbox extends PositionComponent with CollisionCallbacks, CollisionPassthrough { CompositeHitbox({ - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - }) : super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ); + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + Iterable? super.children, + super.priority, + }); } diff --git a/packages/flame/lib/src/collisions/hitboxes/polygon_hitbox.dart b/packages/flame/lib/src/collisions/hitboxes/polygon_hitbox.dart index 77fd97a50..021ed1057 100644 --- a/packages/flame/lib/src/collisions/hitboxes/polygon_hitbox.dart +++ b/packages/flame/lib/src/collisions/hitboxes/polygon_hitbox.dart @@ -1,17 +1,15 @@ +// ignore_for_file: comment_references + import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; /// A [Hitbox] in the shape of a polygon. class PolygonHitbox extends PolygonComponent with ShapeHitbox { PolygonHitbox( - List vertices, { - double? angle, - Anchor? anchor, - }) : super( - vertices, - angle: angle, - anchor: anchor, - ); + super.vertices, { + super.angle, + super.anchor, + }); /// With this constructor you define the [PolygonHitbox] in relation to the /// [parentSize] of the hitbox. @@ -21,17 +19,12 @@ class PolygonHitbox extends PolygonComponent with ShapeHitbox { /// NOTE: Always define your shape in a counter-clockwise fashion (in the /// screen coordinate system) PolygonHitbox.relative( - List relation, { - Vector2? position, - required Vector2 parentSize, - double angle = 0, - Anchor? anchor, + super.relation, { + super.position, + required super.parentSize, + double super.angle = 0, + super.anchor, }) : super.relative( - relation, - position: position, - parentSize: parentSize, - angle: angle, - anchor: anchor, shrinkToBounds: true, ); diff --git a/packages/flame/lib/src/collisions/hitboxes/rectangle_hitbox.dart b/packages/flame/lib/src/collisions/hitboxes/rectangle_hitbox.dart index d8ffa3105..a3fa85665 100644 --- a/packages/flame/lib/src/collisions/hitboxes/rectangle_hitbox.dart +++ b/packages/flame/lib/src/collisions/hitboxes/rectangle_hitbox.dart @@ -1,3 +1,5 @@ +// ignore_for_file: comment_references + import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; @@ -7,37 +9,25 @@ class RectangleHitbox extends RectangleComponent with ShapeHitbox { final bool shouldFillParent; RectangleHitbox({ - Vector2? position, - Vector2? size, - double? angle, - Anchor? anchor, - int? priority, - }) : shouldFillParent = size == null && position == null, - super( - position: position, - size: size, - angle: angle, - anchor: anchor, - priority: priority, - ); + super.position, + super.size, + super.angle, + super.anchor, + super.priority, + }) : shouldFillParent = size == null && position == null; /// With this constructor you define the [RectangleHitbox] in relation to /// the [parentSize]. For example having [relation] as of (0.8, 0.5) would /// create a rectangle that fills 80% of the width and 50% of the height of /// [parentSize]. RectangleHitbox.relative( - Vector2 relation, { - Vector2? position, - required Vector2 parentSize, - double angle = 0, - Anchor? anchor, + super.relation, { + super.position, + required super.parentSize, + double super.angle, + super.anchor, }) : shouldFillParent = false, super.relative( - relation, - position: position, - parentSize: parentSize, - angle: angle, - anchor: anchor, shrinkToBounds: true, ); diff --git a/packages/flame/lib/src/collisions/sweep.dart b/packages/flame/lib/src/collisions/sweep.dart index 9a226f390..804dd80e1 100644 --- a/packages/flame/lib/src/collisions/sweep.dart +++ b/packages/flame/lib/src/collisions/sweep.dart @@ -3,7 +3,7 @@ import 'package:flame/src/collisions/collision_callbacks.dart'; import 'package:flame/src/collisions/hitboxes/hitbox.dart'; class Sweep> extends Broadphase { - Sweep({List? items}) : super(items: items); + Sweep({super.items}); final List _active = []; final Set> _potentials = {}; diff --git a/packages/flame/lib/src/components/custom_painter_component.dart b/packages/flame/lib/src/components/custom_painter_component.dart index cf2a6466a..620103734 100644 --- a/packages/flame/lib/src/components/custom_painter_component.dart +++ b/packages/flame/lib/src/components/custom_painter_component.dart @@ -16,22 +16,14 @@ class CustomPainterComponent extends PositionComponent { CustomPainterComponent({ this.painter, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - }) : super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ); + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, + }); @override @mustCallSuper diff --git a/packages/flame/lib/src/components/fps_text_component.dart b/packages/flame/lib/src/components/fps_text_component.dart index aec48dc8a..975656eaa 100644 --- a/packages/flame/lib/src/components/fps_text_component.dart +++ b/packages/flame/lib/src/components/fps_text_component.dart @@ -7,21 +7,15 @@ class FpsTextComponent extends TextComponent { FpsTextComponent({ int windowSize = 60, this.decimalPlaces = 0, - T? textRenderer, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, + T? super.textRenderer, + super.position, + super.size, + super.scale, + super.angle, + super.anchor, int? priority, }) : fpsComponent = FpsComponent(windowSize: windowSize), super( - textRenderer: textRenderer, - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, priority: priority ?? double.maxFinite.toInt(), ) { positionType = PositionType.viewport; diff --git a/packages/flame/lib/src/components/input/button_component.dart b/packages/flame/lib/src/components/input/button_component.dart index 30e441a9d..a21811ab0 100644 --- a/packages/flame/lib/src/components/input/button_component.dart +++ b/packages/flame/lib/src/components/input/button_component.dart @@ -26,21 +26,15 @@ class ButtonComponent extends PositionComponent with Tappable { this.buttonDown, this.onPressed, this.onReleased, - Vector2? position, + super.position, Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, }) : super( - position: position, size: size ?? button?.size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, ); @override diff --git a/packages/flame/lib/src/components/input/hud_button_component.dart b/packages/flame/lib/src/components/input/hud_button_component.dart index 47ca7c631..d49656877 100644 --- a/packages/flame/lib/src/components/input/hud_button_component.dart +++ b/packages/flame/lib/src/components/input/hud_button_component.dart @@ -10,30 +10,20 @@ import 'package:flutter/rendering.dart' show EdgeInsets; class HudButtonComponent extends ButtonComponent with HasGameRef, ComponentViewportMargin { HudButtonComponent({ - PositionComponent? button, - PositionComponent? buttonDown, + super.button, + super.buttonDown, EdgeInsets? margin, - Function()? onPressed, - Function()? onReleased, - Vector2? position, + Function()? super.onPressed, + Function()? super.onReleased, + super.position, Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, }) : super( - button: button, - buttonDown: buttonDown, - position: position, - onPressed: onPressed, - onReleased: onReleased, size: size ?? button?.size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, ) { this.margin = margin; } diff --git a/packages/flame/lib/src/components/input/hud_margin_component.dart b/packages/flame/lib/src/components/input/hud_margin_component.dart index c405914de..ae421ee10 100644 --- a/packages/flame/lib/src/components/input/hud_margin_component.dart +++ b/packages/flame/lib/src/components/input/hud_margin_component.dart @@ -24,25 +24,16 @@ class HudMarginComponent extends PositionComponent HudMarginComponent({ this.margin, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - }) : assert( + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, + }) : assert( margin != null || position != null, 'Either margin or position must be defined', - ), - super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, ); @override diff --git a/packages/flame/lib/src/components/input/joystick_component.dart b/packages/flame/lib/src/components/input/joystick_component.dart index aaebf2325..c7d8fe18f 100644 --- a/packages/flame/lib/src/components/input/joystick_component.dart +++ b/packages/flame/lib/src/components/input/joystick_component.dart @@ -3,7 +3,6 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/src/components/input/hud_margin_component.dart'; import 'package:flame/src/gestures/events.dart'; -import 'package:flutter/rendering.dart' show EdgeInsets; import 'package:meta/meta.dart'; enum JoystickDirection { @@ -47,13 +46,13 @@ class JoystickComponent extends HudMarginComponent with Draggable { JoystickComponent({ this.knob, this.background, - EdgeInsets? margin, - Vector2? position, + super.margin, + super.position, double? size, double? knobRadius, - Anchor anchor = Anchor.center, - Iterable? children, - int? priority, + Anchor super.anchor = Anchor.center, + super.children, + super.priority, }) : assert( size != null || background != null, 'Either size or background must be defined', @@ -64,12 +63,7 @@ class JoystickComponent extends HudMarginComponent with Draggable { 'Positions should not be set for the knob or the background', ), super( - margin: margin, - position: position, size: background?.size ?? Vector2.all(size ?? 0), - anchor: anchor, - children: children, - priority: priority, ) { this.knobRadius = knobRadius ?? this.size.x / 2; } diff --git a/packages/flame/lib/src/components/input/sprite_button_component.dart b/packages/flame/lib/src/components/input/sprite_button_component.dart index c7a74d78d..e53356fcb 100644 --- a/packages/flame/lib/src/components/input/sprite_button_component.dart +++ b/packages/flame/lib/src/components/input/sprite_button_component.dart @@ -22,22 +22,16 @@ class SpriteButtonComponent extends SpriteGroupComponent<_ButtonState> this.button, this.buttonDown, this.onPressed, - Vector2? position, + super.position, Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, }) : super( current: _ButtonState.up, - position: position, size: size ?? button?.originalSize, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, ); @override diff --git a/packages/flame/lib/src/components/isometric_tile_map_component.dart b/packages/flame/lib/src/components/isometric_tile_map_component.dart index 680b1e61b..57d7119e4 100644 --- a/packages/flame/lib/src/components/isometric_tile_map_component.dart +++ b/packages/flame/lib/src/components/isometric_tile_map_component.dart @@ -56,23 +56,14 @@ class IsometricTileMapComponent extends PositionComponent { this.matrix, { this.destTileSize, this.tileHeight, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - }) : _renderSprite = Sprite(tileset.image), - super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ); + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, + }) : _renderSprite = Sprite(tileset.image); /// This is the size the tiles will be drawn (either original or overwritten). Vector2 get effectiveTileSize => destTileSize ?? tileset.srcSize; diff --git a/packages/flame/lib/src/components/nine_tile_box_component.dart b/packages/flame/lib/src/components/nine_tile_box_component.dart index c12c0ea6a..2c54d7950 100644 --- a/packages/flame/lib/src/components/nine_tile_box_component.dart +++ b/packages/flame/lib/src/components/nine_tile_box_component.dart @@ -17,22 +17,14 @@ class NineTileBoxComponent extends PositionComponent implements SizeProvider { /// [PositionComponent] to render. NineTileBoxComponent({ this.nineTileBox, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - }) : super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ); + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, + }); @override @mustCallSuper diff --git a/packages/flame/lib/src/components/parallax_component.dart b/packages/flame/lib/src/components/parallax_component.dart index a2ef60546..5f92ca397 100644 --- a/packages/flame/lib/src/components/parallax_component.dart +++ b/packages/flame/lib/src/components/parallax_component.dart @@ -60,23 +60,17 @@ class ParallaxComponent extends PositionComponent /// Creates a component with an empty parallax which can be set later. ParallaxComponent({ Parallax? parallax, - Vector2? position, + super.position, Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, }) : _parallax = parallax, isFullscreen = size == null && !(parallax?.isSized ?? false), super( - position: position, size: size ?? ((parallax?.isSized ?? false) ? parallax?.size : null), - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, ); @mustCallSuper diff --git a/packages/flame/lib/src/components/particle_system_component.dart b/packages/flame/lib/src/components/particle_system_component.dart index c5f97361f..8b660608b 100644 --- a/packages/flame/lib/src/components/particle_system_component.dart +++ b/packages/flame/lib/src/components/particle_system_component.dart @@ -14,20 +14,13 @@ class ParticleSystemComponent extends PositionComponent { /// {@macro particle_system_component} ParticleSystemComponent({ this.particle, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - int? priority, - }) : super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - priority: priority, - ); + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.priority, + }); /// Returns progress of the child [Particle]. /// diff --git a/packages/flame/lib/src/components/position_component.dart b/packages/flame/lib/src/components/position_component.dart index c025c8325..746943a94 100644 --- a/packages/flame/lib/src/components/position_component.dart +++ b/packages/flame/lib/src/components/position_component.dart @@ -73,12 +73,11 @@ class PositionComponent extends Component Vector2? scale, double? angle, Anchor? anchor, - Iterable? children, - int? priority, + super.children, + super.priority, }) : transform = Transform2D(), _anchor = anchor ?? Anchor.topLeft, - _size = NotifyingVector2.copy(size ?? Vector2.zero()), - super(children: children, priority: priority) { + _size = NotifyingVector2.copy(size ?? Vector2.zero()) { if (position != null) { transform.position = position; } diff --git a/packages/flame/lib/src/components/sprite_animation_component.dart b/packages/flame/lib/src/components/sprite_animation_component.dart index e60ce21c5..6a47e8ae9 100644 --- a/packages/flame/lib/src/components/sprite_animation_component.dart +++ b/packages/flame/lib/src/components/sprite_animation_component.dart @@ -26,24 +26,15 @@ class SpriteAnimationComponent extends PositionComponent bool? removeOnFinish, bool? playing, Paint? paint, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, }) : removeOnFinish = removeOnFinish ?? false, - playing = playing ?? true, - super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ) { + playing = playing ?? true { if (paint != null) { this.paint = paint; } diff --git a/packages/flame/lib/src/components/sprite_animation_group_component.dart b/packages/flame/lib/src/components/sprite_animation_group_component.dart index 206a8a951..167de03b7 100644 --- a/packages/flame/lib/src/components/sprite_animation_group_component.dart +++ b/packages/flame/lib/src/components/sprite_animation_group_component.dart @@ -24,23 +24,14 @@ class SpriteAnimationGroupComponent extends PositionComponent this.current, Map? removeOnFinish, Paint? paint, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - }) : removeOnFinish = removeOnFinish ?? const {}, - super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ) { + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, + }) : removeOnFinish = removeOnFinish ?? const {} { if (paint != null) { this.paint = paint; } diff --git a/packages/flame/lib/src/components/sprite_component.dart b/packages/flame/lib/src/components/sprite_component.dart index 908a33db5..5a7e0b346 100644 --- a/packages/flame/lib/src/components/sprite_component.dart +++ b/packages/flame/lib/src/components/sprite_component.dart @@ -22,21 +22,15 @@ class SpriteComponent extends PositionComponent SpriteComponent({ this.sprite, Paint? paint, - Vector2? position, + super.position, Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, }) : super( - position: position, size: size ?? sprite?.srcSize, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, ) { if (paint != null) { this.paint = paint; diff --git a/packages/flame/lib/src/components/sprite_group_component.dart b/packages/flame/lib/src/components/sprite_group_component.dart index da415edc1..7f79c7bf0 100644 --- a/packages/flame/lib/src/components/sprite_group_component.dart +++ b/packages/flame/lib/src/components/sprite_group_component.dart @@ -22,22 +22,14 @@ class SpriteGroupComponent extends PositionComponent this.sprites, this.current, Paint? paint, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - }) : super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ) { + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, + }) { if (paint != null) { this.paint = paint; } diff --git a/packages/flame/lib/src/components/text_box_component.dart b/packages/flame/lib/src/components/text_box_component.dart index 5bc44c931..2e50212e9 100644 --- a/packages/flame/lib/src/components/text_box_component.dart +++ b/packages/flame/lib/src/components/text_box_component.dart @@ -65,33 +65,22 @@ class TextBoxComponent extends TextComponent { TextBoxConfig get boxConfig => _boxConfig; TextBoxComponent({ - String? text, - T? textRenderer, + super.text, + T? super.textRenderer, TextBoxConfig? boxConfig, Anchor? align, double? pixelRatio, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, }) : _boxConfig = boxConfig ?? TextBoxConfig(), _fixedSize = size != null, align = align ?? Anchor.topLeft, - pixelRatio = pixelRatio ?? window.devicePixelRatio, - super( - text: text, - textRenderer: textRenderer, - position: position, - scale: scale, - size: size, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ); + pixelRatio = pixelRatio ?? window.devicePixelRatio; /// Alignment of the text within its bounding box. /// diff --git a/packages/flame/lib/src/components/text_component.dart b/packages/flame/lib/src/components/text_component.dart index 9cca913ad..eee7cb64b 100644 --- a/packages/flame/lib/src/components/text_component.dart +++ b/packages/flame/lib/src/components/text_component.dart @@ -28,24 +28,15 @@ class TextComponent extends PositionComponent { TextComponent({ String? text, T? textRenderer, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, }) : _text = text ?? '', - _textRenderer = textRenderer ?? TextRenderer.createDefault(), - super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ) { + _textRenderer = textRenderer ?? TextRenderer.createDefault() { updateBounds(); } diff --git a/packages/flame/lib/src/effects/anchor_effect.dart b/packages/flame/lib/src/effects/anchor_effect.dart index 6627bdee5..a280ec583 100644 --- a/packages/flame/lib/src/effects/anchor_effect.dart +++ b/packages/flame/lib/src/effects/anchor_effect.dart @@ -19,10 +19,10 @@ abstract class AnchorEffect extends Effect with EffectTarget implements MeasurableEffect { AnchorEffect( - EffectController controller, + super.controller, AnchorProvider? target, { - void Function()? onComplete, - }) : super(controller, onComplete: onComplete) { + super.onComplete, + }) { this.target = target; } diff --git a/packages/flame/lib/src/effects/component_effect.dart b/packages/flame/lib/src/effects/component_effect.dart index e3b03a8a8..52dfc95ec 100644 --- a/packages/flame/lib/src/effects/component_effect.dart +++ b/packages/flame/lib/src/effects/component_effect.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/src/effects/controllers/effect_controller.dart'; import 'package:flame/src/effects/effect.dart'; /// Base class for effects that target a [Component] of type [T]. @@ -8,9 +7,9 @@ import 'package:flame/src/effects/effect.dart'; /// used by `SizeEffect`, `OpacityEffect` and `Transform2DEffect`. abstract class ComponentEffect extends Effect { ComponentEffect( - EffectController controller, { - void Function()? onComplete, - }) : super(controller, onComplete: onComplete); + super.controller, { + super.onComplete, + }); late T target; diff --git a/packages/flame/lib/src/effects/controllers/curved_effect_controller.dart b/packages/flame/lib/src/effects/controllers/curved_effect_controller.dart index 8ad49ddae..7fba9e2e1 100644 --- a/packages/flame/lib/src/effects/controllers/curved_effect_controller.dart +++ b/packages/flame/lib/src/effects/controllers/curved_effect_controller.dart @@ -4,10 +4,9 @@ import 'package:flutter/animation.dart'; /// A controller that grows non-linearly from 0 to 1 following the provided /// [curve]. The [duration] cannot be 0. class CurvedEffectController extends DurationEffectController { - CurvedEffectController(double duration, Curve curve) + CurvedEffectController(super.duration, Curve curve) : assert(duration > 0, 'Duration must be positive: $duration'), - _curve = curve, - super(duration); + _curve = curve; Curve get curve => _curve; final Curve _curve; diff --git a/packages/flame/lib/src/effects/controllers/linear_effect_controller.dart b/packages/flame/lib/src/effects/controllers/linear_effect_controller.dart index f5e6f3bfd..2e5f89134 100644 --- a/packages/flame/lib/src/effects/controllers/linear_effect_controller.dart +++ b/packages/flame/lib/src/effects/controllers/linear_effect_controller.dart @@ -5,7 +5,7 @@ import 'package:flame/src/effects/controllers/duration_effect_controller.dart'; /// The [duration] can also be 0, in which case the effect will jump from 0 to 1 /// instantaneously. class LinearEffectController extends DurationEffectController { - LinearEffectController(double duration) : super(duration); + LinearEffectController(super.duration); // If duration is 0, `completed` will be true, and division by 0 avoided. @override diff --git a/packages/flame/lib/src/effects/controllers/pause_effect_controller.dart b/packages/flame/lib/src/effects/controllers/pause_effect_controller.dart index 29cc86d85..ea1104bc0 100644 --- a/packages/flame/lib/src/effects/controllers/pause_effect_controller.dart +++ b/packages/flame/lib/src/effects/controllers/pause_effect_controller.dart @@ -10,9 +10,8 @@ import 'package:flame/src/effects/controllers/duration_effect_controller.dart'; /// example, you can create a repeated controller where the progress changes /// 0->1->0 over a short period of time, then pauses, and this sequence repeats. class PauseEffectController extends DurationEffectController { - PauseEffectController(double duration, {required double progress}) - : _progress = progress, - super(duration); + PauseEffectController(super.duration, {required double progress}) + : _progress = progress; final double _progress; diff --git a/packages/flame/lib/src/effects/controllers/reverse_curved_effect_controller.dart b/packages/flame/lib/src/effects/controllers/reverse_curved_effect_controller.dart index c166afc4c..7ac4eca78 100644 --- a/packages/flame/lib/src/effects/controllers/reverse_curved_effect_controller.dart +++ b/packages/flame/lib/src/effects/controllers/reverse_curved_effect_controller.dart @@ -4,10 +4,9 @@ import 'package:flutter/animation.dart'; /// A controller that grows non-linearly from 1 to 0 following the provided /// [curve]. The [duration] cannot be 0. class ReverseCurvedEffectController extends DurationEffectController { - ReverseCurvedEffectController(double duration, Curve curve) + ReverseCurvedEffectController(super.duration, Curve curve) : assert(duration > 0, 'Duration must be positive: $duration'), - _curve = curve, - super(duration); + _curve = curve; Curve get curve => _curve; final Curve _curve; diff --git a/packages/flame/lib/src/effects/controllers/reverse_linear_effect_controller.dart b/packages/flame/lib/src/effects/controllers/reverse_linear_effect_controller.dart index 12f9388d3..123cee388 100644 --- a/packages/flame/lib/src/effects/controllers/reverse_linear_effect_controller.dart +++ b/packages/flame/lib/src/effects/controllers/reverse_linear_effect_controller.dart @@ -5,7 +5,7 @@ import 'package:flame/src/effects/controllers/duration_effect_controller.dart'; /// The [duration] can also be 0, in which case the effect will jump from 1 to 0 /// instantaneously. class ReverseLinearEffectController extends DurationEffectController { - ReverseLinearEffectController(double duration) : super(duration); + ReverseLinearEffectController(super.duration); // If duration is 0, `completed` will be true, and division by 0 avoided. @override diff --git a/packages/flame/lib/src/effects/move_effect.dart b/packages/flame/lib/src/effects/move_effect.dart index e2e783802..8a5f3a919 100644 --- a/packages/flame/lib/src/effects/move_effect.dart +++ b/packages/flame/lib/src/effects/move_effect.dart @@ -18,10 +18,10 @@ abstract class MoveEffect extends Effect with EffectTarget implements MeasurableEffect { MoveEffect( - EffectController controller, + super.controller, PositionProvider? target, { - void Function()? onComplete, - }) : super(controller, onComplete: onComplete) { + super.onComplete, + }) { this.target = target; } diff --git a/packages/flame/lib/src/effects/opacity_effect.dart b/packages/flame/lib/src/effects/opacity_effect.dart index 77cf111e5..d8685f084 100644 --- a/packages/flame/lib/src/effects/opacity_effect.dart +++ b/packages/flame/lib/src/effects/opacity_effect.dart @@ -16,11 +16,10 @@ class OpacityEffect extends ComponentEffect { /// over time. OpacityEffect.by( double offset, - EffectController controller, { + super.controller, { this.paintId, - void Function()? onComplete, - }) : _alphaOffset = (255 * offset).round(), - super(controller, onComplete: onComplete); + super.onComplete, + }) : _alphaOffset = (255 * offset).round(); /// This constructor will set the opacity to the specified opacity over time. factory OpacityEffect.to( diff --git a/packages/flame/lib/src/effects/rotate_effect.dart b/packages/flame/lib/src/effects/rotate_effect.dart index 901b54ebe..31e2985fc 100644 --- a/packages/flame/lib/src/effects/rotate_effect.dart +++ b/packages/flame/lib/src/effects/rotate_effect.dart @@ -23,13 +23,9 @@ class RotateEffect extends Effect implements MeasurableEffect { RotateEffect.by( double angle, - EffectController controller, { - void Function()? onComplete, - }) : _angle = angle, - super( - controller, - onComplete: onComplete, - ); + super.controller, { + super.onComplete, + }) : _angle = angle; factory RotateEffect.to( double angle, diff --git a/packages/flame/lib/src/effects/scale_effect.dart b/packages/flame/lib/src/effects/scale_effect.dart index 000b29354..5141813dc 100644 --- a/packages/flame/lib/src/effects/scale_effect.dart +++ b/packages/flame/lib/src/effects/scale_effect.dart @@ -18,10 +18,9 @@ import 'package:vector_math/vector_math_64.dart'; class ScaleEffect extends Effect with EffectTarget { ScaleEffect.by( Vector2 scaleFactor, - EffectController controller, { - void Function()? onComplete, - }) : _scaleFactor = scaleFactor.clone(), - super(controller, onComplete: onComplete); + super.controller, { + super.onComplete, + }) : _scaleFactor = scaleFactor.clone(); factory ScaleEffect.to( Vector2 targetScale, diff --git a/packages/flame/lib/src/effects/sequence_effect.dart b/packages/flame/lib/src/effects/sequence_effect.dart index 1d7b58ba4..999f70e87 100644 --- a/packages/flame/lib/src/effects/sequence_effect.dart +++ b/packages/flame/lib/src/effects/sequence_effect.dart @@ -50,9 +50,9 @@ class SequenceEffect extends Effect { } SequenceEffect._( - EffectController ec, { - void Function()? onComplete, - }) : super(ec, onComplete: onComplete); + super.ec, { + super.onComplete, + }); @override void apply(double progress) {} diff --git a/packages/flame/lib/src/effects/size_effect.dart b/packages/flame/lib/src/effects/size_effect.dart index e60784c69..0c47b4382 100644 --- a/packages/flame/lib/src/effects/size_effect.dart +++ b/packages/flame/lib/src/effects/size_effect.dart @@ -18,11 +18,10 @@ class SizeEffect extends Effect with EffectTarget { /// size at the same time. SizeEffect.by( Vector2 offset, - EffectController controller, { + super.controller, { SizeProvider? target, - void Function()? onComplete, - }) : _offset = offset.clone(), - super(controller, onComplete: onComplete) { + super.onComplete, + }) : _offset = offset.clone() { this.target = target; } diff --git a/packages/flame/lib/src/effects/transform2d_effect.dart b/packages/flame/lib/src/effects/transform2d_effect.dart index c7dcf11d5..d72816f99 100644 --- a/packages/flame/lib/src/effects/transform2d_effect.dart +++ b/packages/flame/lib/src/effects/transform2d_effect.dart @@ -1,6 +1,5 @@ import 'package:flame/src/components/position_component.dart'; import 'package:flame/src/effects/component_effect.dart'; -import 'package:flame/src/effects/controllers/effect_controller.dart'; import 'package:flame/src/game/transform2d.dart'; /// Base class for effects that target a [Transform2D] property. @@ -14,9 +13,9 @@ import 'package:flame/src/game/transform2d.dart'; /// classes. abstract class Transform2DEffect extends ComponentEffect { Transform2DEffect( - EffectController controller, { - void Function()? onComplete, - }) : super(controller, onComplete: onComplete); + super.controller, { + super.onComplete, + }); late Transform2D transform; diff --git a/packages/flame/lib/src/experimental/bounded_position_behavior.dart b/packages/flame/lib/src/experimental/bounded_position_behavior.dart index cf92b07cf..355ef2593 100644 --- a/packages/flame/lib/src/experimental/bounded_position_behavior.dart +++ b/packages/flame/lib/src/experimental/bounded_position_behavior.dart @@ -22,13 +22,12 @@ class BoundedPositionBehavior extends Component { required Shape bounds, PositionProvider? target, double precision = 0.5, - int? priority, + super.priority, }) : assert(precision > 0, 'Precision must be positive: $precision'), _bounds = bounds, _target = target, _previousPosition = Vector2.zero(), - _precision = precision, - super(priority: priority); + _precision = precision; /// The region within which the target's position must be kept. Shape get bounds => _bounds; diff --git a/packages/flame/lib/src/experimental/circular_viewport.dart b/packages/flame/lib/src/experimental/circular_viewport.dart index 0a30ec79b..cf03634f5 100644 --- a/packages/flame/lib/src/experimental/circular_viewport.dart +++ b/packages/flame/lib/src/experimental/circular_viewport.dart @@ -1,13 +1,11 @@ import 'dart:ui'; -import 'package:flame/src/components/component.dart'; import 'package:flame/src/experimental/viewport.dart'; import 'package:vector_math/vector_math_64.dart'; /// A fixed-size viewport in the shape of a circle. class CircularViewport extends Viewport { - CircularViewport(double radius, {Iterable? children}) - : super(children: children) { + CircularViewport(double radius, {super.children}) { size = Vector2.all(2 * radius); } diff --git a/packages/flame/lib/src/experimental/fixed_aspect_ratio_viewport.dart b/packages/flame/lib/src/experimental/fixed_aspect_ratio_viewport.dart index 5450a6374..9564ab255 100644 --- a/packages/flame/lib/src/experimental/fixed_aspect_ratio_viewport.dart +++ b/packages/flame/lib/src/experimental/fixed_aspect_ratio_viewport.dart @@ -1,15 +1,13 @@ import 'dart:ui'; -import 'package:flame/src/components/component.dart'; import 'package:flame/src/experimental/viewport.dart'; import 'package:vector_math/vector_math_64.dart'; class FixedAspectRatioViewport extends Viewport { FixedAspectRatioViewport({ required this.aspectRatio, - Iterable? children, - }) : assert(aspectRatio > 0), - super(children: children); + super.children, + }) : assert(aspectRatio > 0); final double aspectRatio; Rect _clipRect = Rect.zero; diff --git a/packages/flame/lib/src/experimental/fixed_size_viewport.dart b/packages/flame/lib/src/experimental/fixed_size_viewport.dart index 0052c975b..5626946f1 100644 --- a/packages/flame/lib/src/experimental/fixed_size_viewport.dart +++ b/packages/flame/lib/src/experimental/fixed_size_viewport.dart @@ -1,6 +1,5 @@ import 'dart:ui'; -import 'package:flame/src/components/component.dart'; import 'package:flame/src/experimental/viewport.dart'; import 'package:vector_math/vector_math_64.dart'; @@ -12,8 +11,8 @@ class FixedSizeViewport extends Viewport { FixedSizeViewport( double width, double height, { - Iterable? children, - }) : super(children: children) { + super.children, + }) { size = Vector2(width, height); onViewportResize(); } diff --git a/packages/flame/lib/src/experimental/follow_behavior.dart b/packages/flame/lib/src/experimental/follow_behavior.dart index 0f3ee1b23..cfa704dda 100644 --- a/packages/flame/lib/src/experimental/follow_behavior.dart +++ b/packages/flame/lib/src/experimental/follow_behavior.dart @@ -23,7 +23,7 @@ class FollowBehavior extends Component { double maxSpeed = double.infinity, this.horizontalOnly = false, this.verticalOnly = false, - int? priority, + super.priority, }) : _target = target, _owner = owner, _speed = maxSpeed, @@ -31,8 +31,7 @@ class FollowBehavior extends Component { assert( !(horizontalOnly && verticalOnly), 'The behavior cannot be both horizontalOnly and verticalOnly', - ), - super(priority: priority); + ); PositionProvider get target => _target; final PositionProvider _target; diff --git a/packages/flame/lib/src/experimental/max_viewport.dart b/packages/flame/lib/src/experimental/max_viewport.dart index 8413b728e..20be941f4 100644 --- a/packages/flame/lib/src/experimental/max_viewport.dart +++ b/packages/flame/lib/src/experimental/max_viewport.dart @@ -1,6 +1,5 @@ import 'dart:ui'; -import 'package:flame/src/components/component.dart'; import 'package:flame/src/experimental/viewport.dart'; import 'package:vector_math/vector_math_64.dart'; @@ -8,7 +7,7 @@ import 'package:vector_math/vector_math_64.dart'; /// /// This viewport does not perform any clipping. class MaxViewport extends Viewport { - MaxViewport({Iterable? children}) : super(children: children); + MaxViewport({super.children}); @override void onGameResize(Vector2 gameSize) { diff --git a/packages/flame/lib/src/experimental/viewport.dart b/packages/flame/lib/src/experimental/viewport.dart index d106bf173..2a2094fdf 100644 --- a/packages/flame/lib/src/experimental/viewport.dart +++ b/packages/flame/lib/src/experimental/viewport.dart @@ -22,7 +22,7 @@ import 'package:vector_math/vector_math_64.dart'; /// the top left corner of the viewport's bounding box. abstract class Viewport extends Component implements AnchorProvider, PositionProvider, SizeProvider { - Viewport({Iterable? children}) : super(children: children); + Viewport({super.children}); /// Position of the viewport's anchor in the parent's coordinate frame. /// diff --git a/packages/flame/lib/src/game/flame_game.dart b/packages/flame/lib/src/game/flame_game.dart index 2fce98414..dcbdb8bfc 100644 --- a/packages/flame/lib/src/game/flame_game.dart +++ b/packages/flame/lib/src/game/flame_game.dart @@ -17,15 +17,15 @@ import 'package:meta/meta.dart'; /// It is based on the Flame Component System (also known as FCS). class FlameGame extends Component with Game { FlameGame({ - Iterable? children, + super.children, Camera? camera, - }) : super(children: children) { + }) { assert( Component.staticGameInstance == null, '$this instantiated, while another game ${Component.staticGameInstance} ' 'declares itself to be a singleton', ); - _cameraWrapper = CameraWrapper(camera ?? Camera(), this.children); + _cameraWrapper = CameraWrapper(camera ?? Camera(), children); } late final CameraWrapper _cameraWrapper; diff --git a/packages/flame/lib/src/game/game_widget/game_widget.dart b/packages/flame/lib/src/game/game_widget/game_widget.dart index 71aa0f261..0ce160091 100644 --- a/packages/flame/lib/src/game/game_widget/game_widget.dart +++ b/packages/flame/lib/src/game/game_widget/game_widget.dart @@ -115,7 +115,7 @@ class GameWidget extends StatefulWidget { /// game.overlays.add('PauseMenu'); /// ``` GameWidget({ - Key? key, + super.key, required T this.game, this.textDirection, this.loadingBuilder, @@ -126,8 +126,7 @@ class GameWidget extends StatefulWidget { this.focusNode, this.autofocus = true, MouseCursor? mouseCursor, - }) : gameFactory = null, - super(key: key) { + }) : gameFactory = null { if (mouseCursor != null) { game!.mouseCursor = mouseCursor; } @@ -157,7 +156,7 @@ class GameWidget extends StatefulWidget { /// ... /// ``` const GameWidget.controlled({ - Key? key, + super.key, required GameFactory this.gameFactory, this.textDirection, this.loadingBuilder, @@ -166,8 +165,7 @@ class GameWidget extends StatefulWidget { this.overlayBuilderMap, this.focusNode, this.autofocus = true, - }) : game = null, - super(key: key); + }) : game = null; /// Renders a [game] in a flutter widget tree alongside widgets overlays. /// diff --git a/packages/flame/lib/src/geometry/circle_component.dart b/packages/flame/lib/src/geometry/circle_component.dart index d7a656ba3..f0e9b89f0 100644 --- a/packages/flame/lib/src/geometry/circle_component.dart +++ b/packages/flame/lib/src/geometry/circle_component.dart @@ -1,5 +1,4 @@ import 'dart:math'; -import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; @@ -13,20 +12,14 @@ class CircleComponent extends ShapeComponent implements SizeProvider { /// the [CircleComponent]. CircleComponent({ double? radius, - Vector2? position, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - Paint? paint, + super.position, + super.angle, + super.anchor, + super.children, + super.priority, + super.paint, }) : super( - position: position, size: Vector2.all((radius ?? 0) * 2), - angle: angle, - anchor: anchor, - children: children, - priority: priority, - paint: paint, ); /// With this constructor you define the [CircleComponent] in relation to the diff --git a/packages/flame/lib/src/geometry/polygon_component.dart b/packages/flame/lib/src/geometry/polygon_component.dart index b1e27cc2e..4e5c7f7bf 100644 --- a/packages/flame/lib/src/geometry/polygon_component.dart +++ b/packages/flame/lib/src/geometry/polygon_component.dart @@ -4,7 +4,6 @@ import 'dart:ui'; import 'package:collection/collection.dart'; import 'package:flame/src/anchor.dart'; import 'package:flame/src/cache/value_cache.dart'; -import 'package:flame/src/components/component.dart'; import 'package:flame/src/extensions/rect.dart'; import 'package:flame/src/extensions/vector2.dart'; import 'package:flame/src/geometry/line_segment.dart'; @@ -32,31 +31,21 @@ class PolygonComponent extends ShapeComponent { /// screen coordinate system). PolygonComponent( this._vertices, { - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - Paint? paint, + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, + super.paint, bool? shrinkToBounds, }) : assert( _vertices.length > 2, 'Number of vertices are too few to create a polygon', ), shrinkToBounds = shrinkToBounds ?? size == null, - manuallyPositioned = position != null, - super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - paint: paint, - ) { + manuallyPositioned = position != null { refreshVertices(newVertices: _vertices); final verticesLength = _vertices.length; diff --git a/packages/flame/lib/src/geometry/shape_component.dart b/packages/flame/lib/src/geometry/shape_component.dart index 21da985de..3b640a07c 100644 --- a/packages/flame/lib/src/geometry/shape_component.dart +++ b/packages/flame/lib/src/geometry/shape_component.dart @@ -10,23 +10,15 @@ abstract class ShapeComponent extends PositionComponent with HasPaint { bool renderShape = true; ShapeComponent({ - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, Paint? paint, - }) : super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ) { + }) { this.paint = paint ?? this.paint; } } diff --git a/packages/flame/lib/src/parallax.dart b/packages/flame/lib/src/parallax.dart index 779d48948..b3109a0e9 100644 --- a/packages/flame/lib/src/parallax.dart +++ b/packages/flame/lib/src/parallax.dart @@ -117,16 +117,11 @@ class ParallaxImage extends ParallaxRenderer { ParallaxImage( this._image, { - ImageRepeat? repeat, - Alignment? alignment, - LayerFill? fill, - FilterQuality? filterQuality, - }) : super( - repeat: repeat, - alignment: alignment, - fill: fill, - filterQuality: filterQuality, - ); + super.repeat, + super.alignment, + super.fill, + super.filterQuality, + }); /// Takes a path of an image, and optionally arguments for how the image /// should repeat ([repeat]), which edge it should align with ([alignment]), @@ -172,14 +167,10 @@ class ParallaxAnimation extends ParallaxRenderer { ParallaxAnimation( this._animation, this._prerenderedFrames, { - ImageRepeat? repeat, - Alignment? alignment, - LayerFill? fill, - }) : super( - repeat: repeat, - alignment: alignment, - fill: fill, - ); + super.repeat, + super.alignment, + super.fill, + }); /// Takes a path of an image, a SpriteAnimationData, and optionally arguments /// for how the image should repeat ([repeat]), which edge it should align diff --git a/packages/flame/lib/src/particles/accelerated_particle.dart b/packages/flame/lib/src/particles/accelerated_particle.dart index 50d3314c7..7a6816800 100644 --- a/packages/flame/lib/src/particles/accelerated_particle.dart +++ b/packages/flame/lib/src/particles/accelerated_particle.dart @@ -26,11 +26,10 @@ class AcceleratedParticle extends CurvedParticle with SingleChildParticle { Vector2? acceleration, Vector2? speed, Vector2? position, - double? lifespan, + super.lifespan, }) : acceleration = acceleration ?? Vector2.zero(), position = position ?? Vector2.zero(), - speed = speed ?? Vector2.zero(), - super(lifespan: lifespan); + speed = speed ?? Vector2.zero(); @override void render(Canvas canvas) { diff --git a/packages/flame/lib/src/particles/animation_particle.dart b/packages/flame/lib/src/particles/animation_particle.dart index 67437af00..81b0f9017 100644 --- a/packages/flame/lib/src/particles/animation_particle.dart +++ b/packages/flame/lib/src/particles/animation_particle.dart @@ -18,11 +18,9 @@ class SpriteAnimationParticle extends Particle { required this.animation, this.size, this.overridePaint, - double? lifespan, + super.lifespan, this.alignAnimationTime = true, - }) : super( - lifespan: lifespan, - ); + }); @override void setLifespan(double lifespan) { diff --git a/packages/flame/lib/src/particles/circle_particle.dart b/packages/flame/lib/src/particles/circle_particle.dart index 7b7ac4205..43b7509a5 100644 --- a/packages/flame/lib/src/particles/circle_particle.dart +++ b/packages/flame/lib/src/particles/circle_particle.dart @@ -12,8 +12,8 @@ class CircleParticle extends Particle { CircleParticle({ required this.paint, this.radius = 10.0, - double? lifespan, - }) : super(lifespan: lifespan); + super.lifespan, + }); @override void render(Canvas c) { diff --git a/packages/flame/lib/src/particles/component_particle.dart b/packages/flame/lib/src/particles/component_particle.dart index bb21b0e35..4323730bc 100644 --- a/packages/flame/lib/src/particles/component_particle.dart +++ b/packages/flame/lib/src/particles/component_particle.dart @@ -13,10 +13,8 @@ class ComponentParticle extends Particle { required this.component, this.size, this.overridePaint, - double? lifespan, - }) : super( - lifespan: lifespan, - ); + super.lifespan, + }); @override void render(Canvas canvas) { diff --git a/packages/flame/lib/src/particles/composed_particle.dart b/packages/flame/lib/src/particles/composed_particle.dart index 79db60233..bcdcd9a41 100644 --- a/packages/flame/lib/src/particles/composed_particle.dart +++ b/packages/flame/lib/src/particles/composed_particle.dart @@ -9,10 +9,8 @@ class ComposedParticle extends Particle { ComposedParticle({ required this.children, - double? lifespan, - }) : super( - lifespan: lifespan, - ); + super.lifespan, + }); @override void setLifespan(double lifespan) { diff --git a/packages/flame/lib/src/particles/computed_particle.dart b/packages/flame/lib/src/particles/computed_particle.dart index 6bbd71d46..b463c8fcb 100644 --- a/packages/flame/lib/src/particles/computed_particle.dart +++ b/packages/flame/lib/src/particles/computed_particle.dart @@ -16,10 +16,8 @@ class ComputedParticle extends Particle { ComputedParticle({ required this.renderer, - double? lifespan, - }) : super( - lifespan: lifespan, - ); + super.lifespan, + }); @override void render(Canvas canvas) { diff --git a/packages/flame/lib/src/particles/curved_particle.dart b/packages/flame/lib/src/particles/curved_particle.dart index d766406c2..f3573b0fa 100644 --- a/packages/flame/lib/src/particles/curved_particle.dart +++ b/packages/flame/lib/src/particles/curved_particle.dart @@ -8,10 +8,8 @@ class CurvedParticle extends Particle { CurvedParticle({ this.curve = Curves.linear, - double? lifespan, - }) : super( - lifespan: lifespan, - ); + super.lifespan, + }); @override double get progress => curve.transform(super.progress); diff --git a/packages/flame/lib/src/particles/image_particle.dart b/packages/flame/lib/src/particles/image_particle.dart index c2cc64e12..d1f181225 100644 --- a/packages/flame/lib/src/particles/image_particle.dart +++ b/packages/flame/lib/src/particles/image_particle.dart @@ -15,8 +15,8 @@ class ImageParticle extends Particle { ImageParticle({ required this.image, Vector2? size, - double? lifespan, - }) : super(lifespan: lifespan) { + super.lifespan, + }) { final srcWidth = image.width.toDouble(); final srcHeight = image.height.toDouble(); final destWidth = size?.x ?? srcWidth; diff --git a/packages/flame/lib/src/particles/moving_particle.dart b/packages/flame/lib/src/particles/moving_particle.dart index 468dc771a..763159a0e 100644 --- a/packages/flame/lib/src/particles/moving_particle.dart +++ b/packages/flame/lib/src/particles/moving_particle.dart @@ -2,7 +2,6 @@ import 'package:flame/extensions.dart'; import 'package:flame/src/components/mixins/single_child_particle.dart'; import 'package:flame/src/particles/curved_particle.dart'; import 'package:flame/src/particles/particle.dart'; -import 'package:flutter/animation.dart'; /// Statically move given child [Particle] by given [Vector2]. /// @@ -18,10 +17,9 @@ class MovingParticle extends CurvedParticle with SingleChildParticle { required this.child, required this.to, Vector2? from, - double? lifespan, - Curve curve = Curves.linear, - }) : from = from ?? Vector2.zero(), - super(lifespan: lifespan, curve: curve); + super.lifespan, + super.curve, + }) : from = from ?? Vector2.zero(); /// Used to avoid creating new [Vector2] objects in [update]. static final _tmpVector = Vector2.zero(); diff --git a/packages/flame/lib/src/particles/paint_particle.dart b/packages/flame/lib/src/particles/paint_particle.dart index 184e9e42a..ca57466f6 100644 --- a/packages/flame/lib/src/particles/paint_particle.dart +++ b/packages/flame/lib/src/particles/paint_particle.dart @@ -25,10 +25,8 @@ class PaintParticle extends CurvedParticle with SingleChildParticle { // Reasonably large rect for most particles this.bounds = const Rect.fromLTRB(-50, -50, 50, 50), - double? lifespan, - }) : super( - lifespan: lifespan, - ); + super.lifespan, + }); @override void render(Canvas canvas) { diff --git a/packages/flame/lib/src/particles/rotating_particle.dart b/packages/flame/lib/src/particles/rotating_particle.dart index 9ee0c1350..32c9532af 100644 --- a/packages/flame/lib/src/particles/rotating_particle.dart +++ b/packages/flame/lib/src/particles/rotating_particle.dart @@ -18,10 +18,8 @@ class RotatingParticle extends CurvedParticle with SingleChildParticle { required this.child, this.from = 0, this.to = 2 * pi, - double? lifespan, - }) : super( - lifespan: lifespan, - ); + super.lifespan, + }); double get angle => lerpDouble(from, to, progress) ?? 0; diff --git a/packages/flame/lib/src/particles/scaled_particle.dart b/packages/flame/lib/src/particles/scaled_particle.dart index a635e985f..dec690e2f 100644 --- a/packages/flame/lib/src/particles/scaled_particle.dart +++ b/packages/flame/lib/src/particles/scaled_particle.dart @@ -15,10 +15,8 @@ class ScaledParticle extends CurvedParticle with SingleChildParticle { ScaledParticle({ required this.child, this.scale = 1.0, - double? lifespan, - }) : super( - lifespan: lifespan, - ); + super.lifespan, + }); @override void render(Canvas canvas) { diff --git a/packages/flame/lib/src/particles/sprite_particle.dart b/packages/flame/lib/src/particles/sprite_particle.dart index 8a72fe64b..4318d58e9 100644 --- a/packages/flame/lib/src/particles/sprite_particle.dart +++ b/packages/flame/lib/src/particles/sprite_particle.dart @@ -17,10 +17,8 @@ class SpriteParticle extends Particle { required this.sprite, this.size, this.overridePaint, - double? lifespan, - }) : super( - lifespan: lifespan, - ); + super.lifespan, + }); @override void render(Canvas canvas) { diff --git a/packages/flame/lib/src/particles/translated_particle.dart b/packages/flame/lib/src/particles/translated_particle.dart index a8db66e31..696480ca6 100644 --- a/packages/flame/lib/src/particles/translated_particle.dart +++ b/packages/flame/lib/src/particles/translated_particle.dart @@ -14,8 +14,8 @@ class TranslatedParticle extends Particle with SingleChildParticle { TranslatedParticle({ required this.child, required this.offset, - double? lifespan, - }) : super(lifespan: lifespan); + super.lifespan, + }); @override void render(Canvas c) { diff --git a/packages/flame/lib/src/widgets/animation_widget.dart b/packages/flame/lib/src/widgets/animation_widget.dart index 9c364137d..48477d339 100644 --- a/packages/flame/lib/src/widgets/animation_widget.dart +++ b/packages/flame/lib/src/widgets/animation_widget.dart @@ -30,11 +30,10 @@ class SpriteAnimationWidget extends StatelessWidget { required SpriteAnimation animation, this.playing = true, this.anchor = Anchor.topLeft, - Key? key, + super.key, }) : _animationFuture = animation, errorBuilder = null, - loadingBuilder = null, - super(key: key); + loadingBuilder = null; /// Loads image from the asset [path] and renders it as a widget. /// @@ -50,13 +49,12 @@ class SpriteAnimationWidget extends StatelessWidget { this.anchor = Anchor.topLeft, this.errorBuilder, this.loadingBuilder, - Key? key, - }) : _animationFuture = SpriteAnimation.load( + super.key, + }) : _animationFuture = SpriteAnimation.load( path, data, images: images, - ), - super(key: key); + ); @override Widget build(BuildContext context) { @@ -91,8 +89,8 @@ class InternalSpriteAnimationWidget extends StatefulWidget { required this.animation, this.playing = true, this.anchor = Anchor.topLeft, - Key? key, - }) : super(key: key); + super.key, + }); @override State createState() => _InternalSpriteAnimationWidgetState(); diff --git a/packages/flame/lib/src/widgets/base_future_builder.dart b/packages/flame/lib/src/widgets/base_future_builder.dart index caabffdbb..336f51911 100644 --- a/packages/flame/lib/src/widgets/base_future_builder.dart +++ b/packages/flame/lib/src/widgets/base_future_builder.dart @@ -13,8 +13,8 @@ class BaseFutureBuilder extends StatelessWidget { required this.builder, this.loadingBuilder, this.errorBuilder, - Key? key, - }) : super(key: key); + super.key, + }); @override Widget build(BuildContext context) { diff --git a/packages/flame/lib/src/widgets/nine_tile_box.dart b/packages/flame/lib/src/widgets/nine_tile_box.dart index 77299ab9e..3febc2ec0 100644 --- a/packages/flame/lib/src/widgets/nine_tile_box.dart +++ b/packages/flame/lib/src/widgets/nine_tile_box.dart @@ -66,11 +66,10 @@ class NineTileBoxWidget extends StatelessWidget { this.height, this.child, this.padding, - Key? key, + super.key, }) : _imageFuture = image, errorBuilder = null, - loadingBuilder = null, - super(key: key); + loadingBuilder = null; /// Loads image from the asset [path] and renders it as a widget. /// @@ -89,9 +88,8 @@ class NineTileBoxWidget extends StatelessWidget { this.padding, this.errorBuilder, this.loadingBuilder, - Key? key, - }) : _imageFuture = (images ?? Flame.images).load(path), - super(key: key); + super.key, + }) : _imageFuture = (images ?? Flame.images).load(path); @override Widget build(BuildContext context) { @@ -134,8 +132,8 @@ class InternalNineTileBox extends StatelessWidget { this.width, this.height, this.padding, - Key? key, - }) : super(key: key); + super.key, + }); @override Widget build(BuildContext context) { diff --git a/packages/flame/lib/src/widgets/sprite_button.dart b/packages/flame/lib/src/widgets/sprite_button.dart index 222593c2a..593921974 100644 --- a/packages/flame/lib/src/widgets/sprite_button.dart +++ b/packages/flame/lib/src/widgets/sprite_button.dart @@ -51,14 +51,13 @@ class SpriteButton extends StatelessWidget { this.srcSize, this.pressedSrcPosition, this.pressedSrcSize, - Key? key, + super.key, }) : _buttonsFuture = [ sprite, pressedSprite, ], errorBuilder = null, - loadingBuilder = null, - super(key: key); + loadingBuilder = null; SpriteButton.future({ required Future sprite, @@ -73,12 +72,11 @@ class SpriteButton extends StatelessWidget { this.pressedSrcSize, this.errorBuilder, this.loadingBuilder, - Key? key, - }) : _buttonsFuture = Future.wait([ + super.key, + }) : _buttonsFuture = Future.wait([ sprite, pressedSprite, - ]), - super(key: key); + ]); /// Loads the images from the asset [path] and [pressedPath] and renders /// it as a widget. @@ -101,8 +99,8 @@ class SpriteButton extends StatelessWidget { this.pressedSrcSize, this.errorBuilder, this.loadingBuilder, - Key? key, - }) : _buttonsFuture = Future.wait([ + super.key, + }) : _buttonsFuture = Future.wait([ Sprite.load( path, srcSize: srcSize, @@ -115,8 +113,7 @@ class SpriteButton extends StatelessWidget { srcPosition: pressedSrcPosition, images: images, ), - ]), - super(key: key); + ]); @override Widget build(BuildContext context) { @@ -157,8 +154,8 @@ class InternalSpriteButton extends StatefulWidget { required this.pressedSprite, this.width = 200, this.height = 50, - Key? key, - }) : super(key: key); + super.key, + }); @override State createState() => _ButtonState(); diff --git a/packages/flame/lib/src/widgets/sprite_widget.dart b/packages/flame/lib/src/widgets/sprite_widget.dart index de5bbb16b..49406bf18 100644 --- a/packages/flame/lib/src/widgets/sprite_widget.dart +++ b/packages/flame/lib/src/widgets/sprite_widget.dart @@ -39,11 +39,10 @@ class SpriteWidget extends StatelessWidget { this.angle = 0, this.srcPosition, this.srcSize, - Key? key, + super.key, }) : _spriteFuture = sprite, errorBuilder = null, - loadingBuilder = null, - super(key: key); + loadingBuilder = null; /// Load the image from the asset [path] and renders it as a widget. /// @@ -60,14 +59,13 @@ class SpriteWidget extends StatelessWidget { this.srcSize, this.errorBuilder, this.loadingBuilder, - Key? key, - }) : _spriteFuture = Sprite.load( + super.key, + }) : _spriteFuture = Sprite.load( path, srcSize: srcSize, srcPosition: srcPosition, images: images, - ), - super(key: key); + ); @override Widget build(BuildContext context) { @@ -102,8 +100,8 @@ class InternalSpriteWidget extends StatelessWidget { required this.sprite, this.anchor = Anchor.topLeft, this.angle = 0, - Key? key, - }) : super(key: key); + super.key, + }); @override Widget build(_) { diff --git a/packages/flame/pubspec.yaml b/packages/flame/pubspec.yaml index 34c4103e6..38e4a0249 100644 --- a/packages/flame/pubspec.yaml +++ b/packages/flame/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.2.0 homepage: https://github.com/flame-engine/flame environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: collection: ^1.15.0 diff --git a/packages/flame/test/components/component_test.dart b/packages/flame/test/components/component_test.dart index 45f00949e..502b8957e 100644 --- a/packages/flame/test/components/component_test.dart +++ b/packages/flame/test/components/component_test.dart @@ -681,8 +681,7 @@ class IntComponent extends Component { } class TwoChildrenComponent extends Component { - TwoChildrenComponent({Iterable? children}) - : super(children: children); + TwoChildrenComponent({super.children}); late final Component child1; late final Component child2; diff --git a/packages/flame/test/components/text_box_component_test.dart b/packages/flame/test/components/text_box_component_test.dart index 7d5920479..e08a27b9e 100644 --- a/packages/flame/test/components/text_box_component_test.dart +++ b/packages/flame/test/components/text_box_component_test.dart @@ -126,11 +126,11 @@ void main() { class _FramedTextBox extends TextBoxComponent { _FramedTextBox({ - required String text, - Anchor? align, - Vector2? position, - Vector2? size, - }) : super(text: text, align: align, position: position, size: size); + required String super.text, + super.align, + super.position, + super.size, + }); final Paint _borderPaint = Paint() ..style = PaintingStyle.stroke diff --git a/packages/flame/test/effects/controllers/speed_effect_controller_test.dart b/packages/flame/test/effects/controllers/speed_effect_controller_test.dart index efece018b..d4187ba31 100644 --- a/packages/flame/test/effects/controllers/speed_effect_controller_test.dart +++ b/packages/flame/test/effects/controllers/speed_effect_controller_test.dart @@ -134,7 +134,7 @@ void main() { } class BadEffect extends Effect implements MeasurableEffect { - BadEffect(EffectController controller) : super(controller); + BadEffect(super.controller); @override void apply(double progress) {} diff --git a/packages/flame/test/effects/effect_test.dart b/packages/flame/test/effects/effect_test.dart index 438aef54a..5504ae527 100644 --- a/packages/flame/test/effects/effect_test.dart +++ b/packages/flame/test/effects/effect_test.dart @@ -5,7 +5,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; class _MyEffect extends Effect { - _MyEffect(EffectController controller) : super(controller); + _MyEffect(super.controller); double x = -1; Function()? onStartCallback; diff --git a/packages/flame/test/effects/transform2d_effect_test.dart b/packages/flame/test/effects/transform2d_effect_test.dart index c9f016bca..3f92f3099 100644 --- a/packages/flame/test/effects/transform2d_effect_test.dart +++ b/packages/flame/test/effects/transform2d_effect_test.dart @@ -5,7 +5,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; class _MyEffect extends Transform2DEffect { - _MyEffect(EffectController controller) : super(controller); + _MyEffect(super.controller); @override void apply(double progress) {} diff --git a/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart b/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart index e9e8fefae..8abbec44b 100644 --- a/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart +++ b/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart @@ -268,21 +268,19 @@ void main() { class _GameWithHasTappableComponents extends FlameGame with HasTappableComponents { - _GameWithHasTappableComponents({Iterable? children}) - : super(children: children); + _GameWithHasTappableComponents({super.children}); } class _GameWithDualTappableComponents extends FlameGame with HasTappableComponents, HasTappablesBridge { - _GameWithDualTappableComponents({Iterable? children}) - : super(children: children); + _GameWithDualTappableComponents({super.children}); } class _TapCallbacksComponent extends PositionComponent with TapCallbacks { _TapCallbacksComponent({ - Iterable? children, - required Vector2 position, - required Vector2 size, + super.children, + required Vector2 super.position, + required Vector2 super.size, void Function(TapDownEvent)? onTapDown, void Function(TapDownEvent)? onLongTapDown, void Function(TapUpEvent)? onTapUp, @@ -290,8 +288,7 @@ class _TapCallbacksComponent extends PositionComponent with TapCallbacks { }) : _onTapDown = onTapDown, _onLongTapDown = onLongTapDown, _onTapUp = onTapUp, - _onTapCancel = onTapCancel, - super(children: children, position: position, size: size); + _onTapCancel = onTapCancel; final void Function(TapDownEvent)? _onTapDown; final void Function(TapDownEvent)? _onLongTapDown; @@ -312,8 +309,7 @@ class _TapCallbacksComponent extends PositionComponent with TapCallbacks { } class _SimpleTapCallbacksComponent extends PositionComponent with TapCallbacks { - _SimpleTapCallbacksComponent({Vector2? size, List? children}) - : super(children: children, size: size); + _SimpleTapCallbacksComponent({super.size}); } class _TappableComponent extends PositionComponent with Tappable { diff --git a/packages/flame/test/game/game_widget/game_widget_controlled_lifecycle_test.dart b/packages/flame/test/game/game_widget/game_widget_controlled_lifecycle_test.dart index 6d674c556..27e614d8f 100644 --- a/packages/flame/test/game/game_widget/game_widget_controlled_lifecycle_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_controlled_lifecycle_test.dart @@ -96,7 +96,7 @@ class _MyApp extends StatelessWidget { class _MyContainer extends StatefulWidget { final List events; - const _MyContainer(this.events, {Key? key}) : super(key: key); + const _MyContainer(this.events); @override State<_MyContainer> createState() => _MyContainerState(); diff --git a/packages/flame/test/game/game_widget/game_widget_keyboard_test.dart b/packages/flame/test/game/game_widget/game_widget_keyboard_test.dart index 1e6aad6e5..ce54a66fa 100644 --- a/packages/flame/test/game/game_widget/game_widget_keyboard_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_keyboard_test.dart @@ -47,7 +47,7 @@ class _HasKeyboardHandlerComponentsGame extends FlameGame class _GamePage extends StatelessWidget { final Widget child; - const _GamePage({Key? key, required this.child}) : super(key: key); + const _GamePage({required this.child}); @override Widget build(BuildContext context) { diff --git a/packages/flame/test/game/game_widget/game_widget_lifecycle_test.dart b/packages/flame/test/game/game_widget/game_widget_lifecycle_test.dart index 2b321ad19..16914e647 100644 --- a/packages/flame/test/game/game_widget/game_widget_lifecycle_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_lifecycle_test.dart @@ -114,7 +114,7 @@ class _MyApp extends StatelessWidget { class _MyContainer extends StatefulWidget { final List events; - const _MyContainer(this.events, {Key? key}) : super(key: key); + const _MyContainer(this.events); @override State<_MyContainer> createState() => _MyContainerState(); diff --git a/packages/flame/test/widgets/loading_widget.dart b/packages/flame/test/widgets/loading_widget.dart new file mode 100644 index 000000000..cff29c099 --- /dev/null +++ b/packages/flame/test/widgets/loading_widget.dart @@ -0,0 +1,10 @@ +import 'package:flutter/cupertino.dart'; + +class LoadingWidget extends StatelessWidget { + const LoadingWidget({super.key}); + + @override + Widget build(BuildContext context) { + return const SizedBox(); + } +} diff --git a/packages/flame/test/widgets/nine_tile_box_widget_test.dart b/packages/flame/test/widgets/nine_tile_box_widget_test.dart index 221bc257a..9e33f8e37 100644 --- a/packages/flame/test/widgets/nine_tile_box_widget_test.dart +++ b/packages/flame/test/widgets/nine_tile_box_widget_test.dart @@ -6,6 +6,8 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'loading_widget.dart'; + Future main() async { final image = await generateImage(); @@ -38,13 +40,13 @@ Future main() async { path: imagePath, tileSize: 10, destTileSize: 10, - loadingBuilder: (_) => const _LoadingWidget(), + loadingBuilder: (_) => const LoadingWidget(), ), ); final futureBuilderFinder = find.byType(FutureBuilder); final nineTileBoxWidgetFinder = find.byType(InternalNineTileBox); - final loadingWidgetFinder = find.byType(_LoadingWidget); + final loadingWidgetFinder = find.byType(LoadingWidget); expect(futureBuilderFinder, findsOneWidget); expect(loadingWidgetFinder, findsOneWidget); @@ -60,12 +62,3 @@ Future main() async { ); }); } - -class _LoadingWidget extends StatelessWidget { - const _LoadingWidget({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return const SizedBox(); - } -} diff --git a/packages/flame/test/widgets/sprite_animation_widget_test.dart b/packages/flame/test/widgets/sprite_animation_widget_test.dart index c8404332b..28d276229 100644 --- a/packages/flame/test/widgets/sprite_animation_widget_test.dart +++ b/packages/flame/test/widgets/sprite_animation_widget_test.dart @@ -5,6 +5,8 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'loading_widget.dart'; + Future main() async { final image = await generateImage(); @@ -43,14 +45,14 @@ Future main() async { SpriteAnimationWidget.asset( path: imagePath, data: spriteAnimationData, - loadingBuilder: (_) => const _LoadingWidget(), + loadingBuilder: (_) => const LoadingWidget(), ), ); final futureBuilderFinder = find.byType(FutureBuilder); final spriteAnimationWidgetFinder = find.byType(InternalSpriteAnimationWidget); - final loadingWidgetFinder = find.byType(_LoadingWidget); + final loadingWidgetFinder = find.byType(LoadingWidget); expect(futureBuilderFinder, findsOneWidget); expect(loadingWidgetFinder, findsOneWidget); @@ -66,12 +68,3 @@ Future main() async { ); }); } - -class _LoadingWidget extends StatelessWidget { - const _LoadingWidget({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return const SizedBox(); - } -} diff --git a/packages/flame/test/widgets/sprite_button_test.dart b/packages/flame/test/widgets/sprite_button_test.dart index 968dbe1a1..ae1b1c83d 100644 --- a/packages/flame/test/widgets/sprite_button_test.dart +++ b/packages/flame/test/widgets/sprite_button_test.dart @@ -4,6 +4,8 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'loading_widget.dart'; + Future main() async { final image = await generateImage(); @@ -47,13 +49,13 @@ Future main() async { width: 100, height: 100, label: const SizedBox(), - loadingBuilder: (_) => const _LoadingWidget(), + loadingBuilder: (_) => const LoadingWidget(), ), ); final futureBuilderFinder = find.byType(FutureBuilder>); final nineTileBoxWidgetFinder = find.byType(InternalSpriteButton); - final loadingWidgetFinder = find.byType(_LoadingWidget); + final loadingWidgetFinder = find.byType(LoadingWidget); expect(futureBuilderFinder, findsOneWidget); expect(loadingWidgetFinder, findsOneWidget); @@ -69,12 +71,3 @@ Future main() async { ); }); } - -class _LoadingWidget extends StatelessWidget { - const _LoadingWidget({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return const SizedBox(); - } -} diff --git a/packages/flame/test/widgets/sprite_widget_test.dart b/packages/flame/test/widgets/sprite_widget_test.dart index 01f1c966e..4f51896e3 100644 --- a/packages/flame/test/widgets/sprite_widget_test.dart +++ b/packages/flame/test/widgets/sprite_widget_test.dart @@ -4,6 +4,8 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'loading_widget.dart'; + Future main() async { final image = await generateImage(); @@ -29,13 +31,13 @@ Future main() async { await tester.pumpWidget( SpriteWidget.asset( path: imagePath, - loadingBuilder: (_) => const _LoadingWidget(), + loadingBuilder: (_) => const LoadingWidget(), ), ); final futureBuilderFinder = find.byType(FutureBuilder); final spriteWidgetFinder = find.byType(InternalSpriteWidget); - final loadingWidgetFinder = find.byType(_LoadingWidget); + final loadingWidgetFinder = find.byType(LoadingWidget); expect(futureBuilderFinder, findsOneWidget); expect(loadingWidgetFinder, findsOneWidget); @@ -51,12 +53,3 @@ Future main() async { ); }); } - -class _LoadingWidget extends StatelessWidget { - const _LoadingWidget({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return const SizedBox(); - } -} diff --git a/packages/flame_audio/example/pubspec.yaml b/packages/flame_audio/example/pubspec.yaml index 072a3eef7..3028c80db 100644 --- a/packages/flame_audio/example/pubspec.yaml +++ b/packages/flame_audio/example/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flame: ^1.2.0 diff --git a/packages/flame_audio/pubspec.yaml b/packages/flame_audio/pubspec.yaml index 0dad5def5..486ccd5aa 100644 --- a/packages/flame_audio/pubspec.yaml +++ b/packages/flame_audio/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.1.0 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_audio environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: audioplayers: ^0.20.1 diff --git a/packages/flame_bloc/example/lib/main.dart b/packages/flame_bloc/example/lib/main.dart index f92be3feb..d39087361 100644 --- a/packages/flame_bloc/example/lib/main.dart +++ b/packages/flame_bloc/example/lib/main.dart @@ -6,7 +6,7 @@ void main() { } class MyApp extends StatelessWidget { - const MyApp({Key? key}) : super(key: key); + const MyApp({super.key}); @override Widget build(BuildContext context) { diff --git a/packages/flame_bloc/example/lib/src/game.dart b/packages/flame_bloc/example/lib/src/game.dart index 643a4874f..c1d6c8f97 100644 --- a/packages/flame_bloc/example/lib/src/game.dart +++ b/packages/flame_bloc/example/lib/src/game.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; class GamePage extends StatelessWidget { - const GamePage({Key? key}) : super(key: key); + const GamePage({super.key}); @override Widget build(BuildContext context) { @@ -25,7 +25,7 @@ class GamePage extends StatelessWidget { } class GameView extends StatelessWidget { - const GameView({Key? key}) : super(key: key); + const GameView({super.key}); @override Widget build(BuildContext context) { @@ -46,7 +46,7 @@ class GameView extends StatelessWidget { } class Game extends StatelessWidget { - const Game({Key? key}) : super(key: key); + const Game({super.key}); @override Widget build(BuildContext context) { diff --git a/packages/flame_bloc/example/lib/src/game_stats/view/game_stat.dart b/packages/flame_bloc/example/lib/src/game_stats/view/game_stat.dart index e8efb7529..3e755866b 100644 --- a/packages/flame_bloc/example/lib/src/game_stats/view/game_stat.dart +++ b/packages/flame_bloc/example/lib/src/game_stats/view/game_stat.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; class GameStat extends StatelessWidget { - const GameStat({Key? key}) : super(key: key); + const GameStat({super.key}); @override Widget build(BuildContext context) { diff --git a/packages/flame_bloc/example/lib/src/inventory/view/inventory.dart b/packages/flame_bloc/example/lib/src/inventory/view/inventory.dart index b7116cb34..86669680f 100644 --- a/packages/flame_bloc/example/lib/src/inventory/view/inventory.dart +++ b/packages/flame_bloc/example/lib/src/inventory/view/inventory.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; class Inventory extends StatelessWidget { - const Inventory({Key? key}) : super(key: key); + const Inventory({super.key}); Color _mapWeaponColor(Weapon weapon) { switch (weapon) { diff --git a/packages/flame_bloc/example/pubspec.yaml b/packages/flame_bloc/example/pubspec.yaml index acdcc6459..374c6137f 100644 --- a/packages/flame_bloc/example/pubspec.yaml +++ b/packages/flame_bloc/example/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: equatable: ^2.0.3 diff --git a/packages/flame_bloc/lib/src/flame_bloc_game.dart b/packages/flame_bloc/lib/src/flame_bloc_game.dart index 93b9d71bd..0304d68e5 100644 --- a/packages/flame_bloc/lib/src/flame_bloc_game.dart +++ b/packages/flame_bloc/lib/src/flame_bloc_game.dart @@ -139,5 +139,5 @@ class FlameBlocGame extends FlameGame with FlameBloc { /// FlameBlocGame constructor with an optional [Camera] as a parameter to /// FlameGame. @Deprecated('Use FlameBlocProvider and FlameBlocListener instead') - FlameBlocGame({Camera? camera}) : super(camera: camera); + FlameBlocGame({super.camera}); } diff --git a/packages/flame_bloc/pubspec.yaml b/packages/flame_bloc/pubspec.yaml index 25ff25431..3d426aa4b 100644 --- a/packages/flame_bloc/pubspec.yaml +++ b/packages/flame_bloc/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.5.0 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_bloc environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: bloc: ^8.0.2 diff --git a/packages/flame_fire_atlas/example/pubspec.yaml b/packages/flame_fire_atlas/example/pubspec.yaml index 1b530207e..122cc7e57 100644 --- a/packages/flame_fire_atlas/example/pubspec.yaml +++ b/packages/flame_fire_atlas/example/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flame: ^1.2.0 diff --git a/packages/flame_fire_atlas/pubspec.yaml b/packages/flame_fire_atlas/pubspec.yaml index ac96bb7cb..fc16f7c63 100644 --- a/packages/flame_fire_atlas/pubspec.yaml +++ b/packages/flame_fire_atlas/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.1.0 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_fire_atlas environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: archive: ^3.1.5 diff --git a/packages/flame_flare/example/pubspec.yaml b/packages/flame_flare/example/pubspec.yaml index 5b96d7968..aca940f88 100644 --- a/packages/flame_flare/example/pubspec.yaml +++ b/packages/flame_flare/example/pubspec.yaml @@ -4,8 +4,8 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: diff --git a/packages/flame_flare/lib/src/flare_actor_component.dart b/packages/flame_flare/lib/src/flare_actor_component.dart index 8e531b8b6..b779a8400 100644 --- a/packages/flame_flare/lib/src/flare_actor_component.dart +++ b/packages/flame_flare/lib/src/flare_actor_component.dart @@ -8,9 +8,9 @@ class FlareActorComponent extends PositionComponent { FlareActorComponent( this.flareAnimation, { - required Vector2 size, - Vector2? position, - }) : super(position: position, size: size); + required Vector2 super.size, + super.position, + }); @override void onMount() { diff --git a/packages/flame_flare/lib/src/flare_particle.dart b/packages/flame_flare/lib/src/flare_particle.dart index 88e6b5079..0d05889ef 100644 --- a/packages/flame_flare/lib/src/flare_particle.dart +++ b/packages/flame_flare/lib/src/flare_particle.dart @@ -12,9 +12,9 @@ class FlareParticle extends Particle { FlareParticle({ required this.flareAnimation, - double? lifespan, + super.lifespan, required this.size, - }) : super(lifespan: lifespan) { + }) { flareAnimation.init(); } diff --git a/packages/flame_flare/pubspec.yaml b/packages/flame_flare/pubspec.yaml index ec19ed1c2..dd16161fb 100644 --- a/packages/flame_flare/pubspec.yaml +++ b/packages/flame_flare/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.2.0 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_flare environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/packages/flame_forge2d/example/pubspec.yaml b/packages/flame_forge2d/example/pubspec.yaml index cac548fd9..1beddb26b 100644 --- a/packages/flame_forge2d/example/pubspec.yaml +++ b/packages/flame_forge2d/example/pubspec.yaml @@ -6,8 +6,8 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: dashbook: ^0.1.6 diff --git a/packages/flame_forge2d/lib/body_component.dart b/packages/flame_forge2d/lib/body_component.dart index 1797a7c17..2552db0aa 100644 --- a/packages/flame_forge2d/lib/body_component.dart +++ b/packages/flame_forge2d/lib/body_component.dart @@ -14,10 +14,10 @@ abstract class BodyComponent extends Component with HasGameRef, HasPaint { BodyComponent({ Paint? paint, - Iterable? children, - int? priority, + super.children, + super.priority, this.renderBody = true, - }) : super(children: children, priority: priority) { + }) { this.paint = paint ?? (Paint()..color = defaultColor); } diff --git a/packages/flame_forge2d/pubspec.yaml b/packages/flame_forge2d/pubspec.yaml index a197ea6bd..9ff977005 100644 --- a/packages/flame_forge2d/pubspec.yaml +++ b/packages/flame_forge2d/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.12.0 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_forge2d environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/packages/flame_lint/lib/analysis_options.yaml b/packages/flame_lint/lib/analysis_options.yaml index bc4ac9119..3d6de1cc7 100644 --- a/packages/flame_lint/lib/analysis_options.yaml +++ b/packages/flame_lint/lib/analysis_options.yaml @@ -142,6 +142,7 @@ linter: - unnecessary_this - unrelated_type_equality_checks - unsafe_html + - use_enums - use_full_hex_values_for_flutter_colors - use_function_type_syntax_for_parameters - use_if_null_to_convert_nulls_to_bools @@ -151,6 +152,7 @@ linter: - use_named_constants - use_raw_strings - use_rethrow_when_possible + - use_super_parameters - use_test_throws_matchers - valid_regexps - void_checks diff --git a/packages/flame_lint/pubspec.yaml b/packages/flame_lint/pubspec.yaml index 6c6b05c10..51b370a91 100644 --- a/packages/flame_lint/pubspec.yaml +++ b/packages/flame_lint/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_lint publish_to: 'none' environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dev_dependencies: dartdoc: ^5.0.1 diff --git a/packages/flame_oxygen/example/pubspec.yaml b/packages/flame_oxygen/example/pubspec.yaml index beeaea3a2..f4f675127 100644 --- a/packages/flame_oxygen/example/pubspec.yaml +++ b/packages/flame_oxygen/example/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flame: ^1.2.0 diff --git a/packages/flame_oxygen/pubspec.yaml b/packages/flame_oxygen/pubspec.yaml index 3105d7588..a90157876 100644 --- a/packages/flame_oxygen/pubspec.yaml +++ b/packages/flame_oxygen/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.3 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_oxygen environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/packages/flame_rive/example/lib/main.dart b/packages/flame_rive/example/lib/main.dart index 3d9dacd6f..247a0bcf0 100644 --- a/packages/flame_rive/example/lib/main.dart +++ b/packages/flame_rive/example/lib/main.dart @@ -10,7 +10,7 @@ void main() { } class MyApp extends StatefulWidget { - const MyApp({Key? key}) : super(key: key); + const MyApp({super.key}); @override State createState() => _MyAppState(); diff --git a/packages/flame_rive/example/pubspec.yaml b/packages/flame_rive/example/pubspec.yaml index e01b39b8e..acebc1fe6 100644 --- a/packages/flame_rive/example/pubspec.yaml +++ b/packages/flame_rive/example/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flame: ^1.2.0 diff --git a/packages/flame_rive/lib/src/rive_component.dart b/packages/flame_rive/lib/src/rive_component.dart index 2dcadb16b..1f11817fe 100644 --- a/packages/flame_rive/lib/src/rive_component.dart +++ b/packages/flame_rive/lib/src/rive_component.dart @@ -22,28 +22,19 @@ class RiveComponent extends PositionComponent { Alignment alignment = Alignment.center, // position component arguments - Vector2? position, - Vector2? size, - Vector2? scale, - double angle = 0.0, - Anchor anchor = Anchor.topLeft, - Iterable? children, - int? priority, - }) : _renderer = RiveArtboardRenderer( + super.position, + super.size, + super.scale, + double super.angle = 0.0, + Anchor super.anchor = Anchor.topLeft, + super.children, + super.priority, + }) : _renderer = RiveArtboardRenderer( antialiasing: antialiasing, useArtboardSize: useArtboardSize, fit: fit, alignment: alignment, artboard: artboard, - ), - super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, ); @override diff --git a/packages/flame_rive/pubspec.yaml b/packages/flame_rive/pubspec.yaml index e80927bc2..e1276848e 100644 --- a/packages/flame_rive/pubspec.yaml +++ b/packages/flame_rive/pubspec.yaml @@ -4,8 +4,8 @@ homepage: https://github.com/flame-engine/flame version: 1.3.0 environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/packages/flame_svg/example/pubspec.yaml b/packages/flame_svg/example/pubspec.yaml index 391a4d9e5..b17f09db0 100644 --- a/packages/flame_svg/example/pubspec.yaml +++ b/packages/flame_svg/example/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flame: ^1.2.0 diff --git a/packages/flame_svg/lib/svg_component.dart b/packages/flame_svg/lib/svg_component.dart index f4329ab8a..1f6444c9e 100644 --- a/packages/flame_svg/lib/svg_component.dart +++ b/packages/flame_svg/lib/svg_component.dart @@ -11,23 +11,14 @@ class SvgComponent extends PositionComponent { /// Creates an [SvgComponent] SvgComponent({ Svg? svg, - Vector2? position, - Vector2? size, - Vector2? scale, - double? angle, - Anchor? anchor, - Iterable? children, - int? priority, - }) : _svg = svg, - super( - position: position, - size: size, - scale: scale, - angle: angle, - anchor: anchor, - children: children, - priority: priority, - ); + super.position, + super.size, + super.scale, + super.angle, + super.anchor, + super.children, + super.priority, + }) : _svg = svg; set svg(Svg? svg) { _svg?.dispose(); diff --git a/packages/flame_svg/pubspec.yaml b/packages/flame_svg/pubspec.yaml index 9b01ffd22..2b7f28a17 100644 --- a/packages/flame_svg/pubspec.yaml +++ b/packages/flame_svg/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.3.0 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_svg environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/packages/flame_test/example/lib/game.dart b/packages/flame_test/example/lib/game.dart index 6949136bf..120567e67 100644 --- a/packages/flame_test/example/lib/game.dart +++ b/packages/flame_test/example/lib/game.dart @@ -3,7 +3,7 @@ import 'package:flame/game.dart'; import 'package:flutter/material.dart'; class MyGameWidget extends StatelessWidget { - const MyGameWidget({Key? key}) : super(key: key); + const MyGameWidget({super.key}); @override Widget build(BuildContext context) { diff --git a/packages/flame_test/example/pubspec.yaml b/packages/flame_test/example/pubspec.yaml index 50d49749f..2ca3ad5e7 100644 --- a/packages/flame_test/example/pubspec.yaml +++ b/packages/flame_test/example/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flame: ^1.2.0 diff --git a/packages/flame_test/lib/src/flame_test.dart b/packages/flame_test/lib/src/flame_test.dart index 3a1d45ae2..5ed48ce76 100644 --- a/packages/flame_test/lib/src/flame_test.dart +++ b/packages/flame_test/lib/src/flame_test.dart @@ -219,16 +219,11 @@ class GameTester { /// custom [gameSize]. class FlameTester extends GameTester { FlameTester( - GameCreateFunction createGame, { - Vector2? gameSize, - GameWidgetCreateFunction? createGameWidget, - PumpWidgetFunction? pumpWidget, - }) : super( - createGame, - gameSize: gameSize, - createGameWidget: createGameWidget, - pumpWidget: pumpWidget, - ); + super.createGame, { + super.gameSize, + super.createGameWidget, + super.pumpWidget, + }); } /// Default instance of Flame Tester to be used when you don't care about diff --git a/packages/flame_test/pubspec.yaml b/packages/flame_test/pubspec.yaml index 628f4e2df..ecec39801 100644 --- a/packages/flame_test/pubspec.yaml +++ b/packages/flame_test/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.5.0 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_test environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: flame: ^1.2.0 diff --git a/packages/flame_tiled/example/pubspec.yaml b/packages/flame_tiled/example/pubspec.yaml index e573e09a8..774c78da2 100644 --- a/packages/flame_tiled/example/pubspec.yaml +++ b/packages/flame_tiled/example/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.16.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flame: ^1.2.0 diff --git a/packages/flame_tiled/lib/src/tiled_component.dart b/packages/flame_tiled/lib/src/tiled_component.dart index 2ff921445..a9ec90973 100644 --- a/packages/flame_tiled/lib/src/tiled_component.dart +++ b/packages/flame_tiled/lib/src/tiled_component.dart @@ -17,9 +17,9 @@ class TiledComponent extends Component { /// {@macro _tiled_component} TiledComponent( this.tileMap, { - Iterable? children, - int? priority, - }) : super(children: children, priority: priority); + super.children, + super.priority, + }); @override void render(Canvas canvas) { diff --git a/packages/flame_tiled/pubspec.yaml b/packages/flame_tiled/pubspec.yaml index 404fb9e1c..9491b8c1b 100644 --- a/packages/flame_tiled/pubspec.yaml +++ b/packages/flame_tiled/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.5.0 homepage: https://github.com/flame-engine/flame/tree/main/packages/flame_tiled environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ^3.0.0 dependencies: collection: ^1.15.0 diff --git a/tutorials/space_shooter/lib/steps/1_getting_started/1_flame_game/code.dart b/tutorials/space_shooter/lib/steps/1_getting_started/1_flame_game/code.dart index 672bfa7a7..f06ff1c0f 100644 --- a/tutorials/space_shooter/lib/steps/1_getting_started/1_flame_game/code.dart +++ b/tutorials/space_shooter/lib/steps/1_getting_started/1_flame_game/code.dart @@ -25,7 +25,7 @@ class SpaceShooterGame extends FlameGame { } class MyGame extends StatelessWidget { - const MyGame({Key? key}) : super(key: key); + const MyGame({super.key}); @override Widget build(BuildContext context) { diff --git a/tutorials/space_shooter/lib/steps/1_getting_started/1_flame_game/step.dart b/tutorials/space_shooter/lib/steps/1_getting_started/1_flame_game/step.dart index 2c52d8ff6..27ab8f972 100644 --- a/tutorials/space_shooter/lib/steps/1_getting_started/1_flame_game/step.dart +++ b/tutorials/space_shooter/lib/steps/1_getting_started/1_flame_game/step.dart @@ -4,7 +4,7 @@ import 'package:tutorials_space_shooter/steps/1_getting_started/1_flame_game/tut import 'package:tutorials_space_shooter/widgets/step_scaffold.dart'; class RunningFlameStep extends StatelessWidget { - const RunningFlameStep({Key? key}) : super(key: key); + const RunningFlameStep({super.key}); @override Widget build(BuildContext context) { diff --git a/tutorials/space_shooter/lib/steps/1_getting_started/2_input_and_graphics/code.dart b/tutorials/space_shooter/lib/steps/1_getting_started/2_input_and_graphics/code.dart index 579d094bc..28c58dd03 100644 --- a/tutorials/space_shooter/lib/steps/1_getting_started/2_input_and_graphics/code.dart +++ b/tutorials/space_shooter/lib/steps/1_getting_started/2_input_and_graphics/code.dart @@ -36,7 +36,7 @@ class SpaceShooterGame extends FlameGame with PanDetector { } class MyGame extends StatelessWidget { - const MyGame({Key? key}) : super(key: key); + const MyGame({super.key}); @override Widget build(BuildContext context) { diff --git a/tutorials/space_shooter/lib/steps/1_getting_started/2_input_and_graphics/step.dart b/tutorials/space_shooter/lib/steps/1_getting_started/2_input_and_graphics/step.dart index 7f3ac98b8..fed724b60 100644 --- a/tutorials/space_shooter/lib/steps/1_getting_started/2_input_and_graphics/step.dart +++ b/tutorials/space_shooter/lib/steps/1_getting_started/2_input_and_graphics/step.dart @@ -4,7 +4,7 @@ import 'package:tutorials_space_shooter/steps/1_getting_started/2_input_and_grap import 'package:tutorials_space_shooter/widgets/step_scaffold.dart'; class InputAndGraphicsStep extends StatelessWidget { - const InputAndGraphicsStep({Key? key}) : super(key: key); + const InputAndGraphicsStep({super.key}); @override Widget build(BuildContext context) { diff --git a/tutorials/space_shooter/lib/widgets/code_block.dart b/tutorials/space_shooter/lib/widgets/code_block.dart index c0806997d..7b31639d7 100644 --- a/tutorials/space_shooter/lib/widgets/code_block.dart +++ b/tutorials/space_shooter/lib/widgets/code_block.dart @@ -7,7 +7,7 @@ import 'package:flutter_highlight/themes/github.dart'; class CodeBlock extends StatelessWidget { final String value; - const CodeBlock({Key? key, required this.value}) : super(key: key); + const CodeBlock({super.key, required this.value}); @override Widget build(BuildContext context) { diff --git a/tutorials/space_shooter/lib/widgets/step_scaffold.dart b/tutorials/space_shooter/lib/widgets/step_scaffold.dart index 008332805..88c082f9c 100644 --- a/tutorials/space_shooter/lib/widgets/step_scaffold.dart +++ b/tutorials/space_shooter/lib/widgets/step_scaffold.dart @@ -9,10 +9,10 @@ class StepScaffold extends StatelessWidget { final Widget game; const StepScaffold({ - Key? key, + super.key, required this.tutorial, required this.game, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/tutorials/space_shooter/pubspec.yaml b/tutorials/space_shooter/pubspec.yaml index 7958e54b5..7df0da629 100644 --- a/tutorials/space_shooter/pubspec.yaml +++ b/tutorials/space_shooter/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: dashbook: ^0.1.5