Merge branch '13-improve-pick-new-color' into 'master'

Resolve "Improve "pick new color""

Closes #13

See merge request !13

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.10
-app.versionCode=10
+app.versionName=0.0.11
+app.versionCode=11

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

+Improve pick new color.

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

+Amélioration de la sélection de couleur.

lib/models/game.dart

@@ -184,23 +184,25 @@ class Game {
     // build a list of values to pick one
     final List<int> values = [];
 
-    // All eligible values
+    // All eligible values (twice)
     final int maxValue = this.settings.colorsCount;
     for (int i = 1; i <= maxValue; i++) {
       values.add(i);
+      values.add(i);
     }
 
-    // Add values of current col
+    // Add values of current col (twice)
     for (int r = 0; r <= this.settings.boardSize; r++) {
       if (this.isInBoard(CellLocation.go(r, col))) {
         final int? value = this.getCellValue(CellLocation.go(r, col));
         if (value != null) {
           values.add(value);
+          values.add(value);
         }
       }
     }
 
-    // Add values of sibling cols
+    // Add values of sibling cols (twice for top rows)
     for (int deltaCol = -1; deltaCol <= 1; deltaCol++) {
       final int c = col + deltaCol;
       for (int r = 0; r < this.settings.boardSize; r++) {
@@ -208,6 +210,9 @@ class Game {
           final int? value = this.getCellValue(CellLocation.go(r, c));
           if (value != null) {
             values.add(value);
+            if (row < this.settings.boardSize / 3) {
+              values.add(value);
+            }
           }
         }
       }

pubspec.yaml

@@ -3,7 +3,7 @@ description: Jeweled Game
 
 publish_to: 'none'
 
-version: 0.0.10+10
+version: 0.0.11+11
 
 environment:
   sdk: '^3.0.0'