Merge branch '38-add-players-indicators' into 'master'

Resolve "Add players indicators"

Closes #38

See merge request !35

fastlane/metadata/android/en-US/changelogs/31.txt

+Improve player indicators.

fastlane/metadata/android/fr-FR/changelogs/31.txt

+Améliorations graphiques sur les indicateurs de joueur.

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);

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],
                   ),
                 ],
               ),

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"