From 8522b0e6c4ab4aae2bf83cdeae91610b5e075e3c Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Wed, 16 Mar 2022 01:54:54 +0100
Subject: [PATCH 1/8] Changed popup to Linear Layout and tested view display

---
 .../ch/sdp/vibester/GamescreenActivityTest.kt |  9 +++-
 .../ch/sdp/vibester/GamescreenActivity.kt     | 43 +++++++++-------
 .../main/res/layout/activity_gamescreen.xml   | 51 +++++++++++++++++--
 3 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
index 503c405bb..fea958f1f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -45,10 +45,15 @@ class GamescreenActivityTest {
         onView(withId(R.id.scoresTable)).check(matches(isDisplayed()))
     }
 
-    // FIXME: Find a way to test the popup showing despite not being a component / make robolectric work
+    @Test
+    fun answerIsPresentButInvisibleOnStartup() {
+        onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
+    }
+
+    // FIXME: Find a way to make buttons fetchable (give them an ID)?
 /*
     @Test
-    fun clickingButtonLaunchesPopup() {
+    fun clickingButtonMakesAnswerVisible() {
 
 
     }
diff --git a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
index 9b472833d..d178cc23f 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -1,6 +1,7 @@
 package ch.sdp.vibester
 
 import android.content.Intent
+import android.opengl.Visibility
 import android.os.Bundle
 import android.view.Gravity
 import android.widget.*
@@ -21,30 +22,21 @@ class GamescreenActivity: AppCompatActivity() {
          */
         val players = arrayOf("Kamila", "Jiabao", "Arda", "Laurynas")
 
+        val answer = findViewById<LinearLayout>(R.id.answer)
+        val answerText = findViewById<TextView>(R.id.answerText)
+
         val gamescreenIntent = Intent(this, GamescreenActivity::class.java)
 
         // hardcoded test values
         val song = "Demo"
         val artist = "The Placeholders"
 
-        val buildPopup = AlertDialog.Builder(this)
-        buildPopup.setTitle("Solution")
-        buildPopup.setMessage("The song was " + song + " by " + artist)
-
-        buildPopup.setPositiveButton("Correct") { dialog, which ->
-            Toast.makeText(applicationContext,
-                "Congrats!", Toast.LENGTH_SHORT).show()
-        }
-
-        buildPopup.setNegativeButton("Wrong") { dialog, which ->
-            Toast.makeText(applicationContext,
-                "Too bad!", Toast.LENGTH_SHORT).show()
-        }
+        answerText.text= "The song was $song by $artist"
 
         val allPoints = arrayOf(1, 2, 3, 4)
 
         buildScores(players, allPoints)
-        buildBuzzers(players, buildPopup)
+        buildBuzzers(players, answer)
 
     }
 
@@ -87,7 +79,7 @@ class GamescreenActivity: AppCompatActivity() {
     /*
     Programmatically builds the buzzers according to the number and names of players.
      */
-    private fun buildBuzzers(players: Array<String>, popup: AlertDialog.Builder) {
+    private fun buildBuzzers(players: Array<String>, answer: LinearLayout) {
 
         val buzzers = findViewById<LinearLayout>(R.id.buzzersLayout)
         val buttons = arrayOfNulls<Button>(players.size)
@@ -102,11 +94,28 @@ class GamescreenActivity: AppCompatActivity() {
             button.height = 150
             buttons.set(i, button)
             button.setOnClickListener {
-                popup.show()
+                answer.visibility = android.view.View.VISIBLE
             }
             buzzers.addView(button)
 
             i = i + 1
         }
     }
-}
\ No newline at end of file
+}
+
+
+/*
+        val buildPopup = AlertDialog.Builder(this)
+        buildPopup.setTitle("Solution")
+        buildPopup.setMessage("The song was " + song + " by " + artist)
+
+        buildPopup.setPositiveButton("Correct") { dialog, which ->
+            Toast.makeText(applicationContext,
+                "Congrats!", Toast.LENGTH_SHORT).show()
+        }
+
+        buildPopup.setNegativeButton("Wrong") { dialog, which ->
+            Toast.makeText(applicationContext,
+                "Too bad!", Toast.LENGTH_SHORT).show()
+        }
+*/
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_gamescreen.xml b/app/src/main/res/layout/activity_gamescreen.xml
index b869826b9..31476b294 100644
--- a/app/src/main/res/layout/activity_gamescreen.xml
+++ b/app/src/main/res/layout/activity_gamescreen.xml
@@ -16,22 +16,63 @@
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scoresTable" />
+        app:layout_constraintTop_toBottomOf="@+id/scoresTable">
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/answer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginBottom="116dp"
+        android:orientation="vertical"
+        android:visibility="invisible"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/scoresTable">
+
+        <TextView
+            android:id="@+id/answerText"
+            android:layout_width="275dp"
+            android:layout_height="wrap_content"
+            android:gravity="center" />
+
+        <Button
+            android:id="@+id/buttonCorrect"
+            android:layout_width="125dp"
+            android:layout_height="40dp"
+            android:gravity="center"
+            android:text="@string/correct" />
+
+        <Button
+            android:id="@+id/buttonWrong"
+            android:layout_width="125dp"
+            android:layout_height="40dp"
+            android:gravity="center"
+            android:text="@string/wrong" />
+
+    </LinearLayout>
 
     <TableLayout
         android:id="@+id/scoresTable"
         android:layout_width="0dp"
-        android:layout_height="200dp"
+        android:layout_height="0dp"
         android:layout_marginTop="1dp"
-        android:layout_marginBottom="14dp"
+        android:layout_marginBottom="114dp"
         android:gravity="center"
-        app:layout_constraintBottom_toTopOf="@+id/buzzersLayout"
+        app:layout_constraintBottom_toTopOf="@+id/answer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-    </TableLayout>
 
+    </TableLayout>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 9271babb59009b1dd272c8e8eeba1047fd6d91d3 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Wed, 16 Mar 2022 08:33:42 +0100
Subject: [PATCH 2/8] Add answer buttons interaction and tests + cleanup code

---
 .../ch/sdp/vibester/GamescreenActivityTest.kt | 22 +++++++++++----
 .../ch/sdp/vibester/GamescreenActivity.kt     | 28 ++++++-------------
 .../main/res/layout/activity_gamescreen.xml   |  1 +
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
index fea958f1f..97fac774b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -50,12 +50,24 @@ class GamescreenActivityTest {
         onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
     }
 
-    // FIXME: Find a way to make buttons fetchable (give them an ID)?
-/*
     @Test
-    fun clickingButtonMakesAnswerVisible() {
-
+    fun clickingBuzzerMakesAnswerVisible() {
+        var i = 0
+        while (i < 4) {
+            onView(withId(i)).perform(click())
+            onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+            i = i + 1
+            onView(withId(R.id.buttonCorrect)).perform(click())
+        }
+    }
 
+    @Test
+    fun clickingAnswerButtonsMakesAnswerInvisible() {
+        val buttonIdArray = arrayOf(R.id.buttonCorrect, R.id.buttonWrong)
+        for (butId in buttonIdArray) {
+            onView(withId(0)).perform(click()) // make answer visible first
+            onView(withId(butId)).perform(click())
+            onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
+        }
     }
- */
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
index d178cc23f..4288ffef2 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -8,6 +8,7 @@ import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AlertDialogLayout
+import androidx.core.view.get
 
 
 class GamescreenActivity: AppCompatActivity() {
@@ -25,8 +26,6 @@ class GamescreenActivity: AppCompatActivity() {
         val answer = findViewById<LinearLayout>(R.id.answer)
         val answerText = findViewById<TextView>(R.id.answerText)
 
-        val gamescreenIntent = Intent(this, GamescreenActivity::class.java)
-
         // hardcoded test values
         val song = "Demo"
         val artist = "The Placeholders"
@@ -37,7 +36,8 @@ class GamescreenActivity: AppCompatActivity() {
 
         buildScores(players, allPoints)
         buildBuzzers(players, answer)
-
+        setAnswerButton(answer, findViewById(R.id.buttonCorrect))
+        setAnswerButton(answer, findViewById(R.id.buttonWrong))
     }
 
     /*
@@ -89,6 +89,7 @@ class GamescreenActivity: AppCompatActivity() {
         for (pName in players) {
 
             val button = Button(this)
+            button.id = i
             button.text = pName
             button.width = 100
             button.height = 150
@@ -101,21 +102,10 @@ class GamescreenActivity: AppCompatActivity() {
             i = i + 1
         }
     }
-}
-
-
-/*
-        val buildPopup = AlertDialog.Builder(this)
-        buildPopup.setTitle("Solution")
-        buildPopup.setMessage("The song was " + song + " by " + artist)
 
-        buildPopup.setPositiveButton("Correct") { dialog, which ->
-            Toast.makeText(applicationContext,
-                "Congrats!", Toast.LENGTH_SHORT).show()
+    private fun setAnswerButton(answer: LinearLayout, button: Button) {
+        button.setOnClickListener {
+            answer.visibility = android.view.View.INVISIBLE
         }
-
-        buildPopup.setNegativeButton("Wrong") { dialog, which ->
-            Toast.makeText(applicationContext,
-                "Too bad!", Toast.LENGTH_SHORT).show()
-        }
-*/
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_gamescreen.xml b/app/src/main/res/layout/activity_gamescreen.xml
index 31476b294..0ed0f37e1 100644
--- a/app/src/main/res/layout/activity_gamescreen.xml
+++ b/app/src/main/res/layout/activity_gamescreen.xml
@@ -33,6 +33,7 @@
         android:orientation="vertical"
         android:visibility="invisible"
         android:gravity="center"
+        android:background="#AAAAAA"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 8931515cf37df8c4bbf089c91235b30e3047d120 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Wed, 16 Mar 2022 10:31:10 +0100
Subject: [PATCH 3/8] fix answer visibility test

---
 .../androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
index 97fac774b..8d6ba7274 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -54,6 +54,7 @@ class GamescreenActivityTest {
     fun clickingBuzzerMakesAnswerVisible() {
         var i = 0
         while (i < 4) {
+            onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
             onView(withId(i)).perform(click())
             onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
             i = i + 1

From 1070f5126e7c95db2995a9fb8b2d9966a7a26383 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Wed, 16 Mar 2022 10:41:10 +0100
Subject: [PATCH 4/8] retry CI

---
 .../androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
index 8d6ba7274..8fd301795 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -66,7 +66,7 @@ class GamescreenActivityTest {
     fun clickingAnswerButtonsMakesAnswerInvisible() {
         val buttonIdArray = arrayOf(R.id.buttonCorrect, R.id.buttonWrong)
         for (butId in buttonIdArray) {
-            onView(withId(0)).perform(click()) // make answer visible first
+            onView(withId(0)).perform(click()) // make answer visible at first
             onView(withId(butId)).perform(click())
             onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
         }

From 3a764cca2bc114f965c63ad04b5f3d99fb9e5955 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Wed, 16 Mar 2022 12:50:10 +0100
Subject: [PATCH 5/8] fix answer visibility test

---
 .../androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
index 8fd301795..8d6ba7274 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -66,7 +66,7 @@ class GamescreenActivityTest {
     fun clickingAnswerButtonsMakesAnswerInvisible() {
         val buttonIdArray = arrayOf(R.id.buttonCorrect, R.id.buttonWrong)
         for (butId in buttonIdArray) {
-            onView(withId(0)).perform(click()) // make answer visible at first
+            onView(withId(0)).perform(click()) // make answer visible first
             onView(withId(butId)).perform(click())
             onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
         }

From 174cd0e81dafadfd0726791ee45afb9a46aee4b2 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 17 Mar 2022 15:25:37 +0100
Subject: [PATCH 6/8] change buzzer height from absolute to relative

---
 app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
index 4288ffef2..52b54acc0 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -92,7 +92,7 @@ class GamescreenActivity: AppCompatActivity() {
             button.id = i
             button.text = pName
             button.width = 100
-            button.height = 150
+            button.height = 0
             buttons.set(i, button)
             button.setOnClickListener {
                 answer.visibility = android.view.View.VISIBLE

From 8ad4578176b7b1684b381d0d1218fad24a8a046e Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Thu, 17 Mar 2022 22:02:12 +0100
Subject: [PATCH 7/8] update GameScreenActivityTest

---
 .../androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
index 7a3264ec5..0a7533fe0 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -83,7 +83,7 @@ class GamescreenActivityTest {
      */
     @Test
     fun checkIntentOnEnding() {
-        onView(withId(R.id.go_to_end)).perform(click())
+        onView(withId(R.id.scoresTable)).perform(click())
         intended(hasComponent(GameEndingScreen::class.java.name))
         intended(hasExtra("playerName", "Arda"))
         intended(hasExtra("nbIncorrectSong", 3))

From 1b4afbcb7aee508175dc3f7eb40b68a39c2c6321 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Thu, 17 Mar 2022 22:33:10 +0100
Subject: [PATCH 8/8] update GameScreenActivityTest 2

---
 .../java/ch/sdp/vibester/GamescreenActivityTest.kt     |  2 +-
 app/src/main/res/layout/activity_gamescreen.xml        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
index 0a7533fe0..7a3264ec5 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -83,7 +83,7 @@ class GamescreenActivityTest {
      */
     @Test
     fun checkIntentOnEnding() {
-        onView(withId(R.id.scoresTable)).perform(click())
+        onView(withId(R.id.go_to_end)).perform(click())
         intended(hasComponent(GameEndingScreen::class.java.name))
         intended(hasExtra("playerName", "Arda"))
         intended(hasExtra("nbIncorrectSong", 3))
diff --git a/app/src/main/res/layout/activity_gamescreen.xml b/app/src/main/res/layout/activity_gamescreen.xml
index 0ed0f37e1..996937ded 100644
--- a/app/src/main/res/layout/activity_gamescreen.xml
+++ b/app/src/main/res/layout/activity_gamescreen.xml
@@ -75,5 +75,15 @@
 
     </TableLayout>
 
+    <Button
+        android:id="@+id/go_to_end"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="switchToEnding"
+        android:text="@string/go_to_end"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/scoresTable" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file