From ef1a817fc818d94fb2d4a3b8149346fe68899853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Wed, 21 Apr 2021 20:54:19 +0200
Subject: [PATCH] Shuffle text buttons, improve buttons layout
---
android/gradle.properties | 4 ++--
lib/screens/game_pick_word.dart | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/android/gradle.properties b/android/gradle.properties
index d9abd55..6638812 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.12
-app.versionCode=12
+app.versionName=0.0.13
+app.versionCode=13
diff --git a/lib/screens/game_pick_word.dart b/lib/screens/game_pick_word.dart
index fd0f791..1e1addb 100644
--- a/lib/screens/game_pick_word.dart
+++ b/lib/screens/game_pick_word.dart
@@ -101,7 +101,7 @@ class GamePickWordPage extends StatelessWidget {
Container _buildTextContainer(String word, Color color) {
return Container(
- child: FlatButton(
+ child: RaisedButton(
color: Colors.green,
padding: EdgeInsets.all(15),
child: Text(
@@ -127,6 +127,8 @@ class GamePickWordPage extends StatelessWidget {
otherWords.length > 2 ? otherWords[2] : null,
];
+ words.shuffle();
+
return Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
@@ -136,14 +138,17 @@ class GamePickWordPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
_buildTextContainer(words[0], color),
+ SizedBox(width: 10),
_buildTextContainer(words[1], color),
],
),
+ SizedBox(height: 10),
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
_buildTextContainer(words[2], color),
+ SizedBox(width: 10),
_buildTextContainer(words[3], color),
],
)
--
GitLab