diff --git a/doc/flame/examples/lib/collision_detection.dart b/doc/flame/examples/lib/collision_detection.dart index 12be6843a51..e4b4e012486 100644 --- a/doc/flame/examples/lib/collision_detection.dart +++ b/doc/flame/examples/lib/collision_detection.dart @@ -3,7 +3,7 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart' hide Image; +import 'package:material_ui/material_ui.dart' hide Image; class CollisionDetectionGame extends FlameGame with HasCollisionDetection { @override diff --git a/doc/flame/examples/lib/color_effect.dart b/doc/flame/examples/lib/color_effect.dart index b2214a08375..3551fb71554 100644 --- a/doc/flame/examples/lib/color_effect.dart +++ b/doc/flame/examples/lib/color_effect.dart @@ -1,9 +1,9 @@ +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:doc_flame_examples/ember.dart'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/game.dart'; import 'package:flutter/animation.dart'; -import 'package:flutter/cupertino.dart'; class ColorEffectExample extends FlameGame { bool reset = false; diff --git a/doc/flame/examples/lib/glow_effect.dart b/doc/flame/examples/lib/glow_effect.dart index 01cc4acb0d1..9fc2ee5e4f1 100644 --- a/doc/flame/examples/lib/glow_effect.dart +++ b/doc/flame/examples/lib/glow_effect.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class GlowEffectExample extends FlameGame { @override diff --git a/doc/flame/examples/lib/ray_cast.dart b/doc/flame/examples/lib/ray_cast.dart index f743f88cf79..65089a0de5e 100644 --- a/doc/flame/examples/lib/ray_cast.dart +++ b/doc/flame/examples/lib/ray_cast.dart @@ -3,7 +3,7 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RayCastExample extends FlameGame with HasCollisionDetection { final origin = Vector2(20, 20); diff --git a/doc/flame/examples/lib/ray_trace.dart b/doc/flame/examples/lib/ray_trace.dart index 3bc72bd4cd1..d1903aea313 100644 --- a/doc/flame/examples/lib/ray_trace.dart +++ b/doc/flame/examples/lib/ray_trace.dart @@ -6,7 +6,7 @@ import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RayTraceExample extends FlameGame with HasCollisionDetection, TapCallbacks { diff --git a/doc/flame/examples/pubspec.yaml b/doc/flame/examples/pubspec.yaml index 67c81401ba3..5b928f4646f 100644 --- a/doc/flame/examples/pubspec.yaml +++ b/doc/flame/examples/pubspec.yaml @@ -9,13 +9,14 @@ environment: flutter: ">=3.44.0" dependencies: + cupertino_ui: any flame: ^1.38.0 flame_rive: ^1.11.2 flutter: sdk: flutter flutter_shaders: + material_ui: any web: ^1.1.0 - dev_dependencies: flame_lint: ^1.4.3 diff --git a/doc/tutorials/klondike/app/lib/step5/components/flat_button.dart b/doc/tutorials/klondike/app/lib/step5/components/flat_button.dart index 10febb60546..566ba1b7b84 100644 --- a/doc/tutorials/klondike/app/lib/step5/components/flat_button.dart +++ b/doc/tutorials/klondike/app/lib/step5/components/flat_button.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/input.dart'; import 'package:flame/text.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class FlatButton extends ButtonComponent { FlatButton( diff --git a/doc/tutorials/klondike/app/pubspec.yaml b/doc/tutorials/klondike/app/pubspec.yaml index 962f3669080..5e4e6cd1a97 100644 --- a/doc/tutorials/klondike/app/pubspec.yaml +++ b/doc/tutorials/klondike/app/pubspec.yaml @@ -11,6 +11,7 @@ dependencies: flame: ^1.38.0 flutter: sdk: flutter + material_ui: any web: ^1.1.0 dev_dependencies: diff --git a/doc/tutorials/platformer/app/lib/ember_quest.dart b/doc/tutorials/platformer/app/lib/ember_quest.dart index 0c3d7fe23f5..71a0183868e 100644 --- a/doc/tutorials/platformer/app/lib/ember_quest.dart +++ b/doc/tutorials/platformer/app/lib/ember_quest.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'actors/ember.dart'; import 'actors/water_enemy.dart'; diff --git a/doc/tutorials/platformer/app/lib/main.dart b/doc/tutorials/platformer/app/lib/main.dart index 3d832eb5d69..87b2cb9e141 100644 --- a/doc/tutorials/platformer/app/lib/main.dart +++ b/doc/tutorials/platformer/app/lib/main.dart @@ -1,5 +1,5 @@ import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'ember_quest.dart'; import 'overlays/game_over.dart'; diff --git a/doc/tutorials/platformer/app/lib/objects/ground_block.dart b/doc/tutorials/platformer/app/lib/objects/ground_block.dart index 0d6d0a63727..c3b514970d2 100644 --- a/doc/tutorials/platformer/app/lib/objects/ground_block.dart +++ b/doc/tutorials/platformer/app/lib/objects/ground_block.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../ember_quest.dart'; import '../managers/segment_manager.dart'; diff --git a/doc/tutorials/platformer/app/lib/objects/star.dart b/doc/tutorials/platformer/app/lib/objects/star.dart index 3630cd9a702..9831faf7c2c 100644 --- a/doc/tutorials/platformer/app/lib/objects/star.dart +++ b/doc/tutorials/platformer/app/lib/objects/star.dart @@ -1,7 +1,7 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../ember_quest.dart'; diff --git a/doc/tutorials/platformer/app/lib/overlays/game_over.dart b/doc/tutorials/platformer/app/lib/overlays/game_over.dart index d71d5c7f335..8444e6fec8e 100644 --- a/doc/tutorials/platformer/app/lib/overlays/game_over.dart +++ b/doc/tutorials/platformer/app/lib/overlays/game_over.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../ember_quest.dart'; diff --git a/doc/tutorials/platformer/app/lib/overlays/hud.dart b/doc/tutorials/platformer/app/lib/overlays/hud.dart index 184c0a1d384..de40f6c9b2e 100644 --- a/doc/tutorials/platformer/app/lib/overlays/hud.dart +++ b/doc/tutorials/platformer/app/lib/overlays/hud.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../ember_quest.dart'; import 'heart.dart'; diff --git a/doc/tutorials/platformer/app/lib/overlays/main_menu.dart b/doc/tutorials/platformer/app/lib/overlays/main_menu.dart index e9087cda59b..315cd413e1f 100644 --- a/doc/tutorials/platformer/app/lib/overlays/main_menu.dart +++ b/doc/tutorials/platformer/app/lib/overlays/main_menu.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../ember_quest.dart'; diff --git a/doc/tutorials/platformer/app/pubspec.yaml b/doc/tutorials/platformer/app/pubspec.yaml index ff2a5e3cde5..27571bcb4c9 100644 --- a/doc/tutorials/platformer/app/pubspec.yaml +++ b/doc/tutorials/platformer/app/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/doc/tutorials/space_shooter/app/lib/step1/main.dart b/doc/tutorials/space_shooter/app/lib/step1/main.dart index 58cc820eb6b..c02e791678f 100644 --- a/doc/tutorials/space_shooter/app/lib/step1/main.dart +++ b/doc/tutorials/space_shooter/app/lib/step1/main.dart @@ -1,6 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: SpaceShooterGame())); diff --git a/doc/tutorials/space_shooter/app/lib/step2/main.dart b/doc/tutorials/space_shooter/app/lib/step2/main.dart index 56a9f1dcedd..a31245b25cb 100644 --- a/doc/tutorials/space_shooter/app/lib/step2/main.dart +++ b/doc/tutorials/space_shooter/app/lib/step2/main.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: SpaceShooterGame())); diff --git a/doc/tutorials/space_shooter/app/lib/step3/main.dart b/doc/tutorials/space_shooter/app/lib/step3/main.dart index 6f4d1a7d631..d08bc59e4c2 100644 --- a/doc/tutorials/space_shooter/app/lib/step3/main.dart +++ b/doc/tutorials/space_shooter/app/lib/step3/main.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/parallax.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: SpaceShooterGame())); diff --git a/doc/tutorials/space_shooter/app/lib/step4/main.dart b/doc/tutorials/space_shooter/app/lib/step4/main.dart index ee23d4c63c0..3c37fd4b997 100644 --- a/doc/tutorials/space_shooter/app/lib/step4/main.dart +++ b/doc/tutorials/space_shooter/app/lib/step4/main.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/parallax.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: SpaceShooterGame())); diff --git a/doc/tutorials/space_shooter/app/lib/step5/main.dart b/doc/tutorials/space_shooter/app/lib/step5/main.dart index 695f75999a9..5e4d2b4efb7 100644 --- a/doc/tutorials/space_shooter/app/lib/step5/main.dart +++ b/doc/tutorials/space_shooter/app/lib/step5/main.dart @@ -3,7 +3,7 @@ import 'package:flame/events.dart'; import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; import 'package:flame/parallax.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: SpaceShooterGame())); diff --git a/doc/tutorials/space_shooter/app/lib/step6/main.dart b/doc/tutorials/space_shooter/app/lib/step6/main.dart index 15486fe9c03..7b9baa1929c 100644 --- a/doc/tutorials/space_shooter/app/lib/step6/main.dart +++ b/doc/tutorials/space_shooter/app/lib/step6/main.dart @@ -4,7 +4,7 @@ import 'package:flame/events.dart'; import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; import 'package:flame/parallax.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: SpaceShooterGame())); diff --git a/doc/tutorials/space_shooter/app/pubspec.yaml b/doc/tutorials/space_shooter/app/pubspec.yaml index 22a177b9597..b69a37a5b77 100644 --- a/doc/tutorials/space_shooter/app/pubspec.yaml +++ b/doc/tutorials/space_shooter/app/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: flame: ^1.38.0 flutter: sdk: flutter + material_ui: any web: ^1.1.0 dev_dependencies: diff --git a/examples/games/crystal_ball/lib/crystal_ball.dart b/examples/games/crystal_ball/lib/crystal_ball.dart index 0ef3572efa6..df9d74630dc 100644 --- a/examples/games/crystal_ball/lib/crystal_ball.dart +++ b/examples/games/crystal_ball/lib/crystal_ball.dart @@ -3,7 +3,7 @@ import 'dart:ui'; import 'package:crystal_ball/src/game/game.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class CrystalBallWidget extends StatefulWidget { const CrystalBallWidget({super.key}); diff --git a/examples/games/crystal_ball/lib/main.dart b/examples/games/crystal_ball/lib/main.dart index 2a415a83830..61b5495a650 100644 --- a/examples/games/crystal_ball/lib/main.dart +++ b/examples/games/crystal_ball/lib/main.dart @@ -1,5 +1,5 @@ import 'package:crystal_ball/crystal_ball.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() async { runApp(const CrystalBallWidget()); diff --git a/examples/games/crystal_ball/pubspec.yaml b/examples/games/crystal_ball/pubspec.yaml index f41996dc944..57b8ac89109 100644 --- a/examples/games/crystal_ball/pubspec.yaml +++ b/examples/games/crystal_ball/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 diff --git a/examples/games/padracing/lib/car.dart b/examples/games/padracing/lib/car.dart index 88a6996e2f6..3705561fd77 100644 --- a/examples/games/padracing/lib/car.dart +++ b/examples/games/padracing/lib/car.dart @@ -3,7 +3,7 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame_forge2d/flame_forge2d.dart' hide World; -import 'package:flutter/material.dart' hide Image, Gradient; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/game_colors.dart'; import 'package:padracing/lap_line.dart'; import 'package:padracing/padracing_game.dart'; diff --git a/examples/games/padracing/lib/game_colors.dart b/examples/games/padracing/lib/game_colors.dart index fbd2d9168f6..1e6eb2ce3fe 100644 --- a/examples/games/padracing/lib/game_colors.dart +++ b/examples/games/padracing/lib/game_colors.dart @@ -1,5 +1,5 @@ import 'package:flame/extensions.dart'; -import 'package:flutter/material.dart' hide Image, Gradient; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; enum GameColors { green, diff --git a/examples/games/padracing/lib/game_over.dart b/examples/games/padracing/lib/game_over.dart index 8642a20d181..b22d4ecd159 100644 --- a/examples/games/padracing/lib/game_over.dart +++ b/examples/games/padracing/lib/game_over.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart' hide Image, Gradient; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/menu_card.dart'; import 'package:padracing/padracing_game.dart'; diff --git a/examples/games/padracing/lib/lap_line.dart b/examples/games/padracing/lib/lap_line.dart index 85d765ec1e2..83f89cad338 100644 --- a/examples/games/padracing/lib/lap_line.dart +++ b/examples/games/padracing/lib/lap_line.dart @@ -4,7 +4,7 @@ import 'dart:ui'; import 'package:flame/extensions.dart'; import 'package:flame/palette.dart'; import 'package:flame_forge2d/flame_forge2d.dart' hide World; -import 'package:flutter/material.dart' hide Image, Gradient; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/car.dart'; import 'package:padracing/game_colors.dart'; diff --git a/examples/games/padracing/lib/lap_text.dart b/examples/games/padracing/lib/lap_text.dart index 9d77c2c8e17..f07509a117a 100644 --- a/examples/games/padracing/lib/lap_text.dart +++ b/examples/games/padracing/lib/lap_text.dart @@ -1,8 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; -import 'package:flutter/material.dart' hide Image, Gradient; import 'package:google_fonts/google_fonts.dart'; - +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/car.dart'; import 'package:padracing/padracing_game.dart'; diff --git a/examples/games/padracing/lib/main.dart b/examples/games/padracing/lib/main.dart index 67b71714546..ea2d7897fb7 100644 --- a/examples/games/padracing/lib/main.dart +++ b/examples/games/padracing/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart' hide Image, Gradient; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/padracing_widget.dart'; void main() { diff --git a/examples/games/padracing/lib/menu.dart b/examples/games/padracing/lib/menu.dart index 02123042687..f7a4f2d4257 100644 --- a/examples/games/padracing/lib/menu.dart +++ b/examples/games/padracing/lib/menu.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart' hide Image, Gradient; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/game_colors.dart'; import 'package:padracing/menu_card.dart'; import 'package:padracing/padracing_game.dart'; diff --git a/examples/games/padracing/lib/menu_card.dart b/examples/games/padracing/lib/menu_card.dart index 1d8aaf7ab7e..e8405c69e04 100644 --- a/examples/games/padracing/lib/menu_card.dart +++ b/examples/games/padracing/lib/menu_card.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart' hide Image, Gradient; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/game_colors.dart'; diff --git a/examples/games/padracing/lib/padracing_game.dart b/examples/games/padracing/lib/padracing_game.dart index 9648d1219ca..0ed8203fde6 100644 --- a/examples/games/padracing/lib/padracing_game.dart +++ b/examples/games/padracing/lib/padracing_game.dart @@ -7,8 +7,8 @@ import 'package:flame/effects.dart'; import 'package:flame/extensions.dart'; import 'package:flame/input.dart'; import 'package:flame_forge2d/flame_forge2d.dart' hide World; -import 'package:flutter/material.dart' hide Image, Gradient; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/ball.dart'; import 'package:padracing/car.dart'; import 'package:padracing/game_colors.dart'; diff --git a/examples/games/padracing/lib/padracing_widget.dart b/examples/games/padracing/lib/padracing_widget.dart index 7c7948f0f9d..0bbff35a67e 100644 --- a/examples/games/padracing/lib/padracing_widget.dart +++ b/examples/games/padracing/lib/padracing_widget.dart @@ -1,7 +1,6 @@ import 'package:flame/game.dart'; -import 'package:flutter/material.dart' hide Image, Gradient; import 'package:google_fonts/google_fonts.dart'; - +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/game_over.dart'; import 'package:padracing/menu.dart'; import 'package:padracing/padracing_game.dart'; diff --git a/examples/games/padracing/lib/tire.dart b/examples/games/padracing/lib/tire.dart index 09d6e7de095..fa2dd0ed354 100644 --- a/examples/games/padracing/lib/tire.dart +++ b/examples/games/padracing/lib/tire.dart @@ -1,7 +1,7 @@ import 'package:flame/palette.dart'; import 'package:flame_forge2d/flame_forge2d.dart' hide World; -import 'package:flutter/material.dart' hide Image, Gradient; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:padracing/car.dart'; import 'package:padracing/padracing_game.dart'; import 'package:padracing/trail.dart'; diff --git a/examples/games/padracing/pubspec.yaml b/examples/games/padracing/pubspec.yaml index 9b416cc8663..e0d01d269c2 100644 --- a/examples/games/padracing/pubspec.yaml +++ b/examples/games/padracing/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: flutter: sdk: flutter google_fonts: ^8.0.2 + material_ui: any url_launcher: ^6.1.11 dev_dependencies: diff --git a/examples/games/trex/lib/trex_game.dart b/examples/games/trex/lib/trex_game.dart index 105ee36e670..b341ecbda9a 100644 --- a/examples/games/trex/lib/trex_game.dart +++ b/examples/games/trex/lib/trex_game.dart @@ -7,8 +7,8 @@ import 'package:flame/flame.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/text.dart'; -import 'package:flutter/material.dart' hide Image; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart' hide Image; import 'package:trex_game/background/horizon.dart'; import 'package:trex_game/game_over.dart'; import 'package:trex_game/player.dart'; diff --git a/examples/games/trex/lib/trex_widget.dart b/examples/games/trex/lib/trex_widget.dart index 33907aebed4..c45bac213fe 100644 --- a/examples/games/trex/lib/trex_widget.dart +++ b/examples/games/trex/lib/trex_widget.dart @@ -1,5 +1,5 @@ import 'package:flame/game.dart'; -import 'package:flutter/material.dart' hide Image, Gradient; +import 'package:material_ui/material_ui.dart' hide Image, Gradient; import 'package:trex_game/trex_game.dart'; class TRexWidget extends StatelessWidget { diff --git a/examples/games/trex/pubspec.yaml b/examples/games/trex/pubspec.yaml index 0d5a9712b8a..62ab6249c1a 100644 --- a/examples/games/trex/pubspec.yaml +++ b/examples/games/trex/pubspec.yaml @@ -16,6 +16,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter: diff --git a/examples/lib/commons/rounded_rect_component.dart b/examples/lib/commons/rounded_rect_component.dart index e78627a78a1..e9ac0fcc542 100644 --- a/examples/lib/commons/rounded_rect_component.dart +++ b/examples/lib/commons/rounded_rect_component.dart @@ -1,6 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A rectangle whose corners are rounded with half of its height, so that /// its short sides are semicircles. diff --git a/examples/lib/main.dart b/examples/lib/main.dart index bbb486a7f66..bef3bc8364b 100644 --- a/examples/lib/main.dart +++ b/examples/lib/main.dart @@ -37,7 +37,7 @@ import 'package:examples/stories/tiled/tiled.dart'; import 'package:examples/stories/utils/utils.dart'; import 'package:examples/stories/widgets/widgets.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { final page = PageProviderImpl().getPage(); @@ -63,7 +63,6 @@ void main() { void runAsDashbook() { final dashbook = Dashbook( title: 'Flame Examples', - theme: ThemeData.dark(), ); // Some small sample games diff --git a/examples/lib/stories/bridge_libraries/flame_forge2d/composition_example.dart b/examples/lib/stories/bridge_libraries/flame_forge2d/composition_example.dart index f261c8a8c84..5571b84eb62 100644 --- a/examples/lib/stories/bridge_libraries/flame_forge2d/composition_example.dart +++ b/examples/lib/stories/bridge_libraries/flame_forge2d/composition_example.dart @@ -4,7 +4,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/events.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; const TextStyle _textStyle = TextStyle(color: Colors.white, fontSize: 2); diff --git a/examples/lib/stories/bridge_libraries/flame_forge2d/drag_callbacks_example.dart b/examples/lib/stories/bridge_libraries/flame_forge2d/drag_callbacks_example.dart index bf1d4109a37..1d58c2209cb 100644 --- a/examples/lib/stories/bridge_libraries/flame_forge2d/drag_callbacks_example.dart +++ b/examples/lib/stories/bridge_libraries/flame_forge2d/drag_callbacks_example.dart @@ -3,7 +3,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/boundaries import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart'; import 'package:flame/events.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:flutter/material.dart' hide Draggable; +import 'package:material_ui/material_ui.dart' hide Draggable; class DragCallbacksExample extends Forge2DExampleGame { static const description = ''' diff --git a/examples/lib/stories/bridge_libraries/flame_forge2d/joints/weld_joint.dart b/examples/lib/stories/bridge_libraries/flame_forge2d/joints/weld_joint.dart index 457deeae043..c8c31fc93fd 100644 --- a/examples/lib/stories/bridge_libraries/flame_forge2d/joints/weld_joint.dart +++ b/examples/lib/stories/bridge_libraries/flame_forge2d/joints/weld_joint.dart @@ -5,7 +5,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class WeldJointExample extends Forge2DExampleGame { static const description = ''' diff --git a/examples/lib/stories/bridge_libraries/flame_forge2d/raycast_example.dart b/examples/lib/stories/bridge_libraries/flame_forge2d/raycast_example.dart index c2bd48585e8..3365ae45e29 100644 --- a/examples/lib/stories/bridge_libraries/flame_forge2d/raycast_example.dart +++ b/examples/lib/stories/bridge_libraries/flame_forge2d/raycast_example.dart @@ -6,7 +6,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:flutter/material.dart' show Colors, Paint, Canvas; +import 'package:material_ui/material_ui.dart' show Colors, Paint, Canvas; class RaycastExample extends Forge2DExampleGame with MouseMoveCallbacks { static const String description = ''' diff --git a/examples/lib/stories/bridge_libraries/flame_forge2d/utils/balls.dart b/examples/lib/stories/bridge_libraries/flame_forge2d/utils/balls.dart index 2f5d1a617f7..9940411937c 100644 --- a/examples/lib/stories/bridge_libraries/flame_forge2d/utils/balls.dart +++ b/examples/lib/stories/bridge_libraries/flame_forge2d/utils/balls.dart @@ -2,7 +2,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/boundaries import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart'; import 'package:flame/palette.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class Ball extends BodyComponent with ContactCallbacks, GlowingBody { late Paint originalPaint; diff --git a/examples/lib/stories/bridge_libraries/flame_forge2d/utils/boundaries.dart b/examples/lib/stories/bridge_libraries/flame_forge2d/utils/boundaries.dart index 6e0772ade0e..4038aa80c1b 100644 --- a/examples/lib/stories/bridge_libraries/flame_forge2d/utils/boundaries.dart +++ b/examples/lib/stories/bridge_libraries/flame_forge2d/utils/boundaries.dart @@ -1,7 +1,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart'; import 'package:flame/extensions.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; List createBoundaries(Forge2DGame game, {double? strokeWidth}) { final visibleRect = game.camera.visibleWorldRect; diff --git a/examples/lib/stories/bridge_libraries/flame_forge2d/widget_example.dart b/examples/lib/stories/bridge_libraries/flame_forge2d/widget_example.dart index 6db6df9e0de..cf9ceb9af59 100644 --- a/examples/lib/stories/bridge_libraries/flame_forge2d/widget_example.dart +++ b/examples/lib/stories/bridge_libraries/flame_forge2d/widget_example.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart'; import 'package:flame/game.dart'; import 'package:flame_forge2d/flame_forge2d.dart' hide Transform; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The body shape that a widget is given, which follows the shape that /// Material draws it with. diff --git a/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart b/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart index 59198f9586d..054fb697300 100644 --- a/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart +++ b/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart @@ -6,7 +6,7 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame_isolate/flame_isolate.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SimpleIsolateExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/bridge_libraries/flame_jenny/components/dialogue_button.dart b/examples/lib/stories/bridge_libraries/flame_jenny/components/dialogue_button.dart index f685782ce4c..7d02403c954 100644 --- a/examples/lib/stories/bridge_libraries/flame_jenny/components/dialogue_button.dart +++ b/examples/lib/stories/bridge_libraries/flame_jenny/components/dialogue_button.dart @@ -1,7 +1,7 @@ import 'package:examples/stories/bridge_libraries/flame_jenny/commons/commons.dart'; import 'package:flame/components.dart'; import 'package:flame/input.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class DialogueButton extends SpriteButtonComponent { DialogueButton({ diff --git a/examples/lib/stories/bridge_libraries/flame_jenny/components/dialogue_text_box.dart b/examples/lib/stories/bridge_libraries/flame_jenny/components/dialogue_text_box.dart index f0c7a3d79a9..05fabc788d8 100644 --- a/examples/lib/stories/bridge_libraries/flame_jenny/components/dialogue_text_box.dart +++ b/examples/lib/stories/bridge_libraries/flame_jenny/components/dialogue_text_box.dart @@ -1,6 +1,6 @@ import 'package:examples/stories/bridge_libraries/flame_jenny/commons/commons.dart'; import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class DialogueTextBox extends TextBoxComponent { DialogueTextBox({required super.text}) diff --git a/examples/lib/stories/bridge_libraries/flame_jenny/components/menu_button.dart b/examples/lib/stories/bridge_libraries/flame_jenny/components/menu_button.dart index de161965264..a3e5b82ffd1 100644 --- a/examples/lib/stories/bridge_libraries/flame_jenny/components/menu_button.dart +++ b/examples/lib/stories/bridge_libraries/flame_jenny/components/menu_button.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; import 'package:flame/text.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MenuButton extends ButtonComponent { MenuButton({ 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 540293e5324..7a75ec177e3 100644 --- a/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart +++ b/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart @@ -5,8 +5,8 @@ import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.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/camera_and_viewport/fixed_resolution_example.dart b/examples/lib/stories/camera_and_viewport/fixed_resolution_example.dart index d6687b7f88f..706f64692a7 100644 --- a/examples/lib/stories/camera_and_viewport/fixed_resolution_example.dart +++ b/examples/lib/stories/camera_and_viewport/fixed_resolution_example.dart @@ -4,7 +4,7 @@ import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; import 'package:flame/text.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class FixedResolutionExample extends FlameGame with ScrollCallbacks { static const description = ''' diff --git a/examples/lib/stories/camera_and_viewport/follow_component_example.dart b/examples/lib/stories/camera_and_viewport/follow_component_example.dart index c393eb5130e..7b922022cbd 100644 --- a/examples/lib/stories/camera_and_viewport/follow_component_example.dart +++ b/examples/lib/stories/camera_and_viewport/follow_component_example.dart @@ -9,8 +9,8 @@ import 'package:flame/experimental.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; class FollowComponentExample extends FlameGame with HasCollisionDetection, HasKeyboardHandlerComponents { diff --git a/examples/lib/stories/collision_detection/bouncing_ball_example.dart b/examples/lib/stories/collision_detection/bouncing_ball_example.dart index 8dabad163af..b7b20a18844 100644 --- a/examples/lib/stories/collision_detection/bouncing_ball_example.dart +++ b/examples/lib/stories/collision_detection/bouncing_ball_example.dart @@ -4,7 +4,7 @@ import 'dart:ui'; import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class BouncingBallExample extends FlameGame with HasCollisionDetection { static const description = ''' diff --git a/examples/lib/stories/collision_detection/circles_example.dart b/examples/lib/stories/collision_detection/circles_example.dart index 96e67e9a1ad..691485c6679 100644 --- a/examples/lib/stories/collision_detection/circles_example.dart +++ b/examples/lib/stories/collision_detection/circles_example.dart @@ -2,7 +2,7 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart' hide Image, Draggable; +import 'package:material_ui/material_ui.dart' hide Image, Draggable; class CirclesExample extends FlameGame { static const description = ''' diff --git a/examples/lib/stories/collision_detection/multiple_shapes_example.dart b/examples/lib/stories/collision_detection/multiple_shapes_example.dart index 546ac0ccb5f..23d2dd4287b 100644 --- a/examples/lib/stories/collision_detection/multiple_shapes_example.dart +++ b/examples/lib/stories/collision_detection/multiple_shapes_example.dart @@ -8,7 +8,7 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart' hide Image, Draggable; +import 'package:material_ui/material_ui.dart' hide Image, Draggable; enum Shapes { circle, rectangle, polygon, path } diff --git a/examples/lib/stories/collision_detection/multiple_worlds_example.dart b/examples/lib/stories/collision_detection/multiple_worlds_example.dart index 5b4c1e03d55..d511850fda6 100644 --- a/examples/lib/stories/collision_detection/multiple_worlds_example.dart +++ b/examples/lib/stories/collision_detection/multiple_worlds_example.dart @@ -5,7 +5,7 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MultipleWorldsExample extends FlameGame { static const description = ''' diff --git a/examples/lib/stories/collision_detection/quadtree_example.dart b/examples/lib/stories/collision_detection/quadtree_example.dart index ce2bc9c8429..2375569a49f 100644 --- a/examples/lib/stories/collision_detection/quadtree_example.dart +++ b/examples/lib/stories/collision_detection/quadtree_example.dart @@ -7,8 +7,8 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/layers.dart'; -import 'package:flutter/material.dart' hide Image, Draggable; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart' hide Image, Draggable; const tileSize = 8.0; diff --git a/examples/lib/stories/collision_detection/raycast_example.dart b/examples/lib/stories/collision_detection/raycast_example.dart index db333a1048d..67e880b9b14 100644 --- a/examples/lib/stories/collision_detection/raycast_example.dart +++ b/examples/lib/stories/collision_detection/raycast_example.dart @@ -5,7 +5,7 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RaycastExample extends FlameGame with HasCollisionDetection, PathsCreationMixin { diff --git a/examples/lib/stories/collision_detection/raycast_light_example.dart b/examples/lib/stories/collision_detection/raycast_light_example.dart index 78250a80b79..0d3b14b4919 100644 --- a/examples/lib/stories/collision_detection/raycast_light_example.dart +++ b/examples/lib/stories/collision_detection/raycast_light_example.dart @@ -7,7 +7,7 @@ import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RaycastLightExample extends FlameGame with diff --git a/examples/lib/stories/collision_detection/raycast_max_distance_example.dart b/examples/lib/stories/collision_detection/raycast_max_distance_example.dart index 9c43eab00e9..dfcafae21df 100644 --- a/examples/lib/stories/collision_detection/raycast_max_distance_example.dart +++ b/examples/lib/stories/collision_detection/raycast_max_distance_example.dart @@ -10,7 +10,7 @@ import 'package:flame/geometry.dart'; import 'package:flame/palette.dart'; import 'package:flame_noise/flame_noise.dart'; import 'package:flame_test/test_paths.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RaycastMaxDistanceExample extends FlameGame with HasCollisionDetection { static const description = ''' diff --git a/examples/lib/stories/collision_detection/rays_in_shape_example.dart b/examples/lib/stories/collision_detection/rays_in_shape_example.dart index 2dfb1f7f71e..8d3db4837db 100644 --- a/examples/lib/stories/collision_detection/rays_in_shape_example.dart +++ b/examples/lib/stories/collision_detection/rays_in_shape_example.dart @@ -13,7 +13,7 @@ import 'package:flame/geometry.dart'; import 'package:flame/palette.dart'; import 'package:flame/text.dart'; import 'package:flame_test/test_paths.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; const side = 200.0; const playArea = Rect.fromLTRB(-side, -side, side, side); diff --git a/examples/lib/stories/collision_detection/raytrace_example.dart b/examples/lib/stories/collision_detection/raytrace_example.dart index 84d20efda1f..f4d83e5dfb7 100644 --- a/examples/lib/stories/collision_detection/raytrace_example.dart +++ b/examples/lib/stories/collision_detection/raytrace_example.dart @@ -9,7 +9,7 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RaytraceExample extends FlameGame with HasCollisionDetection, MouseMoveCallbacks, TapCallbacks { diff --git a/examples/lib/stories/components/component_pool_example.dart b/examples/lib/stories/components/component_pool_example.dart index 0a25fbb630f..d561c6eca6e 100644 --- a/examples/lib/stories/components/component_pool_example.dart +++ b/examples/lib/stories/components/component_pool_example.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class ComponentPoolExample extends FlameGame { static const String description = diff --git a/examples/lib/stories/components/components_notifier_example.dart b/examples/lib/stories/components/components_notifier_example.dart index 39bed1bdeeb..c30dac0057e 100644 --- a/examples/lib/stories/components/components_notifier_example.dart +++ b/examples/lib/stories/components/components_notifier_example.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/widgets.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class ComponentsNotifierExampleWidget extends StatefulWidget { const ComponentsNotifierExampleWidget({super.key}); diff --git a/examples/lib/stories/components/components_notifier_provider_example.dart b/examples/lib/stories/components/components_notifier_provider_example.dart index 9d0d50b064d..8a36baa1092 100644 --- a/examples/lib/stories/components/components_notifier_provider_example.dart +++ b/examples/lib/stories/components/components_notifier_provider_example.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; class ComponentsNotifierProviderExampleWidget extends StatefulWidget { diff --git a/examples/lib/stories/components/keys_example.dart b/examples/lib/stories/components/keys_example.dart index 66427ca6e96..36c01538d59 100644 --- a/examples/lib/stories/components/keys_example.dart +++ b/examples/lib/stories/components/keys_example.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class KeysExampleWidget extends StatefulWidget { const KeysExampleWidget({super.key}); diff --git a/examples/lib/stories/components/look_at_example.dart b/examples/lib/stories/components/look_at_example.dart index 98dbc2f42f6..a9a5ba01467 100644 --- a/examples/lib/stories/components/look_at_example.dart +++ b/examples/lib/stories/components/look_at_example.dart @@ -7,8 +7,8 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; import 'package:flame/sprite.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; class LookAtExample extends FlameGame<_TapWorld> with HasKeyboardHandlerComponents { diff --git a/examples/lib/stories/components/look_at_smooth_example.dart b/examples/lib/stories/components/look_at_smooth_example.dart index 0b94b1d4f80..f04da8f60d5 100644 --- a/examples/lib/stories/components/look_at_smooth_example.dart +++ b/examples/lib/stories/components/look_at_smooth_example.dart @@ -7,7 +7,7 @@ import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; import 'package:flame/sprite.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class LookAtSmoothExample extends FlameGame { static const description = diff --git a/examples/lib/stories/effects/color_effect_example.dart b/examples/lib/stories/effects/color_effect_example.dart index 60a6a85c2f5..5d22c62426f 100644 --- a/examples/lib/stories/effects/color_effect_example.dart +++ b/examples/lib/stories/effects/color_effect_example.dart @@ -2,7 +2,7 @@ import 'package:examples/commons/ember.dart'; import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class ColorEffectExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/effects/dual_effect_removal_example.dart b/examples/lib/stories/effects/dual_effect_removal_example.dart index 127c5dfa900..6da7209efca 100644 --- a/examples/lib/stories/effects/dual_effect_removal_example.dart +++ b/examples/lib/stories/effects/dual_effect_removal_example.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class DualEffectRemovalExample extends FlameGame with TapCallbacks { static const String description = ''' diff --git a/examples/lib/stories/effects/glow_effect_example.dart b/examples/lib/stories/effects/glow_effect_example.dart index 47fe2d3e725..4926da2d2ee 100644 --- a/examples/lib/stories/effects/glow_effect_example.dart +++ b/examples/lib/stories/effects/glow_effect_example.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: GlowEffectExample())); diff --git a/examples/lib/stories/effects/move_effect_example.dart b/examples/lib/stories/effects/move_effect_example.dart index 7049ed9d179..aebac7a2aed 100644 --- a/examples/lib/stories/effects/move_effect_example.dart +++ b/examples/lib/stories/effects/move_effect_example.dart @@ -5,7 +5,7 @@ import 'package:flame/effects.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame_noise/flame_noise.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MoveEffectExample extends FlameGame { static const description = ''' diff --git a/examples/lib/stories/effects/remove_effect_example.dart b/examples/lib/stories/effects/remove_effect_example.dart index 0ea4302387f..cbcb5538864 100644 --- a/examples/lib/stories/effects/remove_effect_example.dart +++ b/examples/lib/stories/effects/remove_effect_example.dart @@ -4,7 +4,7 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RemoveEffectExample extends FlameGame { static const description = ''' diff --git a/examples/lib/stories/effects/rotate_around_effect_example.dart b/examples/lib/stories/effects/rotate_around_effect_example.dart index d0b0f2f224a..0fb590672e8 100644 --- a/examples/lib/stories/effects/rotate_around_effect_example.dart +++ b/examples/lib/stories/effects/rotate_around_effect_example.dart @@ -6,7 +6,7 @@ import 'package:flame/effects.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; -import 'package:flutter/material.dart' as material; +import 'package:material_ui/material_ui.dart' as material; class RotateAroundEffectExample extends FlameGame { static const description = ''' diff --git a/examples/lib/stories/experimental/layout_component_example_1.dart b/examples/lib/stories/experimental/layout_component_example_1.dart index f7ad4de8361..ac88953b381 100644 --- a/examples/lib/stories/experimental/layout_component_example_1.dart +++ b/examples/lib/stories/experimental/layout_component_example_1.dart @@ -5,7 +5,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class LayoutComponentExample1 extends FlameGame with DragCallbacks { LayoutComponentExample1({ diff --git a/examples/lib/stories/experimental/layout_component_example_2.dart b/examples/lib/stories/experimental/layout_component_example_2.dart index 15a5ebba3f7..06406d3ddb3 100644 --- a/examples/lib/stories/experimental/layout_component_example_2.dart +++ b/examples/lib/stories/experimental/layout_component_example_2.dart @@ -5,7 +5,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class LayoutComponentExample2 extends FlameGame with DragCallbacks { LayoutComponentExample2({ diff --git a/examples/lib/stories/experimental/layout_component_example_3.dart b/examples/lib/stories/experimental/layout_component_example_3.dart index 6dcff5498c3..98299b84665 100644 --- a/examples/lib/stories/experimental/layout_component_example_3.dart +++ b/examples/lib/stories/experimental/layout_component_example_3.dart @@ -5,7 +5,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/experimental.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class LayoutComponentExample3 extends FlameGame with DragCallbacks { LayoutComponentExample3({ diff --git a/examples/lib/stories/input/double_tap_callbacks_example.dart b/examples/lib/stories/input/double_tap_callbacks_example.dart index 03a6d3a12c6..a32ac90faf6 100644 --- a/examples/lib/stories/input/double_tap_callbacks_example.dart +++ b/examples/lib/stories/input/double_tap_callbacks_example.dart @@ -2,7 +2,7 @@ import 'package:examples/commons/ember.dart'; import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class DoubleTapCallbacksExample extends FlameGame with DoubleTapCallbacks { static const String description = ''' diff --git a/examples/lib/stories/input/drag_callbacks_example.dart b/examples/lib/stories/input/drag_callbacks_example.dart index 025023c0adf..ccd815ed04e 100644 --- a/examples/lib/stories/input/drag_callbacks_example.dart +++ b/examples/lib/stories/input/drag_callbacks_example.dart @@ -1,7 +1,7 @@ import 'package:examples/commons/ember.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart' show Colors; +import 'package:material_ui/material_ui.dart' show Colors; class DragCallbacksExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/input/dynamic_scale_drag_example.dart b/examples/lib/stories/input/dynamic_scale_drag_example.dart index 79ed59fbd0f..61c444c4a61 100644 --- a/examples/lib/stories/input/dynamic_scale_drag_example.dart +++ b/examples/lib/stories/input/dynamic_scale_drag_example.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class DynamicScaleDragExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/input/gesture_hitboxes_example.dart b/examples/lib/stories/input/gesture_hitboxes_example.dart index 6a9ef654ebf..244f81c0f21 100644 --- a/examples/lib/stories/input/gesture_hitboxes_example.dart +++ b/examples/lib/stories/input/gesture_hitboxes_example.dart @@ -7,7 +7,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; enum Shapes { circle, rectangle, polygon, path } diff --git a/examples/lib/stories/input/hover_callbacks_example.dart b/examples/lib/stories/input/hover_callbacks_example.dart index fe80ddda1e4..47fac42b94b 100644 --- a/examples/lib/stories/input/hover_callbacks_example.dart +++ b/examples/lib/stories/input/hover_callbacks_example.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class HoverCallbacksExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/input/input.dart b/examples/lib/stories/input/input.dart index 850fc616d08..e2f86e95467 100644 --- a/examples/lib/stories/input/input.dart +++ b/examples/lib/stories/input/input.dart @@ -22,7 +22,7 @@ import 'package:examples/stories/input/secondary_tap_callbacks_example.dart'; import 'package:examples/stories/input/tap_callbacks_example.dart'; import 'package:examples/stories/input/tertiary_tap_callbacks_example.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void addInputStories(Dashbook dashbook) { dashbook.storiesOf('Input') diff --git a/examples/lib/stories/input/joystick_advanced_example.dart b/examples/lib/stories/input/joystick_advanced_example.dart index 6609b64ed78..056bd88d5c6 100644 --- a/examples/lib/stories/input/joystick_advanced_example.dart +++ b/examples/lib/stories/input/joystick_advanced_example.dart @@ -7,7 +7,7 @@ import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame/palette.dart'; import 'package:flame/sprite.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class JoystickAdvancedExample extends FlameGame with HasCollisionDetection { static const String description = ''' diff --git a/examples/lib/stories/input/long_press_example.dart b/examples/lib/stories/input/long_press_example.dart index 945fde1be8f..327ed9f1cbe 100644 --- a/examples/lib/stories/input/long_press_example.dart +++ b/examples/lib/stories/input/long_press_example.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class LongPressExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/input/mouse_cursor_example.dart b/examples/lib/stories/input/mouse_cursor_example.dart index 7c704ccde63..e86933c60c5 100644 --- a/examples/lib/stories/input/mouse_cursor_example.dart +++ b/examples/lib/stories/input/mouse_cursor_example.dart @@ -2,8 +2,8 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart'; class MouseCursorExample extends FlameGame with MouseMoveCallbacks { static const String description = ''' diff --git a/examples/lib/stories/input/mouse_movement_example.dart b/examples/lib/stories/input/mouse_movement_example.dart index 701fb054209..87bffd0c208 100644 --- a/examples/lib/stories/input/mouse_movement_example.dart +++ b/examples/lib/stories/input/mouse_movement_example.dart @@ -2,7 +2,7 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MouseMovementExample extends FlameGame with MouseMoveCallbacks { static const String description = ''' diff --git a/examples/lib/stories/input/overlapping_tap_callbacks_example.dart b/examples/lib/stories/input/overlapping_tap_callbacks_example.dart index bc034403533..c23f1c38fdf 100644 --- a/examples/lib/stories/input/overlapping_tap_callbacks_example.dart +++ b/examples/lib/stories/input/overlapping_tap_callbacks_example.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class OverlappingTapCallbacksExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/input/scroll_example.dart b/examples/lib/stories/input/scroll_example.dart index 6977fefe55a..6d27071fd1d 100644 --- a/examples/lib/stories/input/scroll_example.dart +++ b/examples/lib/stories/input/scroll_example.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class ScrollExample extends FlameGame with ScrollCallbacks { static const String description = ''' diff --git a/examples/lib/stories/input/secondary_tap_callbacks_example.dart b/examples/lib/stories/input/secondary_tap_callbacks_example.dart index 96dc2aed11a..d45df5a35de 100644 --- a/examples/lib/stories/input/secondary_tap_callbacks_example.dart +++ b/examples/lib/stories/input/secondary_tap_callbacks_example.dart @@ -3,7 +3,7 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SecondaryTapCallbacksExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/input/tap_callbacks_example.dart b/examples/lib/stories/input/tap_callbacks_example.dart index ebad404467e..a8a8741e0b9 100644 --- a/examples/lib/stories/input/tap_callbacks_example.dart +++ b/examples/lib/stories/input/tap_callbacks_example.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class TapCallbacksExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/input/tertiary_tap_callbacks_example.dart b/examples/lib/stories/input/tertiary_tap_callbacks_example.dart index cb578940419..e0f989c5cec 100644 --- a/examples/lib/stories/input/tertiary_tap_callbacks_example.dart +++ b/examples/lib/stories/input/tertiary_tap_callbacks_example.dart @@ -3,7 +3,7 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class TertiaryTapCallbacksExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/rendering/particles_example.dart b/examples/lib/stories/rendering/particles_example.dart index b2ad4d5d93b..c9e7f4a70f0 100644 --- a/examples/lib/stories/rendering/particles_example.dart +++ b/examples/lib/stories/rendering/particles_example.dart @@ -5,7 +5,7 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/particles.dart'; -import 'package:flutter/material.dart' hide Image; +import 'package:material_ui/material_ui.dart' hide Image; class ParticlesExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/rendering/particles_interactive_example.dart b/examples/lib/stories/rendering/particles_interactive_example.dart index dcbbded02ae..44277a1df02 100644 --- a/examples/lib/stories/rendering/particles_interactive_example.dart +++ b/examples/lib/stories/rendering/particles_interactive_example.dart @@ -5,7 +5,7 @@ import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/particles.dart'; -import 'package:flutter/material.dart' hide Image; +import 'package:material_ui/material_ui.dart' hide Image; /// The effect presets selectable in the properties panel. enum ParticleEffect { diff --git a/examples/lib/stories/rendering/rendering.dart b/examples/lib/stories/rendering/rendering.dart index c9e8476d3ad..dd5b549c7cd 100644 --- a/examples/lib/stories/rendering/rendering.dart +++ b/examples/lib/stories/rendering/rendering.dart @@ -10,7 +10,7 @@ import 'package:examples/stories/rendering/rich_text_example.dart'; import 'package:examples/stories/rendering/text_box_example.dart'; import 'package:examples/stories/rendering/text_example.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void addRenderingStories(Dashbook dashbook) { dashbook.storiesOf('Rendering') diff --git a/examples/lib/stories/rendering/text_example.dart b/examples/lib/stories/rendering/text_example.dart index 074a26e19ac..2b3eef7366c 100644 --- a/examples/lib/stories/rendering/text_example.dart +++ b/examples/lib/stories/rendering/text_example.dart @@ -5,7 +5,7 @@ import 'package:flame/effects.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; import 'package:flame/text.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class TextExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/router/router_world_example.dart b/examples/lib/stories/router/router_world_example.dart index d900ca61a25..284735749aa 100644 --- a/examples/lib/stories/router/router_world_example.dart +++ b/examples/lib/stories/router/router_world_example.dart @@ -4,8 +4,8 @@ import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/geometry.dart'; import 'package:flame/rendering.dart'; -import 'package:flutter/material.dart' show Colors; import 'package:flutter/rendering.dart'; +import 'package:material_ui/material_ui.dart' show Colors; class RouterWorldExample extends FlameGame { static const description = ''' diff --git a/examples/lib/stories/sprites/sprite_batch_bleed_example.dart b/examples/lib/stories/sprites/sprite_batch_bleed_example.dart index 3b5a04d5239..71e8680bf79 100644 --- a/examples/lib/stories/sprites/sprite_batch_bleed_example.dart +++ b/examples/lib/stories/sprites/sprite_batch_bleed_example.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/sprite.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SpriteBatchBleedExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/sprites/sprite_batch_example.dart b/examples/lib/stories/sprites/sprite_batch_example.dart index 0a1008b3fa7..f81cee3e2df 100644 --- a/examples/lib/stories/sprites/sprite_batch_example.dart +++ b/examples/lib/stories/sprites/sprite_batch_example.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/sprite.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SpriteBatchExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/sprites/sprite_batch_load_example.dart b/examples/lib/stories/sprites/sprite_batch_load_example.dart index 17966303266..cc7b5daf352 100644 --- a/examples/lib/stories/sprites/sprite_batch_load_example.dart +++ b/examples/lib/stories/sprites/sprite_batch_load_example.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/sprite.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SpriteBatchLoadExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/structure/levels.dart b/examples/lib/stories/structure/levels.dart index d516f18fdbd..21cd9af3563 100644 --- a/examples/lib/stories/structure/levels.dart +++ b/examples/lib/stories/structure/levels.dart @@ -4,7 +4,7 @@ import 'package:flame/effects.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class LevelsExample extends FlameGame { static const String description = ''' diff --git a/examples/lib/stories/system/overlays_example.dart b/examples/lib/stories/system/overlays_example.dart index c03f6ac1f9d..b66eea4211d 100644 --- a/examples/lib/stories/system/overlays_example.dart +++ b/examples/lib/stories/system/overlays_example.dart @@ -2,7 +2,7 @@ import 'package:dashbook/dashbook.dart'; import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class OverlaysExample extends FlameGame with TapCallbacks { static const String description = ''' diff --git a/examples/lib/stories/system/step_engine_example.dart b/examples/lib/stories/system/step_engine_example.dart index 4b1b5d579fa..5f838c720b4 100644 --- a/examples/lib/stories/system/step_engine_example.dart +++ b/examples/lib/stories/system/step_engine_example.dart @@ -7,8 +7,8 @@ import 'package:flame/effects.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; class StepEngineExample extends FlameGame with HasCollisionDetection, HasKeyboardHandlerComponents { diff --git a/examples/lib/stories/utils/timer_component_example.dart b/examples/lib/stories/utils/timer_component_example.dart index 1ec6bf12e76..e27281a7f65 100644 --- a/examples/lib/stories/utils/timer_component_example.dart +++ b/examples/lib/stories/utils/timer_component_example.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class TimerComponentExample extends FlameGame with TapCallbacks, DoubleTapCallbacks { diff --git a/examples/lib/stories/utils/timer_example.dart b/examples/lib/stories/utils/timer_example.dart index e149a4f8615..906b6926b41 100644 --- a/examples/lib/stories/utils/timer_example.dart +++ b/examples/lib/stories/utils/timer_example.dart @@ -1,7 +1,7 @@ import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/timer.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class TimerExample extends FlameGame with TapCallbacks { static const String description = ''' diff --git a/examples/lib/stories/widgets/custom_painter_example.dart b/examples/lib/stories/widgets/custom_painter_example.dart index 5d481fd83d8..2a556bbf010 100644 --- a/examples/lib/stories/widgets/custom_painter_example.dart +++ b/examples/lib/stories/widgets/custom_painter_example.dart @@ -2,7 +2,7 @@ import 'package:dashbook/dashbook.dart'; import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class CustomPainterExample extends FlameGame with TapCallbacks { static const description = ''' diff --git a/examples/lib/stories/widgets/nine_tile_box_example_with_animation.dart b/examples/lib/stories/widgets/nine_tile_box_example_with_animation.dart index 4e00ee261a8..bf877f8ef0e 100644 --- a/examples/lib/stories/widgets/nine_tile_box_example_with_animation.dart +++ b/examples/lib/stories/widgets/nine_tile_box_example_with_animation.dart @@ -1,6 +1,6 @@ import 'package:dashbook/dashbook.dart'; import 'package:flame/widgets.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; var _opacity = 1.0; diff --git a/examples/lib/stories/widgets/partial_sprite_widget_example.dart b/examples/lib/stories/widgets/partial_sprite_widget_example.dart index 492c90d4505..a92fd4e5091 100644 --- a/examples/lib/stories/widgets/partial_sprite_widget_example.dart +++ b/examples/lib/stories/widgets/partial_sprite_widget_example.dart @@ -1,7 +1,7 @@ import 'package:dashbook/dashbook.dart'; import 'package:flame/extensions.dart'; import 'package:flame/widgets.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; final anchorOptions = Anchor.values.map((e) => e.name).toList(); diff --git a/examples/lib/stories/widgets/sprite_widget_example.dart b/examples/lib/stories/widgets/sprite_widget_example.dart index a4ca319aeaf..782af8576e0 100644 --- a/examples/lib/stories/widgets/sprite_widget_example.dart +++ b/examples/lib/stories/widgets/sprite_widget_example.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:dashbook/dashbook.dart'; import 'package:examples/stories/widgets/paints.dart'; import 'package:flame/widgets.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; final anchorOptions = Anchor.values.map((e) => e.name).toList(); diff --git a/examples/pubspec.yaml b/examples/pubspec.yaml index 262af24e202..27bf127d92f 100644 --- a/examples/pubspec.yaml +++ b/examples/pubspec.yaml @@ -28,6 +28,7 @@ dependencies: sdk: flutter google_fonts: ^8.0.2 jenny: ^1.5.1 + material_ui: any meta: ^1.12.0 padracing: ^1.0.0 provider: ^6.1.2 diff --git a/packages/flame/example/lib/main.dart b/packages/flame/example/lib/main.dart index bd5569f6849..1e4be0cb267 100644 --- a/packages/flame/example/lib/main.dart +++ b/packages/flame/example/lib/main.dart @@ -4,7 +4,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// This example simply adds a rotating white square on the screen. /// If you press on a square, it will be removed. diff --git a/packages/flame/example/pubspec.yaml b/packages/flame/example/pubspec.yaml index 01e032aea8c..10d772dbc9b 100644 --- a/packages/flame/example/pubspec.yaml +++ b/packages/flame/example/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/packages/flame/lib/src/collisions/collision_detection.dart b/packages/flame/lib/src/collisions/collision_detection.dart index 014c4229cd5..6f0de5d5139 100644 --- a/packages/flame/lib/src/collisions/collision_detection.dart +++ b/packages/flame/lib/src/collisions/collision_detection.dart @@ -1,7 +1,7 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; import 'package:flame/geometry.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// [CollisionDetection] is the foundation of the collision detection system in /// Flame. diff --git a/packages/flame/lib/src/components/components_notifier.dart b/packages/flame/lib/src/components/components_notifier.dart index 1ed5dd050f7..4106146a9d2 100644 --- a/packages/flame/lib/src/components/components_notifier.dart +++ b/packages/flame/lib/src/components/components_notifier.dart @@ -1,7 +1,7 @@ import 'dart:collection'; import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:meta/meta.dart'; /// A [ChangeNotifier] that notifies its listeners when a [Component] is diff --git a/packages/flame/lib/src/components/mixins/has_ancestor.dart b/packages/flame/lib/src/components/mixins/has_ancestor.dart index 0d45a20df70..b9aa174ca8a 100644 --- a/packages/flame/lib/src/components/mixins/has_ancestor.dart +++ b/packages/flame/lib/src/components/mixins/has_ancestor.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A mixin that ensures an ancestor is of the given type [T]. /// diff --git a/packages/flame/lib/src/components/mixins/has_visibility.dart b/packages/flame/lib/src/components/mixins/has_visibility.dart index faecb84dab1..2ffd25617a4 100644 --- a/packages/flame/lib/src/components/mixins/has_visibility.dart +++ b/packages/flame/lib/src/components/mixins/has_visibility.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A mixin that allows a component visibility to be toggled /// without removing it from the tree. Visibility affects diff --git a/packages/flame/lib/src/components/mixins/parent_is_a.dart b/packages/flame/lib/src/components/mixins/parent_is_a.dart index d36cc20b00e..3d2fe65bfca 100644 --- a/packages/flame/lib/src/components/mixins/parent_is_a.dart +++ b/packages/flame/lib/src/components/mixins/parent_is_a.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A mixin that ensures a parent is of the given type [T]. mixin ParentIsA on Component { diff --git a/packages/flame/lib/src/effects/color_effect.dart b/packages/flame/lib/src/effects/color_effect.dart index 3d86d26eee2..1fc17502ee0 100644 --- a/packages/flame/lib/src/effects/color_effect.dart +++ b/packages/flame/lib/src/effects/color_effect.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flame/src/effects/component_effect.dart'; import 'package:flame/src/effects/controllers/effect_controller.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Change the color of a component over time. /// diff --git a/packages/flame/lib/src/game/mixins/keyboard.dart b/packages/flame/lib/src/game/mixins/keyboard.dart index cf5cae7e0f7..2b65e3eb286 100644 --- a/packages/flame/lib/src/game/mixins/keyboard.dart +++ b/packages/flame/lib/src/game/mixins/keyboard.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// A [FlameGame] mixin that implements [KeyboardEvents] with keyboard event /// propagation to components that are mixed with [KeyboardHandler]. diff --git a/packages/flame/lib/src/post_process/post_process.dart b/packages/flame/lib/src/post_process/post_process.dart index f50871d1f12..d3f76f06a35 100644 --- a/packages/flame/lib/src/post_process/post_process.dart +++ b/packages/flame/lib/src/post_process/post_process.dart @@ -4,7 +4,7 @@ import 'dart:ui' hide Image; import 'package:flame/components.dart'; import 'package:flame/post_process.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:meta/meta.dart'; /// A way to apply effects to a whole component tree. diff --git a/packages/flame/lib/src/widgets/animation_widget.dart b/packages/flame/lib/src/widgets/animation_widget.dart index 9b899a45533..7819c6fa68f 100644 --- a/packages/flame/lib/src/widgets/animation_widget.dart +++ b/packages/flame/lib/src/widgets/animation_widget.dart @@ -6,7 +6,7 @@ import 'package:flame/src/sprite_animation.dart'; import 'package:flame/src/sprite_animation_ticker.dart'; import 'package:flame/src/widgets/base_future_builder.dart'; import 'package:flame/src/widgets/sprite_painter.dart'; -import 'package:flutter/material.dart' hide Animation; +import 'package:material_ui/material_ui.dart' hide Animation; export '../sprite_animation.dart'; diff --git a/packages/flame/lib/src/widgets/base_future_builder.dart b/packages/flame/lib/src/widgets/base_future_builder.dart index 50a1612c2b6..bc319e29813 100644 --- a/packages/flame/lib/src/widgets/base_future_builder.dart +++ b/packages/flame/lib/src/widgets/base_future_builder.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class BaseFutureBuilder extends StatelessWidget { final FutureOr future; diff --git a/packages/flame/lib/src/widgets/components_notifier_builder.dart b/packages/flame/lib/src/widgets/components_notifier_builder.dart index e2d3473bbd7..38b60262832 100644 --- a/packages/flame/lib/src/widgets/components_notifier_builder.dart +++ b/packages/flame/lib/src/widgets/components_notifier_builder.dart @@ -1,5 +1,5 @@ import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A widget that rebuilds every time the given [notifier] changes. class ComponentsNotifierBuilder extends StatefulWidget { diff --git a/packages/flame/lib/src/widgets/nine_tile_box.dart b/packages/flame/lib/src/widgets/nine_tile_box.dart index bb86661ec24..4b122e4d65d 100644 --- a/packages/flame/lib/src/widgets/nine_tile_box.dart +++ b/packages/flame/lib/src/widgets/nine_tile_box.dart @@ -6,7 +6,7 @@ import 'package:flame/flame.dart'; import 'package:flame/src/nine_tile_box.dart' as non_widget; import 'package:flame/src/sprite.dart'; import 'package:flame/src/widgets/base_future_builder.dart'; -import 'package:flutter/material.dart' hide Image; +import 'package:material_ui/material_ui.dart' hide Image; export '../nine_tile_box.dart'; export '../sprite.dart'; diff --git a/packages/flame/pubspec.yaml b/packages/flame/pubspec.yaml index 7894212d75f..a100ef1d9f6 100644 --- a/packages/flame/pubspec.yaml +++ b/packages/flame/pubspec.yaml @@ -21,6 +21,7 @@ dependencies: collection: ^1.18.0 flutter: sdk: flutter + material_ui: any meta: ^1.12.0 vector_math: ^2.1.4 diff --git a/packages/flame/test/camera/camera_component_test.dart b/packages/flame/test/camera/camera_component_test.dart index 0f132804a5f..18709c3c4be 100644 --- a/packages/flame/test/camera/camera_component_test.dart +++ b/packages/flame/test/camera/camera_component_test.dart @@ -7,8 +7,8 @@ import 'package:flame/experimental.dart'; import 'package:flame/extensions.dart'; import 'package:flame/post_process.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'camera_test_helpers.dart'; diff --git a/packages/flame/test/components/advanced_button_component_test.dart b/packages/flame/test/components/advanced_button_component_test.dart index 11f092f7134..7267f30e20d 100644 --- a/packages/flame/test/components/advanced_button_component_test.dart +++ b/packages/flame/test/components/advanced_button_component_test.dart @@ -2,8 +2,8 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('AdvancedButtonComponent', () { diff --git a/packages/flame/test/components/button_component_test.dart b/packages/flame/test/components/button_component_test.dart index 3fe54a98f87..20f6eb7e50c 100644 --- a/packages/flame/test/components/button_component_test.dart +++ b/packages/flame/test/components/button_component_test.dart @@ -3,8 +3,8 @@ import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('ButtonComponent', () { diff --git a/packages/flame/test/components/clip_component_test.dart b/packages/flame/test/components/clip_component_test.dart index 3d370ea395a..fabebb87879 100644 --- a/packages/flame/test/components/clip_component_test.dart +++ b/packages/flame/test/components/clip_component_test.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _Rectangle extends RectangleComponent { _Rectangle() diff --git a/packages/flame/test/components/component_test.dart b/packages/flame/test/components/component_test.dart index a6a12ea0ffd..3c9fc8ca1f9 100644 --- a/packages/flame/test/components/component_test.dart +++ b/packages/flame/test/components/component_test.dart @@ -5,8 +5,8 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/src/components/core/component.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import '../custom_component.dart'; diff --git a/packages/flame/test/components/custom_painter_component_test.dart b/packages/flame/test/components/custom_painter_component_test.dart index a54ce1a9c4a..a13fc6a2f46 100644 --- a/packages/flame/test/components/custom_painter_component_test.dart +++ b/packages/flame/test/components/custom_painter_component_test.dart @@ -1,6 +1,6 @@ import 'package:canvas_test/canvas_test.dart'; import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:test/test.dart'; diff --git a/packages/flame/test/components/hud_button_component_test.dart b/packages/flame/test/components/hud_button_component_test.dart index 4a40dccbdf6..847c24f4409 100644 --- a/packages/flame/test/components/hud_button_component_test.dart +++ b/packages/flame/test/components/hud_button_component_test.dart @@ -3,8 +3,8 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/input.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('HudButtonComponent', () { diff --git a/packages/flame/test/components/input/sprite_button_component_test.dart b/packages/flame/test/components/input/sprite_button_component_test.dart index 98b5229de35..8482c464d01 100644 --- a/packages/flame/test/components/input/sprite_button_component_test.dart +++ b/packages/flame/test/components/input/sprite_button_component_test.dart @@ -7,8 +7,8 @@ import 'package:flame/src/anchor.dart'; import 'package:flame/src/components/sprite_group_component.dart'; import 'package:flame/src/sprite_sheet.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; enum _ButtonState { up, diff --git a/packages/flame/test/components/mixins/component_viewport_margin_test.dart b/packages/flame/test/components/mixins/component_viewport_margin_test.dart index 6bf29fabda5..a60399aef39 100644 --- a/packages/flame/test/components/mixins/component_viewport_margin_test.dart +++ b/packages/flame/test/components/mixins/component_viewport_margin_test.dart @@ -1,8 +1,8 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('ComponentViewportMargin', () { diff --git a/packages/flame/test/components/mixins/has_visibility_test.dart b/packages/flame/test/components/mixins/has_visibility_test.dart index ffca605cb0a..b88873a0445 100644 --- a/packages/flame/test/components/mixins/has_visibility_test.dart +++ b/packages/flame/test/components/mixins/has_visibility_test.dart @@ -2,8 +2,8 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import '../../_resources/load_image.dart'; diff --git a/packages/flame/test/components/toogle_button_component_test.dart b/packages/flame/test/components/toogle_button_component_test.dart index 2f41ac05946..10c774d0536 100644 --- a/packages/flame/test/components/toogle_button_component_test.dart +++ b/packages/flame/test/components/toogle_button_component_test.dart @@ -2,8 +2,8 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('ToggleButtonComponent', () { diff --git a/packages/flame/test/effects/color_effect_test.dart b/packages/flame/test/effects/color_effect_test.dart index 3af9deaedef..2c7492582f3 100644 --- a/packages/flame/test/effects/color_effect_test.dart +++ b/packages/flame/test/effects/color_effect_test.dart @@ -1,8 +1,8 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _PaintComponent extends Component with HasPaint {} diff --git a/packages/flame/test/events/component_mixins/drag_callbacks_test.dart b/packages/flame/test/events/component_mixins/drag_callbacks_test.dart index 52dba931cd1..bf015c0ac6c 100644 --- a/packages/flame/test/events/component_mixins/drag_callbacks_test.dart +++ b/packages/flame/test/events/component_mixins/drag_callbacks_test.dart @@ -3,8 +3,8 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'input_test_helper.dart'; diff --git a/packages/flame/test/events/component_mixins/scale_callbacks_test.dart b/packages/flame/test/events/component_mixins/scale_callbacks_test.dart index 33444cda35d..94d1f3c23bc 100644 --- a/packages/flame/test/events/component_mixins/scale_callbacks_test.dart +++ b/packages/flame/test/events/component_mixins/scale_callbacks_test.dart @@ -3,8 +3,9 @@ import 'dart:math'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; + import 'input_test_helper.dart'; void main() { diff --git a/packages/flame/test/events/component_mixins/scale_drag_callbacks_test.dart b/packages/flame/test/events/component_mixins/scale_drag_callbacks_test.dart index b56416d1f19..c57d59c0dfe 100644 --- a/packages/flame/test/events/component_mixins/scale_drag_callbacks_test.dart +++ b/packages/flame/test/events/component_mixins/scale_drag_callbacks_test.dart @@ -3,8 +3,9 @@ import 'dart:math'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; + import 'input_test_helper.dart'; void main() { diff --git a/packages/flame/test/extensions/image_extension_test.dart b/packages/flame/test/extensions/image_extension_test.dart index 919866dd715..678204237da 100644 --- a/packages/flame/test/extensions/image_extension_test.dart +++ b/packages/flame/test/extensions/image_extension_test.dart @@ -4,8 +4,8 @@ import 'dart:ui'; import 'package:flame/extensions.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; final _output = List.filled(8 * 8 * 4, 255); diff --git a/packages/flame/test/game/contains_event_handler_at_test.dart b/packages/flame/test/game/contains_event_handler_at_test.dart index ac53f63a1c9..fddd335b1ce 100644 --- a/packages/flame/test/game/contains_event_handler_at_test.dart +++ b/packages/flame/test/game/contains_event_handler_at_test.dart @@ -2,8 +2,8 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('FlameGame.containsEventHandlerAt', () { diff --git a/packages/flame/test/game/flame_game_test.dart b/packages/flame/test/game/flame_game_test.dart index 4a680e0a7eb..8a681ecc9fb 100644 --- a/packages/flame/test/game/flame_game_test.dart +++ b/packages/flame/test/game/flame_game_test.dart @@ -8,9 +8,9 @@ import 'package:flame/game.dart'; import 'package:flame/src/components/core/component.dart'; import 'package:flame/src/game/game_render_box.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('FlameGame', () { diff --git a/packages/flame/test/game/game_widget/game_widget_hot_reload_test.dart b/packages/flame/test/game/game_widget/game_widget_hot_reload_test.dart index 16cdfe836bf..f1afde93d64 100644 --- a/packages/flame/test/game/game_widget/game_widget_hot_reload_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_hot_reload_test.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _HotReloadGame extends FlameGame { int hotReloadCount = 0; 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 b799c19e556..31c479b1979 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 @@ -1,9 +1,9 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/input.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _KeyboardEventsGame extends FlameGame with KeyboardEvents { final List keysPressed = []; 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 f8c40c9860a..fc969b0ae57 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 @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _MyGame extends FlameGame { final List events; diff --git a/packages/flame/test/game/game_widget/game_widget_managed_lifecycle_test.dart b/packages/flame/test/game/game_widget/game_widget_managed_lifecycle_test.dart index 997ebf282af..f0cb15fa1d3 100644 --- a/packages/flame/test/game/game_widget/game_widget_managed_lifecycle_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_managed_lifecycle_test.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _MyGame extends FlameGame { final List events; diff --git a/packages/flame/test/game/game_widget/game_widget_mouse_cursor_test.dart b/packages/flame/test/game/game_widget/game_widget_mouse_cursor_test.dart index fc00f28e6f4..4bcb0132e75 100644 --- a/packages/flame/test/game/game_widget/game_widget_mouse_cursor_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_mouse_cursor_test.dart @@ -1,6 +1,6 @@ import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { Finder byMouseCursor(MouseCursor cursor) { diff --git a/packages/flame/test/game/game_widget/game_widget_pause_test.dart b/packages/flame/test/game/game_widget/game_widget_pause_test.dart index 5a1e5137d85..586108c60d3 100644 --- a/packages/flame/test/game/game_widget/game_widget_pause_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_pause_test.dart @@ -1,7 +1,7 @@ import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _Wrapper extends StatefulWidget { const _Wrapper({ diff --git a/packages/flame/test/game/game_widget/game_widget_tap_passthrough_test.dart b/packages/flame/test/game/game_widget/game_widget_tap_passthrough_test.dart index df0d26b6143..f629b08b255 100644 --- a/packages/flame/test/game/game_widget/game_widget_tap_passthrough_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_tap_passthrough_test.dart @@ -1,8 +1,8 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _TransparentGame extends FlameGame with DeferHitTestToComponents { @override diff --git a/packages/flame/test/game/game_widget/game_widget_test.dart b/packages/flame/test/game/game_widget/game_widget_test.dart index b7f9f18a3f1..cea037e5851 100644 --- a/packages/flame/test/game/game_widget/game_widget_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_test.dart @@ -4,9 +4,9 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _Wrapper extends StatefulWidget { const _Wrapper({ diff --git a/packages/flame/test/game/mixins/keyboard_test.dart b/packages/flame/test/game/mixins/keyboard_test.dart index ca6c111df04..5724ba2295e 100644 --- a/packages/flame/test/game/mixins/keyboard_test.dart +++ b/packages/flame/test/game/mixins/keyboard_test.dart @@ -1,8 +1,8 @@ import 'package:flame/game.dart'; import 'package:flame/input.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _ValidGame extends FlameGame with KeyboardEvents {} diff --git a/packages/flame/test/nine_tile_box_test.dart b/packages/flame/test/nine_tile_box_test.dart index 4dd9eb0254c..95b558c2f44 100644 --- a/packages/flame/test/nine_tile_box_test.dart +++ b/packages/flame/test/nine_tile_box_test.dart @@ -2,8 +2,8 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import '_resources/load_image.dart'; diff --git a/packages/flame/test/raster_sprite_test.dart b/packages/flame/test/raster_sprite_test.dart index 4d84d68e691..ec38b87063f 100644 --- a/packages/flame/test/raster_sprite_test.dart +++ b/packages/flame/test/raster_sprite_test.dart @@ -3,8 +3,8 @@ import 'dart:ui'; import 'package:flame/cache.dart'; import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import '_resources/load_image.dart'; diff --git a/packages/flame/test/sprite_batch_test.dart b/packages/flame/test/sprite_batch_test.dart index 5d23b3d7875..5ba63cef2c0 100644 --- a/packages/flame/test/sprite_batch_test.dart +++ b/packages/flame/test/sprite_batch_test.dart @@ -3,8 +3,8 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/sprite.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart' hide Image; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart' hide Image; import 'package:mocktail/mocktail.dart'; import '_resources/load_image.dart'; diff --git a/packages/flame/test/sprite_test.dart b/packages/flame/test/sprite_test.dart index cddc08d4334..4704b0a7ad9 100644 --- a/packages/flame/test/sprite_test.dart +++ b/packages/flame/test/sprite_test.dart @@ -2,8 +2,8 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import '_resources/load_image.dart'; diff --git a/packages/flame/test/text/text_renderer_test.dart b/packages/flame/test/text/text_renderer_test.dart index 3182c5f4318..5d35b23e386 100644 --- a/packages/flame/test/text/text_renderer_test.dart +++ b/packages/flame/test/text/text_renderer_test.dart @@ -1,6 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame/text.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/flame/test/widgets/components_notifier_builder_test.dart b/packages/flame/test/widgets/components_notifier_builder_test.dart index 7ded46629f0..ec3e0927f49 100644 --- a/packages/flame/test/widgets/components_notifier_builder_test.dart +++ b/packages/flame/test/widgets/components_notifier_builder_test.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/widgets.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _Enemy extends PositionComponent with Notifier {} 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 95738f9cf71..6a484ce12dc 100644 --- a/packages/flame/test/widgets/nine_tile_box_widget_test.dart +++ b/packages/flame/test/widgets/nine_tile_box_widget_test.dart @@ -4,8 +4,8 @@ import 'package:flame/cache.dart'; import 'package:flame/flame.dart'; import 'package:flame/widgets.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'loading_widget.dart'; diff --git a/packages/flame/test/widgets/sprite_animation_widget_test.dart b/packages/flame/test/widgets/sprite_animation_widget_test.dart index 0579801661a..c5c0def44e6 100644 --- a/packages/flame/test/widgets/sprite_animation_widget_test.dart +++ b/packages/flame/test/widgets/sprite_animation_widget_test.dart @@ -3,8 +3,8 @@ import 'package:flame/flame.dart'; import 'package:flame/src/sprite_animation_ticker.dart'; import 'package:flame/widgets.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'loading_widget.dart'; diff --git a/packages/flame/test/widgets/sprite_widget_test.dart b/packages/flame/test/widgets/sprite_widget_test.dart index 2aaf7d97a5e..163a7e30dd0 100644 --- a/packages/flame/test/widgets/sprite_widget_test.dart +++ b/packages/flame/test/widgets/sprite_widget_test.dart @@ -2,8 +2,8 @@ import 'package:flame/components.dart'; import 'package:flame/flame.dart'; import 'package:flame/widgets.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'loading_widget.dart'; diff --git a/packages/flame_behavior_tree/example/lib/main.dart b/packages/flame_behavior_tree/example/lib/main.dart index ac78836141e..da3a3f8df05 100644 --- a/packages/flame_behavior_tree/example/lib/main.dart +++ b/packages/flame_behavior_tree/example/lib/main.dart @@ -8,7 +8,7 @@ import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame/palette.dart'; import 'package:flame_behavior_tree/flame_behavior_tree.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; typedef MyGame = FlameGame; const gameWidth = 320.0; diff --git a/packages/flame_behavior_tree/example/pubspec.yaml b/packages/flame_behavior_tree/example/pubspec.yaml index 8c1976156a4..e991c42e818 100644 --- a/packages/flame_behavior_tree/example/pubspec.yaml +++ b/packages/flame_behavior_tree/example/pubspec.yaml @@ -17,6 +17,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/packages/flame_behaviors/example/lib/entities/circle/behaviors/circle_collision_behavior.dart b/packages/flame_behaviors/example/lib/entities/circle/behaviors/circle_collision_behavior.dart index ca00f5d6265..e8148f357c9 100644 --- a/packages/flame_behaviors/example/lib/entities/circle/behaviors/circle_collision_behavior.dart +++ b/packages/flame_behaviors/example/lib/entities/circle/behaviors/circle_collision_behavior.dart @@ -1,7 +1,7 @@ import 'package:flame/extensions.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; import 'package:flame_behaviors_example/entities/entities.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class CircleCollisionBehavior extends CollisionBehavior { final _collisionColor = Colors.green.withValues(alpha: 0.8); diff --git a/packages/flame_behaviors/example/lib/entities/circle/behaviors/rectangle_collision_behavior.dart b/packages/flame_behaviors/example/lib/entities/circle/behaviors/rectangle_collision_behavior.dart index b4a551fb82b..f45a28921e5 100644 --- a/packages/flame_behaviors/example/lib/entities/circle/behaviors/rectangle_collision_behavior.dart +++ b/packages/flame_behaviors/example/lib/entities/circle/behaviors/rectangle_collision_behavior.dart @@ -1,7 +1,7 @@ import 'package:flame/extensions.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; import 'package:flame_behaviors_example/entities/entities.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RectangleCollisionBehavior extends CollisionBehavior { final _collisionColor = Colors.yellow.withValues(alpha: 0.8); diff --git a/packages/flame_behaviors/example/lib/entities/circle/circle.dart b/packages/flame_behaviors/example/lib/entities/circle/circle.dart index 8f5700ae658..f0435cb2def 100644 --- a/packages/flame_behaviors/example/lib/entities/circle/circle.dart +++ b/packages/flame_behaviors/example/lib/entities/circle/circle.dart @@ -5,7 +5,7 @@ import 'package:flame/components.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; import 'package:flame_behaviors_example/entities/circle/behaviors/behaviors.dart'; import 'package:flame_behaviors_example/entities/entities.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class Circle extends PositionedEntity with HasPaint { Circle({ diff --git a/packages/flame_behaviors/example/lib/entities/rectangle/behaviors/circle_colliding_behavior.dart b/packages/flame_behaviors/example/lib/entities/rectangle/behaviors/circle_colliding_behavior.dart index 87faa088bdc..3a560c2510b 100644 --- a/packages/flame_behaviors/example/lib/entities/rectangle/behaviors/circle_colliding_behavior.dart +++ b/packages/flame_behaviors/example/lib/entities/rectangle/behaviors/circle_colliding_behavior.dart @@ -1,7 +1,7 @@ import 'package:flame/extensions.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; import 'package:flame_behaviors_example/entities/entities.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class CircleCollidingBehavior extends CollisionBehavior { final _collisionColor = Colors.green.withValues(alpha: 0.8); diff --git a/packages/flame_behaviors/example/lib/entities/rectangle/behaviors/rectangle_colliding_behavior.dart b/packages/flame_behaviors/example/lib/entities/rectangle/behaviors/rectangle_colliding_behavior.dart index fede4ba4e51..c603403c7c4 100644 --- a/packages/flame_behaviors/example/lib/entities/rectangle/behaviors/rectangle_colliding_behavior.dart +++ b/packages/flame_behaviors/example/lib/entities/rectangle/behaviors/rectangle_colliding_behavior.dart @@ -1,7 +1,7 @@ import 'package:flame/extensions.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; import 'package:flame_behaviors_example/entities/entities.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class RectangleCollidingBehavior extends CollisionBehavior { diff --git a/packages/flame_behaviors/example/lib/entities/rectangle/rectangle.dart b/packages/flame_behaviors/example/lib/entities/rectangle/rectangle.dart index 4b764c46749..509d82ff9b4 100644 --- a/packages/flame_behaviors/example/lib/entities/rectangle/rectangle.dart +++ b/packages/flame_behaviors/example/lib/entities/rectangle/rectangle.dart @@ -3,7 +3,7 @@ import 'package:flame/components.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; import 'package:flame_behaviors_example/entities/entities.dart'; import 'package:flame_behaviors_example/entities/rectangle/behaviors/behaviors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class Rectangle extends PositionedEntity with HasPaint { Rectangle({ diff --git a/packages/flame_behaviors/example/lib/main.dart b/packages/flame_behaviors/example/lib/main.dart index fa1e33e9bec..cb1709e937d 100644 --- a/packages/flame_behaviors/example/lib/main.dart +++ b/packages/flame_behaviors/example/lib/main.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; import 'package:flame_behaviors_example/behaviors/behaviors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class ExampleGame extends FlameGame with EntityMixin, HasCollisionDetection { @override diff --git a/packages/flame_behaviors/example/pubspec.yaml b/packages/flame_behaviors/example/pubspec.yaml index 31fe1e94ea8..7e3b5750b37 100644 --- a/packages/flame_behaviors/example/pubspec.yaml +++ b/packages/flame_behaviors/example/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 diff --git a/packages/flame_behaviors/lib/src/behaviors/propagating_collision_behavior.dart b/packages/flame_behaviors/lib/src/behaviors/propagating_collision_behavior.dart index 17cb517ea9f..e8a9745ba78 100644 --- a/packages/flame_behaviors/lib/src/behaviors/propagating_collision_behavior.dart +++ b/packages/flame_behaviors/lib/src/behaviors/propagating_collision_behavior.dart @@ -1,7 +1,7 @@ import 'package:flame/collisions.dart'; import 'package:flame/components.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template collision_behavior} /// This behavior is used for collision between entities. The diff --git a/packages/flame_behaviors/pubspec.yaml b/packages/flame_behaviors/pubspec.yaml index 3cda2317a7f..6aa9869ed3f 100644 --- a/packages/flame_behaviors/pubspec.yaml +++ b/packages/flame_behaviors/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flame_test: ^2.3.0 diff --git a/packages/flame_bloc/example/lib/main.dart b/packages/flame_bloc/example/lib/main.dart index d390873610f..1c7c5f444c4 100644 --- a/packages/flame_bloc/example/lib/main.dart +++ b/packages/flame_bloc/example/lib/main.dart @@ -1,5 +1,5 @@ import 'package:flame_bloc_example/src/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(const MyApp()); diff --git a/packages/flame_bloc/example/lib/src/game.dart b/packages/flame_bloc/example/lib/src/game.dart index c8c36c5f209..0c8c3a7455e 100644 --- a/packages/flame_bloc/example/lib/src/game.dart +++ b/packages/flame_bloc/example/lib/src/game.dart @@ -4,8 +4,8 @@ import 'package:flame_bloc_example/src/game_stats/bloc/game_stats_bloc.dart'; import 'package:flame_bloc_example/src/game_stats/view/game_stat.dart'; import 'package:flame_bloc_example/src/inventory/bloc/inventory_bloc.dart'; import 'package:flame_bloc_example/src/inventory/view/inventory.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:material_ui/material_ui.dart'; class GamePage extends StatelessWidget { const GamePage({super.key}); 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 0c39d75e02e..3748b5570ab 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 @@ -1,6 +1,6 @@ import 'package:flame_bloc_example/src/game_stats/bloc/game_stats_bloc.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:material_ui/material_ui.dart'; class GameStat extends StatelessWidget { const GameStat({super.key}); 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 4a4f2f0edff..5e9abd5f9f5 100644 --- a/packages/flame_bloc/example/lib/src/inventory/view/inventory.dart +++ b/packages/flame_bloc/example/lib/src/inventory/view/inventory.dart @@ -1,6 +1,6 @@ import 'package:flame_bloc_example/src/inventory/bloc/inventory_bloc.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:material_ui/material_ui.dart'; class Inventory extends StatelessWidget { const Inventory({super.key}); diff --git a/packages/flame_bloc/example/pubspec.yaml b/packages/flame_bloc/example/pubspec.yaml index dc4f7c2f386..155715dc14b 100644 --- a/packages/flame_bloc/example/pubspec.yaml +++ b/packages/flame_bloc/example/pubspec.yaml @@ -18,6 +18,7 @@ dependencies: sdk: flutter flutter_bloc: ^8.1.2 + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/packages/flame_bloc/lib/src/flame_bloc_provider.dart b/packages/flame_bloc/lib/src/flame_bloc_provider.dart index 9db0e5b5a2a..a2452cfb972 100644 --- a/packages/flame_bloc/lib/src/flame_bloc_provider.dart +++ b/packages/flame_bloc/lib/src/flame_bloc_provider.dart @@ -1,6 +1,6 @@ import 'package:bloc/bloc.dart'; import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template flame_bloc_provider} /// A [Component] that provides a [Bloc] to its children diff --git a/packages/flame_bloc/lib/src/flame_bloc_reader.dart b/packages/flame_bloc/lib/src/flame_bloc_reader.dart index 4e5941d9b09..1e3814ed905 100644 --- a/packages/flame_bloc/lib/src/flame_bloc_reader.dart +++ b/packages/flame_bloc/lib/src/flame_bloc_reader.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:bloc/bloc.dart'; import 'package:flame/components.dart'; import 'package:flame_bloc/flame_bloc.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Adds [Bloc] access to a [Component]. /// diff --git a/packages/flame_bloc/pubspec.yaml b/packages/flame_bloc/pubspec.yaml index 89f70f1773c..3d40a7060d9 100644 --- a/packages/flame_bloc/pubspec.yaml +++ b/packages/flame_bloc/pubspec.yaml @@ -21,6 +21,7 @@ dependencies: flutter: sdk: flutter flutter_bloc: ">=8.1.2 <10.0.0" + material_ui: any meta: ^1.12.0 dev_dependencies: diff --git a/packages/flame_console/example/lib/main.dart b/packages/flame_console/example/lib/main.dart index c29e0dd01f7..ee2fcb0dcaa 100644 --- a/packages/flame_console/example/lib/main.dart +++ b/packages/flame_console/example/lib/main.dart @@ -2,7 +2,7 @@ import 'package:flame/game.dart'; import 'package:flame_console/flame_console.dart'; import 'package:flame_console_example/commands/commands.dart'; import 'package:flame_console_example/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(const MaterialApp(home: MyGameApp())); diff --git a/packages/flame_console/example/pubspec.yaml b/packages/flame_console/example/pubspec.yaml index 52050a630f5..7db65583776 100644 --- a/packages/flame_console/example/pubspec.yaml +++ b/packages/flame_console/example/pubspec.yaml @@ -15,6 +15,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/packages/flame_console/lib/src/view/console_view.dart b/packages/flame_console/lib/src/view/console_view.dart index eefc1ac3ef3..654b41a44e4 100644 --- a/packages/flame_console/lib/src/view/console_view.dart +++ b/packages/flame_console/lib/src/view/console_view.dart @@ -1,8 +1,8 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_console/flame_console.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:terminui/terminui.dart'; /// A Console like view that can be used to interact with a game. diff --git a/packages/flame_console/lib/src/view/container_builder.dart b/packages/flame_console/lib/src/view/container_builder.dart index e4552dbfc41..120bacd86fc 100644 --- a/packages/flame_console/lib/src/view/container_builder.dart +++ b/packages/flame_console/lib/src/view/container_builder.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; Widget defaultContainerBuilder(BuildContext context, Widget child) { return DecoratedBox( diff --git a/packages/flame_console/pubspec.yaml b/packages/flame_console/pubspec.yaml index ba13cb72869..9f6e66e0857 100644 --- a/packages/flame_console/pubspec.yaml +++ b/packages/flame_console/pubspec.yaml @@ -21,6 +21,7 @@ dependencies: flame: ^1.38.0 flutter: sdk: flutter + material_ui: any terminui: ^0.3.0 dev_dependencies: diff --git a/packages/flame_devtools/lib/main.dart b/packages/flame_devtools/lib/main.dart index 66407901ff8..9abde4b1fe7 100644 --- a/packages/flame_devtools/lib/main.dart +++ b/packages/flame_devtools/lib/main.dart @@ -3,8 +3,8 @@ import 'package:flame_devtools/widgets/component_tree.dart'; import 'package:flame_devtools/widgets/debug_mode_button.dart'; import 'package:flame_devtools/widgets/game_loop_controls.dart'; import 'package:flame_devtools/widgets/overlay_navigation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(const FlameDevTools()); diff --git a/packages/flame_devtools/lib/widgets/component_counter.dart b/packages/flame_devtools/lib/widgets/component_counter.dart index 66a9c162f0e..3e3a916097f 100644 --- a/packages/flame_devtools/lib/widgets/component_counter.dart +++ b/packages/flame_devtools/lib/widgets/component_counter.dart @@ -1,5 +1,5 @@ import 'package:flame_devtools/repository.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class ComponentCounter extends StatefulWidget { const ComponentCounter({super.key}); diff --git a/packages/flame_devtools/lib/widgets/component_snapshot.dart b/packages/flame_devtools/lib/widgets/component_snapshot.dart index bc6c823023d..c71947f614a 100644 --- a/packages/flame_devtools/lib/widgets/component_snapshot.dart +++ b/packages/flame_devtools/lib/widgets/component_snapshot.dart @@ -3,7 +3,7 @@ import 'dart:ui' as ui; import 'package:flame/widgets.dart'; import 'package:flame_devtools/repository.dart'; -import 'package:flutter/material.dart' hide Image; +import 'package:material_ui/material_ui.dart' hide Image; class ComponentSnapshot extends StatefulWidget { const ComponentSnapshot({ diff --git a/packages/flame_devtools/lib/widgets/component_tree.dart b/packages/flame_devtools/lib/widgets/component_tree.dart index 7f791172a33..d883596744e 100644 --- a/packages/flame_devtools/lib/widgets/component_tree.dart +++ b/packages/flame_devtools/lib/widgets/component_tree.dart @@ -4,8 +4,8 @@ import 'package:flame_devtools/widgets/component_snapshot.dart'; import 'package:flame_devtools/widgets/component_tree_model.dart'; import 'package:flame_devtools/widgets/debug_mode_button.dart'; import 'package:flame_devtools/widgets/position_component_attributes_form.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:material_ui/material_ui.dart'; class ComponentTree extends StatelessWidget { const ComponentTree({super.key}); diff --git a/packages/flame_devtools/lib/widgets/component_tree_model.dart b/packages/flame_devtools/lib/widgets/component_tree_model.dart index 490e95f9516..3b62ab6d7ce 100644 --- a/packages/flame_devtools/lib/widgets/component_tree_model.dart +++ b/packages/flame_devtools/lib/widgets/component_tree_model.dart @@ -1,9 +1,9 @@ import 'package:animated_tree_view/animated_tree_view.dart'; import 'package:flame/devtools.dart'; import 'package:flame_devtools/repository.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/legacy.dart'; +import 'package:material_ui/material_ui.dart'; final selectedTreeNodeProvider = StateProvider?>( (_) => null, diff --git a/packages/flame_devtools/lib/widgets/debug_mode_button.dart b/packages/flame_devtools/lib/widgets/debug_mode_button.dart index 93e2742a72c..b3aaa2ad222 100644 --- a/packages/flame_devtools/lib/widgets/debug_mode_button.dart +++ b/packages/flame_devtools/lib/widgets/debug_mode_button.dart @@ -1,5 +1,5 @@ import 'package:flame_devtools/repository.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class DebugModeButton extends StatefulWidget { const DebugModeButton({super.key, this.id}); diff --git a/packages/flame_devtools/lib/widgets/game_loop_controls.dart b/packages/flame_devtools/lib/widgets/game_loop_controls.dart index 565b5c2a27d..ac07295100f 100644 --- a/packages/flame_devtools/lib/widgets/game_loop_controls.dart +++ b/packages/flame_devtools/lib/widgets/game_loop_controls.dart @@ -1,6 +1,6 @@ import 'package:flame_devtools/repository.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; class GameLoopControls extends StatefulWidget { const GameLoopControls({super.key}); diff --git a/packages/flame_devtools/lib/widgets/incremental_number_form_field.dart b/packages/flame_devtools/lib/widgets/incremental_number_form_field.dart index e7f72b907bb..3b571cc56fe 100644 --- a/packages/flame_devtools/lib/widgets/incremental_number_form_field.dart +++ b/packages/flame_devtools/lib/widgets/incremental_number_form_field.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class IncrementalNumberFormField extends StatefulWidget { const IncrementalNumberFormField({ diff --git a/packages/flame_devtools/lib/widgets/overlay_navigation.dart b/packages/flame_devtools/lib/widgets/overlay_navigation.dart index 46a78439e29..7d504ef6f59 100644 --- a/packages/flame_devtools/lib/widgets/overlay_navigation.dart +++ b/packages/flame_devtools/lib/widgets/overlay_navigation.dart @@ -1,6 +1,6 @@ import 'package:devtools_app_shared/ui.dart' as devtools_ui; import 'package:flame_devtools/repository.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class OverlayNavigation extends StatefulWidget { const OverlayNavigation({super.key}); diff --git a/packages/flame_devtools/lib/widgets/position_component_attributes_form.dart b/packages/flame_devtools/lib/widgets/position_component_attributes_form.dart index dd179970fde..d2a51e87d1a 100644 --- a/packages/flame_devtools/lib/widgets/position_component_attributes_form.dart +++ b/packages/flame_devtools/lib/widgets/position_component_attributes_form.dart @@ -1,8 +1,8 @@ import 'package:flame_devtools/providers/position_component_attributes_provider.dart'; import 'package:flame_devtools/repository.dart'; import 'package:flame_devtools/widgets/incremental_number_form_field.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:material_ui/material_ui.dart'; class PositionComponentAttributesForm extends ConsumerWidget { const PositionComponentAttributesForm({ diff --git a/packages/flame_devtools/pubspec.yaml b/packages/flame_devtools/pubspec.yaml index ea263572dbc..e843d2148b2 100644 --- a/packages/flame_devtools/pubspec.yaml +++ b/packages/flame_devtools/pubspec.yaml @@ -16,6 +16,7 @@ dependencies: sdk: flutter flutter_riverpod: ^3.0.3 + material_ui: any dev_dependencies: flame_lint: ^1.4.3 diff --git a/packages/flame_fire_atlas/example/lib/main.dart b/packages/flame_fire_atlas/example/lib/main.dart index 3b2967b885c..82993612a7a 100644 --- a/packages/flame_fire_atlas/example/lib/main.dart +++ b/packages/flame_fire_atlas/example/lib/main.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_fire_atlas/flame_fire_atlas.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { WidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/flame_fire_atlas/example/pubspec.yaml b/packages/flame_fire_atlas/example/pubspec.yaml index d4660fc90ac..90bd5c8465c 100644 --- a/packages/flame_fire_atlas/example/pubspec.yaml +++ b/packages/flame_fire_atlas/example/pubspec.yaml @@ -15,6 +15,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/packages/flame_forge2d/pubspec.yaml b/packages/flame_forge2d/pubspec.yaml index 4f6b5429a96..b80e5395806 100644 --- a/packages/flame_forge2d/pubspec.yaml +++ b/packages/flame_forge2d/pubspec.yaml @@ -28,5 +28,6 @@ dev_dependencies: flame_test: ^2.3.0 flutter_test: sdk: flutter + material_ui: any mocktail: ^1.0.4 test: any diff --git a/packages/flame_forge2d/test/body_component_test.dart b/packages/flame_forge2d/test/body_component_test.dart index 0d31e639dfe..baa2938ca23 100644 --- a/packages/flame_forge2d/test/body_component_test.dart +++ b/packages/flame_forge2d/test/body_component_test.dart @@ -6,8 +6,8 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; class _TestBodyComponent extends BodyComponent with TapCallbacks { diff --git a/packages/flame_gamepads/example/lib/main.dart b/packages/flame_gamepads/example/lib/main.dart index f0442940a6c..85dd87a3105 100644 --- a/packages/flame_gamepads/example/lib/main.dart +++ b/packages/flame_gamepads/example/lib/main.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_gamepads/flame_gamepads.dart'; -import 'package:flutter/material.dart'; import 'package:gamepads/gamepads.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: GamepadsGame())); diff --git a/packages/flame_gamepads/example/pubspec.yaml b/packages/flame_gamepads/example/pubspec.yaml index 6a1bfb107db..2adca199a2d 100644 --- a/packages/flame_gamepads/example/pubspec.yaml +++ b/packages/flame_gamepads/example/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: sdk: flutter gamepads: ^0.1.10 + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter: diff --git a/packages/flame_gamepads/lib/src/gamepad_callbacks.dart b/packages/flame_gamepads/lib/src/gamepad_callbacks.dart index de2411e66fb..c262ef73eb5 100644 --- a/packages/flame_gamepads/lib/src/gamepad_callbacks.dart +++ b/packages/flame_gamepads/lib/src/gamepad_callbacks.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:flame/components.dart'; -import 'package:flutter/material.dart'; import 'package:gamepads/gamepads.dart'; +import 'package:material_ui/material_ui.dart'; /// This mixin can be added to a [Component] allowing it to receive /// normalized gamepad events while the component is mounted. diff --git a/packages/flame_gamepads/pubspec.yaml b/packages/flame_gamepads/pubspec.yaml index d2d5c413e97..9fc14c6e94d 100644 --- a/packages/flame_gamepads/pubspec.yaml +++ b/packages/flame_gamepads/pubspec.yaml @@ -21,6 +21,7 @@ dependencies: sdk: flutter gamepads: ^0.1.10 + material_ui: any dev_dependencies: dartdoc: ^9.0.0 flame_lint: ^1.4.3 diff --git a/packages/flame_isolate/example/lib/colonists_game.dart b/packages/flame_isolate/example/lib/colonists_game.dart index b90bd087e0a..1ebcf379354 100755 --- a/packages/flame_isolate/example/lib/colonists_game.dart +++ b/packages/flame_isolate/example/lib/colonists_game.dart @@ -11,8 +11,8 @@ import 'package:flame_isolate_example/game_map/game_map.dart'; import 'package:flame_isolate_example/objects/colonists_object.dart'; import 'package:flame_isolate_example/terrain/terrain.dart'; import 'package:flame_isolate_example/units/worker.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; class ColonistsGame extends FlameGame with KeyboardEvents { final PositionComponent _cameraPosition = PositionComponent(); diff --git a/packages/flame_isolate/example/lib/main.dart b/packages/flame_isolate/example/lib/main.dart index f924a40a4b4..ed917a7a866 100755 --- a/packages/flame_isolate/example/lib/main.dart +++ b/packages/flame_isolate/example/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flame/game.dart'; import 'package:flame_isolate_example/colonists_game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: ColonistsGame())); diff --git a/packages/flame_isolate/example/lib/standard/int_vector2.dart b/packages/flame_isolate/example/lib/standard/int_vector2.dart index 3116d8d93a5..262b8a4529e 100755 --- a/packages/flame_isolate/example/lib/standard/int_vector2.dart +++ b/packages/flame_isolate/example/lib/standard/int_vector2.dart @@ -1,5 +1,5 @@ +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flame/components.dart'; -import 'package:flutter/cupertino.dart'; import 'package:quiver/core.dart'; @immutable diff --git a/packages/flame_isolate/example/lib/terrain/grass.dart b/packages/flame_isolate/example/lib/terrain/grass.dart index 93cd13e1e39..dba5e5c634c 100755 --- a/packages/flame_isolate/example/lib/terrain/grass.dart +++ b/packages/flame_isolate/example/lib/terrain/grass.dart @@ -1,6 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame_isolate_example/terrain/terrain.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class Grass extends PositionComponent with Terrain { static final _color = Paint()..color = const Color(0xff567d46); diff --git a/packages/flame_isolate/example/lib/units/actions/movable.dart b/packages/flame_isolate/example/lib/units/actions/movable.dart index 455414c58d0..667002c6eea 100755 --- a/packages/flame_isolate/example/lib/units/actions/movable.dart +++ b/packages/flame_isolate/example/lib/units/actions/movable.dart @@ -4,7 +4,7 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; import 'package:flame_isolate_example/colonists_game.dart'; import 'package:flame_isolate_example/standard/int_vector2.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; enum MoveDirection { idle(isLeft: false), // 0 diff --git a/packages/flame_isolate/example/pubspec.yaml b/packages/flame_isolate/example/pubspec.yaml index 6e5c107d91a..c75ebcc65c6 100755 --- a/packages/flame_isolate/example/pubspec.yaml +++ b/packages/flame_isolate/example/pubspec.yaml @@ -12,10 +12,12 @@ environment: dependencies: collection: ^1.18.0 + cupertino_ui: any flame: ^1.38.0 flame_isolate: ^0.6.3+23 flutter: sdk: flutter + material_ui: any quiver: ^3.2.1 dev_dependencies: diff --git a/packages/flame_kenney_xml/example/lib/main.dart b/packages/flame_kenney_xml/example/lib/main.dart index b2a4388eedf..15ddb35e1e5 100644 --- a/packages/flame_kenney_xml/example/lib/main.dart +++ b/packages/flame_kenney_xml/example/lib/main.dart @@ -5,7 +5,7 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame_kenney_xml/flame_kenney_xml.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A simple game that adds a random sprite component created from a kenney.nl /// sprite sheet to the screen when tapped. diff --git a/packages/flame_kenney_xml/example/pubspec.yaml b/packages/flame_kenney_xml/example/pubspec.yaml index ce548b8774e..0fad9cda4f7 100644 --- a/packages/flame_kenney_xml/example/pubspec.yaml +++ b/packages/flame_kenney_xml/example/pubspec.yaml @@ -15,6 +15,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 diff --git a/packages/flame_lottie/example/lib/main.dart b/packages/flame_lottie/example/lib/main.dart index fdd565876b8..3216eb47406 100644 --- a/packages/flame_lottie/example/lib/main.dart +++ b/packages/flame_lottie/example/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flame/game.dart'; import 'package:flame_lottie/flame_lottie.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: LottieExampleGame())); diff --git a/packages/flame_lottie/example/pubspec.yaml b/packages/flame_lottie/example/pubspec.yaml index f4d621dea7c..25bc9496984 100644 --- a/packages/flame_lottie/example/pubspec.yaml +++ b/packages/flame_lottie/example/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: sdk: flutter lottie: + material_ui: any dev_dependencies: flame_lint: ^1.4.3 diff --git a/packages/flame_lottie/pubspec.yaml b/packages/flame_lottie/pubspec.yaml index 6f8a1f0eaea..db05f5c96c9 100644 --- a/packages/flame_lottie/pubspec.yaml +++ b/packages/flame_lottie/pubspec.yaml @@ -27,3 +27,4 @@ dev_dependencies: flame_test: ^2.3.0 flutter_test: sdk: flutter + material_ui: any diff --git a/packages/flame_lottie/test/flame_lottie_test.dart b/packages/flame_lottie/test/flame_lottie_test.dart index 58e0613c066..8b67602040d 100644 --- a/packages/flame_lottie/test/flame_lottie_test.dart +++ b/packages/flame_lottie/test/flame_lottie_test.dart @@ -3,8 +3,8 @@ import 'dart:typed_data'; import 'package:flame_lottie/flame_lottie.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { testWithFlameGame( diff --git a/packages/flame_network_assets/example/lib/main.dart b/packages/flame_network_assets/example/lib/main.dart index 2373dfd22f2..e35bf3b81b4 100644 --- a/packages/flame_network_assets/example/lib/main.dart +++ b/packages/flame_network_assets/example/lib/main.dart @@ -5,7 +5,7 @@ import 'package:flame/events.dart'; import 'package:flame/extensions.dart'; import 'package:flame/game.dart'; import 'package:flame_network_assets/flame_network_assets.dart'; -import 'package:flutter/material.dart' hide Image; +import 'package:material_ui/material_ui.dart' hide Image; void main() { runApp(const GameWidget.managed(gameFactory: MyGame.new)); diff --git a/packages/flame_network_assets/example/pubspec.yaml b/packages/flame_network_assets/example/pubspec.yaml index e8c99dac689..8a93f34c75a 100644 --- a/packages/flame_network_assets/example/pubspec.yaml +++ b/packages/flame_network_assets/example/pubspec.yaml @@ -14,5 +14,6 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 diff --git a/packages/flame_network_assets/pubspec.yaml b/packages/flame_network_assets/pubspec.yaml index 3c82c8a9295..34a4f5c8f69 100644 --- a/packages/flame_network_assets/pubspec.yaml +++ b/packages/flame_network_assets/pubspec.yaml @@ -30,4 +30,5 @@ dev_dependencies: flame_lint: ^1.4.3 flutter_test: sdk: flutter + material_ui: any mocktail: ^1.0.4 diff --git a/packages/flame_network_assets/test/flame_network_image_test.dart b/packages/flame_network_assets/test/flame_network_image_test.dart index ba033382360..7fee2bda976 100644 --- a/packages/flame_network_assets/test/flame_network_image_test.dart +++ b/packages/flame_network_assets/test/flame_network_image_test.dart @@ -2,8 +2,8 @@ import 'dart:io'; import 'dart:ui'; import 'package:flame_network_assets/flame_network_assets.dart'; -import 'package:flutter/material.dart' hide Image; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart' hide Image; import 'package:mocktail/mocktail.dart'; import 'package:path/path.dart' as path; diff --git a/packages/flame_rive/example/lib/main.dart b/packages/flame_rive/example/lib/main.dart index 356eb2c5db7..4f0e3d2015f 100644 --- a/packages/flame_rive/example/lib/main.dart +++ b/packages/flame_rive/example/lib/main.dart @@ -3,7 +3,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_rive/flame_rive.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/flame_rive/example/pubspec.yaml b/packages/flame_rive/example/pubspec.yaml index e741ca445ac..b45578f7ab9 100644 --- a/packages/flame_rive/example/pubspec.yaml +++ b/packages/flame_rive/example/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: flame_rive: ^1.11.2 flutter: sdk: flutter + material_ui: any rive: ^0.14.0 dev_dependencies: diff --git a/packages/flame_riverpod/example/lib/main.dart b/packages/flame_riverpod/example/lib/main.dart index e522b7f0d3c..b3281bb6c3d 100644 --- a/packages/flame_riverpod/example/lib/main.dart +++ b/packages/flame_riverpod/example/lib/main.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:flame/components.dart' hide Timer; import 'package:flame/game.dart'; import 'package:flame_riverpod/flame_riverpod.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:material_ui/material_ui.dart'; final countingStreamProvider = StreamProvider((ref) { return Stream.periodic(const Duration(seconds: 1), (inc) => inc); diff --git a/packages/flame_riverpod/example/pubspec.yaml b/packages/flame_riverpod/example/pubspec.yaml index db344dc22a7..376d3452319 100644 --- a/packages/flame_riverpod/example/pubspec.yaml +++ b/packages/flame_riverpod/example/pubspec.yaml @@ -11,8 +11,10 @@ dependencies: flutter: sdk: flutter flutter_riverpod: ^3.0.3 + material_ui: any dev_dependencies: + cupertino_ui: any flame_lint: ^1.4.3 flutter_test: sdk: flutter diff --git a/packages/flame_riverpod/example/test/widget_test.dart b/packages/flame_riverpod/example/test/widget_test.dart index ebd01d24335..6ce15e9249d 100644 --- a/packages/flame_riverpod/example/test/widget_test.dart +++ b/packages/flame_riverpod/example/test/widget_test.dart @@ -1,7 +1,7 @@ +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flame/game.dart'; import 'package:flame_riverpod/flame_riverpod.dart'; import 'package:flame_riverpod_example/main.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/flame_riverpod/lib/src/consumer.dart b/packages/flame_riverpod/lib/src/consumer.dart index 5fa7b257f14..95648f24303 100644 --- a/packages/flame_riverpod/lib/src/consumer.dart +++ b/packages/flame_riverpod/lib/src/consumer.dart @@ -1,8 +1,9 @@ import 'dart:async'; + +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_riverpod/src/widget.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/misc.dart'; diff --git a/packages/flame_riverpod/pubspec.yaml b/packages/flame_riverpod/pubspec.yaml index 0386c735415..b575b1ec6db 100644 --- a/packages/flame_riverpod/pubspec.yaml +++ b/packages/flame_riverpod/pubspec.yaml @@ -16,6 +16,7 @@ environment: flutter: ">=3.44.0" dependencies: + cupertino_ui: any flame: ^1.38.0 flutter: sdk: flutter @@ -26,3 +27,4 @@ dev_dependencies: flame_lint: ^1.4.3 flutter_test: sdk: flutter + material_ui: any diff --git a/packages/flame_riverpod/test/widget_test.dart b/packages/flame_riverpod/test/widget_test.dart index 7f0f9d8f7c4..014653fe345 100644 --- a/packages/flame_riverpod/test/widget_test.dart +++ b/packages/flame_riverpod/test/widget_test.dart @@ -1,9 +1,9 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_riverpod/flame_riverpod.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; final numberProvider = Provider.autoDispose((ref) { return 1; diff --git a/packages/flame_spine/example/lib/main.dart b/packages/flame_spine/example/lib/main.dart index 841388774c4..59910343194 100644 --- a/packages/flame_spine/example/lib/main.dart +++ b/packages/flame_spine/example/lib/main.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame/events.dart'; import 'package:flame/game.dart'; import 'package:flame_spine/flame_spine.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/flame_spine/example/pubspec.yaml b/packages/flame_spine/example/pubspec.yaml index 247abcb24c7..ffca61fd2d5 100644 --- a/packages/flame_spine/example/pubspec.yaml +++ b/packages/flame_spine/example/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/packages/flame_splash_screen/example/lib/main.dart b/packages/flame_splash_screen/example/lib/main.dart index c846560af2b..b22ecadb00c 100644 --- a/packages/flame_splash_screen/example/lib/main.dart +++ b/packages/flame_splash_screen/example/lib/main.dart @@ -1,5 +1,5 @@ import 'package:flame_splash_screen/flame_splash_screen.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(const MyApp()); diff --git a/packages/flame_splash_screen/example/pubspec.yaml b/packages/flame_splash_screen/example/pubspec.yaml index 27d05bed901..4157b6c4d48 100644 --- a/packages/flame_splash_screen/example/pubspec.yaml +++ b/packages/flame_splash_screen/example/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/packages/flame_sprite_fusion/example/lib/main.dart b/packages/flame_sprite_fusion/example/lib/main.dart index 3019a7fb713..763f08d1d7a 100644 --- a/packages/flame_sprite_fusion/example/lib/main.dart +++ b/packages/flame_sprite_fusion/example/lib/main.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_sprite_fusion/flame_sprite_fusion.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(const MyApp()); diff --git a/packages/flame_sprite_fusion/example/pubspec.yaml b/packages/flame_sprite_fusion/example/pubspec.yaml index 4fcdf2c5a68..554b10d4701 100644 --- a/packages/flame_sprite_fusion/example/pubspec.yaml +++ b/packages/flame_sprite_fusion/example/pubspec.yaml @@ -15,6 +15,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 diff --git a/packages/flame_steering_behaviors/example/lib/main.dart b/packages/flame_steering_behaviors/example/lib/main.dart index ea546cde29b..bb82e5cd7b3 100644 --- a/packages/flame_steering_behaviors/example/lib/main.dart +++ b/packages/flame_steering_behaviors/example/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flame/game.dart'; import 'package:flame_steering_behaviors_example/src/example_game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: ExampleGame())); diff --git a/packages/flame_steering_behaviors/example/pubspec.yaml b/packages/flame_steering_behaviors/example/pubspec.yaml index c6018521d62..3be032be0a4 100644 --- a/packages/flame_steering_behaviors/example/pubspec.yaml +++ b/packages/flame_steering_behaviors/example/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flame_test: ^2.3.0 diff --git a/packages/flame_steering_behaviors/lib/src/mixins/steerable.dart b/packages/flame_steering_behaviors/lib/src/mixins/steerable.dart index de3b4ae013b..721eaf1db31 100644 --- a/packages/flame_steering_behaviors/lib/src/mixins/steerable.dart +++ b/packages/flame_steering_behaviors/lib/src/mixins/steerable.dart @@ -1,6 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template steerable} /// Mixin that makes an [Entity] steerable. diff --git a/packages/flame_steering_behaviors/lib/src/mixins/steering.dart b/packages/flame_steering_behaviors/lib/src/mixins/steering.dart index 39f45a3e6a5..b7dd144d5e5 100644 --- a/packages/flame_steering_behaviors/lib/src/mixins/steering.dart +++ b/packages/flame_steering_behaviors/lib/src/mixins/steering.dart @@ -1,7 +1,7 @@ import 'package:flame/extensions.dart'; import 'package:flame_behaviors/flame_behaviors.dart'; import 'package:flame_steering_behaviors/flame_steering_behaviors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template steering} /// Mixin that turns a [Behavior] into a steering behavior for a [Steerable]. diff --git a/packages/flame_steering_behaviors/lib/src/steering/wander.dart b/packages/flame_steering_behaviors/lib/src/steering/wander.dart index 79e1d7374dd..8e0549a2d13 100644 --- a/packages/flame_steering_behaviors/lib/src/steering/wander.dart +++ b/packages/flame_steering_behaviors/lib/src/steering/wander.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flame/extensions.dart'; import 'package:flame_steering_behaviors/flame_steering_behaviors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template wander} /// Wander steering algorithm. diff --git a/packages/flame_steering_behaviors/pubspec.yaml b/packages/flame_steering_behaviors/pubspec.yaml index a05d7876d13..467d15c14b0 100644 --- a/packages/flame_steering_behaviors/pubspec.yaml +++ b/packages/flame_steering_behaviors/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flame_test: ^2.3.0 diff --git a/packages/flame_svg/example/lib/main.dart b/packages/flame_svg/example/lib/main.dart index 5411151ccc2..0a46056b92e 100644 --- a/packages/flame_svg/example/lib/main.dart +++ b/packages/flame_svg/example/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flame/game.dart'; import 'package:flame_svg/flame_svg.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(GameWidget(game: MyGame())); diff --git a/packages/flame_svg/example/pubspec.yaml b/packages/flame_svg/example/pubspec.yaml index 55ea0aafda6..ef8e9aee8af 100644 --- a/packages/flame_svg/example/pubspec.yaml +++ b/packages/flame_svg/example/pubspec.yaml @@ -15,6 +15,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flutter_test: diff --git a/packages/flame_svg/pubspec.yaml b/packages/flame_svg/pubspec.yaml index 1afe8086d54..c3c83d45084 100644 --- a/packages/flame_svg/pubspec.yaml +++ b/packages/flame_svg/pubspec.yaml @@ -27,5 +27,6 @@ dev_dependencies: flame_lint: ^1.4.3 flutter_test: sdk: flutter + material_ui: any mocktail: ^1.0.4 test: any diff --git a/packages/flame_svg/test/svg_test.dart b/packages/flame_svg/test/svg_test.dart index c86392cc84f..7c0d6417da9 100644 --- a/packages/flame_svg/test/svg_test.dart +++ b/packages/flame_svg/test/svg_test.dart @@ -3,9 +3,9 @@ import 'dart:ui'; import 'package:flame/extensions.dart'; import 'package:flame_svg/svg.dart' as flame_svg; -import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; class _SvgPainter extends CustomPainter { final flame_svg.Svg svg; diff --git a/packages/flame_test/example/lib/game.dart b/packages/flame_test/example/lib/game.dart index 1b653b3f64b..3df4d592129 100644 --- a/packages/flame_test/example/lib/game.dart +++ b/packages/flame_test/example/lib/game.dart @@ -1,6 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MyGameWidget extends StatelessWidget { const MyGameWidget({super.key}); diff --git a/packages/flame_test/example/pubspec.yaml b/packages/flame_test/example/pubspec.yaml index 8490f06f202..c0a8e3c14ff 100644 --- a/packages/flame_test/example/pubspec.yaml +++ b/packages/flame_test/example/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 flame_test: ^2.3.0 diff --git a/packages/flame_test/pubspec.yaml b/packages/flame_test/pubspec.yaml index ced9adad1cf..e45d261b933 100644 --- a/packages/flame_test/pubspec.yaml +++ b/packages/flame_test/pubspec.yaml @@ -29,4 +29,5 @@ dependencies: dev_dependencies: dartdoc: ^9.0.0 - flame_lint: ^1.4.3 \ No newline at end of file + flame_lint: ^1.4.3 + material_ui: any diff --git a/packages/flame_test/test/golden_test.dart b/packages/flame_test/test/golden_test.dart index d0f6df74b02..5c8eed6479e 100644 --- a/packages/flame_test/test/golden_test.dart +++ b/packages/flame_test/test/golden_test.dart @@ -1,8 +1,8 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_test/flame_test.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('Golden tests', () { diff --git a/packages/flame_texturepacker/example/lib/main.dart b/packages/flame_texturepacker/example/lib/main.dart index 3b493ff2d49..afde3ea9e5b 100644 --- a/packages/flame_texturepacker/example/lib/main.dart +++ b/packages/flame_texturepacker/example/lib/main.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_texturepacker/flame_texturepacker.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { final myGame = MyGame(); diff --git a/packages/flame_texturepacker/example/pubspec.yaml b/packages/flame_texturepacker/example/pubspec.yaml index 16eeb7e37f7..7ad20680c92 100644 --- a/packages/flame_texturepacker/example/pubspec.yaml +++ b/packages/flame_texturepacker/example/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3 diff --git a/packages/flame_typled/example/lib/main.dart b/packages/flame_typled/example/lib/main.dart index 87e6aba4afc..efd1709893c 100644 --- a/packages/flame_typled/example/lib/main.dart +++ b/packages/flame_typled/example/lib/main.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_typled/flame_typled.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { runApp(const MyApp()); diff --git a/packages/flame_typled/example/pubspec.yaml b/packages/flame_typled/example/pubspec.yaml index dabced8d7a4..c896af99b9c 100644 --- a/packages/flame_typled/example/pubspec.yaml +++ b/packages/flame_typled/example/pubspec.yaml @@ -15,6 +15,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flame_lint: ^1.4.3