Merge branch 'main' of https://github.com/alestiago/trashy_road

alestiago · Feb 17, 2024 · 4385a06 · 4385a06
2 parents ea04f83 + 58dfd34
commit 4385a06
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 8 deletions.
diff --git a/packages/trashy_road/lib/src/game/bloc/game_bloc.dart b/packages/trashy_road/lib/src/game/bloc/game_bloc.dart
@@ -127,7 +127,7 @@ class GameBloc extends Bloc<GameEvent, GameState> {
 
     emit(
       state.copyWith(
-        status: GameStatus.playing,
+        status: state.startedAt == null ? GameStatus.ready : GameStatus.playing,
         pausedDuration: pausedDuration,
         pausedAt: () => null,
       ),

diff --git a/packages/trashy_road/lib/src/game/view/game_page.dart b/packages/trashy_road/lib/src/game/view/game_page.dart
@@ -89,14 +89,25 @@ class _GameView extends StatelessWidget {
             alignment: Alignment.topRight,
             child: Padding(
               padding: const EdgeInsets.all(8),
-              child: PauseButton(
-                onPause: () {
-                  gameBloc.add(const GamePausedEvent());
-                  return true;
+              child: BlocBuilder<GameBloc, GameState>(
+                buildWhen: (previous, current) {
+                  return current.status == GameStatus.playing;
                 },
-                onResume: () {
-                  gameBloc.add(const GameResumedEvent());
-                  return true;
+                builder: (context, state) {
+                  if (state.status != GameStatus.playing) {
+                    return const SizedBox.shrink();
+                  }
+
+                  return PauseButton(
+                    onPause: () {
+                      gameBloc.add(const GamePausedEvent());
+                      return true;
+                    },
+                    onResume: () {
+                      gameBloc.add(const GameResumedEvent());
+                      return true;
+                    },
+                  );
                 },
               ),
             ),

diff --git a/packages/trashy_road/test/src/game/bloc/game_bloc_test.dart b/packages/trashy_road/test/src/game/bloc/game_bloc_test.dart
@@ -424,6 +424,38 @@ void main() {
           ),
         ],
       );
+
+      blocTest<GameBloc, GameState>(
+        'resumes the game when the user was previously paused and not started',
+        build: () {
+          return withClock<GameBloc>(
+            _IncremetalClock(
+              initialTime: DateTime(0),
+              increment: const Duration(seconds: 1),
+            ),
+            () => GameBloc(identifier: identifier, map: map),
+          );
+        },
+        act: (bloc) => bloc
+          ..add(const GamePausedEvent())
+          ..add(const GameResumedEvent()),
+        expect: () => [
+          GameState(
+            identifier: identifier,
+            map: map,
+            status: GameStatus.paused,
+            inventory: Inventory.empty(),
+            pausedAt: DateTime(0),
+          ),
+          GameState(
+            identifier: identifier,
+            map: map,
+            status: GameStatus.ready,
+            inventory: Inventory.empty(),
+            pausedDuration: const Duration(seconds: 1),
+          ),
+        ],
+      );
     });
 
     group('$GameResetEvent', () {