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

Merge branch '41-improve-text-buttons-display' into 'master'

Resolve "Improve text buttons display"

Closes #41

See merge request !44
parents ebe7155e 1044c7af
No related branches found
No related tags found
1 merge request!44Resolve "Improve text buttons display"
Pipeline #1125 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.11 app.versionName=0.1.12
app.versionCode=35 app.versionCode=36
...@@ -131,7 +131,7 @@ class GamePickImagePage extends StatelessWidget { ...@@ -131,7 +131,7 @@ class GamePickImagePage extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
border: Border.all( border: Border.all(
color: Colors.teal, color: Colors.blue[200],
width: 8, width: 8,
), ),
), ),
...@@ -195,6 +195,7 @@ class GamePickImagePage extends StatelessWidget { ...@@ -195,6 +195,7 @@ class GamePickImagePage extends StatelessWidget {
Container( Container(
margin: EdgeInsets.all(2), margin: EdgeInsets.all(2),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.blue,
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
border: Border.all( border: Border.all(
color: Colors.white, color: Colors.white,
...@@ -202,7 +203,6 @@ class GamePickImagePage extends StatelessWidget { ...@@ -202,7 +203,6 @@ class GamePickImagePage extends StatelessWidget {
), ),
), ),
child: RaisedButton( child: RaisedButton(
color: Colors.green,
padding: EdgeInsets.all(15), padding: EdgeInsets.all(15),
child: Text( child: Text(
word != null ? word[myProvider.lang] : '', word != null ? word[myProvider.lang] : '',
......
...@@ -137,7 +137,7 @@ class GamePickWordPage extends StatelessWidget { ...@@ -137,7 +137,7 @@ class GamePickWordPage extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
border: Border.all( border: Border.all(
color: Colors.teal, color: Colors.blue[200],
width: 8, width: 8,
), ),
), ),
...@@ -181,14 +181,22 @@ class GamePickWordPage extends StatelessWidget { ...@@ -181,14 +181,22 @@ class GamePickWordPage extends StatelessWidget {
Container _buildTextContainer(Data myProvider, Map word) { Container _buildTextContainer(Data myProvider, Map word) {
return Container( return Container(
child: RaisedButton( margin: EdgeInsets.all(2),
color: Colors.green, decoration: BoxDecoration(
color: Colors.blue[800],
borderRadius: BorderRadius.circular(6),
border: Border.all(
color: Colors.white,
width: 6,
),
),
child: FlatButton(
padding: EdgeInsets.all(15), padding: EdgeInsets.all(15),
child: Text( child: Text(
word != null ? word[myProvider.lang] : '', word != null ? word[myProvider.lang] : '',
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w600,
color: Colors.white, color: Colors.white,
), ),
), ),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment