From 1044c7af8618ef14080fc35818ecefa4f66bfba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr> Date: Tue, 11 May 2021 21:57:32 +0200 Subject: [PATCH] Improve colors/display in buttons --- android/gradle.properties | 4 ++-- lib/screens/game_pick_image.dart | 4 ++-- lib/screens/game_pick_word.dart | 16 ++++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index 96a5e22..6118848 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.1.11 -app.versionCode=35 +app.versionName=0.1.12 +app.versionCode=36 diff --git a/lib/screens/game_pick_image.dart b/lib/screens/game_pick_image.dart index da62fe7..ff06025 100644 --- a/lib/screens/game_pick_image.dart +++ b/lib/screens/game_pick_image.dart @@ -131,7 +131,7 @@ class GamePickImagePage extends StatelessWidget { decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), border: Border.all( - color: Colors.teal, + color: Colors.blue[200], width: 8, ), ), @@ -195,6 +195,7 @@ class GamePickImagePage extends StatelessWidget { Container( margin: EdgeInsets.all(2), decoration: BoxDecoration( + color: Colors.blue, borderRadius: BorderRadius.circular(6), border: Border.all( color: Colors.white, @@ -202,7 +203,6 @@ class GamePickImagePage extends StatelessWidget { ), ), child: RaisedButton( - color: Colors.green, padding: EdgeInsets.all(15), child: Text( word != null ? word[myProvider.lang] : '', diff --git a/lib/screens/game_pick_word.dart b/lib/screens/game_pick_word.dart index 7fbe009..19903b4 100644 --- a/lib/screens/game_pick_word.dart +++ b/lib/screens/game_pick_word.dart @@ -137,7 +137,7 @@ class GamePickWordPage extends StatelessWidget { decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), border: Border.all( - color: Colors.teal, + color: Colors.blue[200], width: 8, ), ), @@ -181,14 +181,22 @@ class GamePickWordPage extends StatelessWidget { Container _buildTextContainer(Data myProvider, Map word) { return Container( - child: RaisedButton( - color: Colors.green, + margin: EdgeInsets.all(2), + decoration: BoxDecoration( + color: Colors.blue[800], + borderRadius: BorderRadius.circular(6), + border: Border.all( + color: Colors.white, + width: 6, + ), + ), + child: FlatButton( padding: EdgeInsets.all(15), child: Text( word != null ? word[myProvider.lang] : '', style: TextStyle( fontSize: 20, - fontWeight: FontWeight.w400, + fontWeight: FontWeight.w600, color: Colors.white, ), ), -- GitLab