From 4909d3bc4e4dc02c42ea44ebf6afcc32b6a33fcf Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Mon, 7 Mar 2022 12:38:00 +0100
Subject: [PATCH 01/18] created base files

---
 .../ch/sdp/vibester/GamescreenActivity.kt     | 11 ++++++++++
 .../main/res/layout/activity_gamescreen.xml   | 22 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
 create mode 100644 app/src/main/res/layout/activity_gamescreen.xml

diff --git a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
new file mode 100644
index 000000000..8ac3ceb1f
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -0,0 +1,11 @@
+package ch.sdp.vibester
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+class GamescreenActivity: AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_gamescreen)
+    }
+}
\ 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
new file mode 100644
index 000000000..4ce3fc743
--- /dev/null
+++ b/app/src/main/res/layout/activity_gamescreen.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        tools:layout_editor_absoluteX="56dp"
+        tools:layout_editor_absoluteY="56dp" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="271dp"
+        android:layout_height="129dp"
+        android:text="Button"
+        tools:layout_editor_absoluteX="69dp"
+        tools:layout_editor_absoluteY="472dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 9e1fcd4668a9a22dc9aace2af8fce3d7ababcc50 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Wed, 9 Mar 2022 10:39:56 +0100
Subject: [PATCH 02/18] basic gamescreen and layout

---
 .idea/deploymentTargetDropDown.xml            | 17 -----
 .../ch/sdp/vibester/GamescreenActivity.kt     | 31 ++++++++
 .../main/res/layout/activity_gamescreen.xml   | 76 +++++++++++++++----
 3 files changed, 92 insertions(+), 32 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 17e5c165b..000000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\Maxime\.android\avd\Copy_of_Pixel_3a_API_30_x86.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-03-02T15:09:24.250421300Z" />
-  </component>
-</project>
\ 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 8ac3ceb1f..8a4ac701f 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -1,11 +1,42 @@
 package ch.sdp.vibester
 
+import android.content.Intent
 import android.os.Bundle
+import android.widget.Button
+import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 
 class GamescreenActivity: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_gamescreen)
+
+        /* number of players for the game
+            currently hardcoded as a placeholder
+            will be retrieved from intent launched from the game setup screen
+         */
+        val players = arrayOf("Kamila", "Jiabao", "Arda", "Laurynas", "Margaux", "Maxime")
+
+        val buzzers = findViewById<LinearLayout>(R.id.buzzersLayout)
+
+        val greetingIntent = Intent(this, GamescreenActivity::class.java)
+
+        var i = 1
+
+        val buttons = arrayOfNulls<Button>(players.size)
+
+        for (pName in players) {
+            val buttonName = "button" + i.toString()
+            val buttonId = resources.getIdentifier(buttonName, "id", packageName)
+            val button = findViewById<Button>(buttonId)
+            button.text = pName
+            buttons.set(i-1, button)
+            button.setOnClickListener {
+                startActivity(greetingIntent)
+            }
+            buzzers.addView(findViewById<Button>(buttonId))
+            i = i + 1
+        }
+
     }
 }
\ 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 4ce3fc743..c4524ca83 100644
--- a/app/src/main/res/layout/activity_gamescreen.xml
+++ b/app/src/main/res/layout/activity_gamescreen.xml
@@ -1,22 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView"
-        tools:layout_editor_absoluteX="56dp"
-        tools:layout_editor_absoluteY="56dp" />
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="271dp"
-        android:layout_height="129dp"
-        android:text="Button"
-        tools:layout_editor_absoluteX="69dp"
-        tools:layout_editor_absoluteY="472dp" />
+    <LinearLayout
+        android:id="@+id/buzzersLayout"
+        android:layout_width="match_parent"
+        android:layout_height="500dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <Button
+            android:id="@+id/button1"
+            android:layout_width="350dp"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="Player 1" />
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="350dp"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="Player 2" />
+
+        <Button
+            android:id="@+id/button3"
+            android:layout_width="350dp"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="Player 3" />
+
+        <Button
+            android:id="@+id/button4"
+            android:layout_width="350dp"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="Player 4" />
+
+        <Button
+            android:id="@+id/button5"
+            android:layout_width="350dp"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="Player 5" />
+
+        <Button
+            android:id="@+id/button6"
+            android:layout_width="350dp"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="Player 6" />
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From dff3d2852b3f0c9ac3a8abeda0cbf40f2a37efc7 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Wed, 9 Mar 2022 12:50:26 +0100
Subject: [PATCH 03/18] prepare to merge main into branch

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

