Merge branch '10-make-pick-letter-not-fully-randomized' into 'master'

Resolve "Make pick letter not fully randomized"

Closes #10

See merge request !22

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=1.2.13
-app.versionCode=19
+app.versionName=1.2.14
+app.versionCode=20

lib/provider/data.dart

@@ -55,6 +55,14 @@ class Data extends ChangeNotifier {
     return '';
   }
 
+  bool isCategoryRecentlyPicked(String category) {
+    return _recentCategories.contains(category);
+  }
+
+  bool isLetterRecentlyPicked(String letter) {
+    return _recentLetters.contains(letter);
+  }
+
   int get countdown => _countdown;
   void updateCountdown(int value) {
     _countdown = value;

lib/screens/home.dart

@@ -56,13 +56,17 @@ class Home extends StatelessWidget {
     do {
       randomPickCategory = RandomPickCategory();
       await randomPickCategory.init();
-      if (randomPickCategory.category != null) {
+      if (
+        randomPickCategory.category != null
+        &&
+        !myProvider.isCategoryRecentlyPicked(randomPickCategory.category)
+      ) {
         myProvider.updateCategory(randomPickCategory.category);
         myProvider.setSearchingCategory(false);
         break;
       }
       attempts++;
-    } while (attempts < 3);
+    } while (attempts < 10);
   }
 
   Future<void> pickLetter(Data myProvider) async {
@@ -72,13 +76,17 @@ class Home extends StatelessWidget {
     do {
       randomPickLetter = RandomPickLetter();
       await randomPickLetter.init();
-      if (randomPickLetter.letter != null) {
+      if (
+        randomPickLetter.letter != null
+        &&
+        !myProvider.isLetterRecentlyPicked(randomPickLetter.letter)
+      ) {
         myProvider.updateLetter(randomPickLetter.letter);
         myProvider.setSearchingLetter(false);
         break;
       }
       attempts++;
-    } while (attempts < 3);
+    } while (attempts < 10);
   }
 
   Color darken(Color baseColor, {double amount = 0.2}) {