Merge branch '6-improve-gameplay-add-moves-count-limit' into 'master'

Resolve "Improve gameplay, add moves count limit"

Closes #6

See merge request !5

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.12
-app.versionCode=12
+app.versionName=0.0.13
+app.versionCode=13

lib/layout/game.dart

@@ -41,6 +41,11 @@ class Game {
       progressIndicator += ' (+' + myProvider.progressDelta.toString() + ')';
     }
 
+    Color maxMovesCountColor = Colors.grey;
+    if (myProvider.movesCount > myProvider.maxMovesCount) {
+      maxMovesCountColor = Colors.red;
+    }
+
     return Table(
       children: [
         TableRow(
@@ -60,7 +65,7 @@ class Game {
                   style: TextStyle(
                     fontSize: 15,
                     fontWeight: FontWeight.w600,
-                    color: Colors.grey,
+                    color: maxMovesCountColor,
                   ),
                 ),
               ]

lib/layout/parameters.dart

@@ -13,8 +13,8 @@ class Parameters {
         mainAxisSize: MainAxisSize.min,
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          // Parameters.buildParameterSelector(myProvider, 'level'),
-          // SizedBox(height: 5),
+          Parameters.buildParameterSelector(myProvider, 'level'),
+          SizedBox(height: 5),
           Parameters.buildParameterSelector(myProvider, 'size'),
           SizedBox(height: 5),
           Parameters.buildParameterSelector(myProvider, 'colors'),

lib/provider/data.dart

@@ -142,6 +142,20 @@ class Data extends ChangeNotifier {
     return getColorsCountFromParameter(_parameterColorsDefault);
   }
 
+  int getMovesCountLimitDeltaFromLevelParameter(String parameterLevel) {
+    switch(parameterLevel) {
+      case 'easy': { return 5; }
+      break;
+      case 'medium': { return 3; }
+      break;
+      case 'hard': { return 1; }
+      break;
+      case 'nightmare': { return -1; }
+      break;
+    }
+    return getMovesCountLimitDeltaFromLevelParameter(_parameterLevelDefault);
+  }
+
   int get boardSize => _boardSize;
   void updateBoardSize(int boardSize) {
     _boardSize = boardSize;

lib/utils/board_utils.dart

@@ -50,7 +50,10 @@ class BoardUtils {
     int boardSize = myProvider.boardSize;
     int colorsCount = myProvider.colorsCount;
 
-    return (30 * (boardSize * colorsCount) / (17 * 6)).round();
+    int baseMaxMovesCount = (30 * (boardSize * colorsCount) / (17 * 6)).round();
+    int deltaFromLevel = myProvider.getMovesCountLimitDeltaFromLevelParameter(myProvider.parameterLevel);
+
+    return baseMaxMovesCount + deltaFromLevel;
   }
 
   static fillBoardFromFirstCell(Data myProvider, int value) {