diff --git a/android/gradle.properties b/android/gradle.properties index d965699510bdf71e00b8f08fe1031cef79d05911..cc4e56eef743ffd4a67a64f0b67840717af81ff4 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 0000000000000000000000000000000000000000..f9645b4fc110775657cba27208262a57535e26f2 --- /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 0000000000000000000000000000000000000000..142362c8ef04d77e57d0300ed56c526ad7eb9338 --- /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 e3c0615ef48190785e13fa5eee15c9023d865d89..dc593976ea90f2cdb6ba9c92cf1cd9b90e6656b7 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 dad275d6f8d947d55050e75172b4e7d11403d4c3..f5bd84d50f91f764d470ff030791206b33eae4b4 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), - ) - ], + ] + ) ); }