Merge branch '7-add-a-gain-progress-indicator' into 'master'

Resolve "Add a gain/progress indicator"

Closes #7

See merge request !6

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.4
-app.versionCode=4
+app.versionName=0.0.5
+app.versionCode=5

lib/layout/game.dart

@@ -18,8 +18,36 @@ class Game {
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           SizedBox(height: 8),
+          Game.buildTopIndicatorWidget(myProvider),
+          SizedBox(height: 2),
+          Expanded(
+            child: Board.buildGameBoard(myProvider),
+          ),
+          SizedBox(height: 2),
           Container(
-            child: Text(
+            child: gameIsFinished
+              ? Game.buildEndGameMessage(myProvider)
+              : Game.buildSelectColorBar(myProvider),
+          ),
+        ],
+      ),
+    );
+  }
+
+  static Widget buildTopIndicatorWidget(Data myProvider) {
+    String progressIndicator = myProvider.progress.toString() + '/' + myProvider.progressTotal.toString();
+
+    if (myProvider.movesCount > 0) {
+      progressIndicator += ' (+' + myProvider.progressDelta.toString() + ')';
+    }
+
+    return Table(
+      children: [
+        TableRow(
+          children: [
+            Column(
+              children: [
+                Text(
                   myProvider.movesCount.toString(),
                   style: TextStyle(
                     fontSize: 40,
@@ -27,19 +55,23 @@ class Game {
                     color: Colors.black,
                   ),
                 ),
+              ]
             ),
-          SizedBox(height: 2),
-          Expanded(
-            child: Board.buildGameBoard(myProvider),
+            Column(
+              children: [
+                Text(
+                  progressIndicator,
+                  style: TextStyle(
+                    fontSize: 20,
+                    fontWeight: FontWeight.w600,
+                    color: Colors.green,
                   ),
-          SizedBox(height: 2),
-          Container(
-            child: gameIsFinished
-              ? Game.buildEndGameMessage(myProvider)
-              : Game.buildSelectColorBar(myProvider),
+                ),
+              ]
             ),
           ],
         ),
+      ],
     );
   }
 

lib/provider/data.dart

@@ -24,6 +24,10 @@ class Data extends ChangeNotifier {
   int _movesCount = 0;
   List _cells = [];
 
+  int _progress = 0;
+  int _progressTotal = 0;
+  int _progressDelta = 0;
+
   String get level => _level;
   void updateLevel(String level) {
     _level = level;
@@ -80,6 +84,7 @@ class Data extends ChangeNotifier {
   int get boardSize => _boardSize;
   void updateBoardSize(int boardSize) {
     _boardSize = boardSize;
+    _progressTotal = boardSize * boardSize;
   }
 
   int get colorsCount => _colorsCount;
@@ -135,6 +140,22 @@ class Data extends ChangeNotifier {
     updateMovesCount(movesCount + 1);
   }
 
+  int get progress => _progress;
+  int get progressTotal => _progressTotal;
+  int get progressDelta => _progressDelta;
+  void updateProgress(int progress) {
+    _progress = progress;
+    notifyListeners();
+  }
+  void updateProgressTotal(int progressTotal) {
+    _progressTotal = progressTotal;
+    notifyListeners();
+  }
+  void updateProgressDelta(int progressDelta) {
+    _progressDelta = progressDelta;
+    notifyListeners();
+  }
+
   bool get gameIsRunning => _gameIsRunning;
   void updateGameIsRunning(bool gameIsRunning) {
     _gameIsRunning = gameIsRunning;
@@ -155,6 +176,7 @@ class Data extends ChangeNotifier {
     _gameIsRunning = false;
     _gameWon = false;
     _movesCount = 0;
+    _progress = 0;
     notifyListeners();
   }
 

lib/utils/board_utils.dart

@@ -39,15 +39,24 @@ class BoardUtils {
 
     myProvider.resetGame();
     myProvider.updateCells(grid);
+
+    int initProgress = BoardUtils.getSiblingFillableCells(myProvider, 0, 0, [[0, 0]]).length;
+    myProvider.updateProgress(initProgress);
   }
 
   static fillBoardFromFirstCell(Data myProvider, int value) {
     List cellsToFill = BoardUtils.getSiblingFillableCells(myProvider, 0, 0, [[0, 0]]);
+    int progressBeforeMove = cellsToFill.length;
 
     for (var cellIndex = 0; cellIndex < cellsToFill.length; cellIndex++) {
       myProvider.updateCellValue(cellsToFill[cellIndex][1], cellsToFill[cellIndex][0], value);
     }
 
+    int progressAfterMove = BoardUtils.getSiblingFillableCells(myProvider, 0, 0, [[0, 0]]).length;
+    int progressDelta = progressAfterMove - progressBeforeMove;
+    myProvider.updateProgressDelta(progressDelta);
+    myProvider.updateProgress(progressAfterMove);
+
     myProvider.incrementMovesCount();
   }