diff --git a/examples/lib/commons/ember.dart b/examples/lib/commons/ember.dart index d24a263e0..ff1821497 100644 --- a/examples/lib/commons/ember.dart +++ b/examples/lib/commons/ember.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/effects.dart'; import 'package:flame/game.dart'; class Ember extends SpriteAnimationComponent 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 4cda5b9c0..c41f1cbf0 100644 --- a/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart +++ b/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart @@ -6,7 +6,6 @@ import 'package:flame/input.dart'; import 'package:flame/palette.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter/widgets.dart'; /// A game that allows for camera control and displays Tap, Drag & Scroll /// events information on the screen, to allow exploration of the 3 coordinate diff --git a/examples/lib/stories/collision_detection/circles_example.dart b/examples/lib/stories/collision_detection/circles_example.dart index 8966e1700..5ba2856e8 100644 --- a/examples/lib/stories/collision_detection/circles_example.dart +++ b/examples/lib/stories/collision_detection/circles_example.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; diff --git a/examples/lib/stories/collision_detection/collidable_animation_example.dart b/examples/lib/stories/collision_detection/collidable_animation_example.dart index bc5be3365..2b5ab3921 100644 --- a/examples/lib/stories/collision_detection/collidable_animation_example.dart +++ b/examples/lib/stories/collision_detection/collidable_animation_example.dart @@ -2,11 +2,9 @@ import 'dart:math'; import 'dart:ui'; import 'package:flame/components.dart'; -import 'package:flame/effects.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; -import 'package:flame/input.dart'; import 'package:flame/palette.dart'; class CollidableAnimationExample extends FlameGame with HasCollidables { diff --git a/examples/lib/stories/collision_detection/multiple_shapes_example.dart b/examples/lib/stories/collision_detection/multiple_shapes_example.dart index b3aeb2074..75cdd57c7 100644 --- a/examples/lib/stories/collision_detection/multiple_shapes_example.dart +++ b/examples/lib/stories/collision_detection/multiple_shapes_example.dart @@ -1,12 +1,10 @@ import 'dart:math'; -import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/input.dart'; -import 'package:flame/palette.dart'; import 'package:flutter/material.dart' hide Image, Draggable; enum Shapes { circle, rectangle, polygon } diff --git a/examples/lib/stories/collision_detection/simple_shapes_example.dart b/examples/lib/stories/collision_detection/simple_shapes_example.dart index fee4f484e..3db8b9338 100644 --- a/examples/lib/stories/collision_detection/simple_shapes_example.dart +++ b/examples/lib/stories/collision_detection/simple_shapes_example.dart @@ -3,7 +3,6 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/input.dart'; diff --git a/examples/lib/stories/components/composability_example.dart b/examples/lib/stories/components/composability_example.dart index 9f4a23be7..0fe70e67a 100644 --- a/examples/lib/stories/components/composability_example.dart +++ b/examples/lib/stories/components/composability_example.dart @@ -1,6 +1,5 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flame/input.dart'; import 'package:flame/palette.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/examples/lib/stories/components/debug_example.dart b/examples/lib/stories/components/debug_example.dart index 17456ffbf..25da04c8d 100644 --- a/examples/lib/stories/components/debug_example.dart +++ b/examples/lib/stories/components/debug_example.dart @@ -1,5 +1,3 @@ -import 'dart:ui' hide TextStyle; - import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart'; diff --git a/examples/lib/stories/effects/scale_effect_example.dart b/examples/lib/stories/effects/scale_effect_example.dart index cc0c679c3..d280936cb 100644 --- a/examples/lib/stories/effects/scale_effect_example.dart +++ b/examples/lib/stories/effects/scale_effect_example.dart @@ -1,6 +1,5 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; diff --git a/examples/lib/stories/effects/size_effect_example.dart b/examples/lib/stories/effects/size_effect_example.dart index 7029718fd..d823cf077 100644 --- a/examples/lib/stories/effects/size_effect_example.dart +++ b/examples/lib/stories/effects/size_effect_example.dart @@ -2,7 +2,6 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; diff --git a/examples/lib/stories/input/draggables_example.dart b/examples/lib/stories/input/draggables_example.dart index dc43a6364..e95f04902 100644 --- a/examples/lib/stories/input/draggables_example.dart +++ b/examples/lib/stories/input/draggables_example.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flutter/material.dart' show Colors; diff --git a/examples/lib/stories/input/joystick_advanced_example.dart b/examples/lib/stories/input/joystick_advanced_example.dart index ad729d03e..88ed85ab8 100644 --- a/examples/lib/stories/input/joystick_advanced_example.dart +++ b/examples/lib/stories/input/joystick_advanced_example.dart @@ -2,14 +2,11 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; import 'package:flame/sprite.dart'; -import 'package:flutter/animation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/painting.dart'; import 'joystick_player.dart'; diff --git a/examples/lib/stories/input/joystick_example.dart b/examples/lib/stories/input/joystick_example.dart index 92babfbbb..a4b0d4bbc 100644 --- a/examples/lib/stories/input/joystick_example.dart +++ b/examples/lib/stories/input/joystick_example.dart @@ -1,6 +1,5 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flame/input.dart'; import 'package:flame/palette.dart'; import 'package:flutter/painting.dart'; diff --git a/examples/lib/stories/input/joystick_player.dart b/examples/lib/stories/input/joystick_player.dart index 2c24c7d1d..f1016a9bf 100644 --- a/examples/lib/stories/input/joystick_player.dart +++ b/examples/lib/stories/input/joystick_player.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/game.dart'; class JoystickPlayer extends SpriteComponent with HasGameRef { /// Pixels/s diff --git a/examples/lib/stories/input/keyboard_example.dart b/examples/lib/stories/input/keyboard_example.dart index 6df6efed3..40dd1adc3 100644 --- a/examples/lib/stories/input/keyboard_example.dart +++ b/examples/lib/stories/input/keyboard_example.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; diff --git a/examples/lib/stories/input/multitap_advanced_example.dart b/examples/lib/stories/input/multitap_advanced_example.dart index 19515c199..9e6035cf2 100644 --- a/examples/lib/stories/input/multitap_advanced_example.dart +++ b/examples/lib/stories/input/multitap_advanced_example.dart @@ -2,7 +2,6 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; /// Showcases how to mix two advanced detectors class MultitapAdvancedExample extends FlameGame diff --git a/examples/lib/stories/input/multitap_example.dart b/examples/lib/stories/input/multitap_example.dart index 2a1d4c5b5..66e8bc167 100644 --- a/examples/lib/stories/input/multitap_example.dart +++ b/examples/lib/stories/input/multitap_example.dart @@ -2,7 +2,6 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; /// Includes an example including advanced detectors class MultitapExample extends FlameGame with MultiTouchTapDetector { diff --git a/examples/lib/stories/input/scroll_example.dart b/examples/lib/stories/input/scroll_example.dart index 0c65d69d5..cea8e2886 100644 --- a/examples/lib/stories/input/scroll_example.dart +++ b/examples/lib/stories/input/scroll_example.dart @@ -2,7 +2,6 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; class ScrollExample extends FlameGame with ScrollDetector { static const String description = ''' diff --git a/examples/lib/stories/parallax/no_fcs_parallax_example.dart b/examples/lib/stories/parallax/no_fcs_parallax_example.dart index d1bca73f7..c13b32b3f 100644 --- a/examples/lib/stories/parallax/no_fcs_parallax_example.dart +++ b/examples/lib/stories/parallax/no_fcs_parallax_example.dart @@ -1,8 +1,6 @@ -import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/parallax.dart'; -import 'package:flutter/material.dart'; class NoFCSParallaxExample with Loadable, Game { static const String description = ''' diff --git a/examples/lib/stories/rendering/flip_sprite_example.dart b/examples/lib/stories/rendering/flip_sprite_example.dart index 612b5e1c2..eec97c841 100644 --- a/examples/lib/stories/rendering/flip_sprite_example.dart +++ b/examples/lib/stories/rendering/flip_sprite_example.dart @@ -1,4 +1,3 @@ -import 'package:flame/components.dart'; import 'package:flame/game.dart'; import '../../commons/ember.dart'; diff --git a/examples/lib/stories/rendering/isometric_tile_map_example.dart b/examples/lib/stories/rendering/isometric_tile_map_example.dart index ca145a83d..c8e03894f 100644 --- a/examples/lib/stories/rendering/isometric_tile_map_example.dart +++ b/examples/lib/stories/rendering/isometric_tile_map_example.dart @@ -5,7 +5,6 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/sprite.dart'; -import 'package:flutter/material.dart' hide Image; class IsometricTileMapExample extends FlameGame with MouseMovementDetector { static const String description = ''' diff --git a/examples/lib/stories/rendering/particles_example.dart b/examples/lib/stories/rendering/particles_example.dart index 3ad9cb487..4f353e2f9 100644 --- a/examples/lib/stories/rendering/particles_example.dart +++ b/examples/lib/stories/rendering/particles_example.dart @@ -1,6 +1,5 @@ import 'dart:async'; import 'dart:math'; -import 'dart:ui'; import 'package:flame/components.dart' hide Timer; import 'package:flame/game.dart'; diff --git a/examples/lib/stories/rendering/text_example.dart b/examples/lib/stories/rendering/text_example.dart index 04badb9fc..10e806b72 100644 --- a/examples/lib/stories/rendering/text_example.dart +++ b/examples/lib/stories/rendering/text_example.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; diff --git a/examples/lib/stories/system/without_flamegame_example.dart b/examples/lib/stories/system/without_flamegame_example.dart index 85c5942d1..d51e6b50c 100644 --- a/examples/lib/stories/system/without_flamegame_example.dart +++ b/examples/lib/stories/system/without_flamegame_example.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; diff --git a/examples/lib/stories/widgets/partial_sprite_widget_example.dart b/examples/lib/stories/widgets/partial_sprite_widget_example.dart index 70fe889b0..7e240345f 100644 --- a/examples/lib/stories/widgets/partial_sprite_widget_example.dart +++ b/examples/lib/stories/widgets/partial_sprite_widget_example.dart @@ -2,7 +2,6 @@ import 'package:dashbook/dashbook.dart'; import 'package:flame/extensions.dart'; import 'package:flame/widgets.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; final anchorOptions = Anchor.values.map((e) => e.name).toList(); diff --git a/examples/lib/stories/widgets/sprite_animation_widget_example.dart b/examples/lib/stories/widgets/sprite_animation_widget_example.dart index 8ad5bae6d..9f7521343 100644 --- a/examples/lib/stories/widgets/sprite_animation_widget_example.dart +++ b/examples/lib/stories/widgets/sprite_animation_widget_example.dart @@ -1,6 +1,5 @@ import 'package:dashbook/dashbook.dart'; import 'package:flame/extensions.dart'; -import 'package:flame/sprite.dart'; import 'package:flame/widgets.dart'; import 'package:flutter/widgets.dart'; diff --git a/examples/lib/stories/widgets/sprite_widget_example.dart b/examples/lib/stories/widgets/sprite_widget_example.dart index 4c5b412d6..ec3ec330d 100644 --- a/examples/lib/stories/widgets/sprite_widget_example.dart +++ b/examples/lib/stories/widgets/sprite_widget_example.dart @@ -3,7 +3,6 @@ import 'dart:math'; import 'package:dashbook/dashbook.dart'; import 'package:flame/widgets.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; final anchorOptions = Anchor.values.map((e) => e.name).toList(); diff --git a/packages/flame/example/lib/main.dart b/packages/flame/example/lib/main.dart index 5425bcccf..1a77e65b4 100644 --- a/packages/flame/example/lib/main.dart +++ b/packages/flame/example/lib/main.dart @@ -1,8 +1,6 @@ import 'dart:math' as math; -import 'dart:ui'; import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; diff --git a/packages/flame/lib/src/assets/images.dart b/packages/flame/lib/src/assets/images.dart index f4671fae1..1ef8940a1 100644 --- a/packages/flame/lib/src/assets/images.dart +++ b/packages/flame/lib/src/assets/images.dart @@ -72,11 +72,12 @@ class Images { /// Convert an array of pixel values into an [Image] object. /// /// The [pixels] parameter is the pixel data in the encoding described by - /// [PixelFormat.rgba8888], the encoding can't be changed to allow for web support. + /// [PixelFormat.rgba8888], the encoding can't be changed to allow for web + /// support. /// /// If you want the image to be decoded as it would be on the web you can set - /// [runAsWeb] to `true`. Keep in mind that it is slightly slower than the native - /// [ui.decodeImageFromPixels]. By default it is set to [kIsWeb]. + /// [runAsWeb] to `true`. Keep in mind that it is slightly slower than the + /// native [ui.decodeImageFromPixels]. By default it is set to [kIsWeb]. Future decodeImageFromPixels( Uint8List pixels, int width, diff --git a/packages/flame/lib/src/components/component.dart b/packages/flame/lib/src/components/component.dart index bde0eba92..e0ef91531 100644 --- a/packages/flame/lib/src/components/component.dart +++ b/packages/flame/lib/src/components/component.dart @@ -1,15 +1,10 @@ -import 'dart:ui'; - import 'package:flutter/painting.dart'; import 'package:meta/meta.dart'; import '../../components.dart'; import '../../game.dart'; import '../../input.dart'; -import '../extensions/vector2.dart'; -import '../game/mixins/loadable.dart'; import 'cache/value_cache.dart'; -import 'positioning_type.dart'; /// This represents a Component for your game. /// @@ -285,9 +280,7 @@ class Component with Loadable { ) { var shouldContinue = true; for (final child in children.reversed()) { - if (child is Component) { - shouldContinue = child.propagateToChildren(handler); - } + shouldContinue = child.propagateToChildren(handler); if (shouldContinue && child is T) { shouldContinue = handler(child); } else if (shouldContinue && child is FlameGame) { @@ -336,9 +329,7 @@ class Component with Loadable { 'Did you try to access it on the Game constructor? ' 'Use the "onLoad" or "onMount" method instead.', ); - if (parentGame is FlameGame) { - parentGame.prepareComponent(this); - } + parentGame.prepareComponent(this); debugMode |= parent.debugMode; isPrepared = true; diff --git a/packages/flame/lib/src/components/custom_painter_component.dart b/packages/flame/lib/src/components/custom_painter_component.dart index 953050dd7..af20b7cf6 100644 --- a/packages/flame/lib/src/components/custom_painter_component.dart +++ b/packages/flame/lib/src/components/custom_painter_component.dart @@ -1,8 +1,6 @@ import 'package:flutter/widgets.dart'; import '../../components.dart'; -import '../extensions/vector2.dart'; -import 'position_component.dart'; /// A [PositionComponent] that renders a [CustomPainter] at the designated /// position, scaled to have the designated size and rotated to the specified diff --git a/packages/flame/lib/src/components/input/button_component.dart b/packages/flame/lib/src/components/input/button_component.dart index 3fdf2d2c7..e13eb863c 100644 --- a/packages/flame/lib/src/components/input/button_component.dart +++ b/packages/flame/lib/src/components/input/button_component.dart @@ -1,9 +1,7 @@ import 'package:meta/meta.dart'; import '../../../components.dart'; -import '../../../extensions.dart'; import '../../../input.dart'; -import '../../gestures/events.dart'; /// The [ButtonComponent] bundles two [PositionComponent]s, one that shows while /// the button is being pressed, and one that shows otherwise. 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 d54177f4d..4246f9105 100644 --- a/packages/flame/lib/src/components/input/hud_button_component.dart +++ b/packages/flame/lib/src/components/input/hud_button_component.dart @@ -2,9 +2,7 @@ import 'package:flutter/rendering.dart' show EdgeInsets; import 'package:meta/meta.dart'; import '../../../components.dart'; -import '../../../extensions.dart'; import '../../../input.dart'; -import '../../gestures/events.dart'; /// The [HudButtonComponent] bundles two [PositionComponent]s, one that shows /// when the button is being pressed, and one that shows otherwise. 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 a02833011..e7965e317 100644 --- a/packages/flame/lib/src/components/input/hud_margin_component.dart +++ b/packages/flame/lib/src/components/input/hud_margin_component.dart @@ -2,9 +2,7 @@ import 'package:flutter/widgets.dart' show EdgeInsets; import 'package:meta/meta.dart'; import '../../../components.dart'; -import '../../../extensions.dart'; import '../../../game.dart'; -import '../positioning_type.dart'; /// The [HudMarginComponent] positions itself by a margin to the edge of the /// screen instead of by an absolute position on the screen or on the game, so diff --git a/packages/flame/lib/src/components/input/joystick_component.dart b/packages/flame/lib/src/components/input/joystick_component.dart index 6704ac55a..bb280bbbc 100644 --- a/packages/flame/lib/src/components/input/joystick_component.dart +++ b/packages/flame/lib/src/components/input/joystick_component.dart @@ -4,7 +4,6 @@ import 'package:flutter/rendering.dart' show EdgeInsets; import 'package:meta/meta.dart'; import '../../../components.dart'; -import '../../../extensions.dart'; import '../../gestures/events.dart'; import 'hud_margin_component.dart'; 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 0bd0f53ef..2a201e9f6 100644 --- a/packages/flame/lib/src/components/input/sprite_button_component.dart +++ b/packages/flame/lib/src/components/input/sprite_button_component.dart @@ -1,6 +1,4 @@ import '../../../components.dart'; -import '../../../extensions.dart'; -import '../../../input.dart'; enum _ButtonState { up, 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 86fbf7934..9cacea310 100644 --- a/packages/flame/lib/src/components/isometric_tile_map_component.dart +++ b/packages/flame/lib/src/components/isometric_tile_map_component.dart @@ -3,9 +3,7 @@ import 'dart:ui'; import 'package:meta/meta.dart'; import '../../components.dart'; -import '../extensions/vector2.dart'; import '../spritesheet.dart'; -import 'position_component.dart'; /// This is just a pair of . /// diff --git a/packages/flame/lib/src/components/mixins/collidable.dart b/packages/flame/lib/src/components/mixins/collidable.dart index f3767de38..075cdfbcf 100644 --- a/packages/flame/lib/src/components/mixins/collidable.dart +++ b/packages/flame/lib/src/components/mixins/collidable.dart @@ -2,10 +2,7 @@ import 'package:meta/meta.dart'; import '../../../components.dart'; import '../../../game.dart'; -import '../../components/position_component.dart'; -import '../../extensions/vector2.dart'; import '../../geometry/rectangle.dart'; -import 'hitbox.dart'; /// [CollidableType.active] collides with other [Collidable]s of type active or static /// [CollidableType.passive] collides with other [Collidable]s of type active 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 f3186b695..cb238cba1 100644 --- a/packages/flame/lib/src/components/nine_tile_box_component.dart +++ b/packages/flame/lib/src/components/nine_tile_box_component.dart @@ -3,9 +3,6 @@ import 'dart:ui'; import 'package:meta/meta.dart'; import '../../components.dart'; -import '../extensions/vector2.dart'; -import '../nine_tile_box.dart'; -import 'position_component.dart'; export '../nine_tile_box.dart'; diff --git a/packages/flame/lib/src/components/parallax_component.dart b/packages/flame/lib/src/components/parallax_component.dart index a849cb174..c0f0ab4c2 100644 --- a/packages/flame/lib/src/components/parallax_component.dart +++ b/packages/flame/lib/src/components/parallax_component.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:ui'; import 'package:flutter/painting.dart'; import 'package:meta/meta.dart'; @@ -7,9 +6,7 @@ import 'package:meta/meta.dart'; import '../../components.dart'; import '../../game.dart'; import '../assets/images.dart'; -import '../extensions/vector2.dart'; import '../parallax.dart'; -import 'position_component.dart'; extension ParallaxComponentExtension on FlameGame { Future loadParallaxComponent( diff --git a/packages/flame/lib/src/components/position_component.dart b/packages/flame/lib/src/components/position_component.dart index 65cb82b61..8a5e92a59 100644 --- a/packages/flame/lib/src/components/position_component.dart +++ b/packages/flame/lib/src/components/position_component.dart @@ -3,7 +3,6 @@ import 'dart:ui' hide Offset; import '../anchor.dart'; import '../extensions/offset.dart'; -import '../extensions/rect.dart'; import '../extensions/vector2.dart'; import '../game/notifying_vector2.dart'; import '../game/transform2d.dart'; diff --git a/packages/flame/lib/src/components/shape_component.dart b/packages/flame/lib/src/components/shape_component.dart index d0d59160b..4ca32b212 100644 --- a/packages/flame/lib/src/components/shape_component.dart +++ b/packages/flame/lib/src/components/shape_component.dart @@ -5,8 +5,6 @@ import 'package:flutter/material.dart'; import '../../components.dart'; import '../../geometry.dart'; import '../../palette.dart'; -import '../anchor.dart'; -import '../extensions/vector2.dart'; /// A [ShapeComponent] is a [Shape] wrapped in a [PositionComponent] so that it /// can be added to a component tree and take the camera and viewport into diff --git a/packages/flame/lib/src/components/sprite_animation_component.dart b/packages/flame/lib/src/components/sprite_animation_component.dart index 406ab0c39..142708801 100644 --- a/packages/flame/lib/src/components/sprite_animation_component.dart +++ b/packages/flame/lib/src/components/sprite_animation_component.dart @@ -3,10 +3,6 @@ import 'dart:ui'; import 'package:meta/meta.dart'; import '../../components.dart'; -import '../extensions/vector2.dart'; -import '../sprite_animation.dart'; -import 'mixins/has_paint.dart'; -import 'position_component.dart'; export '../sprite_animation.dart'; 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 3142f71e2..4fb13b5a4 100644 --- a/packages/flame/lib/src/components/sprite_animation_group_component.dart +++ b/packages/flame/lib/src/components/sprite_animation_group_component.dart @@ -3,10 +3,6 @@ import 'dart:ui'; import 'package:meta/meta.dart'; import '../../components.dart'; -import '../extensions/vector2.dart'; -import '../sprite_animation.dart'; -import 'mixins/has_paint.dart'; -import 'position_component.dart'; export '../sprite_animation.dart'; diff --git a/packages/flame/lib/src/components/sprite_component.dart b/packages/flame/lib/src/components/sprite_component.dart index 188ed2198..20c18fc67 100644 --- a/packages/flame/lib/src/components/sprite_component.dart +++ b/packages/flame/lib/src/components/sprite_component.dart @@ -4,11 +4,6 @@ import 'package:meta/meta.dart'; import '../../components.dart'; import '../extensions/image.dart'; -import '../extensions/vector2.dart'; -import '../sprite.dart'; -import 'component.dart'; -import 'mixins/has_paint.dart'; -import 'position_component.dart'; export '../sprite.dart'; diff --git a/packages/flame/lib/src/components/sprite_group_component.dart b/packages/flame/lib/src/components/sprite_group_component.dart index 118c7e7ef..21129a02e 100644 --- a/packages/flame/lib/src/components/sprite_group_component.dart +++ b/packages/flame/lib/src/components/sprite_group_component.dart @@ -3,10 +3,6 @@ import 'dart:ui'; import 'package:meta/meta.dart'; import '../../components.dart'; -import '../extensions/vector2.dart'; -import '../sprite_animation.dart'; -import 'mixins/has_paint.dart'; -import 'position_component.dart'; export '../sprite_animation.dart'; diff --git a/packages/flame/lib/src/components/text_box_component.dart b/packages/flame/lib/src/components/text_box_component.dart index bfa28f53d..68a775c33 100644 --- a/packages/flame/lib/src/components/text_box_component.dart +++ b/packages/flame/lib/src/components/text_box_component.dart @@ -6,10 +6,7 @@ import 'package:flutter/widgets.dart' hide Image; import 'package:meta/meta.dart'; import '../../components.dart'; -import '../extensions/vector2.dart'; import '../palette.dart'; -import '../text.dart'; -import 'position_component.dart'; /// A set of configurations for the [TextBoxComponent] itself, as opposed to /// the [TextRenderer], which contains the configuration for how to render the diff --git a/packages/flame/lib/src/components/text_component.dart b/packages/flame/lib/src/components/text_component.dart index 2f042c70e..1666d81fa 100644 --- a/packages/flame/lib/src/components/text_component.dart +++ b/packages/flame/lib/src/components/text_component.dart @@ -4,9 +4,6 @@ import 'package:flutter/painting.dart'; import 'package:meta/meta.dart'; import '../../components.dart'; -import '../extensions/vector2.dart'; -import '../text.dart'; -import 'position_component.dart'; class TextComponent extends PositionComponent { String _text; diff --git a/packages/flame/lib/src/effects/size_effect.dart b/packages/flame/lib/src/effects/size_effect.dart index 6d1267fa1..ae1c133a1 100644 --- a/packages/flame/lib/src/effects/size_effect.dart +++ b/packages/flame/lib/src/effects/size_effect.dart @@ -1,5 +1,4 @@ import '../../components.dart'; -import '../../extensions.dart'; import 'component_effect.dart'; import 'controllers/effect_controller.dart'; diff --git a/packages/flame/lib/src/game/camera/camera.dart b/packages/flame/lib/src/game/camera/camera.dart index 2a8f98e10..04e471e38 100644 --- a/packages/flame/lib/src/game/camera/camera.dart +++ b/packages/flame/lib/src/game/camera/camera.dart @@ -1,10 +1,8 @@ import 'dart:math' as math; -import 'dart:ui' show Rect, Canvas; import '../../../components.dart'; import '../../../extensions.dart'; import '../../../game.dart'; -import '../projector.dart'; /// A camera translates your game coordinate system; this is useful when your /// world is not 1:1 with your screen size. diff --git a/packages/flame/lib/src/game/camera/viewport.dart b/packages/flame/lib/src/game/camera/viewport.dart index 2f7bd7fb7..70d603ab1 100644 --- a/packages/flame/lib/src/game/camera/viewport.dart +++ b/packages/flame/lib/src/game/camera/viewport.dart @@ -1,11 +1,7 @@ import 'dart:math' as math; -import 'dart:ui'; - -import 'package:flutter/painting.dart'; import '../../../extensions.dart'; import '../../../game.dart'; -import '../projector.dart'; /// A viewport is a class that potentially translates and resizes the screen. /// The reason you might want to have a viewport is to make sure you handle any diff --git a/packages/flame/lib/src/game/game_render_box.dart b/packages/flame/lib/src/game/game_render_box.dart index b73834c85..3bd57df2f 100644 --- a/packages/flame/lib/src/game/game_render_box.dart +++ b/packages/flame/lib/src/game/game_render_box.dart @@ -1,8 +1,4 @@ -import 'dart:ui'; - -import 'package:flutter/gestures.dart'; import 'package:flutter/rendering.dart'; -import 'package:flutter/scheduler.dart'; import 'package:flutter/widgets.dart' hide WidgetBuilder; import '../extensions/size.dart'; 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 18a45075f..d6feb6914 100644 --- a/packages/flame/lib/src/game/game_widget/game_widget.dart +++ b/packages/flame/lib/src/game/game_widget/game_widget.dart @@ -1,4 +1,3 @@ -import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/flame/lib/src/game/game_widget/gestures.dart b/packages/flame/lib/src/game/game_widget/gestures.dart index 256d39d36..9b3e395dd 100644 --- a/packages/flame/lib/src/game/game_widget/gestures.dart +++ b/packages/flame/lib/src/game/game_widget/gestures.dart @@ -3,8 +3,6 @@ import 'package:flutter/widgets.dart'; import '../../../components.dart'; import '../../../extensions.dart'; -import '../../components/mixins/draggable.dart'; -import '../../extensions/offset.dart'; import '../../gestures/detectors.dart'; import '../../gestures/events.dart'; import '../mixins/game.dart'; diff --git a/packages/flame/lib/src/game/mixins/game.dart b/packages/flame/lib/src/game/mixins/game.dart index d11c26583..ec2ce2cb0 100644 --- a/packages/flame/lib/src/game/mixins/game.dart +++ b/packages/flame/lib/src/game/mixins/game.dart @@ -3,16 +3,12 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:flutter/scheduler.dart'; import 'package:flutter/widgets.dart'; import '../../../components.dart'; import '../../assets/assets_cache.dart'; import '../../assets/images.dart'; import '../../extensions/offset.dart'; -import '../../extensions/vector2.dart'; -import '../../sprite.dart'; -import '../../sprite_animation.dart'; import '../game_render_box.dart'; import '../projector.dart'; import 'loadable.dart'; diff --git a/packages/flame/lib/src/game/mixins/has_collidables.dart b/packages/flame/lib/src/game/mixins/has_collidables.dart index ffd355da7..fdde06889 100644 --- a/packages/flame/lib/src/game/mixins/has_collidables.dart +++ b/packages/flame/lib/src/game/mixins/has_collidables.dart @@ -1,6 +1,5 @@ import '../../../components.dart'; import '../../../game.dart'; -import '../../components/mixins/collidable.dart'; import '../../geometry/collision_detection.dart'; /// Keeps track of all the [Collidable]s in the component tree and initiates diff --git a/packages/flame/lib/src/game/mixins/keyboard.dart b/packages/flame/lib/src/game/mixins/keyboard.dart index 4aeee42da..bdb5612a5 100644 --- a/packages/flame/lib/src/game/mixins/keyboard.dart +++ b/packages/flame/lib/src/game/mixins/keyboard.dart @@ -3,7 +3,6 @@ import 'package:flutter/services.dart'; import '../../../components.dart'; import '../../../game.dart'; -import 'game.dart'; /// A [Component] mixin to add keyboard handling capability to components. /// Must be used in components that can only be added to games that are mixed diff --git a/packages/flame/lib/src/geometry/circle.dart b/packages/flame/lib/src/geometry/circle.dart index 325fee977..1671ef489 100644 --- a/packages/flame/lib/src/geometry/circle.dart +++ b/packages/flame/lib/src/geometry/circle.dart @@ -4,7 +4,6 @@ import 'dart:ui'; import '../../game.dart'; import '../../geometry.dart'; import '../extensions/vector2.dart'; -import 'shape.dart'; class Circle extends Shape { /// The [normalizedRadius] is what ratio (0.0, 1.0] of the shortest edge of diff --git a/packages/flame/lib/src/geometry/polygon.dart b/packages/flame/lib/src/geometry/polygon.dart index e58dff05a..3933294f0 100644 --- a/packages/flame/lib/src/geometry/polygon.dart +++ b/packages/flame/lib/src/geometry/polygon.dart @@ -7,7 +7,6 @@ import '../extensions/canvas.dart'; import '../extensions/offset.dart'; import '../extensions/rect.dart'; import '../extensions/vector2.dart'; -import 'shape.dart'; class Polygon extends Shape { final List normalizedVertices; diff --git a/packages/flame/lib/src/geometry/rectangle.dart b/packages/flame/lib/src/geometry/rectangle.dart index 40f5e49dc..4ebdccc71 100644 --- a/packages/flame/lib/src/geometry/rectangle.dart +++ b/packages/flame/lib/src/geometry/rectangle.dart @@ -1,9 +1,5 @@ -import 'dart:ui'; - import '../../extensions.dart'; -import '../../game.dart'; import '../../geometry.dart'; -import 'shape.dart'; class Rectangle extends Polygon { static final _defaultNormalizedVertices = [ diff --git a/packages/flame/lib/src/geometry/shape.dart b/packages/flame/lib/src/geometry/shape.dart index 432a42493..b51df4184 100644 --- a/packages/flame/lib/src/geometry/shape.dart +++ b/packages/flame/lib/src/geometry/shape.dart @@ -1,9 +1,7 @@ import 'dart:ui'; import '../../components.dart'; -import '../../game.dart'; import '../components/cache/value_cache.dart'; -import '../extensions/vector2.dart'; import 'shape_intersections.dart' as intersection_system; /// A shape can represent any geometrical shape with optionally a size, position diff --git a/packages/flame/lib/src/geometry/shape_intersections.dart b/packages/flame/lib/src/geometry/shape_intersections.dart index c6940a791..f81e46ced 100644 --- a/packages/flame/lib/src/geometry/shape_intersections.dart +++ b/packages/flame/lib/src/geometry/shape_intersections.dart @@ -1,13 +1,7 @@ import 'dart:math'; -import 'dart:ui'; - -import 'package:flutter/material.dart'; import '../../extensions.dart'; import '../../geometry.dart'; -import 'circle.dart'; -import 'polygon.dart'; -import 'shape.dart'; abstract class Intersections { Set intersect(T1 shapeA, T2 shapeB); diff --git a/packages/flame/lib/src/parallax.dart b/packages/flame/lib/src/parallax.dart index 1d59cc0fd..12344fe91 100644 --- a/packages/flame/lib/src/parallax.dart +++ b/packages/flame/lib/src/parallax.dart @@ -8,8 +8,6 @@ import '../game.dart'; import 'assets/images.dart'; import 'extensions/canvas.dart'; import 'extensions/image.dart'; -import 'extensions/rect.dart'; -import 'extensions/vector2.dart'; import 'flame.dart'; import 'sprite_animation.dart'; diff --git a/packages/flame/lib/src/particles/accelerated_particle.dart b/packages/flame/lib/src/particles/accelerated_particle.dart index 0c536abd4..a78f2db26 100644 --- a/packages/flame/lib/src/particles/accelerated_particle.dart +++ b/packages/flame/lib/src/particles/accelerated_particle.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import '../../extensions.dart'; import '../components/mixins/single_child_particle.dart'; import 'curved_particle.dart'; diff --git a/packages/flame/lib/src/particles/moving_particle.dart b/packages/flame/lib/src/particles/moving_particle.dart index 19007fe5f..9e2065de9 100644 --- a/packages/flame/lib/src/particles/moving_particle.dart +++ b/packages/flame/lib/src/particles/moving_particle.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flutter/animation.dart'; import '../../extensions.dart'; diff --git a/packages/flame/lib/src/particles/particle.dart b/packages/flame/lib/src/particles/particle.dart index 28553b0a5..6055c55c2 100644 --- a/packages/flame/lib/src/particles/particle.dart +++ b/packages/flame/lib/src/particles/particle.dart @@ -1,5 +1,4 @@ import 'dart:math'; -import 'dart:ui'; import 'package:flutter/animation.dart'; diff --git a/packages/flame/lib/src/particles/translated_particle.dart b/packages/flame/lib/src/particles/translated_particle.dart index 0dd0bf60b..b103b7ce1 100644 --- a/packages/flame/lib/src/particles/translated_particle.dart +++ b/packages/flame/lib/src/particles/translated_particle.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import '../../extensions.dart'; import '../components/mixins/single_child_particle.dart'; import 'particle.dart'; diff --git a/packages/flame/lib/src/sprite.dart b/packages/flame/lib/src/sprite.dart index 6e8eb35a2..e2c24e2d3 100644 --- a/packages/flame/lib/src/sprite.dart +++ b/packages/flame/lib/src/sprite.dart @@ -3,8 +3,6 @@ import 'dart:ui'; import '../image_composition.dart'; import 'anchor.dart'; import 'assets/images.dart'; -import 'extensions/offset.dart'; -import 'extensions/vector2.dart'; import 'flame.dart'; import 'palette.dart'; diff --git a/packages/flame/lib/src/sprite_batch.dart b/packages/flame/lib/src/sprite_batch.dart index 42a30f76b..b8a1351b7 100644 --- a/packages/flame/lib/src/sprite_batch.dart +++ b/packages/flame/lib/src/sprite_batch.dart @@ -4,7 +4,6 @@ import 'dart:ui'; import '../game.dart'; import 'assets/images.dart'; import 'extensions/image.dart'; -import 'extensions/vector2.dart'; import 'flame.dart'; extension SpriteBatchExtension on Game { diff --git a/packages/flame/lib/src/spritesheet.dart b/packages/flame/lib/src/spritesheet.dart index 9b8c115ba..6d2489413 100644 --- a/packages/flame/lib/src/spritesheet.dart +++ b/packages/flame/lib/src/spritesheet.dart @@ -1,7 +1,6 @@ import 'dart:ui'; import 'extensions/vector2.dart'; -import 'sprite.dart'; import 'sprite_animation.dart'; /// Utility class to help extract animations and sprites from a sprite sheet image. diff --git a/packages/flame/lib/src/text.dart b/packages/flame/lib/src/text.dart index 1765520e2..7930c5356 100644 --- a/packages/flame/lib/src/text.dart +++ b/packages/flame/lib/src/text.dart @@ -1,5 +1,3 @@ -import 'dart:ui' hide TextStyle, TextDirection; - import 'package:flutter/material.dart'; import 'anchor.dart'; diff --git a/packages/flame/lib/src/widgets/sprite_widget.dart b/packages/flame/lib/src/widgets/sprite_widget.dart index fc7d0320e..df1289053 100644 --- a/packages/flame/lib/src/widgets/sprite_widget.dart +++ b/packages/flame/lib/src/widgets/sprite_widget.dart @@ -3,7 +3,6 @@ import 'package:flutter/widgets.dart'; import '../../assets.dart'; import '../../extensions.dart'; import '../anchor.dart'; -import '../sprite.dart'; import 'animation_widget.dart'; import 'base_future_builder.dart'; import 'sprite_painter.dart'; diff --git a/packages/flame/test/components/collidable_type_test.dart b/packages/flame/test/components/collidable_type_test.dart index 9b06bf13d..53871860d 100644 --- a/packages/flame/test/components/collidable_type_test.dart +++ b/packages/flame/test/components/collidable_type_test.dart @@ -1,10 +1,8 @@ import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame_test/flame_test.dart'; import 'package:test/test.dart'; -import 'package:vector_math/vector_math_64.dart'; class _HasCollidablesGame extends FlameGame with HasCollidables {} diff --git a/packages/flame/test/components/collision_callback_test.dart b/packages/flame/test/components/collision_callback_test.dart index 869445c1a..d2352a9e7 100644 --- a/packages/flame/test/components/collision_callback_test.dart +++ b/packages/flame/test/components/collision_callback_test.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame/test/components/collision_detection_test.dart b/packages/flame/test/components/collision_detection_test.dart index 150431f2e..9a896eef1 100644 --- a/packages/flame/test/components/collision_detection_test.dart +++ b/packages/flame/test/components/collision_detection_test.dart @@ -1,9 +1,6 @@ import 'package:flame/extensions.dart'; import 'package:flame/geometry.dart'; import 'package:flame/geometry.dart' as geometry; -import 'package:flame/src/geometry/circle.dart'; -import 'package:flame/src/geometry/line.dart'; -import 'package:flame/src/geometry/line_segment.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/flame/test/components/component_lifecycle_test.dart b/packages/flame/test/components/component_lifecycle_test.dart index 7d55f1994..f92f4c199 100644 --- a/packages/flame/test/components/component_lifecycle_test.dart +++ b/packages/flame/test/components/component_lifecycle_test.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/components/hoverable_test.dart b/packages/flame/test/components/hoverable_test.dart index 7d6244536..b76ab9749 100644 --- a/packages/flame/test/components/hoverable_test.dart +++ b/packages/flame/test/components/hoverable_test.dart @@ -2,7 +2,6 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flame/src/components/mixins/hoverable.dart'; import 'package:flame/src/gestures/events.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter/gestures.dart' show PointerHoverEvent; diff --git a/packages/flame/test/components/hud_margin_component_test.dart b/packages/flame/test/components/hud_margin_component_test.dart index 2d2c86374..b6cb995c7 100644 --- a/packages/flame/test/components/hud_margin_component_test.dart +++ b/packages/flame/test/components/hud_margin_component_test.dart @@ -1,4 +1,3 @@ -import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/flame/test/components/isometric_tile_map_component_test.dart b/packages/flame/test/components/isometric_tile_map_component_test.dart index e1510c64a..9e3ce72cd 100644 --- a/packages/flame/test/components/isometric_tile_map_component_test.dart +++ b/packages/flame/test/components/isometric_tile_map_component_test.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/sprite.dart'; import 'package:flame_test/flame_test.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/packages/flame/test/components/shape_component_test.dart b/packages/flame/test/components/shape_component_test.dart index 512da2b07..5c76ba1b3 100644 --- a/packages/flame/test/components/shape_component_test.dart +++ b/packages/flame/test/components/shape_component_test.dart @@ -1,7 +1,6 @@ import 'dart:math'; import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame_test/flame_test.dart'; import 'package:test/test.dart'; diff --git a/packages/flame/test/game/component_rendering_test.dart b/packages/flame/test/game/component_rendering_test.dart index aad9af372..76eb0ec7e 100644 --- a/packages/flame/test/game/component_rendering_test.dart +++ b/packages/flame/test/game/component_rendering_test.dart @@ -2,10 +2,8 @@ import 'dart:ui'; import 'package:canvas_test/canvas_test.dart'; import 'package:flame/components.dart'; -import 'package:flame/game.dart'; import 'package:flame/palette.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame/test/game/flame_game_test.dart b/packages/flame/test/game/flame_game_test.dart index 9da29a700..72ae78cbe 100644 --- a/packages/flame/test/game/flame_game_test.dart +++ b/packages/flame/test/game/flame_game_test.dart @@ -1,10 +1,7 @@ -import 'dart:ui'; - import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/src/game/game_render_box.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/gestures.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart' as flutter; 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 8efd980fc..f082da2b8 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 @@ -3,7 +3,6 @@ import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; class _KeyboardEventsGame extends FlameGame with KeyboardEvents { diff --git a/packages/flame/test/game/notifying_vector2_test.dart b/packages/flame/test/game/notifying_vector2_test.dart index a40d4bc2d..6f5eeedde 100644 --- a/packages/flame/test/game/notifying_vector2_test.dart +++ b/packages/flame/test/game/notifying_vector2_test.dart @@ -9,7 +9,6 @@ void main() { /// notification during a modifying operation. void check(NotifyingVector2 v1, void Function(Vector2) operation) { final v2 = v1.clone(); - expect(v2 is Vector2, true); expect(v2 is NotifyingVector2, false); var notified = 0; void listener() { diff --git a/packages/flame/test/game/projections_test.dart b/packages/flame/test/game/projections_test.dart index 7f2593017..1d70dea3c 100644 --- a/packages/flame/test/game/projections_test.dart +++ b/packages/flame/test/game/projections_test.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; import 'package:test/test.dart'; diff --git a/packages/flame/test/image_composition_test.dart b/packages/flame/test/image_composition_test.dart index 979844722..624f71570 100644 --- a/packages/flame/test/image_composition_test.dart +++ b/packages/flame/test/image_composition_test.dart @@ -1,6 +1,3 @@ -import 'dart:ui'; - -import 'package:flame/extensions.dart'; import 'package:flame/image_composition.dart'; import 'package:mocktail/mocktail.dart'; import 'package:test/test.dart'; diff --git a/packages/flame/test/text_test.dart b/packages/flame/test/text_test.dart index 204c6cd9b..9ed3d247d 100644 --- a/packages/flame/test/text_test.dart +++ b/packages/flame/test/text_test.dart @@ -1,5 +1,3 @@ -import 'dart:ui' hide TextStyle; - import 'package:flame/components.dart'; import 'package:flutter/material.dart'; import 'package:test/test.dart'; diff --git a/packages/flame_bloc/example/lib/src/game/components/player.dart b/packages/flame_bloc/example/lib/src/game/components/player.dart index ef41bb8d7..424d2de3e 100644 --- a/packages/flame_bloc/example/lib/src/game/components/player.dart +++ b/packages/flame_bloc/example/lib/src/game/components/player.dart @@ -1,7 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame/geometry.dart'; import 'package:flame/input.dart'; -import 'package:flame/timer.dart'; import 'package:flame_bloc/flame_bloc.dart'; import 'package:flutter/services.dart'; diff --git a/packages/flame_bloc/lib/src/flame_bloc_game.dart b/packages/flame_bloc/lib/src/flame_bloc_game.dart index 32e8104f9..b19f7d0c4 100644 --- a/packages/flame_bloc/lib/src/flame_bloc_game.dart +++ b/packages/flame_bloc/lib/src/flame_bloc_game.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:bloc/bloc.dart'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart'; diff --git a/packages/flame_bloc/test/flame_bloc_game_test.dart b/packages/flame_bloc/test/flame_bloc_game_test.dart index 8aa46ae9f..c8cf86cbb 100644 --- a/packages/flame_bloc/test/flame_bloc_game_test.dart +++ b/packages/flame_bloc/test/flame_bloc_game_test.dart @@ -1,4 +1,3 @@ -import 'package:bloc/bloc.dart'; import 'package:flame/components.dart'; import 'package:flame_bloc/flame_bloc.dart'; import 'package:flame_test/flame_test.dart'; diff --git a/packages/flame_fire_atlas/example/lib/main.dart b/packages/flame_fire_atlas/example/lib/main.dart index 985d34a35..3c9ccaad3 100644 --- a/packages/flame_fire_atlas/example/lib/main.dart +++ b/packages/flame_fire_atlas/example/lib/main.dart @@ -1,5 +1,4 @@ import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame_fire_atlas/flame_fire_atlas.dart'; diff --git a/packages/flame_fire_atlas/lib/flame_fire_atlas.dart b/packages/flame_fire_atlas/lib/flame_fire_atlas.dart index 8b75aa1da..4817ed595 100644 --- a/packages/flame_fire_atlas/lib/flame_fire_atlas.dart +++ b/packages/flame_fire_atlas/lib/flame_fire_atlas.dart @@ -1,7 +1,6 @@ library flame_fire_atlas; import 'dart:convert'; -import 'dart:ui'; import 'package:archive/archive.dart'; import 'package:flame/assets.dart'; diff --git a/packages/flame_flare/example/lib/main.dart b/packages/flame_flare/example/lib/main.dart index 2b6f6a553..031a297f4 100644 --- a/packages/flame_flare/example/lib/main.dart +++ b/packages/flame_flare/example/lib/main.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; diff --git a/packages/flame_forge2d/example/lib/blob_sample.dart b/packages/flame_forge2d/example/lib/blob_sample.dart index 4947323ac..4611a3fad 100644 --- a/packages/flame_forge2d/example/lib/blob_sample.dart +++ b/packages/flame_forge2d/example/lib/blob_sample.dart @@ -1,7 +1,5 @@ import 'dart:math' as math; -import 'package:flame/extensions.dart'; -import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame_forge2d/body_component.dart'; import 'package:flame_forge2d/forge2d_game.dart'; diff --git a/packages/flame_forge2d/example/lib/boundaries.dart b/packages/flame_forge2d/example/lib/boundaries.dart index a9a3e4cfb..41419d3cc 100644 --- a/packages/flame_forge2d/example/lib/boundaries.dart +++ b/packages/flame_forge2d/example/lib/boundaries.dart @@ -1,4 +1,3 @@ -import 'package:flame/game.dart'; import 'package:flame_forge2d/body_component.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/forge2d_game.dart'; diff --git a/packages/flame_forge2d/example/lib/composition_sample.dart b/packages/flame_forge2d/example/lib/composition_sample.dart index 583887299..127f1242a 100644 --- a/packages/flame_forge2d/example/lib/composition_sample.dart +++ b/packages/flame_forge2d/example/lib/composition_sample.dart @@ -1,9 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/palette.dart'; -import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/forge2d_game.dart'; import 'package:flutter/material.dart'; -import 'package:forge2d/forge2d.dart'; import 'balls.dart'; import 'boundaries.dart'; diff --git a/packages/flame_forge2d/example/lib/contact_callbacks_sample.dart b/packages/flame_forge2d/example/lib/contact_callbacks_sample.dart index a04b3f519..85c2f3fa6 100644 --- a/packages/flame_forge2d/example/lib/contact_callbacks_sample.dart +++ b/packages/flame_forge2d/example/lib/contact_callbacks_sample.dart @@ -2,7 +2,6 @@ import 'dart:math' as math; import 'package:flame/input.dart'; import 'package:flame_forge2d/forge2d_game.dart'; -import 'package:forge2d/forge2d.dart'; import 'balls.dart'; import 'boundaries.dart'; diff --git a/packages/flame_forge2d/example/lib/domino_sample.dart b/packages/flame_forge2d/example/lib/domino_sample.dart index 487af07a4..f073c0780 100644 --- a/packages/flame_forge2d/example/lib/domino_sample.dart +++ b/packages/flame_forge2d/example/lib/domino_sample.dart @@ -1,6 +1,5 @@ import 'dart:ui'; -import 'package:flame/components.dart'; import 'package:flame/input.dart'; import 'package:flame_forge2d/body_component.dart'; import 'package:flame_forge2d/forge2d_game.dart'; diff --git a/packages/flame_forge2d/example/lib/draggable_sample.dart b/packages/flame_forge2d/example/lib/draggable_sample.dart index 3371d5d93..aec8c9b26 100644 --- a/packages/flame_forge2d/example/lib/draggable_sample.dart +++ b/packages/flame_forge2d/example/lib/draggable_sample.dart @@ -1,10 +1,7 @@ import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/input.dart'; -import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/forge2d_game.dart'; import 'package:flutter/material.dart' hide Draggable; -import 'package:forge2d/forge2d.dart'; import 'balls.dart'; import 'boundaries.dart'; diff --git a/packages/flame_forge2d/example/lib/joint_sample.dart b/packages/flame_forge2d/example/lib/joint_sample.dart index 069e22ebe..5f0e51d1e 100644 --- a/packages/flame_forge2d/example/lib/joint_sample.dart +++ b/packages/flame_forge2d/example/lib/joint_sample.dart @@ -1,7 +1,5 @@ import 'dart:math'; -import 'package:flame/extensions.dart'; -import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame_forge2d/body_component.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; diff --git a/packages/flame_forge2d/example/lib/mouse_joint_sample.dart b/packages/flame_forge2d/example/lib/mouse_joint_sample.dart index 478683ecf..ee0f0a50b 100644 --- a/packages/flame_forge2d/example/lib/mouse_joint_sample.dart +++ b/packages/flame_forge2d/example/lib/mouse_joint_sample.dart @@ -1,4 +1,3 @@ -import 'package:flame/extensions.dart'; import 'package:flame/input.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/forge2d_game.dart'; diff --git a/packages/flame_forge2d/example/lib/tappable_sample.dart b/packages/flame_forge2d/example/lib/tappable_sample.dart index 785de3507..17bef308f 100644 --- a/packages/flame_forge2d/example/lib/tappable_sample.dart +++ b/packages/flame_forge2d/example/lib/tappable_sample.dart @@ -1,8 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame/palette.dart'; -import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/forge2d_game.dart'; -import 'package:forge2d/forge2d.dart'; import 'balls.dart'; import 'boundaries.dart'; diff --git a/packages/flame_forge2d/example/lib/widget_sample.dart b/packages/flame_forge2d/example/lib/widget_sample.dart index 27a238776..6a89baf53 100644 --- a/packages/flame_forge2d/example/lib/widget_sample.dart +++ b/packages/flame_forge2d/example/lib/widget_sample.dart @@ -1,4 +1,3 @@ -import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame_forge2d/flame_forge2d.dart' hide Transform; diff --git a/packages/flame_forge2d/lib/body_component.dart b/packages/flame_forge2d/lib/body_component.dart index 718ce0495..7d40f70fc 100644 --- a/packages/flame_forge2d/lib/body_component.dart +++ b/packages/flame_forge2d/lib/body_component.dart @@ -4,7 +4,6 @@ import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/gestures.dart'; import 'package:forge2d/forge2d.dart' hide Timer, Vector2; import 'forge2d_game.dart'; diff --git a/packages/flame_forge2d/lib/forge2d_camera.dart b/packages/flame_forge2d/lib/forge2d_camera.dart index 5bbdb50a8..1706aa5fd 100644 --- a/packages/flame_forge2d/lib/forge2d_camera.dart +++ b/packages/flame_forge2d/lib/forge2d_camera.dart @@ -1,7 +1,4 @@ -import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; -import 'package:forge2d/forge2d.dart' hide Timer; class Forge2DCamera extends Camera { @override diff --git a/packages/flame_forge2d/lib/forge2d_game.dart b/packages/flame_forge2d/lib/forge2d_game.dart index 6048b5898..13d26e32c 100644 --- a/packages/flame_forge2d/lib/forge2d_game.dart +++ b/packages/flame_forge2d/lib/forge2d_game.dart @@ -1,5 +1,3 @@ -import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:forge2d/forge2d.dart' hide Timer; diff --git a/packages/flame_oxygen/example/lib/system/move_system.dart b/packages/flame_oxygen/example/lib/system/move_system.dart index 95cab8aa2..25cff8c26 100644 --- a/packages/flame_oxygen/example/lib/system/move_system.dart +++ b/packages/flame_oxygen/example/lib/system/move_system.dart @@ -1,5 +1,4 @@ import 'package:flame/extensions.dart'; -import 'package:flame/game.dart'; import 'package:flame_oxygen/flame_oxygen.dart'; import 'package:flutter/material.dart'; diff --git a/packages/flame_rive/example/lib/main.dart b/packages/flame_rive/example/lib/main.dart index 122fd8db2..368116d25 100644 --- a/packages/flame_rive/example/lib/main.dart +++ b/packages/flame_rive/example/lib/main.dart @@ -1,8 +1,6 @@ import 'package:flame/components.dart'; -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; -import 'package:flame/palette.dart'; import 'package:flame_rive/flame_rive.dart'; import 'package:flutter/material.dart'; import 'package:rive/rive.dart'; diff --git a/packages/flame_svg/lib/svg.dart b/packages/flame_svg/lib/svg.dart index 0242b0189..ce1efde37 100644 --- a/packages/flame_svg/lib/svg.dart +++ b/packages/flame_svg/lib/svg.dart @@ -1,11 +1,7 @@ -import 'dart:ui'; - import 'package:flame/assets.dart'; -import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/flame.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; /// A [Svg] to be rendered on a Flame [Game]. diff --git a/packages/flame_test/lib/src/mock_gesture_events.dart b/packages/flame_test/lib/src/mock_gesture_events.dart index c28d256ea..3e8c8b170 100644 --- a/packages/flame_test/lib/src/mock_gesture_events.dart +++ b/packages/flame_test/lib/src/mock_gesture_events.dart @@ -1,4 +1,3 @@ -import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flutter/gestures.dart'; diff --git a/packages/flame_test/lib/src/random_test.dart b/packages/flame_test/lib/src/random_test.dart index 17a790680..37e5f755b 100644 --- a/packages/flame_test/lib/src/random_test.dart +++ b/packages/flame_test/lib/src/random_test.dart @@ -86,7 +86,6 @@ void testWidgetsRandom( int? seed, bool? skip, Timeout? timeout, - Duration? initialTimeout, bool semanticsEnabled = true, dynamic tags, }) { @@ -96,7 +95,6 @@ void testWidgetsRandom( (WidgetTester widgetTester) => callback(Random(seed), widgetTester), skip: skip, timeout: timeout, - initialTimeout: initialTimeout, semanticsEnabled: semanticsEnabled, tags: tags, ); diff --git a/packages/flame_tiled/lib/src/renderable_tile_map.dart b/packages/flame_tiled/lib/src/renderable_tile_map.dart index 01a16e806..c663c753b 100644 --- a/packages/flame_tiled/lib/src/renderable_tile_map.dart +++ b/packages/flame_tiled/lib/src/renderable_tile_map.dart @@ -1,8 +1,5 @@ -import 'dart:async'; import 'dart:math' as math; -import 'dart:ui'; -import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/flame.dart'; import 'package:flame/sprite.dart';