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

Merge branch '21-fix-layout-issues' into 'master'

Resolve "Fix layout issues"

Closes #21

See merge request !13
parents 6b55a4af ac4e9f3e
No related branches found
No related tags found
1 merge request!13Resolve "Fix layout issues"
Pipeline #2595 passed
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.0.8 app.versionName=0.0.9
app.versionCode=8 app.versionCode=9
...@@ -82,8 +82,16 @@ class Board { ...@@ -82,8 +82,16 @@ class Board {
); );
} }
double horizontalMargins = 20;
if (wordLength < 6) {
horizontalMargins = 40;
if (wordLength < 5) {
horizontalMargins = 60;
}
}
return Container( return Container(
margin: EdgeInsets.symmetric(horizontal: 40), margin: EdgeInsets.symmetric(horizontal: horizontalMargins),
padding: EdgeInsets.all(2), padding: EdgeInsets.all(2),
child: Table( child: Table(
......
...@@ -17,11 +17,17 @@ class Game { ...@@ -17,11 +17,17 @@ class Game {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Board.buildGameBoard(myProvider), Expanded(
child: Board.buildGameBoard(myProvider),
),
SizedBox(height: 2), SizedBox(height: 2),
gameIsFinished Container(
height: 150,
width: double.maxFinite,
child: gameIsFinished
? Game.buildEndGameMessage(myProvider) ? Game.buildEndGameMessage(myProvider)
: Keyboard.buildWidget(myProvider), : Keyboard.buildWidget(myProvider),
),
], ],
), ),
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment