Add game state restoration feature with undo functionality

Jshewmaker · Jshewmaker · commit 92de7cfd6eaf · 2025-04-17T21:46:09.000-04:00
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
@@ -20,32 +20,33 @@ class App extends StatelessWidget {
     required AppConfigRepository appConfigRepository,
     required UserRepository userRepository,
     required ScryfallRepository scryfallRepository,
+    required PlayerRepository playerRepository,
     required User user,
     super.key,
   })  : _appConfigRepository = appConfigRepository,
         _userRepository = userRepository,
         _scryfallRepository = scryfallRepository,
         _firebaseDatabaseRepository = firebaseDatabaseRepository,
+        _playerRepository = playerRepository,
         _user = user;
 
   final FirebaseDatabaseRepository _firebaseDatabaseRepository;
   final ScryfallRepository _scryfallRepository;
   final AppConfigRepository _appConfigRepository;
+  final PlayerRepository _playerRepository;
   final UserRepository _userRepository;
 
   final User _user;
 
   @override
   Widget build(BuildContext context) {
-    final playerRepository = PlayerRepository();
-
     return MultiRepositoryProvider(
       providers: [
         RepositoryProvider.value(value: _appConfigRepository),
         RepositoryProvider.value(value: _scryfallRepository),
         RepositoryProvider.value(value: _firebaseDatabaseRepository),
         RepositoryProvider.value(value: _userRepository),
-        RepositoryProvider.value(value: playerRepository),
+        RepositoryProvider.value(value: _playerRepository),
         RepositoryProvider.value(value: _user),
       ],
       child: MultiBlocProvider(
@@ -59,7 +60,7 @@ class App extends StatelessWidget {
           ),
           BlocProvider(
             create: (context) => GameBloc(
-              playerRepository: playerRepository,
+              playerRepository: _playerRepository,
               database: context.read<FirebaseDatabaseRepository>(),
             ),
           ),
diff --git a/lib/game/bloc/game_bloc.dart b/lib/game/bloc/game_bloc.dart
@@ -12,6 +12,7 @@ part 'game_event.dart';
 part 'game_state.dart';
 
 class GameBloc extends Bloc<GameEvent, GameState> {
+  // ... existing constructor and fields ...
   GameBloc({
     required PlayerRepository playerRepository,
     required FirebaseDatabaseRepository database,
@@ -26,6 +27,7 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     on<GameFinishEvent>(_onGameFinish);
     on<GameUpdateTimerEvent>(_onUpdateTimer);
     on<PlayerRepositoryUpdateEvent>(_repositoryUpdated);
+    on<GameRestoreRequested>(_onGameRestoreRequested);
 
     // Subscribe to player updates and emit them immediately
     _playerRepository.players.listen((players) {
@@ -189,24 +191,36 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     emit(state.copyWith(elapsedSeconds: event.gameLength));
   }
 
+  Future<void> _onGameRestoreRequested(
+    GameRestoreRequested event,
+    Emitter<GameState> emit,
+  ) async {
+    final restored = _playerRepository.restorePreviousGameState();
+    if (restored) {
+      // Emit restored state as running, clear winner/error
+      emit(state.copyWith(
+        status: GameStatus.running,
+        playerList: _playerRepository.getPlayers(),
+        winner: null,
+        error: null,
+      ));
+      // Dispatch TimerStartEvent to TimerBloc
+      // (Assumes context or a callback is available; see note below)
+      // context.read<TimerBloc>().add(const TimerStartEvent());
+      // If context is not available here, trigger from UI after BlocListener
+    }
+    // else do nothing if no snapshot
+  }
+
   Future<void> _onGameFinish(
     GameFinishEvent event,
     Emitter<GameState> emit,
   ) async {
     emit(state.copyWith(status: GameStatus.finished));
 
-    final updateWinner = event.winner.copyWith(
-      placement: const Value(1),
-      lifePoints: 0,
-      state: PlayerModelState.eliminated,
-      timeOfDeath: Value(DateTime.now().millisecondsSinceEpoch),
-    );
-
-    _playerRepository.updatePlayer(updateWinner);
-
     final gameModel = GameModel(
       roomId: await generateShortGameId(),
-      winnerId: updateWinner.id,
+      winnerId: event.winner.id,
       players: state.playerList,
       startTime: state.startTime ?? DateTime.now(),
       endTime: DateTime.now(),
@@ -228,8 +242,9 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     // Then check for game-ending condition
     final alivePlayers =
         event.players.where((p) => p.state == PlayerModelState.active).toList();
-    if (alivePlayers.length <= 1 && state.status == GameStatus.running) {
-      add(GameFinishEvent(winner: alivePlayers.first));
+    if (alivePlayers.isEmpty && state.status == GameStatus.running) {
+      add(GameFinishEvent(
+          winner: event.players.firstWhere((p) => p.placement == 1)));
     }
   }
 
diff --git a/lib/game/bloc/game_event.dart b/lib/game/bloc/game_event.dart
@@ -7,6 +7,14 @@ abstract class GameEvent extends Equatable {
   List<Object?> get props => [];
 }
 
+/// Event to request restoring the previous game state (undo game over)
+class GameRestoreRequested extends GameEvent {
+  const GameRestoreRequested();
+
+  @override
+  List<Object?> get props => [];
+}
+
 final class CreateGameEvent extends GameEvent {
   const CreateGameEvent({
     required this.numberOfPlayers,
diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb
@@ -596,6 +596,14 @@
     "placeholders": {
       "error": {}
     }
+  },
+  "undoGameOverButtonLabel": "Undo / Restore",
+  "@undoGameOverButtonLabel": {
+    "description": "Button label for restoring the previous game state on the Game Over page"
+  },
+  "gameRestoredMessage": "Previous game restored!",
+  "@gameRestoredMessage": {
+    "description": "Snackbar message shown when a previous game state is successfully restored from the Game Over page"
   }
 }
 
diff --git a/lib/l10n/arb/app_es.arb b/lib/l10n/arb/app_es.arb
@@ -10,5 +10,13 @@
     "gameModeTitle": "Modo de Juego",
     "statsTitle": "Tus Estadísticas",
     "matchHistoryLoadError": "Error al cargar el historial de partidas",
-    "noMatchHistoryAvailable": "No hay historial de partidas disponible"
+    "noMatchHistoryAvailable": "No hay historial de partidas disponible",
+    "undoGameOverButtonLabel": "Deshacer / Restaurar",
+    "@undoGameOverButtonLabel": {
+        "description": "Etiqueta del botón para restaurar el estado previo del juego en la página de Fin de Juego"
+    },
+    "gameRestoredMessage": "¡Juego anterior restaurado!",
+    "@gameRestoredMessage": {
+        "description": "Mensaje de snackbar mostrado cuando se restaura correctamente un estado previo del juego desde la página de Fin de Juego"
+    }
 }
diff --git a/lib/l10n/arb/app_localizations.dart b/lib/l10n/arb/app_localizations.dart
@@ -688,6 +688,18 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Error: {error}'**
   String errorSnackbarMessage(Object error);
+
+  /// Button label for restoring the previous game state on the Game Over page
+  ///
+  /// In en, this message translates to:
+  /// **'Undo / Restore'**
+  String get undoGameOverButtonLabel;
+
+  /// Snackbar message shown when a previous game state is successfully restored from the Game Over page
+  ///
+  /// In en, this message translates to:
+  /// **'Previous game restored!'**
+  String get gameRestoredMessage;
 }
 
 class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
diff --git a/lib/l10n/arb/app_localizations_en.dart b/lib/l10n/arb/app_localizations_en.dart
@@ -322,4 +322,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String errorSnackbarMessage(Object error) {
     return 'Error: $error';
   }
+
+  @override
+  String get undoGameOverButtonLabel => 'Undo / Restore';
+
+  @override
+  String get gameRestoredMessage => 'Previous game restored!';
 }
diff --git a/lib/l10n/arb/app_localizations_es.dart b/lib/l10n/arb/app_localizations_es.dart
@@ -322,4 +322,10 @@ class AppLocalizationsEs extends AppLocalizations {
   String errorSnackbarMessage(Object error) {
     return 'Error: $error';
   }
+
+  @override
+  String get undoGameOverButtonLabel => 'Deshacer / Restaurar';
+
+  @override
+  String get gameRestoredMessage => '¡Juego anterior restaurado!';
 }
diff --git a/lib/life_counter/view/game_over_page.dart b/lib/life_counter/view/game_over_page.dart
@@ -48,7 +48,8 @@ class GameOverView extends StatelessWidget {
 
     final gameModel = context.watch<GameBloc>().state.gameModel;
     if (gameModel == null) return const CircularProgressIndicator();
-
+    // Restore/Undo button (only if canRestoreGame is true)
+    final canRestoreGame = context.read<PlayerRepository>().canRestoreGame;
     return Scaffold(
       appBar: AppBar(
         title: Text(l10n.gameOverTitle),
@@ -66,44 +67,78 @@ class GameOverView extends StatelessWidget {
           final players = state.standings;
           final winner = players.first;
 
-          return CustomScrollView(
-            slivers: [
-              SliverPadding(
-                padding: const EdgeInsets.all(16),
-                sliver: SliverList(
-                  delegate: SliverChildListDelegate([
-                    Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            l10n.matchOverview,
-                            style: Theme.of(context).textTheme.headlineSmall,
-                          ),
-                          const SizedBox(height: 16),
-                          WinnerWidget(
-                            winner: winner,
-                          ),
-                        ],
-                      ),
+          return Column(
+            children: [
+              if (canRestoreGame)
+                Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: FilledButton.icon(
+                    icon: const Icon(Icons.undo, color: Colors.white),
+                    label: Text(l10n.undoGameOverButtonLabel),
+                    style: FilledButton.styleFrom(
+                      backgroundColor: Theme.of(context).colorScheme.primary,
+                      foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                      minimumSize: const Size.fromHeight(48),
+                      textStyle: Theme.of(context).textTheme.titleMedium,
                     ),
-                    const SizedBox(height: 16),
-                    Row(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        DraggableStandingsWidget(
-                          gameOverState: state,
-                        ),
-                        QuestionWidget(
-                          gameOverState: state,
-                          players: players,
+                    onPressed: () {
+                      context
+                          .read<GameBloc>()
+                          .add(const GameRestoreRequested());
+                      context.read<TimerBloc>().add(const TimerStartEvent());
+                      // Optionally show a snackbar or navigate
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(content: Text(l10n.gameRestoredMessage)),
+                      );
+                    },
+                  ),
+                ),
+              Expanded(
+                child: CustomScrollView(
+                  slivers: [
+                    SliverPadding(
+                      padding: const EdgeInsets.all(16),
+                      sliver: SliverList(
+                        delegate: SliverChildListDelegate(
+                          [
+                            Padding(
+                              padding: const EdgeInsets.all(16),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    l10n.matchOverview,
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .headlineSmall,
+                                  ),
+                                  const SizedBox(height: 16),
+                                  WinnerWidget(
+                                    winner: winner,
+                                  ),
+                                ],
+                              ),
+                            ),
+                            const SizedBox(height: 16),
+                            Row(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                DraggableStandingsWidget(
+                                  gameOverState: state,
+                                ),
+                                QuestionWidget(
+                                  gameOverState: state,
+                                  players: players,
+                                ),
+                              ],
+                            ),
+                            const SizedBox(height: 16),
+                            const ButtonsWidget(),
+                          ],
                         ),
-                      ],
+                      ),
                     ),
-                    const SizedBox(height: 16),
-                    const ButtonsWidget(),
-                  ]),
+                  ],
                 ),
               ),
             ],
diff --git a/lib/life_counter/widgets/life_counter_widget.dart b/lib/life_counter/widgets/life_counter_widget.dart
@@ -216,18 +216,18 @@ class _DecrementLifeWidgetState extends State<DecrementLifeWidget> {
         onLongPressEnd: (_) => context.read<PlayerBloc>().add(
               const PlayerStopDecrement(),
             ),
-        child: Padding(
-          padding: isPhone ? const EdgeInsets.all(8) : const EdgeInsets.all(64),
-          child: AnimatedContainer(
-            decoration: BoxDecoration(
-              color:
-                  _isTapped ? Colors.white.withAlpha(32) : Colors.transparent,
-              borderRadius: const BorderRadius.all(
-                Radius.circular(20),
-              ),
+        child: AnimatedContainer(
+          decoration: BoxDecoration(
+            color: _isTapped ? Colors.white.withAlpha(32) : Colors.transparent,
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
             ),
-            duration: const Duration(milliseconds: 50),
-            child: SizedBox.expand(
+          ),
+          duration: const Duration(milliseconds: 50),
+          child: SizedBox.expand(
+            child: Padding(
+              padding:
+                  isPhone ? const EdgeInsets.all(8) : const EdgeInsets.all(64),
               child: Row(
                 children: [
                   const FaIcon(FontAwesomeIcons.minus, size: 36),
diff --git a/lib/main_development.dart b/lib/main_development.dart
@@ -7,14 +7,15 @@ import 'package:firebase_authentication_client/firebase_authentication_client.da
 import 'package:firebase_database_repository/firebase_database_repository.dart';
 import 'package:magic_yeti/app/app.dart';
 import 'package:magic_yeti/bootstrap.dart';
+import 'package:player_repository/player_repository.dart';
 import 'package:scryfall_repository/scryfall_repository.dart';
 import 'package:user_repository/user_repository.dart';
 
 void main() {
   bootstrap(
     (FirebaseFirestore firebaseFirestore) async {
       final authenticationClient = FirebaseAuthenticationClient();
-
+      final playerRepository = PlayerRepository();
       final firebaseDatabaseRepository = FirebaseDatabaseRepository(
         firebase: FirebaseFirestore.instance,
       );
@@ -26,12 +27,14 @@ void main() {
       final scryfallRepository = ScryfallRepository();
       final user = await userRepository.user.first;
       final appConfigRepository = FakeAppConfigRepository();
+      playerRepository.init();
       return App(
         userRepository: userRepository,
         user: user,
         firebaseDatabaseRepository: firebaseDatabaseRepository,
         scryfallRepository: scryfallRepository,
         appConfigRepository: appConfigRepository,
+        playerRepository: playerRepository,
       );
     },
   );
diff --git a/lib/main_production.dart b/lib/main_production.dart
diff --git a/lib/main_staging.dart b/lib/main_staging.dart
diff --git a/packages/player_repository/lib/models/game_snapshot.dart b/packages/player_repository/lib/models/game_snapshot.dart
diff --git a/packages/player_repository/lib/models/game_snapshot.g.dart b/packages/player_repository/lib/models/game_snapshot.g.dart
diff --git a/packages/player_repository/lib/src/player_repository.dart b/packages/player_repository/lib/src/player_repository.dart

Original file line number	Diff line number	Diff line change
`@@ -596,6 +596,14 @@`
`596`	`596`	`"placeholders": {`
`597`	`597`	`"error": {}`
`598`	`598`	`}`
	`599`	`+ },`
	`600`	`+ "undoGameOverButtonLabel": "Undo / Restore",`
	`601`	`+ "@undoGameOverButtonLabel": {`
	`602`	`+ "description": "Button label for restoring the previous game state on the Game Over page"`
	`603`	`+ },`
	`604`	`+ "gameRestoredMessage": "Previous game restored!",`
	`605`	`+ "@gameRestoredMessage": {`
	`606`	`+ "description": "Snackbar message shown when a previous game state is successfully restored from the Game Over page"`
`599`	`607`	`}`
`600`	`608`	`}`
`601`	`609`
Original file line number	Diff line number	Diff line change
`@@ -322,4 +322,10 @@ class AppLocalizationsEn extends AppLocalizations {`
`322`	`322`	`String errorSnackbarMessage(Object error) {`
`323`	`323`	`return 'Error: $error';`
`324`	`324`	`}`
	`325`	`+`
	`326`	`+ @override`
	`327`	`+ String get undoGameOverButtonLabel => 'Undo / Restore';`
	`328`	`+`
	`329`	`+ @override`
	`330`	`+ String get gameRestoredMessage => 'Previous game restored!';`
`325`	`331`	`}`