Skip to content

Fix: Add variant ending to the controller and UI in offline game screen #2721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veloce merged 3 commits into from
Mar 9, 2026
Merged

Fix: Add variant ending to the controller and UI in offline game screen #2721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6a2620
Add variant ending to the controller and UI
nav-28 Mar 7, 2026
40ae0dc
Use the gameStatusL10n for subtitle text
nav-28 Mar 8, 2026
574d4e9
Update offile game screen test
nav-28 Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/src/model/offline_computer/offline_computer_game_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,13 @@ class OfflineComputerGameController extends Notifier<OfflineComputerGameState> {
state = state.copyWith(game: state.game.copyWith(status: GameStatus.stalemate));
} else if (state.currentPosition.isInsufficientMaterial) {
state = state.copyWith(game: state.game.copyWith(status: GameStatus.draw));
} else if (state.currentPosition.isVariantEnd) {
state = state.copyWith(
game: state.game.copyWith(
status: GameStatus.variantEnd,
winner: state.currentPosition.variantOutcome?.winner,
),
);
}

_moveFeedback(sanMove);
Expand Down
20 changes: 9 additions & 11 deletions lib/src/view/offline_computer/offline_computer_game_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:lichess_mobile/src/model/analysis/analysis_controller.dart';
import 'package:lichess_mobile/src/model/common/chess.dart';
import 'package:lichess_mobile/src/model/game/game_board_params.dart';
import 'package:lichess_mobile/src/model/game/game_status.dart';
import 'package:lichess_mobile/src/model/game/offline_computer_game.dart';
import 'package:lichess_mobile/src/model/offline_computer/offline_computer_game_controller.dart';
import 'package:lichess_mobile/src/model/offline_computer/offline_computer_game_preferences.dart';
Expand All @@ -25,6 +24,7 @@ import 'package:lichess_mobile/src/utils/l10n_context.dart';
import 'package:lichess_mobile/src/utils/navigation.dart';
import 'package:lichess_mobile/src/utils/screen.dart';
import 'package:lichess_mobile/src/view/analysis/analysis_screen.dart';
import 'package:lichess_mobile/src/view/game/status_l10n.dart';
import 'package:lichess_mobile/src/widgets/adaptive_action_sheet.dart';
import 'package:lichess_mobile/src/widgets/adaptive_bottom_sheet.dart';
import 'package:lichess_mobile/src/widgets/adaptive_choice_picker.dart';
Expand Down Expand Up @@ -935,16 +935,14 @@ class OfflineComputerGameResultDialog extends StatelessWidget {
title = context.l10n.gameOver;
}

final String subtitle;
if (game.status == GameStatus.mate) {
subtitle = context.l10n.checkmate;
} else if (game.status == GameStatus.resign) {
subtitle = context.l10n.resign;
} else if (game.status == GameStatus.stalemate) {
subtitle = context.l10n.stalemate;
} else {
subtitle = context.l10n.draw;
}
final subtitle = gameStatusL10n(
context,
variant: game.meta.variant,
status: game.status,
lastPosition: game.lastPosition,
winner: game.winner,
isThreefoldRepetition: game.isThreefoldRepetition,
);

return AlertDialog.adaptive(
title: Text(title),
Expand Down
2 changes: 1 addition & 1 deletion test/view/offline_computer/offline_computer_game_screen_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ void main() {

// Verify result dialog is shown
expect(find.text('Game Over'), findsOneWidget);
expect(find.text('Resign'), findsOneWidget);
expect(find.text('White resigned'), findsOneWidget);
expect(find.text('Close'), findsOneWidget);
expect(find.text('New game'), findsWidgets);
});
Expand Down