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

Improve score display

parent ac9792f9
Branches
Tags
1 merge request!55Resolve "Improve graphics and layout"
Pipeline #2479 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.23 app.versionName=0.1.24
app.versionCode=47 app.versionCode=48
...@@ -95,6 +95,16 @@ class GamePickImagePage extends StatelessWidget { ...@@ -95,6 +95,16 @@ class GamePickImagePage extends StatelessWidget {
); );
} }
String getGoodAnswersString(Data myProvider) {
int count = myProvider.questionsCount - 1;
return '👍 ' + myProvider.goodAnswers.toString() + '/' + count.toString();
}
String getWrongAnswersString(Data myProvider) {
int count = myProvider.questionsCount - 1;
return '🚩 ' + myProvider.wrongAnswers.toString() + '/' + count.toString();
}
Container _buildScoreContainer(Data myProvider) { Container _buildScoreContainer(Data myProvider) {
return Container( return Container(
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
...@@ -103,17 +113,12 @@ class GamePickImagePage extends StatelessWidget { ...@@ -103,17 +113,12 @@ class GamePickImagePage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
_buildScoreItemContainer( _buildScoreItemContainer(
'❓ ' + myProvider.questionsCount.toString(), getGoodAnswersString(myProvider),
Colors.white,
),
SizedBox(width: 20),
_buildScoreItemContainer(
'☺️ ' + myProvider.goodAnswers.toString(),
Colors.green, Colors.green,
), ),
SizedBox(width: 20), SizedBox(width: 20),
_buildScoreItemContainer( _buildScoreItemContainer(
'😟 ' + myProvider.wrongAnswers.toString(), getWrongAnswersString(myProvider),
Colors.orange, Colors.orange,
), ),
], ],
......
...@@ -100,6 +100,16 @@ class GamePickWordPage extends StatelessWidget { ...@@ -100,6 +100,16 @@ class GamePickWordPage extends StatelessWidget {
); );
} }
String getGoodAnswersString(Data myProvider) {
int count = myProvider.questionsCount - 1;
return '👍 ' + myProvider.goodAnswers.toString() + '/' + count.toString();
}
String getWrongAnswersString(Data myProvider) {
int count = myProvider.questionsCount - 1;
return '🚩 ' + myProvider.wrongAnswers.toString() + '/' + count.toString();
}
Container _buildScoreContainer(Data myProvider) { Container _buildScoreContainer(Data myProvider) {
return Container( return Container(
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
...@@ -108,17 +118,12 @@ class GamePickWordPage extends StatelessWidget { ...@@ -108,17 +118,12 @@ class GamePickWordPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
_buildScoreItemContainer( _buildScoreItemContainer(
'❓ ' + myProvider.questionsCount.toString(), getGoodAnswersString(myProvider),
Colors.white,
),
SizedBox(width: 20),
_buildScoreItemContainer(
'☺️ ' + myProvider.goodAnswers.toString(),
Colors.green, Colors.green,
), ),
SizedBox(width: 20), SizedBox(width: 20),
_buildScoreItemContainer( _buildScoreItemContainer(
'😟 ' + myProvider.wrongAnswers.toString(), getWrongAnswersString(myProvider),
Colors.orange, Colors.orange,
), ),
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment