Merge branch '27-add-guesses-count' into 'master'

Resolve "Add "guesses count""

Closes #27

See merge request !27

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=1.0.23
-app.versionCode=24
+app.versionName=1.0.24
+app.versionCode=25

fastlane/metadata/android/en-US/changelogs/25.txt

+Add "guesses count" indicator.

fastlane/metadata/android/fr-FR/changelogs/25.txt

+Ajout d'un compteur de coups.

lib/cubit/game_cubit.dart

@@ -36,7 +36,7 @@ class GameCubit extends HydratedCubit<GameState> {
       // Base data
       board: state.currentGame.board,
       // Game data
-      movesCount: state.currentGame.movesCount,
+      guessesCount: state.currentGame.guessesCount,
       pairsFound: state.currentGame.pairsFound,
     );
     game.dump();
@@ -130,6 +130,9 @@ class GameCubit extends HydratedCubit<GameState> {
         }
       }
 
+      state.currentGame.guessesCount++;
+      refresh();
+
       // timer + check pair + unselect
       Timer(const Duration(seconds: 2), () {
         if (hasSameValue) {
@@ -137,12 +140,11 @@ class GameCubit extends HydratedCubit<GameState> {
 
           final int itemValue = state.currentGame.board.tiles[selectedTilesIndexes[0]].value;
           state.currentGame.pairsFound.add(itemValue);
-        }
-
-        state.currentGame.movesCount++;
           refresh();
+        }
 
         state.currentGame.isFinished = state.currentGame.gameWon;
+        refresh();
 
         unselectAllTiles();
         allowInteractions(true);

lib/models/game/game.dart

@@ -28,7 +28,7 @@ class Game {
     required this.board,
 
     // Game data
-    required this.movesCount,
+    required this.guessesCount,
     required this.pairsFound,
   });
 
@@ -47,7 +47,7 @@ class Game {
   final Board board;
 
   // Game data
-  int movesCount;
+  int guessesCount;
   List<int> pairsFound = [];
 
   factory Game.createNull() {
@@ -58,7 +58,7 @@ class Game {
       // Base data
       board: Board.createNull(),
       // Game data
-      movesCount: 0,
+      guessesCount: 0,
       pairsFound: [],
     );
   }
@@ -83,7 +83,7 @@ class Game {
       // Base data
       board: board,
       // Game data
-      movesCount: 0,
+      guessesCount: 0,
       pairsFound: [],
     );
   }
@@ -111,7 +111,7 @@ class Game {
     printlog('  Base data');
     board.dump();
     printlog('  Game data');
-    printlog('    movesCount: $movesCount');
+    printlog('    guessesCount: $guessesCount');
     printlog('    pairsFound: $pairsFound');
     printlog('');
   }
@@ -135,7 +135,7 @@ class Game {
       // Base data
       'board': board.toJson(),
       // Game data
-      'movesCount': movesCount,
+      'guessesCount': guessesCount,
       'pairsFound': pairsFound,
     };
   }

lib/ui/widgets/game/game_top.dart

@@ -13,7 +13,14 @@ class GameTopWidget extends StatelessWidget {
       builder: (BuildContext context, GameState gameState) {
         final Game currentGame = gameState.currentGame;
 
-        return const Text('');
+        return Text(
+          currentGame.guessesCount.toString(),
+          style: TextStyle(
+            fontSize: 40,
+            fontWeight: FontWeight.bold,
+            color: Theme.of(context).colorScheme.primary,
+          ),
+        );
       },
     );
   }

pubspec.yaml

@@ -3,7 +3,7 @@ description: A simple and classic memory game.
 
 publish_to: "none"
 
-version: 1.0.23+24
+version: 1.0.24+25
 
 environment:
   sdk: "^3.0.0"