Move files to src and comply with the dart package layout convention (#…

…621) * 👌 Use `Offset` type directly in `JoystickAction.update` calculations (#631) * Move files to src and comply with the dart package layout convention * Fixing widgets example Co-authored-by: Serge Matveenko <lig@countzero.co> Co-authored-by: Erick Zanardo <erickzanardoo@gmail.com>
flame-engine · Jan 20, 2021 · 00ad86e · 00ad86e
1 parent 4e63c31
commit 00ad86e
Show file tree

Hide file tree

Showing 146 changed files with 1,232 additions and 1,275 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
  - Updated the `widgets.md` documentation
  - Removing methods `initialDimensions` and `removeGestureRecognizer` to avoid confusion
  - Adding standard for `SpriteComponent` and `SpriteAnimationComponent` constructors
+ - Move files to comply with the dart package layout convention
 
 ## 1.0.0-rc5
  - Option for overlays to be already visible on the GameWidget

diff --git a/doc/examples/animations/lib/main.dart b/doc/examples/animations/lib/main.dart
@@ -1,9 +1,7 @@
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
 import 'package:flame/gestures.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flame/extensions/vector2.dart';
-import 'package:flame/sprite_animation.dart';
-import 'package:flame/components/sprite_animation_component.dart';
 import 'package:flutter/material.dart' hide Image;
 import 'dart:ui';
 

diff --git a/doc/examples/aseprite/lib/main.dart b/doc/examples/aseprite/lib/main.dart
@@ -1,7 +1,5 @@
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
-import 'package:flame/sprite_animation.dart';
-import 'package:flame/extensions/vector2.dart';
-import 'package:flame/components/sprite_animation_component.dart';
 import 'package:flutter/material.dart';
 
 void main() async {

diff --git a/doc/examples/composability/lib/main.dart b/doc/examples/composability/lib/main.dart
@@ -1,8 +1,5 @@
-import 'package:flame/anchor.dart';
-import 'package:flame/components/mixins/has_game_ref.dart';
-import 'package:flame/components/position_component.dart';
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
-import 'package:flame/extensions/vector2.dart';
 import 'package:flutter/material.dart';
 
 void main() async {

diff --git a/doc/examples/debug/lib/main.dart b/doc/examples/debug/lib/main.dart
@@ -1,8 +1,6 @@
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
 import 'package:flame/flame.dart';
-import 'package:flame/extensions/vector2.dart';
-import 'package:flame/components/sprite_component.dart';
-import 'package:flame/text_config.dart';
 
 import 'package:flutter/material.dart' hide Image;
 

diff --git a/doc/examples/effects/combined_effects/lib/main.dart b/doc/examples/effects/combined_effects/lib/main.dart
@@ -1,13 +1,9 @@
-import 'package:flame/effects/combined_effect.dart';
-import 'package:flame/effects/move_effect.dart';
-import 'package:flame/effects/scale_effect.dart';
-import 'package:flame/effects/rotate_effect.dart';
+import 'package:flame/effects.dart';
 import 'package:flame/game.dart';
 import 'package:flame/gestures.dart';
-import 'package:flame/extensions/offset.dart';
-import 'package:flame/extensions/vector2.dart';
 import 'package:flame/flame.dart';
-import 'package:flutter/material.dart';
+import 'package:flame/extensions.dart';
+import 'package:flutter/widgets.dart';
 
 import './square.dart';
 

diff --git a/doc/examples/effects/combined_effects/lib/square.dart b/doc/examples/effects/combined_effects/lib/square.dart
@@ -1,9 +1,6 @@
-import 'package:flame/anchor.dart';
-import 'package:flame/components/position_component.dart';
-
 import 'dart:ui';
 
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
 
 class Square extends PositionComponent {
   final Paint _paint;

diff --git a/doc/examples/effects/infinite_effects/lib/main.dart b/doc/examples/effects/infinite_effects/lib/main.dart
@@ -1,8 +1,5 @@
-import 'package:flame/effects/move_effect.dart';
-import 'package:flame/effects/scale_effect.dart';
-import 'package:flame/effects/rotate_effect.dart';
+import 'package:flame/effects.dart';
 import 'package:flame/gestures.dart';
-import 'package:flame/extensions/vector2.dart';
 import 'package:flame/flame.dart';
 import 'package:flame/game.dart';
 import 'package:flutter/material.dart';

diff --git a/doc/examples/effects/infinite_effects/lib/square.dart b/doc/examples/effects/infinite_effects/lib/square.dart
@@ -1,9 +1,6 @@
-import 'package:flame/anchor.dart';
-import 'package:flame/components/position_component.dart';
-
 import 'dart:ui';
 
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
 
 class Square extends PositionComponent {
   final Paint _paint;

diff --git a/doc/examples/effects/sequence_effect/lib/main.dart b/doc/examples/effects/sequence_effect/lib/main.dart
@@ -1,13 +1,8 @@
-import 'package:flame/effects/combined_effect.dart';
-import 'package:flame/effects/move_effect.dart';
-import 'package:flame/effects/scale_effect.dart';
-import 'package:flame/effects/rotate_effect.dart';
-import 'package:flame/effects/sequence_effect.dart';
-import 'package:flame/gestures.dart';
-import 'package:flame/extensions/offset.dart';
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/effects.dart';
 import 'package:flame/flame.dart';
 import 'package:flame/game.dart';
+import 'package:flame/gestures.dart';
+import 'package:flame/extensions.dart';
 import 'package:flutter/material.dart';
 
 import './square.dart';

diff --git a/doc/examples/effects/sequence_effect/lib/square.dart b/doc/examples/effects/sequence_effect/lib/square.dart
@@ -1,9 +1,6 @@
-import 'package:flame/anchor.dart';
-import 'package:flame/components/position_component.dart';
-
 import 'dart:ui';
 
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
 
 class Square extends PositionComponent {
   final Paint _paint;

diff --git a/doc/examples/effects/simple/lib/main_move.dart b/doc/examples/effects/simple/lib/main_move.dart
@@ -1,9 +1,9 @@
+import 'package:flame/effects.dart';
 import 'package:flame/game.dart';
-import 'package:flutter/material.dart';
-import 'package:flame/extensions/vector2.dart';
 import 'package:flame/gestures.dart';
-import 'package:flame/effects/effects.dart';
-import 'package:flame/extensions/offset.dart';
+import 'package:flame/extensions.dart';
+import 'package:flutter/animation.dart';
+import 'package:flutter/widgets.dart';
 
 import './square.dart';
 

diff --git a/doc/examples/effects/simple/lib/main_rotate.dart b/doc/examples/effects/simple/lib/main_rotate.dart
@@ -1,10 +1,10 @@
 import 'dart:math';
 
+import 'package:flame/components.dart';
+import 'package:flame/effects.dart';
 import 'package:flame/game.dart';
 import 'package:flutter/material.dart';
 import 'package:flame/gestures.dart';
-import 'package:flame/anchor.dart';
-import 'package:flame/effects/effects.dart';
 
 import './square.dart';
 

diff --git a/doc/examples/effects/simple/lib/main_scale.dart b/doc/examples/effects/simple/lib/main_scale.dart
@@ -1,9 +1,8 @@
+import 'package:flame/components.dart';
+import 'package:flame/effects.dart';
 import 'package:flutter/material.dart';
 import 'package:flame/game.dart';
 import 'package:flame/gestures.dart';
-import 'package:flame/anchor.dart';
-import 'package:flame/extensions/vector2.dart';
-import 'package:flame/effects/effects.dart';
 
 import './square.dart';
 

diff --git a/doc/examples/effects/simple/lib/square.dart b/doc/examples/effects/simple/lib/square.dart
@@ -1,10 +1,7 @@
-import 'package:flame/anchor.dart';
-import 'package:flame/components/position_component.dart';
+import 'package:flame/components.dart';
 
 import 'dart:ui';
 
-import 'package:flame/extensions/vector2.dart';
-
 class Square extends PositionComponent {
   static final _paint = Paint()..color = const Color(0xFFFFFFFF);
 

diff --git a/doc/examples/gestures/lib/main_draggables.dart b/doc/examples/gestures/lib/main_draggables.dart
@@ -1,11 +1,8 @@
-import 'package:flame/anchor.dart';
-import 'package:flame/components/mixins/draggable.dart';
-import 'package:flame/extensions/offset.dart';
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
+import 'package:flame/extensions.dart';
 import 'package:flame/gestures.dart';
 import 'package:flutter/material.dart' hide Draggable;
 import 'package:flame/game.dart';
-import 'package:flame/components/position_component.dart';
 
 void main() {
   final widget = Container(

diff --git a/doc/examples/gestures/lib/main_mouse_movement.dart b/doc/examples/gestures/lib/main_mouse_movement.dart
@@ -2,8 +2,7 @@ import 'package:flame/game.dart';
 import 'package:flutter/material.dart';
 import 'package:flame/gestures.dart';
 import 'package:flame/palette.dart';
-import 'package:flame/extensions/vector2.dart';
-import 'package:flame/extensions/offset.dart';
+import 'package:flame/extensions.dart';
 
 void main() {
   runApp(

diff --git a/doc/examples/gestures/lib/main_overlapping_tapables.dart b/doc/examples/gestures/lib/main_overlapping_tapables.dart
@@ -1,11 +1,9 @@
 import 'dart:math' as math;
 
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
 import 'package:flame/palette.dart';
 import 'package:flutter/material.dart';
 import 'package:flame/game.dart';
-import 'package:flame/components/position_component.dart';
-import 'package:flame/components/mixins/tapable.dart';
 
 void main() {
   final game = MyGame();

diff --git a/doc/examples/gestures/lib/main_scroll.dart b/doc/examples/gestures/lib/main_scroll.dart
@@ -2,8 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flame/game.dart';
 import 'package:flame/gestures.dart';
 import 'package:flame/palette.dart';
-import 'package:flame/extensions/vector2.dart';
-import 'package:flame/extensions/offset.dart';
+import 'package:flame/extensions.dart';
 
 void main() {
   final game = MyGame();

diff --git a/doc/examples/gestures/lib/main_tapables.dart b/doc/examples/gestures/lib/main_tapables.dart
@@ -1,9 +1,7 @@
-import 'package:flame/anchor.dart';
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
 import 'package:flutter/material.dart';
 import 'package:flame/game.dart';
-import 'package:flame/components/position_component.dart';
-import 'package:flame/components/mixins/tapable.dart';
+import 'package:flame/extensions.dart';
 
 void main() {
   runApp(

diff --git a/doc/examples/isometric/lib/main.dart b/doc/examples/isometric/lib/main.dart
@@ -1,9 +1,6 @@
-import 'package:flame/components/sprite_component.dart';
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
-import 'package:flame/components/isometric_tile_map_component.dart';
 import 'package:flame/gestures.dart';
-import 'package:flame/sprite.dart';
 import 'package:flame/spritesheet.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart' hide Image;

diff --git a/doc/examples/joystick/lib/main.dart b/doc/examples/joystick/lib/main.dart
@@ -1,8 +1,6 @@
-import 'package:flame/components/joystick/joystick_action.dart';
-import 'package:flame/components/joystick/joystick_component.dart';
-import 'package:flame/components/joystick/joystick_directional.dart';
 import 'package:flame/game.dart';
 import 'package:flame/gestures.dart';
+import 'package:flame/joystick.dart';
 import 'package:flutter/material.dart';
 
 import 'player.dart';

diff --git a/doc/examples/joystick/lib/player.dart b/doc/examples/joystick/lib/player.dart
@@ -1,11 +1,9 @@
 import 'dart:math';
 import 'dart:ui';
 
-import 'package:flame/components/component.dart';
-import 'package:flame/components/joystick/joystick_component.dart';
-import 'package:flame/components/joystick/joystick_events.dart';
+import 'package:flame/components.dart';
+import 'package:flame/joystick.dart';
 import 'package:flame/palette.dart';
-import 'package:flame/extensions/vector2.dart';
 
 class Player extends Component implements JoystickListener {
   final _whitePaint = BasicPalette.white.paint;

diff --git a/doc/examples/layers/lib/main.dart b/doc/examples/layers/lib/main.dart
@@ -1,12 +1,12 @@
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
-import 'package:flutter/material.dart' hide Animation;
-import 'package:flame/sprite.dart';
-import 'package:flame/layers/layer.dart';
 import 'package:flame/flame.dart';
+import 'package:flame/layers.dart';
 
 import 'dart:ui';
 
+import 'package:flutter/widgets.dart';
+
 void main() async {
   Flame.initializeWidget();
 

diff --git a/doc/examples/nine_tile_box/lib/main.dart b/doc/examples/nine_tile_box/lib/main.dart
@@ -1,8 +1,5 @@
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
-import 'package:flame/nine_tile_box.dart';
-import 'package:flame/sprite.dart';
-import 'package:flame/extensions/vector2.dart';
-
 import 'package:flutter/material.dart';
 
 void main() async {

diff --git a/doc/examples/parallax/lib/main.dart b/doc/examples/parallax/lib/main.dart
@@ -1,6 +1,5 @@
+import 'package:flame/components.dart';
 import 'package:flame/flame.dart';
-import 'package:flame/components/parallax_component.dart';
-import 'package:flame/extensions/vector2.dart';
 import 'package:flame/game.dart';
 import 'package:flutter/material.dart';
 

diff --git a/doc/examples/parallax/lib/main_advanced.dart b/doc/examples/parallax/lib/main_advanced.dart
@@ -1,7 +1,6 @@
+import 'package:flame/components.dart';
 import 'package:flame/flame.dart';
 import 'package:flame/parallax.dart';
-import 'package:flame/components/parallax_component.dart';
-import 'package:flame/extensions/vector2.dart';
 import 'package:flame/game.dart';
 import 'package:flutter/material.dart';
 

diff --git a/doc/examples/particles/lib/main.dart b/doc/examples/particles/lib/main.dart
@@ -2,29 +2,12 @@ import 'dart:async';
 import 'dart:math';
 import 'dart:ui';
 
-import 'package:flame/sprite_animation.dart';
-import 'package:flame/components/component.dart';
-import 'package:flame/particles/circle_particle.dart';
-import 'package:flame/particles/composed_particle.dart';
-import 'package:flame/particles/curved_particle.dart';
-import 'package:flame/particles/moving_particle.dart';
-import 'package:flame/particles/sprite_particle.dart';
-import 'package:flame/particles/translated_particle.dart';
-import 'package:flame/particles/computed_particle.dart';
-import 'package:flame/particles/image_particle.dart';
-import 'package:flame/particles/rotating_particle.dart';
-import 'package:flame/particles/accelerated_particle.dart';
-import 'package:flame/particles/paint_particle.dart';
-import 'package:flame/particles/animation_particle.dart';
-import 'package:flame/particles/component_particle.dart';
+import 'package:flame/components.dart' hide Timer;
 import 'package:flame/flame.dart';
+import 'package:flame/timer.dart' as flame_timer;
 import 'package:flame/game.dart';
-import 'package:flame/timer.dart' as flame_time;
-import 'package:flame/particle.dart';
-import 'package:flame/extensions/vector2.dart';
-import 'package:flame/sprite.dart';
+import 'package:flame/particles.dart';
 import 'package:flame/spritesheet.dart';
-import 'package:flame/text_config.dart';
 import 'package:flutter/material.dart' hide Image;
 
 void main() async {
@@ -570,7 +553,7 @@ class SineCurve extends Curve {
 /// each 2s of registered lifetime.
 class TrafficLightComponent extends Component {
   final Rect rect = Rect.fromCenter(center: Offset.zero, height: 32, width: 32);
-  final flame_time.Timer colorChangeTimer = flame_time.Timer(2, repeat: true);
+  final flame_timer.Timer colorChangeTimer = flame_timer.Timer(2, repeat: true);
   final colors = <Color>[
     Colors.green,
     Colors.orange,

diff --git a/doc/examples/render_flip/lib/main.dart b/doc/examples/render_flip/lib/main.dart
@@ -1,7 +1,5 @@
-import 'package:flame/sprite_animation.dart';
-import 'package:flame/components/sprite_animation_component.dart';
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
-import 'package:flame/extensions/vector2.dart';
 import 'package:flutter/material.dart' hide Image;
 import 'dart:ui';
 

diff --git a/doc/examples/sprite_batch/lib/main.dart b/doc/examples/sprite_batch/lib/main.dart
@@ -1,10 +1,9 @@
 import 'dart:math';
 
-import 'package:flame/extensions/vector2.dart';
+import 'package:flame/components.dart';
 import 'package:flutter/material.dart';
 import 'package:flame/game.dart';
 import 'package:flame/sprite_batch.dart';
-import 'package:flame/components/sprite_batch_component.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();

diff --git a/doc/examples/sprites/lib/main.dart b/doc/examples/sprites/lib/main.dart
@@ -1,9 +1,8 @@
 import 'dart:math';
 
-import 'package:flame/components/sprite_component.dart';
+import 'package:flame/components.dart';
 import 'package:flame/game.dart';
-import 'package:flame/extensions/vector2.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();