1043 add castling method option v2 #1347
+245
−106
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| import 'package:chessground/chessground.dart'; | ||
| import 'package:dartchess/dartchess.dart'; | ||
| import 'package:fast_immutable_collections/fast_immutable_collections.dart'; | ||
| import 'package:flutter/cupertino.dart'; | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:lichess_mobile/src/model/settings/board_preferences.dart'; | ||
|
|
||
| class BoardWidget extends StatelessWidget { | ||
|
There was a problem hiding this comment. A doc comment indicating the purpose of this widget would be welcome. |
||
| BoardWidget({ | ||
| required this.size, | ||
| required this.boardPrefs, | ||
| required this.fen, | ||
| required this.orientation, | ||
| required this.gameData, | ||
| this.lastMove, | ||
| this.shapes, | ||
| required this.settings, | ||
| this.boardOverlay, | ||
| this.error, | ||
| this.annotations, | ||
| this.boardKey, | ||
| }) : setup = Setup.parseFen(fen); | ||
|
|
||
| final double size; | ||
| final BoardPrefs boardPrefs; | ||
| final String fen; | ||
| final Side orientation; | ||
| final GameData? gameData; | ||
|
There was a problem hiding this comment. Here I don't think Perhaps renaming it to |
||
| final Move? lastMove; | ||
| final ISet<Shape>? shapes; | ||
| final ChessboardSettings settings; | ||
| final String? error; | ||
| final Widget? boardOverlay; | ||
| final IMap<Square, Annotation>? annotations; | ||
| final GlobalKey? boardKey; | ||
| final Setup setup; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final Map<Square, Square> castlingMap = { | ||
|
There was a problem hiding this comment. This could be a static const. |
||
| Square.a1: Square.c1, | ||
| Square.a8: Square.c8, | ||
| Square.h1: Square.g1, | ||
| Square.h8: Square.g8, | ||
| }; | ||
|
|
||
| GameData? modifiedGameData; | ||
|
|
||
| MapEntry<Square, ISet<Square>> mapper(Square sq, ISet<Square> moves) { | ||
| return MapEntry( | ||
| sq, | ||
| setup.board.kings.squares.contains(sq) && //king move | ||
| setup.castlingRights.squares.intersectsWith( | ||
| moves, //king can castle | ||
| ) | ||
| ? (switch (boardPrefs.castlingMethod) { | ||
| CastlingMethod.kingOverRook => moves.removeAll(castlingMap.values), | ||
| CastlingMethod.kingTwoSquares => moves.removeAll(castlingMap.keys), | ||
| _ => moves, | ||
| }) | ||
| : moves, | ||
| ); | ||
| } | ||
|
|
||
| if (gameData != null) { | ||
| modifiedGameData = GameData( | ||
| playerSide: gameData!.playerSide, | ||
| sideToMove: gameData!.sideToMove, | ||
| validMoves: gameData!.validMoves.map(mapper), | ||
| promotionMove: gameData!.promotionMove, | ||
| onMove: gameData!.onMove, | ||
| onPromotionSelection: gameData!.onPromotionSelection, | ||
| premovable: gameData?.premovable, | ||
| isCheck: gameData?.isCheck, | ||
| ); | ||
| } | ||
|
|
||
| final board = Chessboard( | ||
| key: boardKey, | ||
| size: size, | ||
| fen: fen, | ||
| orientation: orientation, | ||
| game: modifiedGameData ?? gameData, | ||
| lastMove: lastMove, | ||
| shapes: shapes, | ||
| settings: settings, | ||
| annotations: annotations, | ||
| ); | ||
|
|
||
| if (boardOverlay != null) { | ||
| return SizedBox.square( | ||
| dimension: size, | ||
| child: Stack( | ||
| children: [ | ||
| board, | ||
| SizedBox.square( | ||
| dimension: size, | ||
| child: Center( | ||
| child: SizedBox( | ||
| width: (size / 8) * 6.6, | ||
| height: (size / 8) * 4.6, | ||
| child: boardOverlay, | ||
| ), | ||
| ), | ||
| ), | ||
| ], | ||
| ), | ||
| ); | ||
| } else if (error != null) { | ||
| return SizedBox.square( | ||
| dimension: size, | ||
| child: Stack(children: [board, _ErrorWidget(errorMessage: error!, boardSize: size)]), | ||
| ); | ||
| } | ||
|
|
||
| return board; | ||
| } | ||
| } | ||
|
|
||
| class _ErrorWidget extends StatelessWidget { | ||
| const _ErrorWidget({required this.errorMessage, required this.boardSize}); | ||
| final double boardSize; | ||
| final String errorMessage; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return SizedBox.square( | ||
| dimension: boardSize, | ||
| child: Center( | ||
| child: Padding( | ||
| padding: const EdgeInsets.all(16.0), | ||
| child: Container( | ||
| decoration: BoxDecoration( | ||
| color: | ||
| Theme.of(context).platform == TargetPlatform.iOS | ||
|
There was a problem hiding this comment. Since the new theme we can remove these distinctions between iOS and android. So use I should have changed it in the new theme PR, but let's do it here. |
||
| ? CupertinoColors.secondarySystemBackground.resolveFrom(context) | ||
| : Theme.of(context).colorScheme.surface, | ||
| borderRadius: const BorderRadius.all(Radius.circular(10.0)), | ||
| ), | ||
| child: Padding(padding: const EdgeInsets.all(10.0), child: Text(errorMessage)), | ||
| ), | ||
| ), | ||
| ), | ||
| ); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should not support
eitherbecause it is not supported on website.The default is
kingOverRookThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Default is now
eithersince we'll support all three castling methods which is correctly set on line 159.