Implement showing numbers on pieces

calcitem · Apr 27, 2024 · 85987ce · 85987ce
1 parent c16288d
commit 85987ce
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 0 deletions.
diff --git a/src/ui/flutter_app/lib/appearance_settings/models/display_settings.dart b/src/ui/flutter_app/lib/appearance_settings/models/display_settings.dart
@@ -66,6 +66,7 @@ class DisplaySettings {
     this.aiResponseDelayTime = 0.0,
     this.isPositionalAdvantageIndicatorShown = false,
     this.backgroundImagePath = '',
+    this.isNumbersOnPiecesShown = false,
   });
 
   /// Encodes a Json style map into a [DisplaySettings] object
@@ -145,6 +146,9 @@ class DisplaySettings {
   @HiveField(20, defaultValue: '')
   final String backgroundImagePath;
 
+  @HiveField(21, defaultValue: false)
+  final bool isNumbersOnPiecesShown;
+
   /// Decodes a Json from a [DisplaySettings] object
   Map<String, dynamic> toJson() => _$DisplaySettingsToJson(this);
 }
diff --git a/src/ui/flutter_app/lib/appearance_settings/widgets/appearance_settings_page.dart b/src/ui/flutter_app/lib/appearance_settings/widgets/appearance_settings_page.dart
@@ -359,6 +359,12 @@ class AppearanceSettingsPage extends StatelessWidget {
           titleString: S.of(context).pointWidth,
           onTap: () => setPointWidth(context),
         ),
+        SettingsListTile.switchTile(
+          value: displaySettings.isNumbersOnPiecesShown,
+          onChanged: (bool val) => DB().displaySettings =
+              displaySettings.copyWith(isNumbersOnPiecesShown: val),
+          titleString: S.of(context).showNumbersOnPieces,
+        ),
         SettingsListTile(
           titleString: S.of(context).pieceWidth,
           onTap: () => setPieceWidth(context),

diff --git a/src/ui/flutter_app/lib/game_page/services/engine/position.dart b/src/ui/flutter_app/lib/game_page/services/engine/position.dart
@@ -18,6 +18,14 @@ part of '../mill.dart';
 
 List<int> posKeyHistory = <int>[];
 
+class SquareAttribute {
+  SquareAttribute({
+    required this.placedPieceNumber,
+  });
+
+  int placedPieceNumber;
+}
+
 class StateInfo {
   // Copied when making a move
   int rule50 = 0;
@@ -37,6 +45,12 @@ class Position {
   final List<PieceColor> _grid =
       List<PieceColor>.filled(7 * 7, PieceColor.none);
 
+  int placedPieceNumber = 0;
+  final List<SquareAttribute> sqAttrList = List<SquareAttribute>.generate(
+    sqNumber,
+    (int index) => SquareAttribute(placedPieceNumber: 0),
+  );
+
   final Map<PieceColor, int> pieceInHandCount = <PieceColor, int>{
     PieceColor.white: DB().ruleSettings.piecesCount,
     PieceColor.black: DB().ruleSettings.piecesCount,
@@ -582,6 +596,10 @@ class Position {
 
         _currentSquare = s;
 
+        // Set square number
+        placedPieceNumber++;
+        sqAttrList[s].placedPieceNumber = placedPieceNumber;
+
         final int n = _millsCount(_currentSquare);
 
         if (n == 0) {
@@ -1318,6 +1336,11 @@ extension SetupPosition on Position {
     isNeedStalemateRemoval = false;
     isStalemateRemoving = false;
 
+    placedPieceNumber = 0;
+    for (int i = 0; i < sqNumber; i++) {
+      sqAttrList[i].placedPieceNumber = 0;
+    }
+
     for (int i = 0; i < sqNumber; i++) {
       _board[i] = PieceColor.none;
     }
@@ -1386,6 +1409,11 @@ extension SetupPosition on Position {
     isNeedStalemateRemoval = pos.isNeedStalemateRemoval;
     isStalemateRemoving = pos.isStalemateRemoving;
 
+    placedPieceNumber = pos.placedPieceNumber;
+    for (int i = 0; i < sqNumber; i++) {
+      sqAttrList[i].placedPieceNumber = pos.sqAttrList[i].placedPieceNumber;
+    }
+
     for (int i = 0; i < sqNumber; i++) {
       _board[i] = pos._board[i];
     }

diff --git a/src/ui/flutter_app/lib/game_page/widgets/painters/piece_painter.dart b/src/ui/flutter_app/lib/game_page/widgets/painters/piece_painter.dart
@@ -26,6 +26,7 @@ class PiecePaintParam {
     required this.pos,
     required this.animated,
     required this.diameter,
+    this.squareAttribute,
   });
 
   /// The color of the piece.
@@ -38,6 +39,7 @@ class PiecePaintParam {
   final Offset pos;
   final bool animated;
   final double diameter;
+  final SquareAttribute? squareAttribute;
 }
 
 /// Custom Piece Painter
@@ -82,6 +84,10 @@ class PiecePainter extends CustomPainter {
           continue;
         }
 
+        final int sq = indexToSquare[index]!;
+        final SquareAttribute squareAttribute =
+            GameController().position.sqAttrList[sq];
+
         final Offset pos = pointFromIndex(index, size);
         final bool animated = focusIndex == index;
 
@@ -91,6 +97,7 @@ class PiecePainter extends CustomPainter {
             pos: pos,
             animated: animated,
             diameter: pieceWidth,
+            squareAttribute: squareAttribute,
           ),
         );
 
@@ -145,6 +152,33 @@ class PiecePainter extends CustomPainter {
         piece.animated ? animatedPieceInnerRadius : pieceInnerRadius,
         paint,
       );
+
+      if (DB().displaySettings.isNumbersOnPiecesShown &&
+          piece.squareAttribute?.placedPieceNumber != null) {
+        // Text Drawing:
+        final TextPainter textPainter = TextPainter(
+          text: TextSpan(
+            text: piece.squareAttribute?.placedPieceNumber.toString(),
+            style: TextStyle(
+              color: piece.piece.pieceColor.computeLuminance() > 0.5
+                  ? Colors.black
+                  : Colors.white,
+              fontSize: piece.diameter * 0.5, // Adjust font size as needed
+            ),
+          ),
+          textAlign: TextAlign.center,
+          textDirection: TextDirection.ltr,
+        );
+        textPainter.layout();
+
+        // Calculate offset for centering the text
+        final Offset textOffset = Offset(
+          piece.pos.dx - textPainter.width / 2,
+          piece.pos.dy - textPainter.height / 2,
+        );
+
+        textPainter.paint(canvas, textOffset);
+      }
     }
 
     // Draw focus and blur position