diff --git a/android/gradle.properties b/android/gradle.properties index 3487476dc637023e34426ce50caf3343f91e3038..c2a871af8ab063d06f9d9304e63850ba93031951 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 0000000000000000000000000000000000000000..757e0a95ad5304a483c23e5f2262e7e564458c85 --- /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 0000000000000000000000000000000000000000..a0007715ecf4090fa2791dae9a128d24d1e585d9 --- /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 f485358f3c50d549eedb98f2ded936a96c036e50..1e08a793058052bd87b0beafb1c95f3e5b4c03ec 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 9998344609ae51e2c5c1d539ffb9d02b8a8f08d4..1df4d023b64c2c538df0a9ab3543aaf9a03b205f 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 c14befc493f448c33ebebb5b18f437e1969d82a9..82ea300c89b7311dc12133916216f181a09a36c6 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); }