From c0ecee2de190f89d41ceb88300d72d40fedc05eb Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 6 Mar 2022 11:00:55 +0100
Subject: [PATCH 01/12] WIP before adding firebase: created basic UI and
 classes

---
 .idea/deploymentTargetDropDown.xml            | 17 -----
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  3 +
 app/build.gradle                              |  5 ++
 .../java/ch/sdp/vibester/scoreboard/Helper.kt | 11 +++
 .../java/ch/sdp/vibester/scoreboard/Player.kt |  7 ++
 .../sdp/vibester/scoreboard/PlayerAdapter.kt  | 44 ++++++++++++
 .../vibester/scoreboard/ScoreBoardActivity.kt | 35 +++++++++
 .../layout/scoreboard_content_scrolling.xml   | 23 ++++++
 .../res/layout/scoreboard_item_player.xml     | 72 +++++++++++++++++++
 .../main/res/layout/scoreboard_scoreboard.xml | 34 +++++++++
 app/src/main/res/values/strings.xml           |  1 +
 gradle.properties                             |  1 +
 13 files changed, 237 insertions(+), 18 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 app/src/main/java/ch/sdp/vibester/scoreboard/Helper.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/scoreboard/Player.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/scoreboard/PlayerAdapter.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
 create mode 100644 app/src/main/res/layout/scoreboard_content_scrolling.xml
 create mode 100644 app/src/main/res/layout/scoreboard_item_player.xml
 create mode 100644 app/src/main/res/layout/scoreboard_scoreboard.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/.idea/gradle.xml b/.idea/gradle.xml
index 22d8cccb1..c70cccec8 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="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 57c4551b7..381bdc521 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,9 @@
         <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/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>
