From 423eb5d1fa03543e01d2c9a3a74945fd5b9cd2e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr> Date: Tue, 3 Sep 2024 08:59:05 +0200 Subject: [PATCH] Fix seeds display --- android/gradle.properties | 4 ++-- .../metadata/android/en-US/changelogs/8.txt | 1 + .../metadata/android/fr-FR/changelogs/8.txt | 1 + lib/ui/widgets/game/game_score.dart | 17 +++++++++++++++-- lib/ui/widgets/game/game_seeds.dart | 18 +++++++++--------- pubspec.yaml | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/8.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/8.txt diff --git a/android/gradle.properties b/android/gradle.properties index 85b94f8..65eed64 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.0.7 -app.versionCode=7 +app.versionName=0.0.8 +app.versionCode=8 diff --git a/fastlane/metadata/android/en-US/changelogs/8.txt b/fastlane/metadata/android/en-US/changelogs/8.txt new file mode 100644 index 0000000..3828692 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/8.txt @@ -0,0 +1 @@ +Fix seeds display. diff --git a/fastlane/metadata/android/fr-FR/changelogs/8.txt b/fastlane/metadata/android/fr-FR/changelogs/8.txt new file mode 100644 index 0000000..b6d1045 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/8.txt @@ -0,0 +1 @@ +Correction sur l'affichage des graines. diff --git a/lib/ui/widgets/game/game_score.dart b/lib/ui/widgets/game/game_score.dart index 9bea3b2..bc55c5f 100644 --- a/lib/ui/widgets/game/game_score.dart +++ b/lib/ui/widgets/game/game_score.dart @@ -4,7 +4,6 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:awale/cubit/game_cubit.dart'; import 'package:awale/models/game/game.dart'; -import 'package:awale/ui/widgets/game/game_seeds.dart'; class GameScoreWidget extends StatelessWidget { const GameScoreWidget({ @@ -37,7 +36,21 @@ class GameScoreWidget extends StatelessWidget { ), ), width: 100, - child: GameSeedsWidget(seedsCount: currentGame.scores[playerIndex]), + child: RotatedBox( + quarterTurns: 1 + 2 * playerIndex, + child: Padding( + padding: const EdgeInsets.fromLTRB(0, 65, 0, 0), + child: Text( + currentGame.scores[playerIndex].toString(), + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 40, + fontWeight: FontWeight.bold, + color: Theme.of(context).colorScheme.primary, + ), + ), + ), + ), ); }, ); diff --git a/lib/ui/widgets/game/game_seeds.dart b/lib/ui/widgets/game/game_seeds.dart index 8a05066..21a92ce 100644 --- a/lib/ui/widgets/game/game_seeds.dart +++ b/lib/ui/widgets/game/game_seeds.dart @@ -33,16 +33,16 @@ class GameSeedsWidget extends StatelessWidget { [-20, 0], // 6 [-10, -17], // 7 [0, -34], // 8 - [21, -34], // 9 - [30, -16], // 10 + [20, -34], // 9 + [30, -17], // 10 [40, 0], // 11 - [30, -18], // 12 - [20, 35], // 13 - [0, 35], // 14 - [-20, 35], // 15 - [-30, 18], // 16 - [-38, 0], // 17 - [-30, -16], // 18 + [30, 17], // 12 + [20, 34], // 13 + [0, 34], // 14 + [-20, 34], // 15 + [-30, 17], // 16 + [-40, 0], // 17 + [-30, -17], // 18 [-20, -34], // 19 ]; diff --git a/pubspec.yaml b/pubspec.yaml index b13223f..b49be71 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Awale game publish_to: "none" -version: 0.0.7+7 +version: 0.0.8+8 environment: sdk: "^3.0.0" -- GitLab