Skip to content
Snippets Groups Projects
Commit e5b231a7 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Do not pick recently picked data (letter or category)

parent 30bdffb4
Branches
Tags
1 merge request!22Resolve "Make pick letter not fully randomized"
Pipeline #1786 passed
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
......@@ -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;
......
......@@ -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}) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment