Skip to content
Snippets Groups Projects
Commit 216aca45 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '39-preload-winning-image' into 'master'

Resolve "Preload winning image"

Closes #39

See merge request !33
parents c0f3d6f8 78481bcc
No related branches found
No related tags found
1 merge request!33Resolve "Preload winning image"
Pipeline #1714 passed
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
Improve display winning image, fake preload
Amélioration de l'affichage de victoire, préchargement de l'image
......@@ -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,
],
),
]
......
......@@ -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),
)
],
]
)
);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment