Merge pull request #10 from wagenknecht/voll_krass_bugfix

added correct categorys and difficulties at the highscore
wagenknecht · Jun 29, 2022 · b7d8baf · b7d8baf
2 parents a734be2 + 358e8aa
commit b7d8baf
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 44 deletions.
diff --git a/app/src/main/java/de/hochschulestralsund/quizapp/Activitys/EndlessHighsoreActivity.java b/app/src/main/java/de/hochschulestralsund/quizapp/Activitys/EndlessHighsoreActivity.java
@@ -46,7 +46,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         layoutManager = new LinearLayoutManager(this);
         recyclerView.setLayoutManager(layoutManager);
         database = AppDatabase.getDatabase(getApplicationContext());
-        ArrayAdapter categoryAdapter = new ArrayAdapter<>(this, R.layout.spinner_selected_item, Category.values());
+        Category[] categories = Category.values();
+        ArrayAdapter categoryAdapter = new ArrayAdapter<>(this, R.layout.spinner_selected_item, categories);
         categoryAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
         selectCategorySpinner.setAdapter(categoryAdapter);
         selectCategorySpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -66,6 +67,13 @@ public void onNothingSelected(AdapterView<?> adapterView) {
         if (getIntent().getExtras() != null) {
             score = (Integer) getIntent().getSerializableExtra("score");
             category = (String) getIntent().getSerializableExtra("category");
+            for(int i=0;i<categories.length;i++){
+                if(categories[i].toString().equals(category)){
+                    selectCategorySpinner.setSelection(i);
+                    break;
+                }
+            }
+
             //        if (score>=DatabaseHighsore)
             checkScore();
             btnStart = findViewById(R.id.btnStart);

diff --git a/app/src/main/java/de/hochschulestralsund/quizapp/Activitys/EndlessQuizActivity.java b/app/src/main/java/de/hochschulestralsund/quizapp/Activitys/EndlessQuizActivity.java
@@ -50,13 +50,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         category = question.get(0).getCategory();
         btnContinue = findViewById(R.id.btnContinue);
         btnContinue.setVisibility(View.INVISIBLE);
-        setAnsweres();
+        setAnswers();
         setQuestion();
         number = 0;
     }
 
     //gets Triggert when a Button is clicked
-    public void answere(View view) {
+    public void answer(View view) {
         //check if questions are all asked
         if (number % questionsPerApiCall == 0) {
             loadMoreQuestions();
@@ -101,12 +101,11 @@ public void setQuestion() {
 
     }
 
-    public Button setAnsweres() {
+    public Button setAnswers() {
         //select a Random button to be right
         Random random = new Random();
         int correct = random.nextInt(4);
         correctAnswere = buttons.get(correct); //save CorrectAnswer to global string to compare result
-        //todo remove string correct, just for testing
         correctAnswere.setText(question.get(number % questionsPerApiCall).getCorrect_answer());
         int j = 0;
         for (int i = 0; i < buttons.size(); i++) {
@@ -128,7 +127,7 @@ public void clickContinue(View view) {
         } else {
             buttons.forEach(a -> a.setClickable(true));
             number++;
-            setAnsweres();
+            setAnswers();
             setQuestion();
         }
         view.setVisibility(View.INVISIBLE);

diff --git a/app/src/main/java/de/hochschulestralsund/quizapp/Activitys/HighscoreActivity.java b/app/src/main/java/de/hochschulestralsund/quizapp/Activitys/HighscoreActivity.java
@@ -54,7 +54,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         layoutManager = new LinearLayoutManager(this);
         recyclerView.setLayoutManager(layoutManager);
         database = AppDatabase.getDatabase(getApplicationContext());
-        ArrayAdapter categoryAdapter = new ArrayAdapter<>(this, R.layout.spinner_selected_item, Category.values());
+        Category[] categories= Category.values();
+        ArrayAdapter categoryAdapter = new ArrayAdapter<>(this, R.layout.spinner_selected_item, categories);
         categoryAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
         selectCategorySpinner.setAdapter(categoryAdapter);
         selectCategorySpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -71,21 +72,40 @@ public void onNothingSelected(AdapterView<?> adapterView) {
             }
         });
 
+        btnEasy = findViewById(R.id.btnEasy);
+        btnMedium = findViewById(R.id.btnMedium);
+        btnHard = findViewById(R.id.btnHard);
+        btnMedium.setBackgroundColor(Color.GRAY);
+        btnHard.setBackgroundColor(Color.GRAY);
+
+
         if (getIntent().getExtras() != null) {
             score = (Integer) getIntent().getSerializableExtra("score");
             category = (String) getIntent().getSerializableExtra("category");
             difficulty = (String) getIntent().getSerializableExtra("difficulty");
+
+            switch(difficulty){
+                case "hard": hard(btnHard); break;
+                case "medium": medium(btnMedium); break;
+                case "easy": easy(btnEasy); break;
+            }
+
+            for(int i=0;i<categories.length;i++){
+                if(categories[i].toString().equals(category)){
+                    selectCategorySpinner.setSelection(i);
+                    break;
+                }
+            }
+
+
+
+
             //        if (score>=DatabaseHighsore)
             checkScore();
             Button btnStart = findViewById(R.id.btnStart);
             btnStart.setText("Retry");
         }
 
-        btnEasy = findViewById(R.id.btnEasy);
-        btnMedium = findViewById(R.id.btnMedium);
-        btnHard = findViewById(R.id.btnHard);
-        btnMedium.setBackgroundColor(Color.GRAY);
-        btnHard.setBackgroundColor(Color.GRAY);
 
         List<Bestenliste> bestenliste1 = database.bestenlisteDao().getBestenlisteCategoryDifficultyEntry(selectCategorySpinner.getSelectedItem().toString(), "easy");
 

diff --git a/app/src/main/java/de/hochschulestralsund/quizapp/Activitys/QuizActivity.java b/app/src/main/java/de/hochschulestralsund/quizapp/Activitys/QuizActivity.java
@@ -21,7 +21,7 @@
 
 public class QuizActivity extends AppCompatActivity {
 
-    private Button correctAnswere;
+    private Button correctAnswer;
     private int score;
     private List<Question> question;
     private int number;
@@ -47,21 +47,21 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         difficulty = question.get(0).getDifficulty();
         btnContinue = findViewById(R.id.btnContinue);
         btnContinue.setVisibility(View.INVISIBLE);
-        setAnsweres();
+        setAnswers();
         setQuestion();
         number = 0;
     }
 
-    //gets Triggert when a Button is clicked
-    public void answere(View view) {
+    //gets triggered when a Button is clicked
+    public void answer(View view) {
         btnContinue.setVisibility(View.VISIBLE);
         buttons.forEach(a -> {
             a.setClickable(false);
             a.setBackgroundColor(Color.GRAY);
         });
-        correctAnswere.setBackgroundColor(Color.GREEN);
+        correctAnswer.setBackgroundColor(Color.GREEN);
         //if question is correct
-        if (view.getId() == correctAnswere.getId()) {
+        if (view.getId() == correctAnswer.getId()) {
             score = score + 1;
         } else {
             view.setBackgroundColor(Color.RED);
@@ -77,13 +77,12 @@ public void setQuestion() {
         Number.setText("Question " + (number + 1) + "/10");
     }
 
-    public Button setAnsweres() {
+    public Button setAnswers() {
         //select a Random button to be right
         Random random = new Random();
         int correct = random.nextInt(4);
-        correctAnswere = buttons.get(correct); //save CorrectAnswer to global string to compare result
-        //todo remove string correct, just for testing
-        correctAnswere.setText(question.get(number).getCorrect_answer());
+        correctAnswer = buttons.get(correct); //save CorrectAnswer to global string to compare result
+        correctAnswer.setText(question.get(number).getCorrect_answer());
         int j = 0;
         for (int i = 0; i < buttons.size(); i++) {
             if (i != correct) {
@@ -92,7 +91,7 @@ public Button setAnsweres() {
                 j++;
             }
         }
-        return correctAnswere;
+        return correctAnswer;
     }
 
     public void clickContinue(View view) {
@@ -106,7 +105,7 @@ public void clickContinue(View view) {
         } else {
             buttons.forEach(a -> a.setClickable(true));
             number++;
-            setAnsweres();
+            setAnswers();
             setQuestion();
             view.setVisibility(View.INVISIBLE);
             buttons.forEach(a -> a.setBackgroundColor(fetchcolorOnPrimary()));

diff --git a/app/src/main/java/de/hochschulestralsund/quizapp/Api/OpenTrivialRestClient.java b/app/src/main/java/de/hochschulestralsund/quizapp/Api/OpenTrivialRestClient.java
@@ -13,7 +13,6 @@ public class OpenTrivialRestClient {
     private static AsyncHttpClient client = new AsyncHttpClient();
 
     public static void get(int amount, RequestParams params, AsyncHttpResponseHandler responseHandler) {
-        // TODO: Params does not seem to be needed. Investigate later.
         client.get(getAbsoluteUrl(amount), params, responseHandler);
     }
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -65,15 +65,4 @@
         android:text="Highscore Endless"
         android:textSize="20sp" />
 
-    <Button
-        android:id="@+id/settingsBtn"
-        style="@style/blueButton"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginHorizontal="26dp"
-        android:text="Settings"
-        android:textSize="20sp"
-        android:onClick="clickSettings"/>
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/quiz_activity.xml b/app/src/main/res/layout/quiz_activity.xml
@@ -63,7 +63,7 @@
         android:layout_height="100sp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
-        android:onClick="answere"
+        android:onClick="answer"
         android:text="Button"
         app:layout_constraintBottom_toTopOf="@+id/antwort4"
         app:layout_constraintEnd_toEndOf="parent"
@@ -77,7 +77,7 @@
         android:layout_height="100sp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:onClick="answere"
+        android:onClick="answer"
         android:text="Button"
         app:layout_constraintBottom_toTopOf="@+id/btnContinue"
         app:layout_constraintEnd_toEndOf="parent"
@@ -91,7 +91,7 @@
         android:layout_height="100sp"
         android:layout_marginStart="16dp"
         android:layout_marginBottom="16dp"
-        android:onClick="answere"
+        android:onClick="answer"
         android:text="Button"
         app:layout_constraintBottom_toTopOf="@+id/btnContinue"
         app:layout_constraintEnd_toStartOf="@+id/antwort4"
@@ -105,7 +105,7 @@
         android:layout_height="100sp"
         android:layout_marginStart="16dp"
         android:layout_marginBottom="8dp"
-        android:onClick="answere"
+        android:onClick="answer"
         android:text="Button"
         app:layout_constraintBottom_toTopOf="@+id/antwort3"
         app:layout_constraintEnd_toStartOf="@+id/antwort2"

diff --git a/app/src/main/res/layout/quiz_endless_activity.xml b/app/src/main/res/layout/quiz_endless_activity.xml
@@ -93,7 +93,7 @@
         android:layout_height="100sp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
-        android:onClick="answere"
+        android:onClick="answer"
         android:text="Button"
         app:layout_constraintBottom_toTopOf="@+id/antwort4"
         app:layout_constraintEnd_toEndOf="parent"
@@ -107,7 +107,7 @@
         android:layout_height="100sp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:onClick="answere"
+        android:onClick="answer"
         android:text="Button"
         app:layout_constraintBottom_toTopOf="@+id/btnContinue"
         app:layout_constraintEnd_toEndOf="parent"
@@ -121,7 +121,7 @@
         android:layout_height="100sp"
         android:layout_marginStart="16dp"
         android:layout_marginBottom="16dp"
-        android:onClick="answere"
+        android:onClick="answer"
         android:text="Button"
         app:layout_constraintBottom_toTopOf="@+id/btnContinue"
         app:layout_constraintEnd_toStartOf="@+id/antwort4"
@@ -135,7 +135,7 @@
         android:layout_height="100sp"
         android:layout_marginStart="16dp"
         android:layout_marginBottom="8dp"
-        android:onClick="answere"
+        android:onClick="answer"
         android:text="Button"
         app:layout_constraintBottom_toTopOf="@+id/antwort3"
         app:layout_constraintEnd_toStartOf="@+id/antwort2"