From e1105405db54c4cafa658a8c028c037f21e86cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Wed, 28 Sep 2022 14:40:48 +0200
Subject: [PATCH] Display word if not found when game ends
---
android/gradle.properties | 4 +--
.../metadata/android/en-US/changelogs/21.txt | 1 +
.../metadata/android/fr-FR/changelogs/21.txt | 1 +
lib/layout/board.dart | 30 ++++++++++++++-----
lib/provider/data.dart | 4 +--
5 files changed, 28 insertions(+), 12 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/21.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/21.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 24add27..eeed3ef 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 0000000..3bd5415
--- /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 0000000..3735131
--- /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 5be81f4..17b35c4 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 6086912..04df186 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;
}
--
GitLab