From e320fbdf190b3049287894d96150588eedf7b871 Mon Sep 17 00:00:00 2001 From: Jaime Sanchez Date: Wed, 22 Nov 2023 10:49:29 +0100 Subject: [PATCH 1/4] chore: update leap git dependency to target main --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 18c23137..7893f33c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,7 +60,7 @@ dependency_overrides: leap: git: url: https://github.com/kurtome/leap.git - ref: feat/tiled-options-use-atlas + ref: main path: packages/leap flutter: From edf24a8915a831aa1a9aab0356440e98cf709f46 Mon Sep 17 00:00:00 2001 From: Jaime Sanchez Date: Wed, 22 Nov 2023 11:37:50 +0100 Subject: [PATCH 2/4] fix: remove unused --- lib/game/dash_run_game.dart | 1 - test/game/dash_run_game_test.dart | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/game/dash_run_game.dart b/lib/game/dash_run_game.dart index 44146a76..5d6b41a2 100644 --- a/lib/game/dash_run_game.dart +++ b/lib/game/dash_run_game.dart @@ -63,7 +63,6 @@ class DashRunGame extends LeapGame final AudioController audioController; final List _inputListener = []; - late final SimpleCombinedInput input; late final SpriteSheet itemsSpritesheet; final bool inMapTester; diff --git a/test/game/dash_run_game_test.dart b/test/game/dash_run_game_test.dart index b0a864f7..2fb2604c 100644 --- a/test/game/dash_run_game_test.dart +++ b/test/game/dash_run_game_test.dart @@ -3,9 +3,9 @@ import 'package:bloc_test/bloc_test.dart'; import 'package:dash_run/audio/audio.dart'; import 'package:dash_run/game/game.dart'; +import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:leap/leap.dart'; import 'package:mocktail/mocktail.dart'; class _MockGameBloc extends MockBloc @@ -65,7 +65,7 @@ void main() { await game.ready(); }, verify: (game, tester) async => expect( - game.descendants().whereType(), + game.descendants().whereType(), isNotNull, ), ); From 50834d913153a8851a47b368841bbef59d65c585 Mon Sep 17 00:00:00 2001 From: Jaime Sanchez Date: Wed, 22 Nov 2023 12:18:07 +0100 Subject: [PATCH 3/4] fix: overflow in tests --- .../view/game_instructions_overlay.dart | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/game_intro/game_instructions/view/game_instructions_overlay.dart b/lib/game_intro/game_instructions/view/game_instructions_overlay.dart index c7da51c9..57204e06 100644 --- a/lib/game_intro/game_instructions/view/game_instructions_overlay.dart +++ b/lib/game_intro/game_instructions/view/game_instructions_overlay.dart @@ -178,15 +178,17 @@ class _CardContent extends StatelessWidget { ), ), const SizedBox(height: 12), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 24, - ), - child: Text( - description, - textAlign: TextAlign.center, - style: theme.textTheme.bodyLarge?.copyWith( - color: Colors.white, + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 24, + ), + child: Text( + description, + textAlign: TextAlign.center, + style: theme.textTheme.bodyLarge?.copyWith( + color: Colors.white, + ), ), ), ), From 971fca35ad51604ac1cffb92c81b6226ed6d8b75 Mon Sep 17 00:00:00 2001 From: Jaime Sanchez Date: Wed, 22 Nov 2023 12:38:13 +0100 Subject: [PATCH 4/4] chore: update leap git ref --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 7893f33c..3e08d9c4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,7 +60,7 @@ dependency_overrides: leap: git: url: https://github.com/kurtome/leap.git - ref: main + ref: 02f2be0c9d47cf2ce51ee2109fbe21a42dcd7457 path: packages/leap flutter: