diff --git a/android/gradle.properties b/android/gradle.properties index 24add27a90a4accaf6a1ee28ec651d0d6bda4f8e..eeed3ef5a3d04530f5624cce71b2a57976938aed 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=0.0.20 -app.versionCode=20 +app.versionName=0.0.21 +app.versionCode=21 diff --git a/fastlane/metadata/android/en-US/changelogs/21.txt b/fastlane/metadata/android/en-US/changelogs/21.txt new file mode 100644 index 0000000000000000000000000000000000000000..3bd541548e6a33733bdcc38c4098d3e883683bb7 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/21.txt @@ -0,0 +1 @@ +Display word if not found when the game ends diff --git a/fastlane/metadata/android/fr-FR/changelogs/21.txt b/fastlane/metadata/android/fr-FR/changelogs/21.txt new file mode 100644 index 0000000000000000000000000000000000000000..3735131a799548ec6f8f048be45abf67872437d5 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/21.txt @@ -0,0 +1 @@ +Affichage du mot à deviner s'il n'est pas trouvé à la fin de la partie diff --git a/lib/layout/board.dart b/lib/layout/board.dart index 5be81f4c7d9f0a0beb4e558740de3e4f339e917d..17b35c4c40248c6047dae28ae304603eb0693891 100644 --- a/lib/layout/board.dart +++ b/lib/layout/board.dart @@ -102,6 +102,17 @@ class Board { tableRows.add(TableRow(children: tableCells)); } + List<Widget> gameBoard = [ + Table( + defaultVerticalAlignment: TableCellVerticalAlignment.middle, + border: TableBorder.all( + color: Colors.white, + style: BorderStyle.none, + ), + children: tableRows, + ), + ]; + double horizontalMargins = 20; if (wordLength < 6) { horizontalMargins = 40; @@ -110,16 +121,21 @@ class Board { } } + if (myProvider.isGameFinished() && !myProvider.gameWon) { + gameBoard.add(Text( + myProvider.word, + style: TextStyle( + fontSize: 40, + fontWeight: FontWeight.bold, + ), + )); + } + return Container( margin: EdgeInsets.symmetric(horizontal: horizontalMargins), padding: EdgeInsets.all(2), - child: Table( - defaultVerticalAlignment: TableCellVerticalAlignment.middle, - border: TableBorder.all( - color: Colors.white, - style: BorderStyle.none, - ), - children: tableRows, + child: Column( + children: gameBoard, ), ); } diff --git a/lib/provider/data.dart b/lib/provider/data.dart index 6086912031fa366e88accbac4da60cbef247e8eb..04df1862662810be67da5b6ad5556714f678a5a1 100644 --- a/lib/provider/data.dart +++ b/lib/provider/data.dart @@ -198,9 +198,7 @@ class Data extends ChangeNotifier { } bool isGameFinished() { - print('isGameFinished'); - - if (_foundWord || (_guesses.length > (_maxGuessesCount - 1))) { + if (_foundWord || (_guesses.length >= _maxGuessesCount)) { return true; }