diff --git a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
index 8a4ac701f..b3be69d55 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -19,7 +19,7 @@ class GamescreenActivity: AppCompatActivity() {
 
         val buzzers = findViewById<LinearLayout>(R.id.buzzersLayout)
 
-        val greetingIntent = Intent(this, GamescreenActivity::class.java)
+        val gamescreenIntent = Intent(this, GamescreenActivity::class.java)
 
         var i = 1
 
@@ -32,7 +32,7 @@ class GamescreenActivity: AppCompatActivity() {
             button.text = pName
             buttons.set(i-1, button)
             button.setOnClickListener {
-                startActivity(greetingIntent)
+                startActivity(gamescreenIntent)
             }
             buzzers.addView(findViewById<Button>(buttonId))
             i = i + 1

From 28fd49c920c3f2d4d42f4c71a3eba26814b05e73 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 10 Mar 2022 01:13:57 +0100
Subject: [PATCH 04/18] basic scores and buzzers interface

---
 .../ch/sdp/vibester/GamescreenActivity.kt     | 53 ++++++++++++---
 .../main/res/layout/activity_gamescreen.xml   | 67 +++++--------------
 2 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
index b3be69d55..fffb2a0d4 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -2,11 +2,15 @@ package ch.sdp.vibester
 
 import android.content.Intent
 import android.os.Bundle
-import android.widget.Button
-import android.widget.LinearLayout
+import android.view.Gravity
+import android.widget.*
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AlertDialogLayout
+
 
 class GamescreenActivity: AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_gamescreen)
@@ -15,28 +19,61 @@ class GamescreenActivity: AppCompatActivity() {
             currently hardcoded as a placeholder
             will be retrieved from intent launched from the game setup screen
          */
-        val players = arrayOf("Kamila", "Jiabao", "Arda", "Laurynas", "Margaux", "Maxime")
+        val players = arrayOf("Kamila", "Jiabao", "Arda", "Laurynas")
 
         val buzzers = findViewById<LinearLayout>(R.id.buzzersLayout)
+        val scores = findViewById<LinearLayout>(R.id.scoresTable)
 
         val gamescreenIntent = Intent(this, GamescreenActivity::class.java)
 
+        val buildPopup = AlertDialog.Builder(this)
+
+
         var i = 1
 
         val buttons = arrayOfNulls<Button>(players.size)
 
+        val viewsOfPoints = arrayOfNulls<TableRow>(players.size)
+        val allPoints = arrayOf(1, 2, 3, 4)
+
         for (pName in players) {
-            val buttonName = "button" + i.toString()
-            val buttonId = resources.getIdentifier(buttonName, "id", packageName)
-            val button = findViewById<Button>(buttonId)
+
+            //val scoreName = "score" + i.toString()
+            //val scoreId = resources.getIdentifier(scoreName, "id", packageName)
+            val score = TableRow(this)
+            //score.id = scoreId
+            score.gravity = Gravity.CENTER
+            val nameView = TextView(this)
+            nameView.text = pName
+            nameView.height = 75
+            nameView.width = 300
+            nameView.gravity = Gravity.LEFT
+            val points = TextView(this)
+            points.text = allPoints[i-1].toString()
+            points.height = 75
+            points.width = 150
+            points.gravity = Gravity.RIGHT
+            score.addView(nameView)
+            score.addView(points)
+            viewsOfPoints.set(i-1, score)
+            scores.addView(score)//,TableLayout.LayoutParams(TableLayout.LayoutParams.WRAP_CONTENT, TableLayout.LayoutParams.WRAP_CONTENT))
+            //val buttonName = "button" + i.toString()
+            //val buttonId = resources.getIdentifier(buttonName, "id", packageName)
+            val button = Button(this)
             button.text = pName
+            //button.id = buttonId
+            button.width = 0
+            button.height = 150
             buttons.set(i-1, button)
             button.setOnClickListener {
-                startActivity(gamescreenIntent)
+
+                //startActivity(gamescreenIntent)
             }
-            buzzers.addView(findViewById<Button>(buttonId))
+            buzzers.addView(button)
+
             i = i + 1
         }
 
+
     }
 }
\ 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 c4524ca83..42a12c1d9 100644
--- a/app/src/main/res/layout/activity_gamescreen.xml
+++ b/app/src/main/res/layout/activity_gamescreen.xml
@@ -8,61 +8,26 @@
     <LinearLayout
         android:id="@+id/buzzersLayout"
         android:layout_width="match_parent"
-        android:layout_height="500dp"
+        android:layout_height="0dp"
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <Button
-            android:id="@+id/button1"
-            android:layout_width="350dp"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:text="Player 1" />
-
-        <Button
-            android:id="@+id/button2"
-            android:layout_width="350dp"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:text="Player 2" />
-
-        <Button
-            android:id="@+id/button3"
-            android:layout_width="350dp"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:text="Player 3" />
-
-        <Button
-            android:id="@+id/button4"
-            android:layout_width="350dp"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:text="Player 4" />
-
-        <Button
-            android:id="@+id/button5"
-            android:layout_width="350dp"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:text="Player 5" />
-
-        <Button
-            android:id="@+id/button6"
-            android:layout_width="350dp"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:text="Player 6" />
-    </LinearLayout>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/scoresTable" />
+
+    <TableLayout
+        android:id="@+id/scoresTable"
+        android:layout_width="0dp"
+        android:layout_height="200dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="14dp"
+        android:gravity="center"
+        app:layout_constraintBottom_toTopOf="@+id/buzzersLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+    </TableLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From d515691a9c9025c336a336a1478c2475023c1a9a Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 10 Mar 2022 01:16:19 +0100
Subject: [PATCH 05/18] update manifest with new activity

---
 app/src/main/AndroidManifest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c98527a60..318f3f9be 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication">
+        <activity
+            android:name="ch.sdp.vibester.GamescreenActivity"
+            android:exported="false" />
         <activity
             android:name="ch.sdp.vibester.GreetingActivity"
             android:exported="false" />

From 52b1bc7c47c661b855455c9dc156eb15e11ebf3d Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 10 Mar 2022 13:48:28 +0100
Subject: [PATCH 06/18] cleanup code into functions + add popup

---
 .../ch/sdp/vibester/GamescreenActivity.kt     | 73 ++++++++++++++-----
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
index fffb2a0d4..fdae45513 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -21,59 +21,92 @@ class GamescreenActivity: AppCompatActivity() {
          */
         val players = arrayOf("Kamila", "Jiabao", "Arda", "Laurynas")
 
-        val buzzers = findViewById<LinearLayout>(R.id.buzzersLayout)
-        val scores = findViewById<LinearLayout>(R.id.scoresTable)
-
         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()
+        }
 
-        var i = 1
+        buildPopup.setNegativeButton("Wrong") { dialog, which ->
+            Toast.makeText(applicationContext,
+                "Too bad!", Toast.LENGTH_SHORT).show()
+        }
 
-        val buttons = arrayOfNulls<Button>(players.size)
+        val allPoints = arrayOf(1, 2, 3, 4)
+
+        buildScores(players, allPoints)
+        buildBuzzers(players, buildPopup)
 
+    }
+
+    /*
+    Programmatically builds the table of scores according to the number of players
+     */
+    private fun buildScores(players: Array<String>, allPoints: Array<Int>) {
+
+        val scores = findViewById<LinearLayout>(R.id.scoresTable)
         val viewsOfPoints = arrayOfNulls<TableRow>(players.size)
-        val allPoints = arrayOf(1, 2, 3, 4)
+
+        var i = 0
 
         for (pName in players) {
 
-            //val scoreName = "score" + i.toString()
-            //val scoreId = resources.getIdentifier(scoreName, "id", packageName)
             val score = TableRow(this)
-            //score.id = scoreId
             score.gravity = Gravity.CENTER
+
             val nameView = TextView(this)
             nameView.text = pName
             nameView.height = 75
             nameView.width = 300
             nameView.gravity = Gravity.LEFT
+
             val points = TextView(this)
-            points.text = allPoints[i-1].toString()
+            points.text = allPoints[i].toString()
             points.height = 75
             points.width = 150
             points.gravity = Gravity.RIGHT
+
             score.addView(nameView)
             score.addView(points)
-            viewsOfPoints.set(i-1, score)
-            scores.addView(score)//,TableLayout.LayoutParams(TableLayout.LayoutParams.WRAP_CONTENT, TableLayout.LayoutParams.WRAP_CONTENT))
-            //val buttonName = "button" + i.toString()
-            //val buttonId = resources.getIdentifier(buttonName, "id", packageName)
+            viewsOfPoints.set(i, score)
+            scores.addView(score)
+
+            i = i + 1
+        }
+    }
+
+    /*
+    Programmatically builds the buzzers according to the number and names of players.
+     */
+    private fun buildBuzzers(players: Array<String>, popup: AlertDialog.Builder) {
+
+        val buzzers = findViewById<LinearLayout>(R.id.buzzersLayout)
+        val buttons = arrayOfNulls<Button>(players.size)
+
+        var i = 0
+
+        for (pName in players) {
+
             val button = Button(this)
             button.text = pName
-            //button.id = buttonId
             button.width = 0
             button.height = 150
-            buttons.set(i-1, button)
+            buttons.set(i, button)
             button.setOnClickListener {
-
-                //startActivity(gamescreenIntent)
+                popup.show()
             }
             buzzers.addView(button)
 
             i = i + 1
         }
-
-
     }
 }