diff --git a/app/build.gradle b/app/build.gradle
index 20d848a83..57c921e02 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,6 +47,11 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
 }
 
 tasks.withType(Test) {
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/Helper.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/Helper.kt
new file mode 100644
index 000000000..401d25ac0
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/Helper.kt
@@ -0,0 +1,11 @@
+package ch.sdp.vibester.scoreboard
+
+import android.widget.ImageView
+import com.bumptech.glide.Glide
+
+/**
+ * Helper function to load image from given url
+ */
+fun ImageView.loadImg(url : String) {
+    Glide.with(context).load(url).into(this)
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/Player.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/Player.kt
new file mode 100644
index 000000000..0075d6a2b
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/Player.kt
@@ -0,0 +1,7 @@
+package ch.sdp.vibester.scoreboard
+
+data class Player (
+    val nik: Int = 0,
+    val name: String = "",
+    val photo: String = "",
+    val score: Int = 0)
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/PlayerAdapter.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/PlayerAdapter.kt
new file mode 100644
index 000000000..aa9fadd7d
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/PlayerAdapter.kt
@@ -0,0 +1,44 @@
+package ch.sdp.vibester.scoreboard
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import ch.sdp.vibester.R
+
+class PlayerAdapter : RecyclerView.Adapter<PlayerAdapter.PlayerViewHolder>() {
+
+    private var players: MutableList<Player> = mutableListOf()
+
+    override fun getItemCount(): Int = players.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PlayerViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.scoreboard_item_player, parent, false)
+        return PlayerViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: PlayerViewHolder, position: Int) {
+        holder.bind(players[position], position)
+    }
+
+    fun addPlayers(players: List<Player>) {
+        this.players.apply {
+            clear()
+            addAll(players)
+        }
+        notifyDataSetChanged()
+    }
+
+    inner class PlayerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        fun bind(player: Player, position: Int) {
+            val newPosition = position + 1
+            itemView.findViewById<TextView>(R.id.tv_position).text = (newPosition).toString()
+            itemView.findViewById<TextView>(R.id.tv_name).text = player.name
+            itemView.findViewById<TextView>(R.id.tv_score).text = player.score.toString()
+            itemView.findViewById<ImageView>(R.id.iv_photo).loadImg(player.photo)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
new file mode 100644
index 000000000..2e6b2c8d6
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
@@ -0,0 +1,35 @@
+package ch.sdp.vibester.scoreboard
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import ch.sdp.vibester.R
+
+class ScoreBoardActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.scoreboard_scoreboard)
+        setSupportActionBar(findViewById(R.id.toolbar))
+        setupRecycleView()
+        loadPlayers()
+    }
+
+    private fun setupRecycleView() {
+        findViewById<RecyclerView>(R.id.recycler_view).apply {
+            layoutManager = LinearLayoutManager(context)
+            adapter = PlayerAdapter()
+            setHasFixedSize(true)
+        }
+    }
+
+    private fun loadPlayers() {
+        //firebase
+    }
+
+    private fun showPlayersPosition(players: List<Player>) {
+        val adapter = findViewById<RecyclerView>(R.id.recycler_view).adapter as PlayerAdapter
+        adapter.addPlayers(players)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/scoreboard_content_scrolling.xml b/app/src/main/res/layout/scoreboard_content_scrolling.xml
new file mode 100644
index 000000000..bfec4231e
--- /dev/null
+++ b/app/src/main/res/layout/scoreboard_content_scrolling.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView 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"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context="">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:nestedScrollingEnabled="false"
+            android:scrollbars="none" />
+
+    </RelativeLayout>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/scoreboard_item_player.xml b/app/src/main/res/layout/scoreboard_item_player.xml
new file mode 100644
index 000000000..4fb8ed0df
--- /dev/null
+++ b/app/src/main/res/layout/scoreboard_item_player.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#26ffffff"
+    android:layout_marginBottom="8dp"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:orientation="horizontal">
+
+    <RelativeLayout
+        android:layout_width="32dp"
+        android:layout_height="match_parent"
+        android:padding="5dp"
+        android:background="#33f58220">
+        <TextView
+            android:id="@+id/tv_position"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:textSize="18sp"
+            tools:text="11"/>
+    </RelativeLayout>
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/iv_photo"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_margin="5dp"
+        android:scaleType="centerCrop" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            tools:text="awidiyadew"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:textAllCaps="true"
+            android:textSize="18sp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_score"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="30sp"
+            android:textStyle="bold"
+            android:textColor="@color/black"
+            tools:text="54" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/scoreboard_scoreboard.xml b/app/src/main/res/layout/scoreboard_scoreboard.xml
new file mode 100644
index 000000000..d63bed95f
--- /dev/null
+++ b/app/src/main/res/layout/scoreboard_scoreboard.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:layout_collapseMode="none"
+            app:popupTheme="y">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/scoreboard"
+                android:textAlignment="center"
+                android:textColor="#ffffff"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/scoreboard_content_scrolling" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ 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 11a7d24f6..c34b07ed0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,4 +4,5 @@
     <string name="default_txtview_txt">empty text view</string>
     <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>
 </resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index c43b231e7..c8ca25d57 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,3 +25,4 @@ org.gradle.daemon=true
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
+android.enableJetifier=true

From c2dde17135c001b2432809bff3c795dc86fdf490 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 6 Mar 2022 11:44:10 +0100
Subject: [PATCH 02/12] implement hard-coded version of loadPlayers

---
 .../ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
index 2e6b2c8d6..688c8c20a 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
@@ -25,7 +25,15 @@ class ScoreBoardActivity : AppCompatActivity() {
     }
 
     private fun loadPlayers() {
-        //firebase
+        //TODO: replace by firebase
+        val players: List<Player> = listOf(
+            Player(111, "Brownie","", 687 ),
+            Player(222, "pancake", "", 498),
+            Player(333, "cookie", "", 593),
+            Player(444, "Scone", "", 659),
+            Player(555, "cheesecake", "", 678),
+        )
+        showPlayersPosition(players)
     }
 
     private fun showPlayersPosition(players: List<Player>) {

From 48ee4aab84e208fd3d6ce6ccc6a250028ec1c675 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 6 Mar 2022 17:46:13 +0100
Subject: [PATCH 03/12] set url for the images

---
 .../ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt   | 10 +++++-----
 app/src/main/res/layout/scoreboard_scoreboard.xml      |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
index 688c8c20a..805b79e64 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
@@ -27,11 +27,11 @@ class ScoreBoardActivity : AppCompatActivity() {
     private fun loadPlayers() {
         //TODO: replace by firebase
         val players: List<Player> = listOf(
-            Player(111, "Brownie","", 687 ),
-            Player(222, "pancake", "", 498),
-            Player(333, "cookie", "", 593),
-            Player(444, "Scone", "", 659),
-            Player(555, "cheesecake", "", 678),
+            Player(111, "Brownie","https://images.app.goo.gl/QJFUc8JwEs5aNHVJA", 687 ),
+            Player(222, "pancake", "https://images.app.goo.gl/3BAnNtTn6isYGgQX9", 498),
+            Player(333, "cookie", "https://images.app.goo.gl/49955BeModw7Q1Ls5", 593),
+            Player(444, "Scone", "https://images.app.goo.gl/WiSfZupnUQrMZZfs9", 659),
+            Player(555, "cheesecake", "https://images.app.goo.gl/STS3nKqSLdxogekF7", 678),
         )
         showPlayersPosition(players)
     }
diff --git a/app/src/main/res/layout/scoreboard_scoreboard.xml b/app/src/main/res/layout/scoreboard_scoreboard.xml
index d63bed95f..d181c77fb 100644
--- a/app/src/main/res/layout/scoreboard_scoreboard.xml
+++ b/app/src/main/res/layout/scoreboard_scoreboard.xml
@@ -13,8 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:layout_collapseMode="none"
-            app:popupTheme="y">
+            app:layout_collapseMode="none">
 
             <TextView
                 android:layout_width="match_parent"

From be2ba62c9da503db9a6e7cd9d65f0b45abea37ae Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Mon, 7 Mar 2022 20:38:46 +0100
Subject: [PATCH 04/12] redefined style and colors

---
 app/src/main/AndroidManifest.xml              |  9 +++------
 .../vibester/scoreboard/ScoreBoardActivity.kt |  8 ++++----
 .../res/layout/scoreboard_item_player.xml     |  6 +++---
 .../main/res/layout/scoreboard_scoreboard.xml |  3 ++-
 app/src/main/res/values/colors.xml            |  5 +++++
 app/src/main/res/values/scoreboard_styles.xml | 20 +++++++++++++++++++
 6 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/values/scoreboard_styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c98527a60..788d5c1bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,12 +8,9 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.MyApplication">
-        <activity
-            android:name="ch.sdp.vibester.GreetingActivity"
-            android:exported="false" />
-        <activity
-            android:name="ch.sdp.vibester.MainActivity"
+        android:theme="@style/AppTheme">
+        <activity android:name="ch.sdp.vibester.scoreboard.ScoreBoardActivity"
+            android:theme="@style/AppTheme.NoActionBar"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
index 805b79e64..3e47ed4a1 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
@@ -25,13 +25,13 @@ class ScoreBoardActivity : AppCompatActivity() {
     }
 
     private fun loadPlayers() {
-        //TODO: replace by firebase
+        //TODO: replace hard-coded players by firebase query
         val players: List<Player> = listOf(
             Player(111, "Brownie","https://images.app.goo.gl/QJFUc8JwEs5aNHVJA", 687 ),
-            Player(222, "pancake", "https://images.app.goo.gl/3BAnNtTn6isYGgQX9", 498),
-            Player(333, "cookie", "https://images.app.goo.gl/49955BeModw7Q1Ls5", 593),
-            Player(444, "Scone", "https://images.app.goo.gl/WiSfZupnUQrMZZfs9", 659),
             Player(555, "cheesecake", "https://images.app.goo.gl/STS3nKqSLdxogekF7", 678),
+            Player(444, "Scone", "https://images.app.goo.gl/WiSfZupnUQrMZZfs9", 659),
+            Player(333, "cookie", "https://images.app.goo.gl/49955BeModw7Q1Ls5", 593),
+            Player(222, "pancake", "https://images.app.goo.gl/3BAnNtTn6isYGgQX9", 498),
         )
         showPlayersPosition(players)
     }
diff --git a/app/src/main/res/layout/scoreboard_item_player.xml b/app/src/main/res/layout/scoreboard_item_player.xml
index 4fb8ed0df..cafe7a7eb 100644
--- a/app/src/main/res/layout/scoreboard_item_player.xml
+++ b/app/src/main/res/layout/scoreboard_item_player.xml
@@ -19,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:textColor="@color/black"
+            android:textColor="@color/colorText"
             android:textStyle="bold"
             android:textSize="18sp"
             tools:text="11"/>
@@ -46,7 +46,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             tools:text="awidiyadew"
-            android:textColor="@color/black"
+            android:textColor="@color/colorText"
             android:textStyle="bold"
             android:textAllCaps="true"
             android:textSize="18sp" />
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             android:textSize="30sp"
             android:textStyle="bold"
-            android:textColor="@color/black"
+            android:textColor="@color/colorBtpn"
             tools:text="54" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/scoreboard_scoreboard.xml b/app/src/main/res/layout/scoreboard_scoreboard.xml
index d181c77fb..d4b40ed24 100644
--- a/app/src/main/res/layout/scoreboard_scoreboard.xml
+++ b/app/src/main/res/layout/scoreboard_scoreboard.xml
@@ -13,7 +13,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:layout_collapseMode="none">
+            app:layout_collapseMode="none"
+            app:popupTheme="@style/AppTheme.PopupOverlay">
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127d3..553d12bb0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,9 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="colorPrimary">#f58220</color>
+    <color name="colorPrimaryDark">#b66119</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="colorText">#FF000000</color>
+    <color name="colorBtpn">#f58220</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/scoreboard_styles.xml b/app/src/main/res/values/scoreboard_styles.xml
new file mode 100644
index 000000000..497a8c7f9
--- /dev/null
+++ b/app/src/main/res/values/scoreboard_styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+</resources>
\ No newline at end of file

From 676852a6a5321e64b3a84f29ed83c06ee03c10df Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Mon, 7 Mar 2022 21:47:42 +0100
Subject: [PATCH 05/12] reset Glide and extend players in ScoreBoardActivity.kt

---
 app/build.gradle                                 |  7 +++++--
 app/src/main/AndroidManifest.xml                 |  2 ++
 .../main/java/ch/sdp/vibester/AppGlideModule.kt  | 16 ++++++++++++++++
 .../java/ch/sdp/vibester/scoreboard/Helper.kt    |  6 +++---
 .../vibester/scoreboard/ScoreBoardActivity.kt    | 13 ++++++++++---
 5 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/AppGlideModule.kt

diff --git a/app/build.gradle b/app/build.gradle
index 57c921e02..0bc2adb0b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'jacoco'
+    id 'kotlin-kapt'
 }
 
 android {
@@ -50,8 +51,10 @@ dependencies {
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    implementation ('com.github.bumptech.glide:glide:4.13.0', {
+        exclude group: 'com.android.support'
+    })
+    kapt 'com.github.bumptech.glide:compiler:4.13.0'
 }
 
 tasks.withType(Test) {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 788d5c1bb..5959bae6f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ch.sdp.vibester">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/ch/sdp/vibester/AppGlideModule.kt b/app/src/main/java/ch/sdp/vibester/AppGlideModule.kt
new file mode 100644
index 000000000..1faada6f0
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/AppGlideModule.kt
@@ -0,0 +1,16 @@
+package ch.sdp.vibester
+import android.content.Context
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.module.AppGlideModule
+import com.bumptech.glide.request.RequestOptions
+
+@GlideModule
+class AppGlideModule : AppGlideModule() {
+    override fun applyOptions(context: Context, builder: GlideBuilder) {
+        super.applyOptions(context, builder)
+        builder.apply { RequestOptions().diskCacheStrategy(DiskCacheStrategy.ALL) }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/Helper.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/Helper.kt
index 401d25ac0..58958da1f 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/Helper.kt
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/Helper.kt
@@ -1,11 +1,11 @@
 package ch.sdp.vibester.scoreboard
 
 import android.widget.ImageView
-import com.bumptech.glide.Glide
+import ch.sdp.vibester.GlideApp
 
 /**
  * Helper function to load image from given url
  */
-fun ImageView.loadImg(url : String) {
-    Glide.with(context).load(url).into(this)
+fun ImageView.loadImg(url: String) {
+    GlideApp.with(context).load(url).into(this)
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
index 3e47ed4a1..b5aa8bfcd 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
@@ -28,10 +28,17 @@ class ScoreBoardActivity : AppCompatActivity() {
         //TODO: replace hard-coded players by firebase query
         val players: List<Player> = listOf(
             Player(111, "Brownie","https://images.app.goo.gl/QJFUc8JwEs5aNHVJA", 687 ),
-            Player(555, "cheesecake", "https://images.app.goo.gl/STS3nKqSLdxogekF7", 678),
+            Player(555, "Cheesecake", "https://images.app.goo.gl/STS3nKqSLdxogekF7", 678),
             Player(444, "Scone", "https://images.app.goo.gl/WiSfZupnUQrMZZfs9", 659),
-            Player(333, "cookie", "https://images.app.goo.gl/49955BeModw7Q1Ls5", 593),
-            Player(222, "pancake", "https://images.app.goo.gl/3BAnNtTn6isYGgQX9", 498),
+            Player(333, "Cookie", "https://images.app.goo.gl/49955BeModw7Q1Ls5", 593),
+            Player(981, "Cinnamon Roll", "https://images.app.goo.gl/o8oYg2jAjQc757nn6", 568),
+            Player(267, "Fruits Tart", "https://images.app.goo.gl/uMstJPy6SrbpZC3v6", 523),
+            Player(222, "Pancake", "https://images.app.goo.gl/3BAnNtTn6isYGgQX9", 498),
+            Player(143, "Ice Cream", "https://images.app.goo.gl/f2iKsWuhQYaB9GB58", 450),
+            Player(528, "Waffle", "https://images.app.goo.gl/jsjRdqah1RfMtfXM8", 439),
+            Player(628, "Macaron", "https://images.app.goo.gl/J6bm9BqNTiKPwDju9", 412),
+            Player(729, "Croissant", "https://images.app.goo.gl/WVAL5WaWRUW2gFys8", 385),
+            Player(963, "Pudding", "https://images.app.goo.gl/UpXEDTFLbcTL5mTJ8", 127),
         )
         showPlayersPosition(players)
     }

From f1bfc8cb10fc880b88bb21f10d6b701efcdb48f1 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Mon, 7 Mar 2022 22:22:59 +0100
Subject: [PATCH 06/12] update players list

---
 .../java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
index b5aa8bfcd..ea376fb5f 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
@@ -27,9 +27,9 @@ class ScoreBoardActivity : AppCompatActivity() {
     private fun loadPlayers() {
         //TODO: replace hard-coded players by firebase query
         val players: List<Player> = listOf(
-            Player(111, "Brownie","https://images.app.goo.gl/QJFUc8JwEs5aNHVJA", 687 ),
-            Player(555, "Cheesecake", "https://images.app.goo.gl/STS3nKqSLdxogekF7", 678),
-            Player(444, "Scone", "https://images.app.goo.gl/WiSfZupnUQrMZZfs9", 659),
+            Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 ),
+            Player(555, "Cheesecake", "https://images.app.goo.gl/REJnoWR2t3mi2kYJA", 678),
+            Player(444, "Scone", "https://images.app.goo.gl/YkBi16zwyjB7ejj96", 659),
             Player(333, "Cookie", "https://images.app.goo.gl/49955BeModw7Q1Ls5", 593),
             Player(981, "Cinnamon Roll", "https://images.app.goo.gl/o8oYg2jAjQc757nn6", 568),
             Player(267, "Fruits Tart", "https://images.app.goo.gl/uMstJPy6SrbpZC3v6", 523),

From 6edbf8e0b68d52957568d1cec938c1ce40fe8c78 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 8 Mar 2022 19:52:31 +0100
Subject: [PATCH 07/12] WIP test test using Robelectric and Mockito

---
 app/build.gradle                              | 12 +++++
 .../ch/sdp/vibester/ScoreBoardActivityTest.kt | 47 +++++++++++++++++++
 .../java/ch/sdp/vibester/PlayerAdapterTest.kt | 44 +++++++++++++++++
 gradlew                                       |  0
 4 files changed, 103 insertions(+)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/ScoreBoardActivityTest.kt
 create mode 100644 app/src/test/java/ch/sdp/vibester/PlayerAdapterTest.kt
 mode change 100644 => 100755 gradlew

diff --git a/app/build.gradle b/app/build.gradle
index 6f80f7fa0..2b00a3775 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,6 +34,12 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
@@ -45,12 +51,17 @@ dependencies {
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.6'
+    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
     implementation platform('com.google.firebase:firebase-bom:29.1.0')
+    implementation 'com.google.dagger:dagger:2.28.3'
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -59,6 +70,7 @@ dependencies {
         exclude group: 'com.android.support'
     })
     kapt 'com.github.bumptech.glide:compiler:4.13.0'
+    kapt 'com.google.dagger:dagger-compiler:2.28.3'
 }
 
 tasks.withType(Test) {
diff --git a/app/src/androidTest/java/ch/sdp/vibester/ScoreBoardActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/ScoreBoardActivityTest.kt
new file mode 100644
index 000000000..7ccbcba50
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/ScoreBoardActivityTest.kt
@@ -0,0 +1,47 @@
+package ch.sdp.vibester
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import ch.sdp.vibester.scoreboard.ScoreBoardActivity
+
+@RunWith(AndroidJUnit4::class)
+class ScoreBoardActivityTest {
+
+    @Rule
+    @JvmField
+    val activityRule = ActivityScenarioRule(ScoreBoardActivity::class.java)
+
+    @Before
+    fun setUp() {
+    }
+
+    @Test
+    fun recycleViewToViewTest() {
+        onView(withId(R.id.recycler_view)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun recycleViewClickTest() {
+        onView((withId(R.id.recycler_view)))
+            .perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(2, click()))
+    }
+
+    @After
+    fun tearDown() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/ch/sdp/vibester/PlayerAdapterTest.kt b/app/src/test/java/ch/sdp/vibester/PlayerAdapterTest.kt
new file mode 100644
index 000000000..7f972cebf
--- /dev/null
+++ b/app/src/test/java/ch/sdp/vibester/PlayerAdapterTest.kt
@@ -0,0 +1,44 @@
+package ch.sdp.vibester
+
+import android.content.Context
+import android.view.View
+import androidx.test.core.app.ApplicationProvider
+import ch.sdp.vibester.scoreboard.Player
+import ch.sdp.vibester.scoreboard.PlayerAdapter
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+
+@RunWith(RobolectricTestRunner::class)
+@Config(maxSdk = 31)
+class PlayerAdapterTest {
+    private lateinit var adapter: PlayerAdapter
+    private lateinit var holder: PlayerAdapter.PlayerViewHolder
+    private lateinit var mockView: View
+
+    @Rule //initMocks
+    @JvmField
+    val rule: MockitoRule = MockitoJUnit.rule()
+
+    @Before
+    fun setUp() {
+        ApplicationProvider.getApplicationContext<Context>()
+        adapter = PlayerAdapter()
+        mockView = mock(View::class.java)
+    }
+
+    @Test
+    fun getItemCountTest() {
+        val player = Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 )
+        adapter.addPlayers(listOf(player))
+        assertEquals(1, adapter.itemCount)
+    }
+}
\ No newline at end of file
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From 6b3acf35e4387fe14ad1663dc52a85b3175670d2 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 8 Mar 2022 21:16:36 +0100
Subject: [PATCH 08/12] Test PlayerAdapter.kt refactor ScoreBoardActivity.kt

---
 app/build.gradle                              |  2 +-
 .../java/ch/sdp/vibester/PlayerAdapterTest.kt | 65 +++++++++++++++++++
 .../sdp/vibester/scoreboard/PlayerAdapter.kt  |  4 +-
 .../vibester/scoreboard/ScoreBoardActivity.kt | 31 ++++-----
 .../layout/scoreboard_content_scrolling.xml   |  1 +
 .../java/ch/sdp/vibester/PlayerAdapterTest.kt | 44 -------------
 6 files changed, 85 insertions(+), 62 deletions(-)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/PlayerAdapterTest.kt
 delete mode 100644 app/src/test/java/ch/sdp/vibester/PlayerAdapterTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index 2b00a3775..bc93ccf3e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
     androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
     implementation platform('com.google.firebase:firebase-bom:29.1.0')
-    implementation 'com.google.dagger:dagger:2.28.3'
+    implementation 'com.google.dagger:dagger:2.38.1'
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
diff --git a/app/src/androidTest/java/ch/sdp/vibester/PlayerAdapterTest.kt b/app/src/androidTest/java/ch/sdp/vibester/PlayerAdapterTest.kt
new file mode 100644
index 000000000..733d17212
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/PlayerAdapterTest.kt
@@ -0,0 +1,65 @@
+package ch.sdp.vibester
+
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ApplicationProvider
+import ch.sdp.vibester.scoreboard.Player
+import ch.sdp.vibester.scoreboard.PlayerAdapter
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Test
+
+
+class PlayerAdapterTest {
+    @Test
+    fun recyclerViewShowsCorrectCount() {
+        val player1 = Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 )
+        val player2 = Player(555, "Cheesecake", "https://images.app.goo.gl/REJnoWR2t3mi2kYJA", 678)
+        val players: MutableList<Player> = arrayListOf()
+        players.addAll(listOf(player1, player2))
+        val playerViewHolder: RecyclerView.Adapter<PlayerAdapter.PlayerViewHolder> = PlayerAdapter(players)
+        assertThat(playerViewHolder.itemCount, equalTo(2))
+    }
+
+    @Test
+    fun itemTypeIsCorrect() {
+        val player1 = Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 )
+        val player2 = Player(555, "Cheesecake", "https://images.app.goo.gl/REJnoWR2t3mi2kYJA", 678)
+        val players: MutableList<Player> = arrayListOf()
+        players.addAll(listOf(player1, player2))
+        val playerViewHolder: RecyclerView.Adapter<PlayerAdapter.PlayerViewHolder> = PlayerAdapter(players)
+        val defaultType = 0
+        assertThat(playerViewHolder.getItemViewType(0), equalTo(defaultType))
+    }
+
+    @Test
+    fun setupAdapterForRecyclerView() {
+        val player1 = Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 )
+        val player2 = Player(555, "Cheesecake", "https://images.app.goo.gl/REJnoWR2t3mi2kYJA", 678)
+        val players: MutableList<Player> = arrayListOf()
+        players.addAll(listOf(player1, player2))
+        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
+        recyclerView.layoutManager = LinearLayoutManager(ApplicationProvider.getApplicationContext())
+        val playerAdapter = PlayerAdapter(players)
+        recyclerView.adapter = playerAdapter
+        val newPlayers: MutableList<Player> = arrayListOf()
+        newPlayers.add(Player(444, "Scone", "https://images.app.goo.gl/YkBi16zwyjB7ejj96", 659))
+        playerAdapter.addPlayers(newPlayers)
+        playerAdapter.notifyDataSetChanged()
+    }
+
+    @Test
+    fun addPlayersWorks() {
+        val player1 = Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 )
+        val player2 = Player(555, "Cheesecake", "https://images.app.goo.gl/REJnoWR2t3mi2kYJA", 678)
+        val players: MutableList<Player> = arrayListOf()
+        players.addAll(listOf(player1, player2))
+        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
+        recyclerView.layoutManager = LinearLayoutManager(ApplicationProvider.getApplicationContext())
+        val playerAdapter = PlayerAdapter(players)
+        val player3 = Player(444, "Scone", "https://images.app.goo.gl/YkBi16zwyjB7ejj96", 659)
+        val updatedList = arrayListOf(player3)
+        playerAdapter.addPlayers(updatedList)
+        assertThat(playerAdapter.players == updatedList, equalTo(true))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/PlayerAdapter.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/PlayerAdapter.kt
index aa9fadd7d..b6bd6f190 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/PlayerAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/PlayerAdapter.kt
@@ -8,9 +8,9 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 
-class PlayerAdapter : RecyclerView.Adapter<PlayerAdapter.PlayerViewHolder>() {
+class PlayerAdapter(playersInit: List<Player>) : RecyclerView.Adapter<PlayerAdapter.PlayerViewHolder>() {
 
-    private var players: MutableList<Player> = mutableListOf()
+    var players: MutableList<Player> = playersInit.toMutableList()
 
     override fun getItemCount(): Int = players.size
 
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
index ea376fb5f..7b2ce9e09 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
@@ -16,30 +16,31 @@ class ScoreBoardActivity : AppCompatActivity() {
         loadPlayers()
     }
 
+    private val players: List<Player> = listOf(
+        Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 ),
+        Player(555, "Cheesecake", "https://images.app.goo.gl/REJnoWR2t3mi2kYJA", 678),
+        Player(444, "Scone", "https://images.app.goo.gl/YkBi16zwyjB7ejj96", 659),
+        Player(333, "Cookie", "https://images.app.goo.gl/49955BeModw7Q1Ls5", 593),
+        Player(981, "Cinnamon Roll", "https://images.app.goo.gl/o8oYg2jAjQc757nn6", 568),
+        Player(267, "Fruits Tart", "https://images.app.goo.gl/uMstJPy6SrbpZC3v6", 523),
+        Player(222, "Pancake", "https://images.app.goo.gl/3BAnNtTn6isYGgQX9", 498),
+        Player(143, "Ice Cream", "https://images.app.goo.gl/f2iKsWuhQYaB9GB58", 450),
+        Player(528, "Waffle", "https://images.app.goo.gl/jsjRdqah1RfMtfXM8", 439),
+        Player(628, "Macaron", "https://images.app.goo.gl/J6bm9BqNTiKPwDju9", 412),
+        Player(729, "Croissant", "https://images.app.goo.gl/WVAL5WaWRUW2gFys8", 385),
+        Player(963, "Pudding", "https://images.app.goo.gl/UpXEDTFLbcTL5mTJ8", 127),
+    )
+
     private fun setupRecycleView() {
         findViewById<RecyclerView>(R.id.recycler_view).apply {
             layoutManager = LinearLayoutManager(context)
-            adapter = PlayerAdapter()
+            adapter = PlayerAdapter(players)
             setHasFixedSize(true)
         }
     }
 
     private fun loadPlayers() {
         //TODO: replace hard-coded players by firebase query
-        val players: List<Player> = listOf(
-            Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 ),
-            Player(555, "Cheesecake", "https://images.app.goo.gl/REJnoWR2t3mi2kYJA", 678),
-            Player(444, "Scone", "https://images.app.goo.gl/YkBi16zwyjB7ejj96", 659),
-            Player(333, "Cookie", "https://images.app.goo.gl/49955BeModw7Q1Ls5", 593),
-            Player(981, "Cinnamon Roll", "https://images.app.goo.gl/o8oYg2jAjQc757nn6", 568),
-            Player(267, "Fruits Tart", "https://images.app.goo.gl/uMstJPy6SrbpZC3v6", 523),
-            Player(222, "Pancake", "https://images.app.goo.gl/3BAnNtTn6isYGgQX9", 498),
-            Player(143, "Ice Cream", "https://images.app.goo.gl/f2iKsWuhQYaB9GB58", 450),
-            Player(528, "Waffle", "https://images.app.goo.gl/jsjRdqah1RfMtfXM8", 439),
-            Player(628, "Macaron", "https://images.app.goo.gl/J6bm9BqNTiKPwDju9", 412),
-            Player(729, "Croissant", "https://images.app.goo.gl/WVAL5WaWRUW2gFys8", 385),
-            Player(963, "Pudding", "https://images.app.goo.gl/UpXEDTFLbcTL5mTJ8", 127),
-        )
         showPlayersPosition(players)
     }
 
diff --git a/app/src/main/res/layout/scoreboard_content_scrolling.xml b/app/src/main/res/layout/scoreboard_content_scrolling.xml
index bfec4231e..d5bb5074f 100644
--- a/app/src/main/res/layout/scoreboard_content_scrolling.xml
+++ b/app/src/main/res/layout/scoreboard_content_scrolling.xml
@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:nestedScrollingEnabled="false"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             android:scrollbars="none" />
 
     </RelativeLayout>
diff --git a/app/src/test/java/ch/sdp/vibester/PlayerAdapterTest.kt b/app/src/test/java/ch/sdp/vibester/PlayerAdapterTest.kt
deleted file mode 100644
index 7f972cebf..000000000
--- a/app/src/test/java/ch/sdp/vibester/PlayerAdapterTest.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package ch.sdp.vibester
-
-import android.content.Context
-import android.view.View
-import androidx.test.core.app.ApplicationProvider
-import ch.sdp.vibester.scoreboard.Player
-import ch.sdp.vibester.scoreboard.PlayerAdapter
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mockito.mock
-import org.mockito.junit.MockitoJUnit
-import org.mockito.junit.MockitoRule
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-
-
-@RunWith(RobolectricTestRunner::class)
-@Config(maxSdk = 31)
-class PlayerAdapterTest {
-    private lateinit var adapter: PlayerAdapter
-    private lateinit var holder: PlayerAdapter.PlayerViewHolder
-    private lateinit var mockView: View
-
-    @Rule //initMocks
-    @JvmField
-    val rule: MockitoRule = MockitoJUnit.rule()
-
-    @Before
-    fun setUp() {
-        ApplicationProvider.getApplicationContext<Context>()
-        adapter = PlayerAdapter()
-        mockView = mock(View::class.java)
-    }
-
-    @Test
-    fun getItemCountTest() {
-        val player = Player(111, "Brownie","https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", 687 )
-        adapter.addPlayers(listOf(player))
-        assertEquals(1, adapter.itemCount)
-    }
-}
\ No newline at end of file

From a1e3bcda0165993f6ef58cd1295b8b128e39e1d5 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 8 Mar 2022 21:47:14 +0100
Subject: [PATCH 09/12] add tests for ScoreBoardActivity refactor
 PlayerAdapterTest.kt and ScoreBoardActivityTest.kt

---
 .../{ => scoreboard}/PlayerAdapterTest.kt     |  2 +-
 .../ScoreBoardActivityTest.kt                 | 31 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)
 rename app/src/androidTest/java/ch/sdp/vibester/{ => scoreboard}/PlayerAdapterTest.kt (98%)
 rename app/src/androidTest/java/ch/sdp/vibester/{ => scoreboard}/ScoreBoardActivityTest.kt (54%)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/PlayerAdapterTest.kt b/app/src/androidTest/java/ch/sdp/vibester/scoreboard/PlayerAdapterTest.kt
similarity index 98%
rename from app/src/androidTest/java/ch/sdp/vibester/PlayerAdapterTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/scoreboard/PlayerAdapterTest.kt
index 733d17212..d34ecc794 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/PlayerAdapterTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/scoreboard/PlayerAdapterTest.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.scoreboard
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/androidTest/java/ch/sdp/vibester/ScoreBoardActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/scoreboard/ScoreBoardActivityTest.kt
similarity index 54%
rename from app/src/androidTest/java/ch/sdp/vibester/ScoreBoardActivityTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/scoreboard/ScoreBoardActivityTest.kt
index 7ccbcba50..dad1f3d95 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/ScoreBoardActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/scoreboard/ScoreBoardActivityTest.kt
@@ -1,22 +1,18 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.scoreboard
 
 import androidx.recyclerview.widget.RecyclerView
-import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import ch.sdp.vibester.scoreboard.ScoreBoardActivity
+import ch.sdp.vibester.R
 
 @RunWith(AndroidJUnit4::class)
 class ScoreBoardActivityTest {
@@ -25,10 +21,6 @@ class ScoreBoardActivityTest {
     @JvmField
     val activityRule = ActivityScenarioRule(ScoreBoardActivity::class.java)
 
-    @Before
-    fun setUp() {
-    }
-
     @Test
     fun recycleViewToViewTest() {
         onView(withId(R.id.recycler_view)).check(matches(isDisplayed()))
@@ -40,8 +32,19 @@ class ScoreBoardActivityTest {
             .perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(2, click()))
     }
 
-    @After
-    fun tearDown() {
+    @Test
+    fun recycleViewScrollDownTest() {
+        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
+        val itemCount = recyclerView.adapter?.itemCount
+        if(itemCount != null) {
+            onView(withId(R.id.recycler_view)).perform(RecyclerViewActions.scrollToPosition<RecyclerView.ViewHolder>(itemCount.minus(1)))
+        }
+    }
 
+    @Test
+    fun recycleViewShowItemTest() {
+        onView(withId(R.id.recycler_view)).perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(5, click()))
+        val nameItem = "Cinnamon Roll"
+        onView(withText(nameItem)).check(matches(isDisplayed()))
     }
 }
\ No newline at end of file

From 19440c646cb810683d1a3cbf985a4a09e87545a2 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Wed, 9 Mar 2022 13:33:28 +0100
Subject: [PATCH 10/12] change AndroidManifest.xml back

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5959bae6f..c62733dcf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,9 +10,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name="ch.sdp.vibester.scoreboard.ScoreBoardActivity"
-            android:theme="@style/AppTheme.NoActionBar"
+        android:theme="@style/Theme.MyApplication">
+        <activity
+            android:name="ch.sdp.vibester.GreetingActivity"
+            android:exported="false" />
+        <activity
+            android:name="ch.sdp.vibester.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

From a145ce2652ff53f019b4e6ab174998a8818e252e Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Wed, 9 Mar 2022 15:36:31 +0100
Subject: [PATCH 11/12] add scoreboard to MainActivity

---
 .idea/misc.xml                                    |  1 +
 app/src/main/AndroidManifest.xml                  |  2 ++
 app/src/main/java/ch/sdp/vibester/MainActivity.kt | 11 ++++++++---
 app/src/main/res/layout/activity_main.xml         | 12 ++++++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 381bdc521..746f31250 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,7 @@
         <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" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c62733dcf..2b510bf04 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,8 @@
         <activity
             android:name="ch.sdp.vibester.GreetingActivity"
             android:exported="false" />
+        <activity android:name=".scoreboard.ScoreBoardActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name="ch.sdp.vibester.MainActivity"
             android:exported="true">
diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index e28027588..f97703275 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
+import ch.sdp.vibester.scoreboard.ScoreBoardActivity
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -16,12 +17,16 @@ class MainActivity : AppCompatActivity() {
         val btnGreeting = findViewById<Button>(R.id.mainButton)
         val greetingIntent = Intent(this, GreetingActivity::class.java)
 
-
-
-
         btnGreeting.setOnClickListener {
             greetingIntent.putExtra("name", txtInput.text.toString())
             startActivity(greetingIntent)
         }
+
+        val btnScoreboard = findViewById<Button>(R.id.scoreboardButton)
+        val scoreboardIntent = Intent(this, ScoreBoardActivity::class.java)
+
+        btnScoreboard.setOnClickListener {
+            startActivity(scoreboardIntent)
+        }
     }
 }
\ 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..6af4dfeb1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,4 +38,16 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/scoreboardButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/scoreboard"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.653" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 2049cd0acc34116ed788d6cff157346a94fe3560 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Wed, 9 Mar 2022 15:47:26 +0100
Subject: [PATCH 12/12] test to scoreboard button

---
 .../java/ch/sdp/vibester/MainActivityTest.kt  | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
index a0debcb70..13236e1c1 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
@@ -5,11 +5,13 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intended
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
-import androidx.test.espresso.intent.matcher.IntentMatchers.toPackage
+import androidx.test.espresso.intent.matcher.IntentMatchers.*
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import ch.sdp.vibester.scoreboard.ScoreBoardActivity
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -22,15 +24,29 @@ class MainActivityTest {
         MainActivity::class.java
     )
 
+    @Before
+    fun setUp() {
+        Intents.init()
+    }
+
+    @After
+    fun clean() {
+        Intents.release()
+    }
+
     @Test
     fun mainTest(){
         val inputName = "SDPUser"
-        Intents.init()
         onView(withId(R.id.mainNameInput)).perform(typeText(inputName))
         onView(withId(R.id.mainButton)).perform(click())
         intended(toPackage("ch.sdp.vibester"))
         intended(hasExtra("name", inputName))
-        Intents.release()
+    }
+
+    @Test
+    fun scoreboardTest() {
+        onView(withId(R.id.scoreboardButton)).perform(click())
+        intended(hasComponent(ScoreBoardActivity::class.qualifiedName))
     }