From 78481bcc20e057c00e1d68e243bceb14c99c564e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Mon, 12 Jul 2021 11:09:26 +0200
Subject: [PATCH] Improve display winning image, fake preload
---
android/gradle.properties | 4 +-
.../metadata/android/en-US/changelogs/30.txt | 1 +
.../metadata/android/fr-FR/changelogs/30.txt | 1 +
lib/layout/game.dart | 49 ++++++++---------
lib/layout/parameters.dart | 52 +++++++++++++------
5 files changed, 62 insertions(+), 45 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/30.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/30.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index d965699..cc4e56e 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.29
-app.versionCode=29
+app.versionName=0.0.30
+app.versionCode=30
diff --git a/fastlane/metadata/android/en-US/changelogs/30.txt b/fastlane/metadata/android/en-US/changelogs/30.txt
new file mode 100644
index 0000000..f9645b4
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/30.txt
@@ -0,0 +1 @@
+Improve display winning image, fake preload
diff --git a/fastlane/metadata/android/fr-FR/changelogs/30.txt b/fastlane/metadata/android/fr-FR/changelogs/30.txt
new file mode 100644
index 0000000..142362c
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/30.txt
@@ -0,0 +1 @@
+Amélioration de l'affichage de victoire, préchargement de l'image
diff --git a/lib/layout/game.dart b/lib/layout/game.dart
index e3c0615..dc59397 100644
--- a/lib/layout/game.dart
+++ b/lib/layout/game.dart
@@ -70,6 +70,15 @@ class Game {
static Container buildWinMessage(Data myProvider) {
+ Column decorationImage = Column(
+ children: [
+ Image(
+ image: AssetImage('assets/icons/game_win.png'),
+ fit: BoxFit.fill
+ ),
+ ]
+ );
+
return Container(
margin: EdgeInsets.all(2),
padding: EdgeInsets.all(2),
@@ -79,35 +88,21 @@ class Game {
children: [
TableRow(
children: [
- Column(
- children: [
- Image(
- image: AssetImage('assets/icons/game_win.png'),
- fit: BoxFit.fill
- ),
- ]
- ),
- Column(
- children: [
- FlatButton(
- child: Container(
- child: Image(
- image: AssetImage('assets/icons/button_back.png'),
- fit: BoxFit.fill
- ),
+ decorationImage,
+ Column(
+ children: [
+ FlatButton(
+ child: Container(
+ child: Image(
+ image: AssetImage('assets/icons/button_back.png'),
+ fit: BoxFit.fill
),
- onPressed: () => GameUtils.resetGame(myProvider),
),
- ]
- ),
- Column(
- children: [
- Image(
- image: AssetImage('assets/icons/game_win.png'),
- fit: BoxFit.fill
- ),
- ]
- ),
+ onPressed: () => GameUtils.resetGame(myProvider),
+ ),
+ ]
+ ),
+ decorationImage,
],
),
]
diff --git a/lib/layout/parameters.dart b/lib/layout/parameters.dart
index dad275d..f5bd84d 100644
--- a/lib/layout/parameters.dart
+++ b/lib/layout/parameters.dart
@@ -5,8 +5,6 @@ import '../utils/game_utils.dart';
class Parameters {
- static const double _startButtonSize = 120;
-
static Container buildParametersSelector(Data myProvider) {
return Container(
padding: EdgeInsets.all(2),
@@ -29,22 +27,44 @@ class Parameters {
}
- static Column buildStartGameButton(Data myProvider) {
- return Column(
- mainAxisSize: MainAxisSize.min,
- mainAxisAlignment: MainAxisAlignment.center,
+ static Container buildStartGameButton(Data myProvider) {
+ Column decorationImage = Column(
children: [
- FlatButton(
- padding: EdgeInsets.all(2),
- child: Image(
- image: AssetImage('assets/icons/button_start.png'),
- width: _startButtonSize,
- height: _startButtonSize,
- fit: BoxFit.fill
+ Image(
+ image: AssetImage('assets/icons/game_win.png'),
+ fit: BoxFit.fill
+ ),
+ ]
+ );
+
+ return Container(
+ margin: EdgeInsets.all(2),
+ padding: EdgeInsets.all(2),
+
+ child: Table(
+ defaultColumnWidth: IntrinsicColumnWidth(),
+ children: [
+ TableRow(
+ children: [
+ decorationImage,
+ Column(
+ children: [
+ FlatButton(
+ child: Container(
+ child: Image(
+ image: AssetImage('assets/icons/button_start.png'),
+ fit: BoxFit.fill
+ ),
+ ),
+ onPressed: () => GameUtils.startGame(myProvider),
+ ),
+ ]
+ ),
+ decorationImage,
+ ],
),
- onPressed: () => GameUtils.startGame(myProvider),
- )
- ],
+ ]
+ )
);
}
--
GitLab