\ No newline at end of file

From a6c7a32978cf9e161ee28f165074c60b283b1386 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 10 Mar 2022 14:37:13 +0100
Subject: [PATCH 07/18] prepare merge

---
 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 fdae45513..9b472833d 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -98,7 +98,7 @@ class GamescreenActivity: AppCompatActivity() {
 
             val button = Button(this)
             button.text = pName
-            button.width = 0
+            button.width = 100
             button.height = 150
             buttons.set(i, button)
             button.setOnClickListener {

From 064d9bd75a2998d6c9ce4ae128d0297a503da35b Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 10 Mar 2022 15:21:06 +0100
Subject: [PATCH 08/18] basic tests

---
 .../ch/sdp/vibester/GamescreenActivityTest.kt | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
new file mode 100644
index 000000000..1972d97df
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -0,0 +1,31 @@
+package ch.sdp.vibester
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class GamescreenActivityTest {
+
+    @get:Rule
+    val testRule = ActivityScenarioRule(
+        GamescreenActivity::class.java
+    )
+
+    @Test
+    fun buzzerLayoutIsDisplayed() {
+        onView(withId(R.id.buzzersLayout)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun scoresLayoutIsDisplayed() {
+        onView(withId(R.id.scoresTable)).check(matches(isDisplayed()))
+    }
+
+}
\ No newline at end of file

From 8020d7a97b6003f7ee3b77e36855e01767242e0d Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 10 Mar 2022 15:29:56 +0100
Subject: [PATCH 09/18] prepare for pull

---
 app/src/main/java/ch/sdp/vibester/MainActivity.kt | 11 ++++++-----
 app/src/main/res/layout/activity_main.xml         |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index e28027588..5f1c0cf58 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
+import android.widget.PopupMenu
 import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
@@ -14,14 +15,14 @@ class MainActivity : AppCompatActivity() {
         val txtInput = findViewById<EditText>(R.id.mainNameInput)
 
         val btnGreeting = findViewById<Button>(R.id.mainButton)
-        val greetingIntent = Intent(this, GreetingActivity::class.java)
-
-
 
+        val gamescreenIntent = Intent(this, GamescreenActivity::class.java)
 
         btnGreeting.setOnClickListener {
-            greetingIntent.putExtra("name", txtInput.text.toString())
-            startActivity(greetingIntent)
+            //gamescreenIntent.putExtra("name", txtInput.text.toString())
+            startActivity(gamescreenIntent)
         }
+
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b57e3c7f7..cc950ae33 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,6 +15,8 @@
         android:layout_marginEnd="159dp"
         android:layout_marginBottom="440dp"
         android:text="@string/button_txt"
+        app:layout_constrainedHeight="false"
+        app:layout_constrainedWidth="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"

From abe9cff17dcb513344ea7156a7452bdce3f7ccf6 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 10 Mar 2022 15:31:02 +0100
Subject: [PATCH 10/18] prepare for pull

---
 .idea/gradle.xml | 2 +-
 .idea/misc.xml   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 22d8cccb1..5a6f65932 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio java home" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 57c4551b7..be72175c6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,10 +6,13 @@
         <entry key="..\:/Users/Maxime/Desktop/SDP/MyApplication/app/src/main/res/layout/activity_greeting.xml" value="0.3145833333333333" />
         <entry key="..\:/Users/Maxime/Desktop/SDP/MyApplication/app/src/main/res/layout/activity_main.xml" value="0.3145833333333333" />
         <entry key="..\:/Users/Maxime/Desktop/SDP/app/src/main/res/layout/activity_greeting.xml" value="0.19384057971014493" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/activity_gamescreen.xml" value="0.1265625" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/activity_main.xml" value="0.17760416666666667" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/menu/popup_menu_buzzer.xml" value="0.2546875" />
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

From 9b296aa6c7fe1e910faea10e80ae9f6f248045c3 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Thu, 10 Mar 2022 22:21:13 +0100
Subject: [PATCH 11/18] save changes before trying new activity

---
 .../GamescreenActivityRobolectricTest.kt      | 33 +++++++++++++++++++
 .../ch/sdp/vibester/GamescreenActivity.kt     | 16 ++++++---
 2 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityRobolectricTest.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityRobolectricTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityRobolectricTest.kt
new file mode 100644
index 000000000..d2025e6d2
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityRobolectricTest.kt
@@ -0,0 +1,33 @@
+package ch.sdp.vibester
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import junit.framework.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Robolectric
+import org.robolectric.shadows.ShadowAlertDialog
+
+@RunWith(RobolectricTestRunner::class)
+
+class GamescreenActivityRobolectricTest {
+
+    @Before
+    fun setup() {
+        val activity = Robolectric.buildActivity(GamescreenActivity::class.java).create().resume().get()
+    }
+
+    @Test
+    fun buzzerTriggersAlertDialog() {
+        Espresso.onView(ViewMatchers.withParent(ViewMatchers.withId(R.id.buzzersLayout)))
+            .perform(ViewActions.click())
+        assertNotNull(ShadowAlertDialog.getLatestAlertDialog())
+
+    }
+}
\ 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 9b472833d..717cf2b13 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -41,17 +41,19 @@ class GamescreenActivity: AppCompatActivity() {
                 "Too bad!", Toast.LENGTH_SHORT).show()
         }
 
-        val allPoints = arrayOf(1, 2, 3, 4)
+        val popup = buildPopup.create()
 
-        buildScores(players, allPoints)
-        buildBuzzers(players, buildPopup)
+        val allPoints = arrayOf(1, 3, 2, 4)
+
+        val viewsOfPoints = buildScores(players, allPoints)
+        val buttons = buildBuzzers(players, popup)
 
     }
 
     /*
     Programmatically builds the table of scores according to the number of players
      */
-    private fun buildScores(players: Array<String>, allPoints: Array<Int>) {
+    fun buildScores(players: Array<String>, allPoints: Array<Int>): Array<TableRow?> {
 
         val scores = findViewById<LinearLayout>(R.id.scoresTable)
         val viewsOfPoints = arrayOfNulls<TableRow>(players.size)
@@ -82,12 +84,14 @@ class GamescreenActivity: AppCompatActivity() {
 
             i = i + 1
         }
+
+        return viewsOfPoints
     }
 
     /*
     Programmatically builds the buzzers according to the number and names of players.
      */
-    private fun buildBuzzers(players: Array<String>, popup: AlertDialog.Builder) {
+    fun buildBuzzers(players: Array<String>, popup: AlertDialog): Array<Button?> {
 
         val buzzers = findViewById<LinearLayout>(R.id.buzzersLayout)
         val buttons = arrayOfNulls<Button>(players.size)
@@ -108,5 +112,7 @@ class GamescreenActivity: AppCompatActivity() {
 
             i = i + 1
         }
+
+        return buttons
     }
 }
\ No newline at end of file

From e378528ad0891564dba578b73ce6d81960a68d84 Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Fri, 11 Mar 2022 07:45:54 +0100
Subject: [PATCH 12/18] gamescreen with partial tests (except popup)

---
 .../GamescreenActivityRobolectricTest.kt      | 33 -------------------
 .../ch/sdp/vibester/GamescreenActivityTest.kt | 29 ++++++++++++++--
 .../java/ch/sdp/vibester/MainActivityTest.kt  |  6 +++-
 .../ch/sdp/vibester/GamescreenActivity.kt     | 16 +++------
 .../main/java/ch/sdp/vibester/MainActivity.kt | 20 +++++------
 .../main/res/layout/activity_gamescreen.xml   |  4 +++
 app/src/main/res/layout/activity_main.xml     | 12 +++++++
 app/src/main/res/values/strings.xml           |  3 ++
 8 files changed, 66 insertions(+), 57 deletions(-)
 delete mode 100644 app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityRobolectricTest.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityRobolectricTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityRobolectricTest.kt
deleted file mode 100644
index d2025e6d2..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityRobolectricTest.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package ch.sdp.vibester
-
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import junit.framework.Assert.assertNotNull
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.Robolectric
-import org.robolectric.shadows.ShadowAlertDialog
-
-@RunWith(RobolectricTestRunner::class)
-
-class GamescreenActivityRobolectricTest {
-
-    @Before
-    fun setup() {
-        val activity = Robolectric.buildActivity(GamescreenActivity::class.java).create().resume().get()
-    }
-
-    @Test
-    fun buzzerTriggersAlertDialog() {
-        Espresso.onView(ViewMatchers.withParent(ViewMatchers.withId(R.id.buzzersLayout)))
-            .perform(ViewActions.click())
-        assertNotNull(ShadowAlertDialog.getLatestAlertDialog())
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
index 1972d97df..503c405bb 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
@@ -1,16 +1,23 @@
 package ch.sdp.vibester
 
+import android.app.AlertDialog
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.hamcrest.CoreMatchers.allOf
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
+
 class GamescreenActivityTest {
 
     @get:Rule
@@ -18,6 +25,16 @@ class GamescreenActivityTest {
         GamescreenActivity::class.java
     )
 
+    @Before
+    fun setUp() {
+        Intents.init()
+    }
+
+    @After
+    fun clean() {
+        Intents.release()
+    }
+
     @Test
     fun buzzerLayoutIsDisplayed() {
         onView(withId(R.id.buzzersLayout)).check(matches(isDisplayed()))
@@ -28,4 +45,12 @@ 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 clickingButtonLaunchesPopup() {
+
+
+    }
+ */
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
index 13236e1c1..447d6dbf6 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
@@ -49,5 +49,9 @@ class MainActivityTest {
         intended(hasComponent(ScoreBoardActivity::class.qualifiedName))
     }
 
-
+    @Test
+    fun gamescreenTest() {
+        onView(withId(R.id.toLocalGameButton)).perform(click())
+        intended(hasComponent(GamescreenActivity::class.qualifiedName))
+    }
 }
\ 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 717cf2b13..9b472833d 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
@@ -41,19 +41,17 @@ class GamescreenActivity: AppCompatActivity() {
                 "Too bad!", Toast.LENGTH_SHORT).show()
         }
 
-        val popup = buildPopup.create()
+        val allPoints = arrayOf(1, 2, 3, 4)
 
-        val allPoints = arrayOf(1, 3, 2, 4)
-
-        val viewsOfPoints = buildScores(players, allPoints)
-        val buttons = buildBuzzers(players, popup)
+        buildScores(players, allPoints)
+        buildBuzzers(players, buildPopup)
 
     }
 
     /*
     Programmatically builds the table of scores according to the number of players
      */
-    fun buildScores(players: Array<String>, allPoints: Array<Int>): Array<TableRow?> {
+    private fun buildScores(players: Array<String>, allPoints: Array<Int>) {
 
         val scores = findViewById<LinearLayout>(R.id.scoresTable)
         val viewsOfPoints = arrayOfNulls<TableRow>(players.size)
@@ -84,14 +82,12 @@ class GamescreenActivity: AppCompatActivity() {
 
             i = i + 1
         }
-
-        return viewsOfPoints
     }
 
     /*
     Programmatically builds the buzzers according to the number and names of players.
      */
-    fun buildBuzzers(players: Array<String>, popup: AlertDialog): Array<Button?> {
+    private fun buildBuzzers(players: Array<String>, popup: AlertDialog.Builder) {
 
         val buzzers = findViewById<LinearLayout>(R.id.buzzersLayout)
         val buttons = arrayOfNulls<Button>(players.size)
@@ -112,7 +108,5 @@ class GamescreenActivity: AppCompatActivity() {
 
             i = i + 1
         }
-
-        return buttons
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index 6ea8e9331..9a0bc3061 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -16,21 +16,14 @@ class MainActivity : AppCompatActivity() {
         val txtInput = findViewById<EditText>(R.id.mainNameInput)
 
         val btnGreeting = findViewById<Button>(R.id.mainButton)
-<<<<<<< HEAD
 
-        val gamescreenIntent = Intent(this, GamescreenActivity::class.java)
-=======
         val greetingIntent = Intent(this, GreetingActivity::class.java)
->>>>>>> 10f227f71c430aeb8ad28cad04051b08a126ae15
 
         btnGreeting.setOnClickListener {
-            //gamescreenIntent.putExtra("name", txtInput.text.toString())
-            startActivity(gamescreenIntent)
+            greetingIntent.putExtra("name", txtInput.text.toString())
+            startActivity(greetingIntent)
         }
 
-<<<<<<< HEAD
-
-=======
         // button to scoreboard
         // FIXME: scoreboard enter button need to be move to the welcome screen
         val btnScoreboard = findViewById<Button>(R.id.scoreboardButton)
@@ -39,6 +32,13 @@ class MainActivity : AppCompatActivity() {
         btnScoreboard.setOnClickListener {
             startActivity(scoreboardIntent)
         }
->>>>>>> 10f227f71c430aeb8ad28cad04051b08a126ae15
+
+        // button to local (buzzer) game
+        val btnLocalGame = findViewById<Button>(R.id.toLocalGameButton)
+        val gamescreenIntent = Intent(this, GamescreenActivity::class.java)
+
+        btnLocalGame.setOnClickListener {
+            startActivity(gamescreenIntent)
+        }
     }
 }
\ 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 42a12c1d9..b869826b9 100644
--- a/app/src/main/res/layout/activity_gamescreen.xml
+++ b/app/src/main/res/layout/activity_gamescreen.xml
@@ -9,6 +9,8 @@
         android:id="@+id/buzzersLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:orientation="vertical"
@@ -30,4 +32,6 @@
         app:layout_constraintTop_toTopOf="parent">
     </TableLayout>
 
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c48392e30..af30ca8aa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -52,4 +52,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.653" />
+
+    <Button
+        android:id="@+id/toLocalGameButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="L O C A L  G A M E"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.743" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c34b07ed0..d15d7dd14 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,4 +5,7 @@
     <string name="button_txt">Enter</string>
     <string name="hint_input_txt">Enter</string>
     <string name="scoreboard">S C O R E B O A R D</string>
+    <string name="the_song_was">The song was...</string>
+    <string name="wrong">Wrong</string>
+    <string name="correct">Correct</string>
 </resources>
\ No newline at end of file

From 54e86fd4b4b6576f61db13a6a44f670b09ed505e Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Fri, 11 Mar 2022 07:58:26 +0100
Subject: [PATCH 13/18] prepare main merge

---
 .idea/misc.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 07c141378..ff01d07fc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,10 +6,12 @@
         <entry key="..\:/Users/Maxime/Desktop/SDP/MyApplication/app/src/main/res/layout/activity_greeting.xml" value="0.3145833333333333" />
         <entry key="..\:/Users/Maxime/Desktop/SDP/MyApplication/app/src/main/res/layout/activity_main.xml" value="0.3145833333333333" />
         <entry key="..\:/Users/Maxime/Desktop/SDP/app/src/main/res/layout/activity_greeting.xml" value="0.19384057971014493" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.23229166666666667" />
-        <entry key="app/src/main/res/layout/scoreboard_content_scrolling.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/scoreboard_item_player.xml" value="0.23229166666666667" />
-        <entry key="app/src/main/res/layout/scoreboard_scoreboard.xml" value="0.1" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/activity_gamescreen.xml" value="0.1265625" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/activity_main.xml" value="0.17760416666666667" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/activity_solution.xml" value="0.2546875" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/scoreboard_item_player.xml" value="0.12386018237082067" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/scoreboard_scoreboard.xml" value="0.12386018237082067" />
+        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/menu/popup_menu_buzzer.xml" value="0.2546875" />
       </map>
     </option>
   </component>

From f6ab218fa8ba25d948a7eeb8028a29c8d5ecb1ab Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Fri, 11 Mar 2022 08:19:40 +0100
Subject: [PATCH 14/18] remove stray merge marker

---
 app/src/main/res/layout/activity_main.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4a73c14d0..dfa3f38eb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -77,5 +77,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/mainButton" />
->>>>>>> main
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 5094e91fc26eebfd261313a34b7df8ce5047e390 Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Fri, 11 Mar 2022 09:34:00 +0100
Subject: [PATCH 15/18] Update misc.xml

---
 .idea/misc.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a44055158..5be6c94a9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,12 +6,10 @@
         <entry key="..\:/Users/Maxime/Desktop/SDP/MyApplication/app/src/main/res/layout/activity_greeting.xml" value="0.3145833333333333" />
         <entry key="..\:/Users/Maxime/Desktop/SDP/MyApplication/app/src/main/res/layout/activity_main.xml" value="0.3145833333333333" />
         <entry key="..\:/Users/Maxime/Desktop/SDP/app/src/main/res/layout/activity_greeting.xml" value="0.19384057971014493" />
-        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/activity_gamescreen.xml" value="0.1265625" />
-        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/activity_main.xml" value="0.17760416666666667" />
-        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/activity_solution.xml" value="0.2546875" />
-        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/scoreboard_item_player.xml" value="0.12386018237082067" />
-        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/layout/scoreboard_scoreboard.xml" value="0.12386018237082067" />
-        <entry key="..\:/Users/marga/AndroidStudioProjects/SDP_2022-Vibester/app/src/main/res/menu/popup_menu_buzzer.xml" value="0.2546875" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.23229166666666667" />
+        <entry key="app/src/main/res/layout/scoreboard_content_scrolling.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/scoreboard_item_player.xml" value="0.23229166666666667" />
+        <entry key="app/src/main/res/layout/scoreboard_scoreboard.xml" value="0.1" />
       </map>
     </option>
   </component>
@@ -21,4 +19,4 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-</project>
\ No newline at end of file
+</project>

From 7cf1b67cee995f2f59b7a9b5f0bffca8c32567fb Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Fri, 11 Mar 2022 09:34:36 +0100
Subject: [PATCH 16/18] Update misc.xml


From b4f916a97b28920da404732516f314511cac9a6d Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Fri, 11 Mar 2022 09:41:50 +0100
Subject: [PATCH 17/18] Update misc.xml


From 86e9abcc4cca5474a2937c5696da73d57b7e8e3d Mon Sep 17 00:00:00 2001
From: zwierski <margaux.zwierski@epfl.ch>
Date: Fri, 11 Mar 2022 09:54:26 +0100
Subject: [PATCH 18/18] fix local button problem

---
 .../java/ch/sdp/vibester/GameSetupScreenTest.kt        | 10 +++++-----
 app/src/main/java/ch/sdp/vibester/GameSetupScreen.kt   |  2 +-
 app/src/main/java/ch/sdp/vibester/MainActivity.kt      |  7 -------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GameSetupScreenTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GameSetupScreenTest.kt
index 81c7dc4fb..8fba2ef38 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GameSetupScreenTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GameSetupScreenTest.kt
@@ -73,7 +73,7 @@ class GameSetupScreenTest {
     @Test
     fun checkIntentOnProceedDefault() { //FILLER TEST
         onView(withId(R.id.nb_players_selected)).perform(click())
-        intended(hasComponent(WelcomeScreen::class.java.name))
+        intended(hasComponent(GamescreenActivity::class.java.name))
         intended(hasExtra("Number of players", "One"))
     }
 
@@ -82,7 +82,7 @@ class GameSetupScreenTest {
         onView(withId(R.id.nb_player_spinner)).perform(click())
         onData(Matchers.anything()).atPosition(0).perform(click())
         onView(withId(R.id.nb_players_selected)).perform(click())
-        intended(hasComponent(WelcomeScreen::class.java.name))
+        intended(hasComponent(GamescreenActivity::class.java.name))
         intended(hasExtra("Number of players", "One"))
     }
 
@@ -91,7 +91,7 @@ class GameSetupScreenTest {
         onView(withId(R.id.nb_player_spinner)).perform(click())
         onData(Matchers.anything()).atPosition(1).perform(click())
         onView(withId(R.id.nb_players_selected)).perform(click())
-        intended(hasComponent(WelcomeScreen::class.java.name))
+        intended(hasComponent(GamescreenActivity::class.java.name))
         intended(hasExtra("Number of players", "Two"))
     }
 
@@ -100,7 +100,7 @@ class GameSetupScreenTest {
         onView(withId(R.id.nb_player_spinner)).perform(click())
         onData(Matchers.anything()).atPosition(2).perform(click())
         onView(withId(R.id.nb_players_selected)).perform(click())
-        intended(hasComponent(WelcomeScreen::class.java.name))
+        intended(hasComponent(GamescreenActivity::class.java.name))
         intended(hasExtra("Number of players", "Three"))
     }
 
@@ -109,7 +109,7 @@ class GameSetupScreenTest {
         onView(withId(R.id.nb_player_spinner)).perform(click())
         onData(Matchers.anything()).atPosition(3).perform(click())
         onView(withId(R.id.nb_players_selected)).perform(click())
-        intended(hasComponent(WelcomeScreen::class.java.name))
+        intended(hasComponent(GamescreenActivity::class.java.name))
         intended(hasExtra("Number of players", "Four"))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/GameSetupScreen.kt b/app/src/main/java/ch/sdp/vibester/GameSetupScreen.kt
index f59be4536..40af5f351 100644
--- a/app/src/main/java/ch/sdp/vibester/GameSetupScreen.kt
+++ b/app/src/main/java/ch/sdp/vibester/GameSetupScreen.kt
@@ -34,7 +34,7 @@ class GameSetupScreen : AppCompatActivity(), AdapterView.OnItemSelectedListener
     override fun onNothingSelected(parent: AdapterView<*>) {text = "One"}
 
     fun proceedToGame(view: View) { //FILLER INTENT
-        val intent = Intent(this, WelcomeScreen::class.java)
+        val intent = Intent(this, GamescreenActivity::class.java)
         intent.putExtra("Number of players", text)
         startActivity(intent)
     }
diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index 79c7a545b..d5a1e6440 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -50,13 +50,6 @@ class MainActivity : AppCompatActivity() {
             startActivity(scoreboardIntent)
         }
 
-        // button to local (buzzer) game
-        val btnLocalGame = findViewById<Button>(R.id.toLocalGameButton)
-        val gamescreenIntent = Intent(this, GamescreenActivity::class.java)
-
-        btnLocalGame.setOnClickListener {
-            startActivity(gamescreenIntent)
-        }
     }
 
     fun switchToWelcome(view: View) {