Merge branch '26-do-not-pick-recently-picked-word' into 'master'

Resolve "Do not pick recently picked word"

Closes #26

See merge request !26

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.1.18
-app.versionCode=42
+app.versionName=0.1.19
+app.versionCode=43

lib/provider/data.dart

@@ -9,6 +9,8 @@ class Data extends ChangeNotifier {
   Map _word = null;
   List _otherWords = [];
   List _images = [];
+  final int _recentWordsCount = 20;
+  List _recentWords = [];
 
   // game data
   int _questionsCount = 0;
@@ -26,9 +28,17 @@ class Data extends ChangeNotifier {
 
   set updateWord(Map value) {
     _word = value;
+    if (value != null && value['key'] != '') {
+      _recentWords.insert(0, value['key']);
+      _recentWords = _recentWords.take(_recentWordsCount).toList();
+    }
     notifyListeners();
   }
 
+  bool isRecentlyPicked(String word) {
+    return _recentWords.contains(word);
+  }
+
   List get otherWords => _otherWords;
 
   set updateOtherWords(List words) {

lib/screens/game_pick_image.dart

@@ -43,12 +43,16 @@ class GamePickImagePage extends StatelessWidget {
         word = words.take(1).toList()[0];
       }
       attempts++;
-    } while (attempts < 3);
 
-    if ((words != null) && (words.length == _countWords)) {
+      if (
+        (words != null) && (words.length == _countWords)
+        &&
+        !myProvider.isRecentlyPicked(word['key'])
+      ) {
         myProvider.updateWord = word;
         myProvider.updateImages = words;
       }
+    } while (myProvider.word != word && attempts < 10);
   }
 
   Future<void> checkWord(Data myProvider, word) async {
@@ -121,7 +125,13 @@ class GamePickImagePage extends StatelessWidget {
     double imageSize = 130;
 
     String imageAsset = 'assets/placeholder.png';
-    if ((word['images'] != null) && (word['images'][0] != null)) {
+    if (
+      (word['images'] != null)
+      &&
+      (word['images'].length != 0)
+      &&
+      (word['images'][0] != null)
+    ) {
         imageAsset = 'assets/images/'+word['images'][0];
     }
 

lib/screens/game_pick_word.dart

@@ -45,17 +45,19 @@ class GamePickWordPage extends StatelessWidget {
         images = word['images'];
       }
       attempts++;
-    } while (attempts < 3);
 
       if (
         ((words != null) && (words.length == _countWords))
         &&
         ((images != null) && (images.length == _countImages))
+        &&
+        !myProvider.isRecentlyPicked(word['key'])
       ) {
         myProvider.updateWord = word;
         myProvider.updateOtherWords = words.skip(1).toList();
         myProvider.updateImages = images;
       }
+    } while (myProvider.word != word && attempts < 10);
   }
 
   Future<void> checkWord(Data myProvider, word) async {

lib/utils/random_pick_image.dart

@@ -26,14 +26,15 @@ class RandomPickImage {
     // Check we have enough images
     if ((imageList == null) || (imageList.length < count)) {
       print('Not enough images in list for word "'+word+'".');
-    }
-
+      _images = [];
+    } else {
       // Randomize images list
       imageList.shuffle();
 
       // Pick first images from shuffled list
       _images = imageList.take(count).toList();
     }
+  }
 
   List get images => _images;
 }

lib/utils/random_pick_word.dart

@@ -26,8 +26,8 @@ class RandomPickWord {
     // Check we have enough words
     if (wordList.length < count) {
       print('Not enough words in list.');
-    }
-
+      _words = [];
+    } else {
       // Remove empty words
       wordList.removeWhere((value) => ((value.containsKey(lang) == false) || (value[lang] == '')));
 
@@ -37,6 +37,7 @@ class RandomPickWord {
       // Pick first words from shuffled list
       _words = wordList.take(count).toList();
     }
+  }
 
   List get words => _words;
 }

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.7.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -87,7 +87,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   nested:
     dependency: transitive
     description:
@@ -162,7 +162,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.0"
   typed_data:
     dependency: transitive
     description: