From c3c820715b6a2364c7da24d6d3cc185ec43437cd Mon Sep 17 00:00:00 2001 From: "luca0N\\!" Date: Tue, 16 Mar 2021 00:57:42 -0300 Subject: [PATCH 1/2] Randomized question order --- app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java b/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java index de8d6b3..144d56d 100644 --- a/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java +++ b/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java @@ -43,6 +43,7 @@ import java.net.Proxy; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; +import java.util.Collections; import com.luca0n.joguitos.pluck.R; import com.luca0n.joguitos.pluck.PluckApplication; @@ -152,6 +153,9 @@ public class ApiUtil { if (questions.size() == 0) throw new NoTriviaResultsException(); + // Shuffle the question array. + Collections.shuffle(questions); + return questions; } } From 8e84fe2ff53b91af67df00fa4a902afad7f6c48e Mon Sep 17 00:00:00 2001 From: "luca0N\\!" Date: Tue, 16 Mar 2021 01:00:19 -0300 Subject: [PATCH 2/2] Finished filter support The game now limits trivia file questions based on the question amount picked by the player on `MainActivity`. --- app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java b/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java index 144d56d..cc3883b 100644 --- a/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java +++ b/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java @@ -128,7 +128,11 @@ public class ApiUtil { ArrayList questions = new ArrayList<>(); + int elements = 0; + for (JsonElement element : jsonArray) { + if (elements++ == filters.getAmount()) + break; JsonObject object = element.getAsJsonObject(); TriviaType type = TriviaType.get(object.get("type").getAsString());