From edff7d5fb1be55e62687da82a11809ee32bf0ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Wed, 9 Nov 2022 20:13:40 +0100
Subject: [PATCH] Fix end game block
---
android/gradle.properties | 4 +--
.../metadata/android/en-US/changelogs/24.txt | 1 +
.../metadata/android/fr-FR/changelogs/24.txt | 1 +
lib/layout/game.dart | 33 +++++++++++--------
lib/screens/home.dart | 2 +-
lib/utils/game_utils.dart | 2 +-
6 files changed, 26 insertions(+), 17 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/24.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/24.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 3487476..c2a871a 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.23
-app.versionCode=23
+app.versionName=0.0.24
+app.versionCode=24
diff --git a/fastlane/metadata/android/en-US/changelogs/24.txt b/fastlane/metadata/android/en-US/changelogs/24.txt
new file mode 100644
index 0000000..757e0a9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/24.txt
@@ -0,0 +1 @@
+Fix display end game block
diff --git a/fastlane/metadata/android/fr-FR/changelogs/24.txt b/fastlane/metadata/android/fr-FR/changelogs/24.txt
new file mode 100644
index 0000000..a000771
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/24.txt
@@ -0,0 +1 @@
+Correction sur l'affichage du block de fin de partie
diff --git a/lib/layout/game.dart b/lib/layout/game.dart
index f485358..1e08a79 100644
--- a/lib/layout/game.dart
+++ b/lib/layout/game.dart
@@ -30,15 +30,13 @@ class Game {
);
}
- static TextButton buildRestartGameButton(Data myProvider) {
+ static TextButton buildQuitGameButton(Data myProvider) {
return TextButton(
- child: Container(
- child: Image(
- image: AssetImage('assets/icons/button_back.png'),
- fit: BoxFit.fill,
- ),
+ child: Image(
+ image: AssetImage('assets/icons/button_back.png'),
+ fit: BoxFit.fill,
),
- onPressed: () => GameUtils.resetGame(myProvider),
+ onPressed: () => GameUtils.quitGame(myProvider),
);
}
@@ -50,9 +48,12 @@ class Game {
decorationImageAssetName = 'assets/icons/game_fail.png';
}
- Image decorationImage = Image(
- image: AssetImage(decorationImageAssetName),
- fit: BoxFit.fill,
+ Widget decorationWidget = TextButton(
+ child: Image(
+ image: AssetImage(decorationImageAssetName),
+ fit: BoxFit.fill,
+ ),
+ onPressed: () => null,
);
return Container(
@@ -63,9 +64,15 @@ class Game {
children: [
TableRow(
children: [
- Column(children: [decorationImage]),
- Column(children: [buildRestartGameButton(myProvider)]),
- Column(children: [decorationImage]),
+ Column(
+ children: [decorationWidget],
+ ),
+ Column(
+ children: [buildQuitGameButton(myProvider)],
+ ),
+ Column(
+ children: [decorationWidget],
+ ),
],
),
],
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 9998344..1df4d02 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -39,7 +39,7 @@ class _HomeState extends State<Home> {
),
),
onPressed: () => toast('Long press to quit game...'),
- onLongPress: () => GameUtils.resetGame(myProvider),
+ onLongPress: () => GameUtils.quitGame(myProvider),
),
];
}
diff --git a/lib/utils/game_utils.dart b/lib/utils/game_utils.dart
index c14befc..82ea300 100644
--- a/lib/utils/game_utils.dart
+++ b/lib/utils/game_utils.dart
@@ -2,7 +2,7 @@ import '../provider/data.dart';
import '../utils/random_pick_word.dart';
class GameUtils {
- static Future<void> resetGame(Data myProvider) async {
+ static Future<void> quitGame(Data myProvider) async {
myProvider.updateGameIsRunning(false);
}
--
GitLab