From 617aa066b4054f04d45ed8e5ace08705aa019b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Fri, 8 Nov 2024 13:39:37 +0100
Subject: [PATCH] Add players indicators
---
.../metadata/android/en-US/changelogs/31.txt | 1 +
.../metadata/android/fr-FR/changelogs/31.txt | 1 +
lib/ui/widgets/game/game_bottom.dart | 4 +++
lib/ui/widgets/game/game_end.dart | 26 +++++++++++++++++--
pubspec.yaml | 2 +-
5 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/31.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/31.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/31.txt b/fastlane/metadata/android/en-US/changelogs/31.txt
new file mode 100644
index 0000000..9bb6da6
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/31.txt
@@ -0,0 +1 @@
+Improve player indicators.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/31.txt b/fastlane/metadata/android/fr-FR/changelogs/31.txt
new file mode 100644
index 0000000..73d6706
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/31.txt
@@ -0,0 +1 @@
+Améliorations graphiques sur les indicateurs de joueur.
diff --git a/lib/ui/widgets/game/game_bottom.dart b/lib/ui/widgets/game/game_bottom.dart
index 736a431..403001e 100644
--- a/lib/ui/widgets/game/game_bottom.dart
+++ b/lib/ui/widgets/game/game_bottom.dart
@@ -13,6 +13,10 @@ class GameBottomWidget extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
+ if (currentActivity.isFinished) {
+ return SizedBox.shrink();
+ }
+
final Color color = currentActivity.currentPlayer == 0
? Colors.grey
: (currentActivity.currentPlayer == 1 ? Colors.yellow : Colors.red);
diff --git a/lib/ui/widgets/game/game_end.dart b/lib/ui/widgets/game/game_end.dart
index 295cfe8..e321d16 100644
--- a/lib/ui/widgets/game/game_end.dart
+++ b/lib/ui/widgets/game/game_end.dart
@@ -45,6 +45,28 @@ class GameEndWidget extends StatelessWidget {
fit: BoxFit.fill,
);
+ final Widget indicatorPlayer1 = (currentActivity.currentPlayer == 1 && connected4)
+ ? AspectRatio(
+ aspectRatio: 1,
+ child: StyledButton(
+ color: Colors.yellow,
+ onPressed: () {},
+ child: SizedBox.shrink(),
+ ),
+ )
+ : player1Image;
+
+ final Widget indicatorPlayer2 = (currentActivity.currentPlayer == 2 && connected4)
+ ? AspectRatio(
+ aspectRatio: 1,
+ child: StyledButton(
+ color: Colors.red,
+ onPressed: () {},
+ child: SizedBox.shrink(),
+ ),
+ )
+ : player2Image;
+
return Container(
margin: const EdgeInsets.all(2),
padding: const EdgeInsets.all(2),
@@ -57,7 +79,7 @@ class GameEndWidget extends StatelessWidget {
Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
- children: [player1Image],
+ children: [indicatorPlayer1],
),
Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -86,7 +108,7 @@ class GameEndWidget extends StatelessWidget {
Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
- children: [player2Image],
+ children: [indicatorPlayer2],
),
],
),
diff --git a/pubspec.yaml b/pubspec.yaml
index 19a5ecd..555148d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: puissance4
publish_to: "none"
-version: 1.4.2+30
+version: 1.4.3+31
environment:
sdk: "^3.0.0"
--
GitLab