From 6116ee1361497fe58b79a992fef0608f1d7046b3 Mon Sep 17 00:00:00 2001 From: vladimir98vk Date: Thu, 25 May 2023 13:47:30 +0200 Subject: [PATCH] Results screen total moved to the end --- lib/results_screen.dart | 8 ++++++-- lib/utility/localizations.dart | 2 ++ lib/utility/translations/de.dart | 1 + lib/utility/translations/en.dart | 1 + lib/utility/translations/fr.dart | 1 + lib/utility/translations/it.dart | 1 + 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/results_screen.dart b/lib/results_screen.dart index 6212746..9466838 100644 --- a/lib/results_screen.dart +++ b/lib/results_screen.dart @@ -171,7 +171,7 @@ class _ResultsScreenState extends State { ); Widget _buildRow(BuildContext context, int index) { - if (index == 0) { + if (index >= widget.results.values.length) { final int score = widget.results.values .fold(0, (previousValue, element) => previousValue + element.score); final int time = widget.results.values @@ -182,6 +182,10 @@ class _ResultsScreenState extends State { children: [ SizedBox( width: MediaQuery.of(context).size.width / 4, + child: Text( + CATLocalizations.of(context).total, + textAlign: TextAlign.center, + ), ), SizedBox( width: MediaQuery.of(context).size.width / 4, @@ -212,7 +216,7 @@ class _ResultsScreenState extends State { ], ); } - final ResultsRecord record = widget.results.values.toList()[index - 1]; + final ResultsRecord record = widget.results.values.toList()[index]; return Row( mainAxisAlignment: MainAxisAlignment.spaceAround, diff --git a/lib/utility/localizations.dart b/lib/utility/localizations.dart index feff8a1..b42b443 100644 --- a/lib/utility/localizations.dart +++ b/lib/utility/localizations.dart @@ -364,6 +364,8 @@ class CATLocalizations { String get column5 => _localizedValues[_locale.languageCode]!["column5"]!; + String get total => _localizedValues[_locale.languageCode]!["total"]!; + String get resultCorrect => _localizedValues[_locale.languageCode]!["resultCorrect"]!; diff --git a/lib/utility/translations/de.dart b/lib/utility/translations/de.dart index e08fbf1..24827f6 100644 --- a/lib/utility/translations/de.dart +++ b/lib/utility/translations/de.dart @@ -104,6 +104,7 @@ const Map _resultsScreen = { "column3": "CAT-score", "column4": "Ergebnis", "column5": "Time", + "total": "Totale", "resultCorrect": "Richtig", "resultSkip": "Kapitulation", "resultWrong": "Falsch", diff --git a/lib/utility/translations/en.dart b/lib/utility/translations/en.dart index b74d05e..5e54401 100644 --- a/lib/utility/translations/en.dart +++ b/lib/utility/translations/en.dart @@ -103,6 +103,7 @@ const Map _resultsScreen = { "column3": "CAT-score", "column4": "Result", "column5": "Time", + "total": "Total", "resultCorrect": "Correct", "resultSkip": "Given up", "resultWrong": "Wrong", diff --git a/lib/utility/translations/fr.dart b/lib/utility/translations/fr.dart index adb492c..b9a3dc3 100644 --- a/lib/utility/translations/fr.dart +++ b/lib/utility/translations/fr.dart @@ -104,6 +104,7 @@ const Map _resultsScreen = { "column3": "CAT-score", "column4": "Résultat", "column5": "Time", + "total": "Totale", "resultCorrect": "Correct", "resultSkip": "Abandonné", "resultWrong": "Faux", diff --git a/lib/utility/translations/it.dart b/lib/utility/translations/it.dart index f2569b9..b4d0edb 100644 --- a/lib/utility/translations/it.dart +++ b/lib/utility/translations/it.dart @@ -103,6 +103,7 @@ const Map _resultsScreen = { "column3": "CAT-score", "column4": "Risultato", "column5": "Tempo", + "total": "Totale", "resultCorrect": "Giusto", "resultSkip": "Rinuncia", "resultWrong": "Sbagliato",