diff --git a/packages/flame/test/_goldens/camera_component_fixed_resolution_order_test.png b/packages/flame/test/_goldens/camera_component_fixed_resolution_order_test.png index ec49b454067..b20245b2bad 100644 Binary files a/packages/flame/test/_goldens/camera_component_fixed_resolution_order_test.png and b/packages/flame/test/_goldens/camera_component_fixed_resolution_order_test.png differ diff --git a/packages/flame/test/_goldens/camera_component_fixed_resolution_order_zoom_test.png b/packages/flame/test/_goldens/camera_component_fixed_resolution_order_zoom_test.png index 036f119105d..95b98d74f33 100644 Binary files a/packages/flame/test/_goldens/camera_component_fixed_resolution_order_zoom_test.png and b/packages/flame/test/_goldens/camera_component_fixed_resolution_order_zoom_test.png differ diff --git a/packages/flame/test/_goldens/camera_component_order_test.png b/packages/flame/test/_goldens/camera_component_order_test.png index eaa7f8f1913..eabf66b58a9 100644 Binary files a/packages/flame/test/_goldens/camera_component_order_test.png and b/packages/flame/test/_goldens/camera_component_order_test.png differ diff --git a/packages/flame/test/_goldens/clip_component_circle.png b/packages/flame/test/_goldens/clip_component_circle.png index 59a90e29114..5db23d7dece 100644 Binary files a/packages/flame/test/_goldens/clip_component_circle.png and b/packages/flame/test/_goldens/clip_component_circle.png differ diff --git a/packages/flame/test/_goldens/clip_component_polygon.png b/packages/flame/test/_goldens/clip_component_polygon.png index a4ecec309af..a5c8b744c8d 100644 Binary files a/packages/flame/test/_goldens/clip_component_polygon.png and b/packages/flame/test/_goldens/clip_component_polygon.png differ diff --git a/packages/flame/test/_goldens/clip_component_rect.png b/packages/flame/test/_goldens/clip_component_rect.png index 6e6f73e776e..60974017fd9 100644 Binary files a/packages/flame/test/_goldens/clip_component_rect.png and b/packages/flame/test/_goldens/clip_component_rect.png differ diff --git a/packages/flame/test/_goldens/sprite_batch_test_1.png b/packages/flame/test/_goldens/sprite_batch_test_1.png index fbedeafa55e..579dee88061 100644 Binary files a/packages/flame/test/_goldens/sprite_batch_test_1.png and b/packages/flame/test/_goldens/sprite_batch_test_1.png differ diff --git a/packages/flame/test/camera/camera_component_test.dart b/packages/flame/test/camera/camera_component_test.dart index e2b0f2b4fbb..b99b220414d 100644 --- a/packages/flame/test/camera/camera_component_test.dart +++ b/packages/flame/test/camera/camera_component_test.dart @@ -1,14 +1,14 @@ import 'dart:math'; -import 'dart:ui' show PictureRecorder; +import 'dart:ui'; import 'package:flame/camera.dart'; import 'package:flame/components.dart'; import 'package:flame/experimental.dart'; import 'package:flame/extensions.dart'; +import 'package:flame/palette.dart'; import 'package:flame/post_process.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; import 'camera_test_helpers.dart'; @@ -401,24 +401,24 @@ void main() { CrossHair( size: Vector2.all(28), position: camera.viewport.size / 2 + Vector2.all(4), - color: Colors.teal, + color: BasicPalette.teal.color, ), ); camera.viewfinder.add( CrossHair( size: Vector2.all(20), position: Vector2(-2, 4), - color: Colors.white, + color: BasicPalette.white.color, ), ); world.add( - CrossHair(size: Vector2.all(14), color: Colors.green), + CrossHair(size: Vector2.all(14), color: BasicPalette.green.color), ); camera.viewport.add( CrossHair( size: Vector2.all(8), position: camera.viewport.size / 2 + Vector2(4, -4), - color: Colors.red, + color: BasicPalette.red.color, ), ); }, @@ -443,24 +443,24 @@ void main() { CrossHair( size: Vector2.all(28), position: resolution / 2 + Vector2.all(4), - color: Colors.teal, + color: BasicPalette.teal.color, ), ); camera.viewfinder.add( CrossHair( size: Vector2.all(20), position: Vector2(0, 2), - color: Colors.white, + color: BasicPalette.white.color, ), ); world.add( - CrossHair(size: Vector2.all(14), color: Colors.green), + CrossHair(size: Vector2.all(14), color: BasicPalette.green.color), ); camera.viewport.add( CrossHair( size: Vector2.all(8), position: resolution / 2 + Vector2(2, -2), - color: Colors.red, + color: BasicPalette.red.color, ), ); }, @@ -485,24 +485,24 @@ void main() { CrossHair( size: Vector2.all(28), position: resolution / 2 + Vector2.all(4), - color: Colors.teal, + color: BasicPalette.teal.color, ), ); camera.viewfinder.add( CrossHair( size: Vector2.all(20), position: Vector2(-2, 4), - color: Colors.white, + color: BasicPalette.white.color, ), ); world.add( - CrossHair(size: Vector2.all(14), color: Colors.green), + CrossHair(size: Vector2.all(14), color: BasicPalette.green.color), ); camera.viewport.add( CrossHair( size: Vector2.all(8), position: resolution / 2 + Vector2(4, -4), - color: Colors.red, + color: BasicPalette.red.color, ), ); }, diff --git a/packages/flame/test/components/clip_component_test.dart b/packages/flame/test/components/clip_component_test.dart index a414e2e7881..3f3f5931d7f 100644 --- a/packages/flame/test/components/clip_component_test.dart +++ b/packages/flame/test/components/clip_component_test.dart @@ -1,14 +1,14 @@ import 'package:flame/components.dart'; +import 'package:flame/palette.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; class _Rectangle() extends RectangleComponent { this : super( size: Vector2(200, 200), anchor: Anchor.center, - paint: Paint()..color = Colors.blue, + paint: BasicPalette.blue.paint(), ); } diff --git a/packages/flame/test/effects/color_effect_test.dart b/packages/flame/test/effects/color_effect_test.dart index 951144f4ef7..e9684f21c24 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/palette.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; class _PaintComponent() extends Component with HasPaint; @@ -11,7 +11,8 @@ void main() { testWithFlameGame('applies the correct color filter', (game) async { final component = _PaintComponent(); await game.ensureAdd(component); - const color = Colors.red; + // has distinct components, so a swap fails + final color = BasicPalette.pink.color; component.add( ColorEffect(color, EffectController(duration: 1)), ); @@ -19,8 +20,8 @@ void main() { expect( component.paint.colorFilter.toString(), equals( - 'ColorFilter.mode(Color(alpha: 0.0000, red: 0.9569, green: ' - '0.2627, blue: 0.2118, colorSpace: ColorSpace.sRGB),' + 'ColorFilter.mode(Color(alpha: 0.0000, red: 1.0000, green: ' + '0.4118, blue: 0.7059, colorSpace: ColorSpace.sRGB),' ' BlendMode.srcATop)', ), ); @@ -29,8 +30,8 @@ void main() { expect( component.paint.colorFilter.toString(), equals( - 'ColorFilter.mode(Color(alpha: 0.5000, red: 0.9569, green: ' - '0.2627, blue: 0.2118, colorSpace: ColorSpace.sRGB), ' + 'ColorFilter.mode(Color(alpha: 0.5000, red: 1.0000, green: ' + '0.4118, blue: 0.7059, colorSpace: ColorSpace.sRGB), ' 'BlendMode.srcATop)', ), ); @@ -43,7 +44,7 @@ void main() { await game.ensureAdd(component); final originalColorFilter = component.paint.colorFilter; - const color = Colors.red; + final color = BasicPalette.red.color; final effect = ColorEffect( color, @@ -73,7 +74,7 @@ void main() { await game.ensureAdd(component); final originalColorFilter = component.paint.colorFilter; - const color = Colors.red; + final color = BasicPalette.red.color; final effect = ColorEffect( color, @@ -103,7 +104,7 @@ void main() { await game.ensureAdd(component); final effect = ColorEffect( - Colors.red, + BasicPalette.red.color, EffectController(duration: 1), ); await component.ensureAdd(effect); @@ -127,7 +128,7 @@ void main() { final effect = ColorEffect( opacityFrom: 1, opacityTo: 0, - Colors.black, + BasicPalette.black.color, ZigzagEffectController( period: 1, ), @@ -143,7 +144,7 @@ void main() { test('Validates opacity values', () { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityTo: 1.1, ), @@ -152,7 +153,7 @@ void main() { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityFrom: 255, ), @@ -161,7 +162,7 @@ void main() { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityTo: -254, ), @@ -170,7 +171,7 @@ void main() { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityFrom: -0.5, ), @@ -179,7 +180,7 @@ void main() { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityFrom: 0.1, opacityTo: 0.9, diff --git a/packages/flame/test/extensions/image_extension_test.dart b/packages/flame/test/extensions/image_extension_test.dart index 678204237da..afc1e9355bc 100644 --- a/packages/flame/test/extensions/image_extension_test.dart +++ b/packages/flame/test/extensions/image_extension_test.dart @@ -3,9 +3,9 @@ import 'dart:typed_data'; import 'dart:ui'; import 'package:flame/extensions.dart'; +import 'package:flame/palette.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; final _output = List.filled(8 * 8 * 4, 255); @@ -120,7 +120,7 @@ void main() { final recorder = PictureRecorder(); Canvas(recorder).drawRect( const Rect.fromLTWH(0, 0, 100, 100), - Paint()..color = Colors.white, + BasicPalette.white.paint(), ); final pic = recorder.endRecording(); final image = await pic.toImage(100, 100); diff --git a/packages/flame/test/sprite_batch_test.dart b/packages/flame/test/sprite_batch_test.dart index 156d9e185b9..8ccf23a4551 100644 --- a/packages/flame/test/sprite_batch_test.dart +++ b/packages/flame/test/sprite_batch_test.dart @@ -1,10 +1,10 @@ import 'dart:ui'; import 'package:flame/components.dart'; +import 'package:flame/palette.dart'; import 'package:flame/sprite.dart'; import 'package:flame_test/flame_test.dart'; 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'; @@ -24,17 +24,18 @@ void main() { test('can replace the color of a batch', () { final image = _MockImage(); final spriteBatch = SpriteBatch(image); - spriteBatch.add(source: Rect.zero, color: Colors.blue); + spriteBatch.add(source: Rect.zero, color: BasicPalette.blue.color); - spriteBatch.replace(0, color: Colors.red); + final red = BasicPalette.red.color; + spriteBatch.replace(0, color: red); final batchItem = spriteBatch.getBatchItem(0); /// Use .closeTo() to avoid floating point rounding errors. - expect(batchItem.paint.color.a, closeTo(Colors.red.a, 0.001)); - expect(batchItem.paint.color.r, closeTo(Colors.red.r, 0.001)); - expect(batchItem.paint.color.g, closeTo(Colors.red.g, 0.001)); - expect(batchItem.paint.color.b, closeTo(Colors.red.b, 0.001)); + expect(batchItem.paint.color.a, closeTo(red.a, 0.001)); + expect(batchItem.paint.color.r, closeTo(red.r, 0.001)); + expect(batchItem.paint.color.g, closeTo(red.g, 0.001)); + expect(batchItem.paint.color.b, closeTo(red.b, 0.001)); }); test('can replace the source of a batch', () { @@ -312,7 +313,7 @@ void main() { spriteBatch.add( source: source, - color: Colors.redAccent, + color: BasicPalette.red.color, offset: Vector2.all(margin), ); diff --git a/packages/flame_network_assets/pubspec.yaml b/packages/flame_network_assets/pubspec.yaml index 504ffecd0d0..256569ea37f 100644 --- a/packages/flame_network_assets/pubspec.yaml +++ b/packages/flame_network_assets/pubspec.yaml @@ -30,5 +30,4 @@ dev_dependencies: flame_lint: ^1.5.0-dev.1 flutter_test: sdk: flutter - material_ui: ^1.0.0 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 221b2ec798b..6af18eabbb5 100644 --- a/packages/flame_network_assets/test/flame_network_image_test.dart +++ b/packages/flame_network_assets/test/flame_network_image_test.dart @@ -1,9 +1,9 @@ import 'dart:io'; import 'dart:ui'; +import 'package:flame/palette.dart'; import 'package:flame_network_assets/flame_network_assets.dart'; 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; @@ -60,7 +60,7 @@ void main() { final canvas = Canvas(recorder); canvas.drawRect( const Rect.fromLTWH(0, 0, 50, 50), - Paint()..color = Colors.pink, + BasicPalette.pink.paint(), ); final picture = recorder.endRecording(); image = await picture.toImage(50, 50); diff --git a/packages/flame_test/pubspec.yaml b/packages/flame_test/pubspec.yaml index d1bdd04335e..aed8020c18d 100644 --- a/packages/flame_test/pubspec.yaml +++ b/packages/flame_test/pubspec.yaml @@ -30,4 +30,3 @@ dependencies: dev_dependencies: dartdoc: ^9.0.0 flame_lint: ^1.5.0-dev.1 - material_ui: ^1.0.0 diff --git a/packages/flame_test/test/golden_test.dart b/packages/flame_test/test/golden_test.dart index 5c8eed6479e..b4f6df898f5 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/palette.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; void main() { group('Golden tests', () { @@ -15,7 +15,7 @@ void main() { CircleComponent( radius: 10, position: Vector2.all(100), - paint: Paint()..color = Colors.white, + paint: BasicPalette.white.paint(), ), ); }, @@ -30,7 +30,7 @@ void main() { testGolden( 'Same test but with testGolden', (game, tester) async { - final paint = Paint()..color = Colors.white; + final paint = BasicPalette.white.paint(); game.add( CircleComponent(radius: 10, position: Vector2.all(100), paint: paint), ); @@ -41,7 +41,7 @@ void main() { testGolden( 'Same test, but with smaller size', (game, tester) async { - final paint = Paint()..color = Colors.white; + final paint = BasicPalette.white.paint(); game.add( CircleComponent(radius: 10, position: Vector2.all(100), paint: paint), );