diff --git a/android/gradle.properties b/android/gradle.properties index fc7454c62533f7c1dfb3e9452ba63f6e305f3a8b..18da836461b1c3deb7b0aad235614e71bd272853 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 5a5e21ccc8f9afb0f37260b199a8de7aee8a72c4..507f4018507125394edfc193249caa3c8548cdfd 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 3839d8d65480a4a4623d442855f1d0661143b0a8..9ef2cc9440a30502c400ca29c7ccf133cfdd7b4a 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, ), ],