More renaming

CHANGELOG.md

@@ -1,11 +1,9 @@
 ## 4.0.0
 
-- Add a `ChessBoardEditor` widget, intended to be used as the basis for a board editor like lichess.org/editor
+- Add a `ChessboardEditor` widget, intended to be used as the basis for a board editor like lichess.org/editor
 - Chessground is now dependant on `dartchess`. It is only used to share
   common types: `Role`, `Side` and `Piece`. It is not used for any chess logic.
 - `SquareId` is now an extension type on String.
-- `Board` was renamed to `ChessBoard`.
-- `Move` was renamed to `BoardMove`.
 - Add the `writeFen` helper function.
 - Add the `legalMovesOf` helper function to convert a dartchess `Position` to a
   set of valid moves compatible with Chessground.

README.md

@@ -23,7 +23,7 @@ chess logic so you can use it with different chess variants.
 
 ## Getting started
 
-This package exports a `ChessBoard` widget which can be interactable or not. It is
+This package exports a `Chessboard` widget which can be interactable or not. It is
 entirely configurable with a `BoardSettings` object.
 
 ## Usage
@@ -54,9 +54,9 @@ class _MyHomePageState extends State<MyHomePage> {
         title: const Text('Chessground demo'),
       ),
       body: Center(
-        child: ChessBoard(
+        child: Chessboard(
           size: screenWidth,
-          data: BoardData(
+          state: ChessboardState(
             interactableSide: InteractableSide.none,
             orientation: Side.white,
             fen: fen,

example/lib/board_editor_page.dart

@@ -30,7 +30,7 @@ class _BoardEditorPageState extends State<BoardEditorPage> {
       colorScheme: BoardTheme.blue.colors,
       enableCoordinates: true,
     );
-    final boardEditor = ChessBoardEditor(
+    final boardEditor = ChessboardEditor(
       size: screenWidth,
       orientation: dc.Side.white,
       pieces: pieces,

example/lib/board_theme.dart

@@ -2,33 +2,33 @@ import 'package:chessground/chessground.dart';
 
 /// The chessboard theme.
 enum BoardTheme {
-  blue('Blue', BoardColorScheme.blue),
-  blue2('Blue2', BoardColorScheme.blue2),
-  blue3('Blue3', BoardColorScheme.blue3),
-  blueMarble('Blue Marble', BoardColorScheme.blueMarble),
-  canvas('Canvas', BoardColorScheme.canvas),
-  wood('Wood', BoardColorScheme.wood),
-  wood2('Wood2', BoardColorScheme.wood2),
-  wood3('Wood3', BoardColorScheme.wood3),
-  wood4('Wood4', BoardColorScheme.wood4),
-  maple('Maple', BoardColorScheme.maple),
-  maple2('Maple 2', BoardColorScheme.maple2),
-  brown('Brown', BoardColorScheme.brown),
-  leather('Leather', BoardColorScheme.leather),
-  green('Green', BoardColorScheme.green),
-  marble('Marble', BoardColorScheme.marble),
-  greenPlastic('Green Plastic', BoardColorScheme.greenPlastic),
-  grey('Grey', BoardColorScheme.grey),
-  metal('Metal', BoardColorScheme.metal),
-  olive('Olive', BoardColorScheme.olive),
-  newspaper('Newspaper', BoardColorScheme.newspaper),
-  purpleDiag('Purple-Diag', BoardColorScheme.purpleDiag),
-  pinkPyramid('Pink', BoardColorScheme.pinkPyramid),
-  horsey('Horsey', BoardColorScheme.horsey);
+  blue('Blue', ChessboardColorScheme.blue),
+  blue2('Blue2', ChessboardColorScheme.blue2),
+  blue3('Blue3', ChessboardColorScheme.blue3),
+  blueMarble('Blue Marble', ChessboardColorScheme.blueMarble),
+  canvas('Canvas', ChessboardColorScheme.canvas),
+  wood('Wood', ChessboardColorScheme.wood),
+  wood2('Wood2', ChessboardColorScheme.wood2),
+  wood3('Wood3', ChessboardColorScheme.wood3),
+  wood4('Wood4', ChessboardColorScheme.wood4),
+  maple('Maple', ChessboardColorScheme.maple),
+  maple2('Maple 2', ChessboardColorScheme.maple2),
+  brown('Brown', ChessboardColorScheme.brown),
+  leather('Leather', ChessboardColorScheme.leather),
+  green('Green', ChessboardColorScheme.green),
+  marble('Marble', ChessboardColorScheme.marble),
+  greenPlastic('Green Plastic', ChessboardColorScheme.greenPlastic),
+  grey('Grey', ChessboardColorScheme.grey),
+  metal('Metal', ChessboardColorScheme.metal),
+  olive('Olive', ChessboardColorScheme.olive),
+  newspaper('Newspaper', ChessboardColorScheme.newspaper),
+  purpleDiag('Purple-Diag', ChessboardColorScheme.purpleDiag),
+  pinkPyramid('Pink', ChessboardColorScheme.pinkPyramid),
+  horsey('Horsey', ChessboardColorScheme.horsey);
 
   final String label;
 
-  final BoardColorScheme colors;
+  final ChessboardColorScheme colors;
 
   const BoardTheme(this.label, this.colors);
 }

example/lib/board_thumbnails.dart

@@ -19,9 +19,9 @@ class BoardThumbnailsPage extends StatelessWidget {
         children: [
           for (final fen in positions)
             LayoutBuilder(builder: (context, constraints) {
-              return ChessBoard(
+              return Chessboard(
                 size: constraints.biggest.width,
-                settings: BoardSettings(
+                settings: ChessboardSettings(
                   enableCoordinates: false,
                   borderRadius: BorderRadius.circular(5),
                   boxShadow: [
@@ -43,7 +43,7 @@ class BoardThumbnailsPage extends StatelessWidget {
                     ),
                   ],
                 ),
-                data: BoardData(
+                state: ChessboardState(
                   interactableSide: InteractableSide.none,
                   orientation: Side.white,
                   fen: fen,

example/lib/main.dart

@@ -58,8 +58,8 @@ class _HomePageState extends State<HomePage> {
   dc.Position<dc.Chess> position = dc.Chess.initial;
   dc.Side orientation = dc.Side.white;
   String fen = dc.kInitialBoardFEN;
-  BoardMove? lastMove;
-  BoardMove? premove;
+  Move? lastMove;
+  Move? premove;
   ValidMoves validMoves = IMap(const {});
   dc.Side sideToMove = dc.Side.white;
   PieceSet pieceSet = PieceSet.merida;
@@ -134,9 +134,9 @@ class _HomePageState extends State<HomePage> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: [
-            ChessBoard(
+            Chessboard(
               size: screenWidth,
-              settings: BoardSettings(
+              settings: ChessboardSettings(
                 pieceAssets: pieceSet.assets,
                 colorScheme: boardTheme.colors,
                 enableCoordinates: true,
@@ -155,7 +155,7 @@ class _HomePageState extends State<HomePage> {
                 ),
                 pieceShiftMethod: pieceShiftMethod,
               ),
-              data: BoardData(
+              state: ChessboardState(
                 interactableSide: playMode == Mode.botPlay
                     ? InteractableSide.white
                     : (position.turn == dc.Side.white
@@ -369,13 +369,13 @@ class _HomePageState extends State<HomePage> {
     super.initState();
   }
 
-  void _onSetPremove(BoardMove? move) {
+  void _onSetPremove(Move? move) {
     setState(() {
       premove = move;
     });
   }
 
-  void _onUserMoveFreePlay(BoardMove move, {bool? isDrop, bool? isPremove}) {
+  void _onUserMoveFreePlay(Move move, {bool? isDrop, bool? isPremove}) {
     lastPos = position;
     final m = dc.Move.fromUci(move.uci)!;
     setState(() {
@@ -386,8 +386,7 @@ class _HomePageState extends State<HomePage> {
     });
   }
 
-  void _onUserMoveAgainstBot(BoardMove move,
-      {bool? isDrop, bool? isPremove}) async {
+  void _onUserMoveAgainstBot(Move move, {bool? isDrop, bool? isPremove}) async {
     lastPos = position;
     final m = dc.Move.fromUci(move.uci)!;
     setState(() {
@@ -415,7 +414,7 @@ class _HomePageState extends State<HomePage> {
         final mv = (allMoves..shuffle()).first;
         setState(() {
           position = position.playUnchecked(mv);
-          lastMove = BoardMove(
+          lastMove = Move(
               from: SquareId(dc.toAlgebraic(mv.from)),
               to: SquareId(dc.toAlgebraic(mv.to)));
           fen = position.fen;

lib/chessground.dart

@@ -5,9 +5,9 @@ library chessground;
 
 export 'src/board_color_scheme.dart';
 export 'src/draw_shape_options.dart';
-export 'src/board_data.dart';
 export 'src/board_editor_settings.dart';
 export 'src/board_settings.dart';
+export 'src/board_state.dart';
 export 'src/fen.dart';
 export 'src/models.dart';
 export 'src/piece_set.dart';