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

Merge branch '23-improve-home-page' into 'master'

Resolve "Improve home page"

Closes #23

See merge request !23
parents 68942c31 8cf271e0
No related branches found
No related tags found
1 merge request!23Resolve "Improve home page"
Pipeline #1133 passed
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.1.12 app.versionName=0.1.13
app.versionCode=36 app.versionCode=37
assets/menu/game-pick-image.png

58.1 KiB

assets/menu/game-pick-word.png

138 KiB

...@@ -20,50 +20,51 @@ class Home extends StatelessWidget { ...@@ -20,50 +20,51 @@ class Home extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
Data _myProvider = Provider.of<Data>(context); Data _myProvider = Provider.of<Data>(context);
return Scaffold( Container _buildMenuItemContainer(String code, Color color) {
backgroundColor: Colors.blue, double imageSize = 150;
body: Center(
child: Column( String imageAsset = 'assets/menu/' + code + '.png';
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center, return Container(
mainAxisSize: MainAxisSize.max, margin: EdgeInsets.all(2),
children: <Widget>[ decoration: BoxDecoration(
FlatButton( borderRadius: BorderRadius.circular(8),
color: Colors.green, border: Border.all(
padding: EdgeInsets.all(15), color: Colors.teal,
child: Text( width: 8,
'🖼️ ➡️ 💬',
style: Theme.of(context)
.textTheme
.display1
.copyWith(color: Colors.white),
), ),
onPressed: () {
resetGame(_myProvider);
Navigator.pushNamed(
context,
'/game-pick-word',
);
},
), ),
FlatButton( child: FlatButton(
color: Colors.green, color: color,
padding: EdgeInsets.all(15), padding: EdgeInsets.all(15),
child: Text( child: Image(
'💬️ ➡️ 🖼', image: AssetImage(imageAsset),
style: Theme.of(context) width: imageSize,
.textTheme height: imageSize,
.display1 fit: BoxFit.fill
.copyWith(color: Colors.white),
), ),
onPressed: () { onPressed: () {
resetGame(_myProvider); resetGame(_myProvider);
Navigator.pushNamed( Navigator.pushNamed(
context, context,
'/game-pick-image', '/' + code,
); );
}, },
), ),
);
}
return Scaffold(
backgroundColor: Colors.blue,
body: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.max,
children: <Widget>[
_buildMenuItemContainer('game-pick-word', Colors.pink),
_buildMenuItemContainer('game-pick-image', Colors.yellow),
], ],
), ),
), ),
......
...@@ -22,4 +22,5 @@ flutter: ...@@ -22,4 +22,5 @@ flutter:
- assets/assets_images.json - assets/assets_images.json
- assets/files/ - assets/files/
- assets/images/ - assets/images/
- assets/menu/
- assets/placeholder.png - assets/placeholder.png
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment