Merge branch '41-add-a-tips-count-on-game' into 'master'

Resolve "Add a tips count on game"

Closes #41

See merge request !36

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.36
-app.versionCode=36
+app.versionName=0.0.37
+app.versionCode=37

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

+Add a tips counter on game

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

+Ajout d'un compteur de coups de pouce

lib/provider/data.dart

@@ -25,6 +25,7 @@ class Data extends ChangeNotifier {
   int _currentCellCol = null;
   int _currentCellRow = null;
   int _currentCellValue = null;
+  int _givenTipsCount = 0;
 
   String get level => _level;
   set updateLevel(String level) {
@@ -111,6 +112,16 @@ class Data extends ChangeNotifier {
     notifyListeners();
   }
 
+  int get givenTipsCount => _givenTipsCount;
+  increaseGivenTipsCount() {
+    _givenTipsCount = _givenTipsCount + 1;
+    notifyListeners();
+  }
+  resetGivenTipsCount() {
+    _givenTipsCount = 0;
+    notifyListeners();
+  }
+
   selectCell(int col, int row) {
     _currentCellCol = col;
     _currentCellRow = row;

lib/screens/home.dart

 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:badges/badges.dart';
 
 import '../layout/game.dart';
 import '../layout/parameters.dart';
@@ -27,10 +28,25 @@ class Home extends StatelessWidget {
               ),
             ),
             margin: EdgeInsets.all(8),
+            child: Badge(
+              showBadge: myProvider.givenTipsCount == 0 ? false : true,
+              badgeColor:
+                myProvider.givenTipsCount < 10
+                  ? Colors.green
+                  : myProvider.givenTipsCount < 20
+                    ? Colors.orange
+                    : Colors.red,
+              badgeContent: Text(
+                myProvider.givenTipsCount == 0 ? '' : myProvider.givenTipsCount.toString(),
+                style: TextStyle(
+                  color: Colors.white
+                )
+              ),
               child: Image(
                 image: AssetImage('assets/icons/button_help.png'),
                 fit: BoxFit.fill
               ),
+            )
           ),
           onPressed: () => GameUtils.showTip(myProvider),
         ),

lib/utils/game_utils.dart

@@ -11,6 +11,7 @@ class GameUtils {
   static Future<void> startGame(Data myProvider) async {
     myProvider.updateSize = myProvider.size;
     myProvider.updateStateRunning = true;
+    myProvider.resetGivenTipsCount();
     myProvider.updateCells = BoardUtils.createEmptyBoard(myProvider.blockSizeHorizontal * myProvider.blockSizeVertical);
     BoardUtils.pickGrid(myProvider);
   }
@@ -23,6 +24,7 @@ class GameUtils {
       // currently selected cell -> set value
       GameUtils.helpFillCell(myProvider);
     }
+    myProvider.increaseGivenTipsCount();
   }
 
   static void helpSelectCell(Data myProvider) {

pubspec.lock

@@ -8,6 +8,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.7.0"
+  badges:
+    dependency: "direct main"
+    description:
+      name: badges
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   boolean_selector:
     dependency: transitive
     description:

pubspec.yaml

@@ -10,6 +10,7 @@ dependencies:
   flutter:
     sdk: flutter
   provider: ^5.0.0
+  badges: ^2.0.1
 
 dev_dependencies:
   flutter_test: