Merge branch '7-improve-get-fill-value-function' into 'master'

Resolve "Improve get fill value function"

Closes #7

See merge request !6

android/gradle.properties

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

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

+Improve get new cell value, ponderate from sibling cells

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

+Amélioration de la sélection de la couleur d'une nouvelle case, pondération avec les couleurs voisines

lib/utils/board_utils.dart

@@ -153,12 +153,65 @@ class BoardUtils {
     return true;
   }
 
+  static bool isInBoard(Data myProvider, int row, int col) {
+    if (row > 0 &&
+        row < myProvider.sizeHorizontal &&
+        col > 0 &&
+        col < myProvider.sizeVertical) {
+      return true;
+    }
+    return false;
+  }
+
   static String getFillValue(Data myProvider, int row, int col) {
-    var rand = new Random();
+    // build a list of values to pick one
+    List<String> values = [];
+
+    // All eligible values
     int maxValue = myProvider.colorsCount;
-    int value = 1 + rand.nextInt(maxValue);
+    for (int i = 1; i <= maxValue; i++) {
+      values.add(i.toString());
+    }
+
+    // Add values of current col
+    for (int r = 0; r <= myProvider.sizeVertical; r++) {
+      if (isInBoard(myProvider, r, col)) {
+        String value = myProvider.getCellValue(r, col);
+        if (value != '0') {
+          values.add(value);
+        }
+      }
+    }
+
+    // Add values of sibling cols
+    for (int deltaCol = -1; deltaCol <= 1; deltaCol++) {
+      int c = col + deltaCol;
+      for (int r = 0; r < myProvider.sizeVertical; r++) {
+        if (isInBoard(myProvider, r, c)) {
+          String value = myProvider.getCellValue(r, c);
+          if (value != '0') {
+            values.add(value);
+          }
+        }
+      }
+    }
+
+    // Add values of sibling cells
+    for (int deltaCol = -2; deltaCol <= 2; deltaCol++) {
+      int c = col + deltaCol;
+      for (int deltaRow = -2; deltaRow <= 2; deltaRow++) {
+        int r = row + deltaRow;
+        if (isInBoard(myProvider, r, c)) {
+          String value = myProvider.getCellValue(r, c);
+          if (value != '0') {
+            values.add(value);
+          }
+        }
+      }
+    }
 
-    return value.toString();
+    // Pick random value from "ponderated" list
+    return values[Random().nextInt(values.length)];
   }
 
   static moveCellsDown(Data myProvider) {