diff --git a/lib/presentation/views/active_game_view.dart b/lib/presentation/views/active_game_view.dart index ff9e066..b05daba 100644 --- a/lib/presentation/views/active_game_view.dart +++ b/lib/presentation/views/active_game_view.dart @@ -24,11 +24,19 @@ class ActiveGameView extends StatefulWidget { } class _ActiveGameViewState extends State { + /// Constant value to represent a press on the cancel button in round view. + static const int kRoundCancelled = -1; + final confettiController = ConfettiController( duration: const Duration(seconds: 10), ); + late final GameSession gameSession; + + /// A list of the ranks for each player corresponding to their index in sortedPlayerIndices late List denseRanks; + + /// A list of player indices sorted by their scores in ascending order. late List sortedPlayerIndices; @override @@ -453,6 +461,9 @@ class _ActiveGameViewState extends State { ), ); + // If the user presses the cancel button + if (round == kRoundCancelled) return; + if (widget.gameSession.isGameFinished && context.mounted) { _playFinishAnimation(context); } diff --git a/lib/presentation/views/round_view.dart b/lib/presentation/views/round_view.dart index d2a9da5..45249b4 100644 --- a/lib/presentation/views/round_view.dart +++ b/lib/presentation/views/round_view.dart @@ -80,7 +80,7 @@ class _RoundViewState extends State { padding: EdgeInsets.zero, onPressed: () => { LocalStorageService.saveGameSessions(), - Navigator.pop(context) + Navigator.pop(context, -1) }, child: Text(AppLocalizations.of(context).cancel), ), diff --git a/pubspec.yaml b/pubspec.yaml index 2ea3c92..367411f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: cabo_counter description: "Mobile app for the card game Cabo" publish_to: 'none' -version: 0.5.3+594 +version: 0.5.3+595 environment: sdk: ^3.5.4