From ac4e9f3e81b4126873e4a1201ffceb3e05829bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Thu, 7 Apr 2022 21:07:03 +0200
Subject: [PATCH] Fix layout issues
---
android/gradle.properties | 4 ++--
lib/layout/board.dart | 10 +++++++++-
lib/layout/game.dart | 14 ++++++++++----
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/android/gradle.properties b/android/gradle.properties
index 65eed64..4bb5439 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.8
-app.versionCode=8
+app.versionName=0.0.9
+app.versionCode=9
diff --git a/lib/layout/board.dart b/lib/layout/board.dart
index bb72265..bd42321 100644
--- a/lib/layout/board.dart
+++ b/lib/layout/board.dart
@@ -82,8 +82,16 @@ class Board {
);
}
+ double horizontalMargins = 20;
+ if (wordLength < 6) {
+ horizontalMargins = 40;
+ if (wordLength < 5) {
+ horizontalMargins = 60;
+ }
+ }
+
return Container(
- margin: EdgeInsets.symmetric(horizontal: 40),
+ margin: EdgeInsets.symmetric(horizontal: horizontalMargins),
padding: EdgeInsets.all(2),
child: Table(
diff --git a/lib/layout/game.dart b/lib/layout/game.dart
index 8f7de82..6abe0c3 100644
--- a/lib/layout/game.dart
+++ b/lib/layout/game.dart
@@ -17,11 +17,17 @@ class Game {
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
- Board.buildGameBoard(myProvider),
+ Expanded(
+ child: Board.buildGameBoard(myProvider),
+ ),
SizedBox(height: 2),
- gameIsFinished
- ? Game.buildEndGameMessage(myProvider)
- : Keyboard.buildWidget(myProvider),
+ Container(
+ height: 150,
+ width: double.maxFinite,
+ child: gameIsFinished
+ ? Game.buildEndGameMessage(myProvider)
+ : Keyboard.buildWidget(myProvider),
+ ),
],
),
);
--
GitLab