From 45e1b38253218f2154dc141152d65c57e7a000a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Mon, 14 Feb 2022 23:27:27 +0100
Subject: [PATCH] Improve score display

---
 android/gradle.properties        |  4 ++--
 lib/screens/game_pick_image.dart | 19 ++++++++++++-------
 lib/screens/game_pick_word.dart  | 19 ++++++++++++-------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index fc7454c..18da836 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.23
-app.versionCode=47
+app.versionName=0.1.24
+app.versionCode=48
diff --git a/lib/screens/game_pick_image.dart b/lib/screens/game_pick_image.dart
index 5a5e21c..507f401 100644
--- a/lib/screens/game_pick_image.dart
+++ b/lib/screens/game_pick_image.dart
@@ -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) {
     return Container(
       padding: EdgeInsets.all(5),
@@ -103,17 +113,12 @@ class GamePickImagePage extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
           _buildScoreItemContainer(
-            '❓ ' + myProvider.questionsCount.toString(),
-            Colors.white,
-          ),
-          SizedBox(width: 20),
-          _buildScoreItemContainer(
-            '☺️ ' + myProvider.goodAnswers.toString(),
+            getGoodAnswersString(myProvider),
             Colors.green,
           ),
           SizedBox(width: 20),
           _buildScoreItemContainer(
-            '😟 ' + myProvider.wrongAnswers.toString(),
+            getWrongAnswersString(myProvider),
             Colors.orange,
           ),
         ],
diff --git a/lib/screens/game_pick_word.dart b/lib/screens/game_pick_word.dart
index 3839d8d..9ef2cc9 100644
--- a/lib/screens/game_pick_word.dart
+++ b/lib/screens/game_pick_word.dart
@@ -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) {
     return Container(
       padding: EdgeInsets.all(5),
@@ -108,17 +118,12 @@ class GamePickWordPage extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
           _buildScoreItemContainer(
-            '❓ ' + myProvider.questionsCount.toString(),
-            Colors.white,
-          ),
-          SizedBox(width: 20),
-          _buildScoreItemContainer(
-            '☺️ ' + myProvider.goodAnswers.toString(),
+            getGoodAnswersString(myProvider),
             Colors.green,
           ),
           SizedBox(width: 20),
           _buildScoreItemContainer(
-            '😟 ' + myProvider.wrongAnswers.toString(),
+            getWrongAnswersString(myProvider),
             Colors.orange,
           ),
         ],
-- 
GitLab