Improve life counter UI and fix timer/game state management issues

Author: Jshewmaker

lib/app/view/app.dart

@@ -9,6 +9,7 @@ import 'package:magic_yeti/app/utils/device_info_provider.dart';
 import 'package:magic_yeti/game/bloc/game_bloc.dart';
 import 'package:magic_yeti/home/match_history_bloc/match_history_bloc.dart';
 import 'package:magic_yeti/l10n/arb/app_localizations.dart';
+import 'package:magic_yeti/timer/bloc/timer_bloc.dart';
 import 'package:player_repository/player_repository.dart';
 import 'package:scryfall_repository/scryfall_repository.dart';
 import 'package:user_repository/user_repository.dart';
@@ -69,6 +70,9 @@ class App extends StatelessWidget {
                 LoadMatchHistory(userId: context.read<AppBloc>().state.user.id),
               ),
           ),
+          BlocProvider(
+            create: (context) => TimerBloc(),
+          ),
         ],
         child: const AppView(),
       ),

lib/game/bloc/game_bloc.dart

@@ -193,7 +193,7 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     GameFinishEvent event,
     Emitter<GameState> emit,
   ) async {
-    emit(state.copyWith(status: GameStatus.loading));
+    emit(state.copyWith(status: GameStatus.finished));
 
     final updateWinner = event.winner.copyWith(
       placement: const Value(1),
@@ -229,7 +229,6 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     final alivePlayers =
         event.players.where((p) => p.state == PlayerModelState.active).toList();
     if (alivePlayers.length <= 1 && state.status == GameStatus.running) {
-      emit(state.copyWith(status: GameStatus.finished));
       add(GameFinishEvent(winner: alivePlayers.first));
     }
   }

lib/home/home_page.dart

@@ -18,6 +18,7 @@ import 'package:magic_yeti/match_details/view/match_details_page.dart';
 import 'package:magic_yeti/profile/view/profile_page.dart';
 import 'package:magic_yeti/sign_up/sign_up.dart';
 import 'package:magic_yeti/stats_overview/stats_overview.dart';
+import 'package:magic_yeti/timer/bloc/timer_bloc.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 
 class HomePage extends StatefulWidget {
@@ -393,6 +394,8 @@ class GameModeButtons extends StatelessWidget {
             startingLifePoints: lifePoints,
           ),
         );
+
+    context.read<TimerBloc>().add(const TimerStartEvent());
     context.go(GamePage.routePath);
   }
 }

lib/life_counter/view/game_over_page.dart

@@ -11,6 +11,7 @@ import 'package:magic_yeti/home/home_page.dart';
 import 'package:magic_yeti/l10n/l10n.dart';
 import 'package:magic_yeti/life_counter/bloc/game_over_bloc.dart';
 import 'package:magic_yeti/life_counter/view/game_page.dart';
+import 'package:magic_yeti/timer/bloc/timer_bloc.dart';
 import 'package:player_repository/models/player.dart';
 import 'package:player_repository/player_repository.dart';
 
@@ -51,6 +52,14 @@ class GameOverView extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         title: Text(l10n.gameOverTitle),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            context.go(GamePage.routePath);
+            context.read<TimerBloc>().add(const TimerStartEvent());
+            context.read<GameBloc>().add(const GameResumeEvent());
+          },
+        ),
       ),
       body: BlocBuilder<GameOverBloc, GameOverState>(
         builder: (context, state) {
@@ -160,6 +169,7 @@ class ButtonsWidget extends StatelessWidget {
                           );
 
                       context.read<GameBloc>().add(const GameResetEvent());
+                      context.read<TimerBloc>().add(const TimerStartEvent());
                       context.go(GamePage.routePath);
                     },
               child: Text(

lib/life_counter/view/game_page.dart

@@ -26,24 +26,19 @@ class GamePage extends StatelessWidget {
       return const Center(child: CircularProgressIndicator());
     }
 
-    return BlocProvider(
-      create: (context) => TimerBloc()..add(const TimerStartEvent()),
-      child: BlocListener<GameBloc, GameState>(
-        listener: (context, state) {
-          if (state.status == GameStatus.finished) {
-            context.read<TimerBloc>().add(const TimerPauseEvent());
-            final gameLength = context.read<TimerBloc>().state.elapsedSeconds;
-            context
-                .read<GameBloc>()
-                .add(GameUpdateTimerEvent(gameLength: gameLength));
-            context.read<TimerBloc>().add(const TimerResetEvent());
-            context.read<TimerBloc>().add(const TimerPauseEvent());
-            context.go(GameOverPage.routePath);
-          }
-        },
-        child:
-            playerCount == 2 ? const TwoPlayerGame() : const FourPlayerGame(),
-      ),
+    return BlocListener<GameBloc, GameState>(
+      listener: (context, state) {
+        if (state.status == GameStatus.finished) {
+          context.read<TimerBloc>().add(const TimerPauseEvent());
+          final gameLength = context.read<TimerBloc>().state.elapsedSeconds;
+          context
+              .read<GameBloc>()
+              .add(GameUpdateTimerEvent(gameLength: gameLength));
+
+          context.go(GameOverPage.routePath);
+        }
+      },
+      child: playerCount == 2 ? const TwoPlayerGame() : const FourPlayerGame(),
     );
   }
 }