From 00533367cd2774625f2a9d57681f7d4072dc271e Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 09:36:11 +0200
Subject: [PATCH 01/26] extract setUpRecycleView in SearchUserActivity.kt

---
 .../vibester/activity/SearchUserActivity.kt    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
index 6ff7700bd..91625bb41 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -42,7 +42,6 @@ class SearchUserActivity : AppCompatActivity(), OnItemClickListener {
     var users = arrayListOf<User>()
     lateinit var userProfileAdapter: UserProfileAdapter
 
-    private var recyclerView: RecyclerView? = null
     private var searchEditText: EditText? = null
 
     private var uidList: ArrayList<String> = ArrayList()
@@ -54,13 +53,7 @@ class SearchUserActivity : AppCompatActivity(), OnItemClickListener {
         supportActionBar?.hide()
         setContentView(R.layout.activity_search_user)
 
-        recyclerView = findViewById(R.id.searchList)
-        recyclerView!!.setHasFixedSize(true)
-        recyclerView!!.layoutManager = LinearLayoutManager(this)
-
-        userProfileAdapter = UserProfileAdapter(this.users, authenticator, usersRepo, imageGetter, this)
-
-        recyclerView!!.adapter = userProfileAdapter
+        setUpRecycleView()
 
         searchEditText = findViewById(R.id.searchUserET)
         searchForUsers("")
@@ -87,6 +80,15 @@ class SearchUserActivity : AppCompatActivity(), OnItemClickListener {
         })
     }
 
+    private fun setUpRecycleView() {
+        findViewById<RecyclerView>(R.id.searchList).apply {
+            layoutManager = LinearLayoutManager(context)
+            userProfileAdapter = UserProfileAdapter(users, authenticator, usersRepo, imageGetter, this@SearchUserActivity)
+            adapter = userProfileAdapter
+            setHasFixedSize(true)
+        }
+    }
+
     /**
      * Callback to update users in adapter during search
      */

From dffb899939b316b8599ea61201fb2cd77128d63a Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 09:40:39 +0200
Subject: [PATCH 02/26] extract listener inn onCreate() in
 SearchUserActivity.kt

---
 .../java/ch/sdp/vibester/activity/SearchUserActivity.kt  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
index 91625bb41..a51db4e20 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -58,8 +58,13 @@ class SearchUserActivity : AppCompatActivity(), OnItemClickListener {
         searchEditText = findViewById(R.id.searchUserET)
         searchForUsers("")
 
-        val buttonScan: FloatingActionButton = findViewById(R.id.searchUser_scanning)
+        setScanBtnListener()
+
+        setSearchFieldListener()
+    }
 
+    private fun setScanBtnListener() {
+        val buttonScan: FloatingActionButton = findViewById(R.id.searchUser_scanning)
         val extras = intent.extras
 
         buttonScan.setOnClickListener {
@@ -70,7 +75,9 @@ class SearchUserActivity : AppCompatActivity(), OnItemClickListener {
             }
             startActivity(qrIntent)
         }
+    }
 
+    private fun setSearchFieldListener() {
         searchEditText!!.addTextChangedListener(object:TextWatcher{
             override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {}
             override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {

From b2184f3fd1d8b7601e2a892cb923100176e7c6e4 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 09:41:16 +0200
Subject: [PATCH 03/26] fix typo in SearchUserActivity.kt

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

diff --git a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
index a51db4e20..855566f15 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -113,7 +113,7 @@ class SearchUserActivity : AppCompatActivity(), OnItemClickListener {
 
     /**
      * Search for users by usernames in Firebase Realtime Database
-     * @param inputUsername search text inputed by user
+     * @param inputUsername search text inputted by user
      */
     private fun searchForUsers(inputUsername:String){
         usersRepo.searchByField("username", inputUsername, callback = ::setUserInAdapter, callbackUid = ::setUserInAdapter2)

From a2d0b5360d4271cd20148862987ed1c5054a0113 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 09:50:59 +0200
Subject: [PATCH 04/26] show following icon in profile

---
 app/src/main/res/layout/profile_following_item.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/res/layout/profile_following_item.xml b/app/src/main/res/layout/profile_following_item.xml
index e240ee1bd..ca4e28685 100644
--- a/app/src/main/res/layout/profile_following_item.xml
+++ b/app/src/main/res/layout/profile_following_item.xml
@@ -20,4 +20,16 @@
         android:text="@string/profile_username"
         android:textSize="19sp" />
 
+    <ImageView
+        android:id="@+id/profile_FollowingIcon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="49dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginEnd="25dp"
+        android:src="@drawable/green_tick">
+    </ImageView>
+
 </RelativeLayout>
\ No newline at end of file

From e93b473008a02407eb720624f8f8be3b84022d77 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 10:18:24 +0200
Subject: [PATCH 05/26] change to ADD btn when click on unfollow btn in profile

---
 .../activity/profile/ProfileActivity.kt       |  8 +++---
 .../vibester/user/ProfileFollowingAdapter.kt  | 26 ++++++++++++++++++-
 .../sdp/vibester/user/UserProfileAdapter.kt   |  2 +-
 .../res/layout/profile_following_item.xml     | 22 +++++++++++++---
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
index 5f77bb121..45cf4e0f0 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
@@ -49,7 +49,7 @@ open class ProfileActivity : AppCompatActivity(), OnItemClickListener {
     val imageRequestCode = 100
 
     private var followings: MutableList<User> ? = null
-    private var profileFriendsAdapter: ProfileFollowingAdapter?= null
+    private var profileFollowingAdapter: ProfileFollowingAdapter?= null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         requestWindowFeature(Window.FEATURE_NO_TITLE)
@@ -70,14 +70,14 @@ open class ProfileActivity : AppCompatActivity(), OnItemClickListener {
     private fun setupRecycleViewForFriends() {
         findViewById<RecyclerView>(R.id.profile_followingList).apply {
             layoutManager = LinearLayoutManager(context)
-            adapter = followings?.let { ProfileFollowingAdapter(it, this@ProfileActivity) }
+            adapter = followings?.let { ProfileFollowingAdapter(it, dataGetter, authenticator,this@ProfileActivity) }
             setHasFixedSize(true)
         }
     }
 
     private fun showFriendsPosition(friends: MutableList<User>?) {
-        profileFriendsAdapter = ProfileFollowingAdapter(friends!!, this)
-        findViewById<RecyclerView>(R.id.profile_followingList)!!.adapter = profileFriendsAdapter
+        profileFollowingAdapter = ProfileFollowingAdapter(friends!!, dataGetter, authenticator, this)
+        findViewById<RecyclerView>(R.id.profile_followingList)!!.adapter = profileFollowingAdapter
     }
 
 
diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index d5e8d8fd2..33014d081 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -2,10 +2,13 @@ package ch.sdp.vibester.user
 
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.AdapterHelper
 import ch.sdp.vibester.helper.loadImg
 
@@ -14,8 +17,11 @@ import ch.sdp.vibester.helper.loadImg
  */
 class ProfileFollowingAdapter constructor(
     private val following: MutableList<User>,
-    private val listener: OnItemClickListener?
+    val dataGetter: DataGetter,
+    authenticator: FireBaseAuthenticator,
+    private val listener: OnItemClickListener?,
 ): RecyclerView.Adapter<ProfileFollowingAdapter.ProfileFollowingViewHolder>() {
+    private val currentUser = authenticator.getCurrUser()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProfileFollowingViewHolder {
         return ProfileFollowingViewHolder(
@@ -39,6 +45,24 @@ class ProfileFollowingAdapter constructor(
         fun bind(user: User) {
             itemView.findViewById<TextView>(R.id.profile_following_username).text = user.username
             itemView.findViewById<ImageView>(R.id.profile_following_profile_image).loadImg(user.image)
+
+            unFollowBtnListener(user)
+
+        }
+
+        private fun unFollowBtnListener(user: User) {
+            itemView.findViewById<ImageView>(R.id.profile_unfollowIcon).setOnClickListener {
+                if (currentUser != null) {
+                    dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid, false)
+                    changeImageToBtn()
+                }
+            }
+
+        }
+
+        private fun changeImageToBtn() {
+            itemView.findViewById<ImageView>(R.id.profile_unfollowIcon).visibility = View.INVISIBLE
+            itemView.findViewById<Button>(R.id.profile_followingBtn).visibility = View.VISIBLE
         }
 
         init {
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index efdb5adc1..3cb4b7c4a 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -78,8 +78,8 @@ class UserProfileAdapter constructor(
          */
         fun bind(user: User) {
             itemView.findViewById<TextView>(R.id.search_user_username).text = user.username
-
             imageGetter.fetchImage("profileImg/${user.uid}", this::setImage)
+
             val addFriendBtn = itemView.findViewById<Button>(R.id.addFollowingBtn)
 
             if (userFollowing.isNotEmpty() && user.uid in userFollowing) {
diff --git a/app/src/main/res/layout/profile_following_item.xml b/app/src/main/res/layout/profile_following_item.xml
index ca4e28685..8ada13608 100644
--- a/app/src/main/res/layout/profile_following_item.xml
+++ b/app/src/main/res/layout/profile_following_item.xml
@@ -21,15 +21,29 @@
         android:textSize="19sp" />
 
     <ImageView
-        android:id="@+id/profile_FollowingIcon"
+        android:id="@+id/profile_unfollowIcon"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
         android:layout_marginStart="49dp"
-        android:layout_marginTop="0dp"
+        android:layout_marginTop="9dp"
         android:layout_marginEnd="25dp"
-        android:src="@drawable/green_tick">
-    </ImageView>
+        android:src="@drawable/green_tick"></ImageView>
+
+    <Button
+        android:id="@+id/profile_followingBtn"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="49dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginEnd="25dp"
+        android:backgroundTint="@color/cg_blue"
+        android:text="+"
+        android:visibility="invisible" />
 
 </RelativeLayout>
\ No newline at end of file

From f7a65fce18d2786d61ab54d46b48b1431212bc58 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 10:36:22 +0200
Subject: [PATCH 06/26] check isFollowing in map

---
 .../ch/sdp/vibester/activity/profile/ProfileActivity.kt   | 2 +-
 .../main/java/ch/sdp/vibester/user/UserProfileAdapter.kt  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
index 45cf4e0f0..fbfb4cda6 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
@@ -193,7 +193,7 @@ open class ProfileActivity : AppCompatActivity(), OnItemClickListener {
      *
      */
     private fun loadFollowing(followingMap: Map<String, Boolean>) {
-        followingMap.forEach { (userId, _) ->  dataGetter.getUserData(userId, this::addFollowing)}
+        followingMap.forEach { (userId, isFollowing) ->  if (isFollowing) dataGetter.getUserData(userId, this::addFollowing) }
         showFriendsPosition(followings)
     }
 
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index 3cb4b7c4a..671494b4a 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -28,16 +28,16 @@ class UserProfileAdapter constructor(
     RecyclerView.Adapter<UserProfileAdapter.UserProfileViewHolder>() {
 
     private val currentUser = authenticator.getCurrUser()
-    private var userFollowing: Array<String> = arrayOf()
+    private var userFollowing: MutableList<String> = mutableListOf()
     private val imageSize = 100
 
     init {
-        if (currentUser != null) { dataGetter.getUserData(currentUser.uid, this::setFriends) }
+        if (currentUser != null) { dataGetter.getUserData(currentUser.uid, this::setFollowing) }
     }
 
     // Callback for getUserData
-    private fun setFriends(user:User){
-        userFollowing = user.following.keys.toTypedArray()
+    private fun setFollowing(user:User) {
+        user.following.forEach { (userId, isFollowing) -> if (isFollowing) userFollowing.add(userId) }
     }
 
     /**

From 6bece81cad5d1fd664dbad6790f72303664f0e05 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 11:00:21 +0200
Subject: [PATCH 07/26] add followBtnListener in ProfileFollowingAdapter.kt

---
 .../ch/sdp/vibester/user/ProfileFollowingAdapter.kt   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index 33014d081..3218b881f 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -47,7 +47,7 @@ class ProfileFollowingAdapter constructor(
             itemView.findViewById<ImageView>(R.id.profile_following_profile_image).loadImg(user.image)
 
             unFollowBtnListener(user)
-
+            followBtnListener(user)
         }
 
         private fun unFollowBtnListener(user: User) {
@@ -65,6 +65,15 @@ class ProfileFollowingAdapter constructor(
             itemView.findViewById<Button>(R.id.profile_followingBtn).visibility = View.VISIBLE
         }
 
+        private fun followBtnListener(user: User) {
+            itemView.findViewById<Button>(R.id.profile_followingBtn).setOnClickListener {
+                if (currentUser != null) {
+                    dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid, true)
+                    AdapterHelper().changeBtnToImageHelper(R.id.profile_followingBtn, R.id.profile_unfollowIcon, itemView)
+                }
+            }
+        }
+
         init {
             itemView.setOnClickListener(this)
         }

From 6adeae2d6bcf8ca4d7f698a214dabc6f30bdca75 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 11:22:11 +0200
Subject: [PATCH 08/26] add unfollowBtnListener in UserProfileAdapter.kt

---
 .../vibester/user/ProfileFollowingAdapter.kt  |  1 -
 .../sdp/vibester/user/UserProfileAdapter.kt   | 37 ++++++++++++++-----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index 3218b881f..8a8cee1ca 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -57,7 +57,6 @@ class ProfileFollowingAdapter constructor(
                     changeImageToBtn()
                 }
             }
-
         }
 
         private fun changeImageToBtn() {
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index 671494b4a..f7c172de7 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -2,6 +2,8 @@ package ch.sdp.vibester.user
 
 import android.net.Uri
 import android.view.View
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
@@ -68,7 +70,6 @@ class UserProfileAdapter constructor(
     override fun getItemCount() = users.size
 
 
-
     /**
      * Customer ViewHolder class for UserProfile. Each item contains username and image.
      */
@@ -80,13 +81,24 @@ class UserProfileAdapter constructor(
             itemView.findViewById<TextView>(R.id.search_user_username).text = user.username
             imageGetter.fetchImage("profileImg/${user.uid}", this::setImage)
 
-            val addFriendBtn = itemView.findViewById<Button>(R.id.addFollowingBtn)
+            setFollowBtnListener(user)
+            unFollowBtnListener(user)
+        }
+
+        private fun setImage(imageURI: Uri) {
+            val avatar = itemView.findViewById<ImageView>(R.id.search_user_profile_image)
+
+            ImageHelper().setImage(imageURI, avatar, imageSize)
+        }
+
+        private fun setFollowBtnListener(user: User) {
+            val followBtn = itemView.findViewById<Button>(R.id.addFollowingBtn)
 
             if (userFollowing.isNotEmpty() && user.uid in userFollowing) {
                 changeBtnToImage()
             }
             else {
-                addFriendBtn.setOnClickListener {
+                followBtn.setOnClickListener {
                     if (currentUser != null) {
                         dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid,true)
                         changeBtnToImage()
@@ -95,15 +107,22 @@ class UserProfileAdapter constructor(
             }
         }
 
-        private fun setImage(imageURI: Uri) {
-            val avatar = itemView.findViewById<ImageView>(R.id.search_user_profile_image)
-
-            ImageHelper().setImage(imageURI, avatar, imageSize)
+        private fun changeBtnToImage() {
+            AdapterHelper().changeBtnToImageHelper(R.id.addFollowingBtn, R.id.addedFollowingIcon, itemView)
         }
 
+        private fun unFollowBtnListener(user: User) {
+            itemView.findViewById<ImageView>(R.id.addedFollowingIcon).setOnClickListener {
+                if (currentUser != null) {
+                    dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid, false)
+                    changeImageToBtn()
+                }
+            }
+        }
 
-        private fun changeBtnToImage() {
-            AdapterHelper().changeBtnToImageHelper(R.id.addFollowingBtn, R.id.addedFollowingIcon, itemView)
+        private fun changeImageToBtn() {
+            itemView.findViewById<ImageView>(R.id.addedFollowingIcon).visibility = INVISIBLE
+            itemView.findViewById<Button>(R.id.addFollowingBtn).visibility = VISIBLE
         }
 
         init {

From a90b19f12bec43410fd198902d9af0c418ec0319 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 11:25:31 +0200
Subject: [PATCH 09/26] update ProfileFollowingAdapterTest.kt add DataGetter()
 and FireBaseAuthenticator in constructor

---
 .../ch/sdp/vibester/user/ProfileFollowingAdapterTest.kt     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/user/ProfileFollowingAdapterTest.kt b/app/src/androidTest/java/ch/sdp/vibester/user/ProfileFollowingAdapterTest.kt
index e8ec411e2..1d2e3102a 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/user/ProfileFollowingAdapterTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/user/ProfileFollowingAdapterTest.kt
@@ -2,6 +2,8 @@ package ch.sdp.vibester.user
 
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.matcher.ViewMatchers.assertThat
+import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
 import org.hamcrest.CoreMatchers.equalTo
 import org.junit.Test
 
@@ -13,7 +15,7 @@ class ProfileFollowingAdapterTest {
         val friends: MutableList<User> = arrayListOf()
         friends.addAll(listOf(friend1, friend2))
         val profileFollowingViewHolder: RecyclerView.Adapter<ProfileFollowingAdapter.ProfileFollowingViewHolder> =
-            ProfileFollowingAdapter(friends, null)
+            ProfileFollowingAdapter(friends, DataGetter(), FireBaseAuthenticator(), null)
         assertThat(profileFollowingViewHolder.itemCount, equalTo(friends.size))
     }
 
@@ -24,7 +26,7 @@ class ProfileFollowingAdapterTest {
         val friends: MutableList<User> = arrayListOf()
         friends.addAll(listOf(friend1, friend2))
         val profileFollowingViewHolder: RecyclerView.Adapter<ProfileFollowingAdapter.ProfileFollowingViewHolder> =
-            ProfileFollowingAdapter(friends, null)
+            ProfileFollowingAdapter(friends, DataGetter(), FireBaseAuthenticator(), null)
         val defaultType = 0
         assertThat(
             profileFollowingViewHolder.getItemViewType(0),

From c2bb1091dd0ea6fe39e781b9c8f661e5fdc8d807 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 11:50:31 +0200
Subject: [PATCH 10/26] extract changeImageToBtn()

---
 .../ch/sdp/vibester/helper/AdapterHelper.kt   | 23 +++++++++++++++----
 .../vibester/user/ProfileFollowingAdapter.kt  |  6 +----
 .../sdp/vibester/user/UserProfileAdapter.kt   |  6 +----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
index da48dc9a2..2f304d4fa 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
@@ -4,6 +4,8 @@ import android.view.LayoutInflater
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.user.OnItemClickListener
 import android.view.View
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
@@ -12,9 +14,9 @@ import android.widget.ImageView
 class AdapterHelper {
 
     /**
+     * verify the item still exits then tell the listener it has been click
      * @param position position of the item in the recycle view
      * @param listener listener of the item on click
-     * verify the item still exits then tell the listener it has been click
      */
     fun onClickHelper(position: Int, listener: OnItemClickListener?) {
         //check the item is not deleted between time
@@ -24,20 +26,31 @@ class AdapterHelper {
     }
 
     /**
+     * change the view from button to image in itemView
      * @param buttonId ID of the button
      * @param imageId ID of the image
      * @param itemView View contains the button and image
-     * change the view from button to image in itemView
      */
     fun changeBtnToImageHelper(buttonId: Int, imageId: Int, itemView: View) {
-        itemView.findViewById<Button>(buttonId).visibility = View.INVISIBLE
-        itemView.findViewById<ImageView>(imageId).visibility = View.VISIBLE
+        itemView.findViewById<Button>(buttonId).visibility = INVISIBLE
+        itemView.findViewById<ImageView>(imageId).visibility = VISIBLE
+    }
+
+    /**
+     * change the view from image to button in itemView
+     * @param imageId ID of the image
+     * @param buttonId ID of the button
+     * @param itemView View contains the image and button
+     */
+    fun changeImageToBtn(imageId: Int, buttonId: Int, itemView: View) {
+        itemView.findViewById<ImageView>(imageId).visibility = INVISIBLE
+        itemView.findViewById<Button>(buttonId).visibility = VISIBLE
     }
 
     /**
+     * helper function creates the view used in function onCreateViewHolder
      * @param parent
      * @param layoutId id of the layout
-     * helper function creates the view used in function onCreateViewHolder
      */
     fun createViewForViewHolder(parent: ViewGroup, layoutId: Int): View {
         return LayoutInflater.from(parent.context).inflate(layoutId, parent, false)
diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index 8a8cee1ca..f2f667409 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -54,15 +54,11 @@ class ProfileFollowingAdapter constructor(
             itemView.findViewById<ImageView>(R.id.profile_unfollowIcon).setOnClickListener {
                 if (currentUser != null) {
                     dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid, false)
-                    changeImageToBtn()
+                    AdapterHelper().changeImageToBtn(R.id.profile_unfollowIcon, R.id.profile_followingBtn, itemView)
                 }
             }
         }
 
-        private fun changeImageToBtn() {
-            itemView.findViewById<ImageView>(R.id.profile_unfollowIcon).visibility = View.INVISIBLE
-            itemView.findViewById<Button>(R.id.profile_followingBtn).visibility = View.VISIBLE
-        }
 
         private fun followBtnListener(user: User) {
             itemView.findViewById<Button>(R.id.profile_followingBtn).setOnClickListener {
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index f7c172de7..30e711d9d 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -115,15 +115,11 @@ class UserProfileAdapter constructor(
             itemView.findViewById<ImageView>(R.id.addedFollowingIcon).setOnClickListener {
                 if (currentUser != null) {
                     dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid, false)
-                    changeImageToBtn()
+                    AdapterHelper().changeImageToBtn(R.id.addedFollowingIcon, R.id.addFollowingBtn, itemView)
                 }
             }
         }
 
-        private fun changeImageToBtn() {
-            itemView.findViewById<ImageView>(R.id.addedFollowingIcon).visibility = INVISIBLE
-            itemView.findViewById<Button>(R.id.addFollowingBtn).visibility = VISIBLE
-        }
 
         init {
             itemView.setOnClickListener(this)

From 66eb99d85ce0cfad7b07c2f84da367eb65ad6b2a Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 12:03:34 +0200
Subject: [PATCH 11/26] extract follow unfollow in DataGetter.kt

---
 .../ch/sdp/vibester/database/DataGetter.kt     | 18 ++++++++++++++++++
 .../vibester/user/ProfileFollowingAdapter.kt   |  4 ++--
 .../ch/sdp/vibester/user/UserProfileAdapter.kt |  6 ++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 08456917c..a033e6685 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -43,6 +43,24 @@ class DataGetter @Inject constructor() {
         dbUserRef.child(uid).child(fieldName).child(subFieldName).setValue(newVal)
     }
 
+    /**
+     * set user with userId to follow user with followingId
+     * @param userId id of of the current user
+     * @param followingId id of the user to be following
+     */
+    fun setFollowing(userId: String, followingId: String) {
+        setSubFieldValue(userId, "following", followingId, true)
+    }
+
+    /**
+     * set user with userId to unfollow user with followingId
+     * @param userId if of the current user
+     * @param followingId id of the user to be unfollowing
+     */
+    fun setUnfollow(userId: String, followingId: String) {
+        setSubFieldValue(userId, "following", followingId, false)
+    }
+
 
     /**
      * Update integer value in a subfield based on method sum/best
diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index f2f667409..38ee4a1e2 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -53,7 +53,7 @@ class ProfileFollowingAdapter constructor(
         private fun unFollowBtnListener(user: User) {
             itemView.findViewById<ImageView>(R.id.profile_unfollowIcon).setOnClickListener {
                 if (currentUser != null) {
-                    dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid, false)
+                    dataGetter.setUnfollow(currentUser.uid, user.uid)
                     AdapterHelper().changeImageToBtn(R.id.profile_unfollowIcon, R.id.profile_followingBtn, itemView)
                 }
             }
@@ -63,7 +63,7 @@ class ProfileFollowingAdapter constructor(
         private fun followBtnListener(user: User) {
             itemView.findViewById<Button>(R.id.profile_followingBtn).setOnClickListener {
                 if (currentUser != null) {
-                    dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid, true)
+                    dataGetter.setFollowing(currentUser.uid, user.uid)
                     AdapterHelper().changeBtnToImageHelper(R.id.profile_followingBtn, R.id.profile_unfollowIcon, itemView)
                 }
             }
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index 30e711d9d..8a4e9ea10 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -2,8 +2,6 @@ package ch.sdp.vibester.user
 
 import android.net.Uri
 import android.view.View
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
@@ -100,7 +98,7 @@ class UserProfileAdapter constructor(
             else {
                 followBtn.setOnClickListener {
                     if (currentUser != null) {
-                        dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid,true)
+                        dataGetter.setFollowing(currentUser.uid, user.uid)
                         changeBtnToImage()
                     }
                 }
@@ -114,7 +112,7 @@ class UserProfileAdapter constructor(
         private fun unFollowBtnListener(user: User) {
             itemView.findViewById<ImageView>(R.id.addedFollowingIcon).setOnClickListener {
                 if (currentUser != null) {
-                    dataGetter.setSubFieldValue(currentUser.uid, "following", user.uid, false)
+                    dataGetter.setUnfollow(currentUser.uid, user.uid)
                     AdapterHelper().changeImageToBtn(R.id.addedFollowingIcon, R.id.addFollowingBtn, itemView)
                 }
             }

From 9ea5e1dfc30c12fb0bfe93c8fef00d2d79b88a39 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 15:54:08 +0200
Subject: [PATCH 12/26] test unfollowBtnClick wip

---
 .../activity/SearchUserActivityTest.kt        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
index 9ef759e64..57edaea5a 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
@@ -196,6 +196,30 @@ class SearchUserActivityTest {
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.addFollowingBtn)
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.addedFollowingIcon)
     }
+/*
+    @Test
+    fun checkUnFollowBtnClick() {
+        val intent = Intent(ApplicationProvider.getApplicationContext(), SearchUserActivity::class.java)
+
+        createMockInvocation()
+        createMockAuthenticator()
+
+        val scn: ActivityScenario<SearchUserActivity> = ActivityScenario.launch(intent)
+
+        onView(withId(R.id.searchList)).perform(
+            RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
+                0, clickOnViewChild(R.id.addFollowingBtn)
+            )
+        )
+
+        onView(withId(R.id.searchList)).perform(
+            RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
+                0, clickOnViewChild(R.id.addedFollowingIcon)
+            )
+        )
+        checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.addFollowingBtn)
+        checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.addedFollowingIcon)
+    }*/
 
     /**
      * Custom function to handle button clicks inside recycleView

From c6c46b5a87721a179e1a1030177bb105dc6c0b6c Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 15:59:53 +0200
Subject: [PATCH 13/26] test unfollowBtnClick finish

---
 .../activity/SearchUserActivityTest.kt         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
index 57edaea5a..2a3537cb6 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
@@ -64,8 +64,11 @@ class SearchUserActivityTest {
 
         every { mockUsersRepo.getCurrentUser() } answers {createMockUser()}
 
-        every {mockUsersRepo.updateSubFieldInt(any(), any(), any(), any(),any())} answers {}
-        every {mockUsersRepo.setSubFieldValue(any(), any(), any(), any())} answers {}
+        every { mockUsersRepo.updateSubFieldInt(any(), any(), any(), any(),any())} answers {}
+        every { mockUsersRepo.setSubFieldValue(any(), any(), any(), any())} answers {}
+
+        every { mockUsersRepo.setFollowing(any(), any())} answers {}
+        every { mockUsersRepo.setUnfollow(any(), any())} answers {}
 
     }
 
@@ -187,6 +190,7 @@ class SearchUserActivityTest {
 
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.addFollowingBtn)
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.addedFollowingIcon)
+
         onView(withId(R.id.searchList))
             .perform(
                 RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
@@ -196,9 +200,9 @@ class SearchUserActivityTest {
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.addFollowingBtn)
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.addedFollowingIcon)
     }
-/*
+
     @Test
-    fun checkUnFollowBtnClick() {
+    fun checkUnfollowBtnClick() {
         val intent = Intent(ApplicationProvider.getApplicationContext(), SearchUserActivity::class.java)
 
         createMockInvocation()
@@ -206,20 +210,22 @@ class SearchUserActivityTest {
 
         val scn: ActivityScenario<SearchUserActivity> = ActivityScenario.launch(intent)
 
+        //follow
         onView(withId(R.id.searchList)).perform(
             RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
                 0, clickOnViewChild(R.id.addFollowingBtn)
             )
         )
-
+        //unfollow
         onView(withId(R.id.searchList)).perform(
             RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
                 0, clickOnViewChild(R.id.addedFollowingIcon)
             )
         )
+
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.addFollowingBtn)
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.addedFollowingIcon)
-    }*/
+    }
 
     /**
      * Custom function to handle button clicks inside recycleView

From 6feb7d3e90fe728e090ac738b8f24de5465ba924 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 16:17:40 +0200
Subject: [PATCH 14/26] rename changeBtnToImage and rewrite documentation for
 changeImageToBtn

---
 .../activity/SearchUserActivityTest.kt        |   1 +
 .../activity/profile/MyProfileActivityTest.kt | 113 +++++++++++++++++-
 .../ch/sdp/vibester/helper/AdapterHelper.kt   |   7 +-
 .../ch/sdp/vibester/model/SongListAdapter.kt  |   5 +-
 .../vibester/user/ProfileFollowingAdapter.kt  |   2 +-
 .../sdp/vibester/user/UserProfileAdapter.kt   |   2 +-
 .../res/layout/profile_following_item.xml     |   3 +-
 7 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
index 2a3537cb6..020739a4e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
@@ -197,6 +197,7 @@ class SearchUserActivityTest {
                     0,
                     clickOnViewChild(R.id.addFollowingBtn))
             )
+
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.addFollowingBtn)
         checkRecyclerSubViews(R.id.searchList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.addedFollowingIcon)
     }
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
index 72825ac48..6af4cc0dd 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
@@ -2,11 +2,14 @@ package ch.sdp.vibester.activity.profile
 
 import android.content.Context
 import android.content.Intent
+import android.view.View
 
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.scrollTo
@@ -14,6 +17,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.matcher.BoundedMatcher
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
@@ -29,6 +33,8 @@ import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.every
 import io.mockk.mockk
 import org.hamcrest.CoreMatchers.not
+import org.hamcrest.Description
+import org.hamcrest.Matcher
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -85,6 +91,9 @@ class MyProfileActivityTest {
         every { mockUsersRepo.getCurrentUser() } answers { null }
         every { mockUsersRepo.setFieldValue(any(), any(), any()) } answers {}
         every { mockUsersRepo.setFieldValue(any(), any(), any()) } answers {}
+
+        every { mockUsersRepo.setFollowing(any(), any())} answers {}
+        every { mockUsersRepo.setUnfollow(any(), any())} answers {}
     }
 
     private fun createMockImageGetter() {
@@ -162,7 +171,7 @@ class MyProfileActivityTest {
     }
 
     @Test
-    fun friendsRecycleViewClickTest() {
+    fun friendsRecycleViewGoToProfileTest() {
         val friendsMap: Map<String, Boolean> = mapOf(
             "friend1" to true, "friend2" to true
         )
@@ -224,9 +233,6 @@ class MyProfileActivityTest {
     }
 
 
-
-    //FIXME layout does not display some elements
-
     @Test
     fun clickBackToProfile() {
         val inputProfile = User("Lalisa Bon", R.string.test_profile_image.toString(), "lisa@test.com",  12, 8)
@@ -362,4 +368,103 @@ class MyProfileActivityTest {
         onView(withId(R.id.profile_image_CardView)).check(matches(isDisplayed()))
     }
 
+    @Test
+    fun checkUnfollowBtnClick() {
+        val friendsMap: Map<String, Boolean> = mapOf(
+            "friend1" to true, "friend2" to true
+        )
+        val inputProfile = User("Lalisa Bon", R.string.test_profile_image.toString(), "lisa@test.com",
+            12, following = friendsMap)
+        val ctx = ApplicationProvider.getApplicationContext() as Context
+        val intent = Intent(ctx, MyProfileActivity::class.java)
+
+        createMockDataGetter(inputProfile)
+        createMockAuthenticator()
+        createMockImageGetter()
+
+        val scn: ActivityScenario<MyProfileActivity> = ActivityScenario.launch(intent)
+
+        onView(withId(R.id.profile_following)).perform(click())
+
+        checkRecyclerSubViews(R.id.profile_followingList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.profile_unfollowIcon)
+        checkRecyclerSubViews(R.id.profile_followingList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.profile_followingBtn)
+
+        onView(withId(R.id.profile_followingList)).perform(
+            RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
+                0, clickOnViewChild(R.id.profile_unfollowIcon)
+            )
+        )
+
+        checkRecyclerSubViews(R.id.profile_followingList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.profile_followingBtn)
+        checkRecyclerSubViews(R.id.profile_followingList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.profile_unfollowIcon)
+    }
+
+    @Test
+    fun checkFollowBtnClick() {
+        val friendsMap: Map<String, Boolean> = mapOf(
+            "friend1" to true, "friend2" to true
+        )
+        val inputProfile = User("Lalisa Bon", R.string.test_profile_image.toString(), "lisa@test.com",
+            12, following = friendsMap)
+        val ctx = ApplicationProvider.getApplicationContext() as Context
+        val intent = Intent(ctx, MyProfileActivity::class.java)
+
+        createMockDataGetter(inputProfile)
+        createMockAuthenticator()
+        createMockImageGetter()
+
+        val scn: ActivityScenario<MyProfileActivity> = ActivityScenario.launch(intent)
+
+        onView(withId(R.id.profile_following)).perform(click())
+
+        onView(withId(R.id.profile_followingList)).perform(
+            RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
+                0, clickOnViewChild(R.id.profile_unfollowIcon)
+            )
+        )
+        onView(withId(R.id.profile_followingList)).perform(
+            RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
+                0, clickOnViewChild(R.id.profile_followingBtn)
+            )
+        )
+
+        checkRecyclerSubViews(R.id.profile_followingList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.profile_followingBtn)
+        checkRecyclerSubViews(R.id.profile_followingList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.profile_unfollowIcon)
+
+    }
+
+    /**
+     * Custom function to handle button clicks inside recycleView
+     */
+    private fun clickOnViewChild(viewId: Int) = object : ViewAction {
+        override fun getConstraints() = null
+
+        override fun getDescription() = "Click on a child view with specified id."
+
+        override fun perform(uiController: UiController, view: View) = click().perform(uiController, view.findViewById(viewId))
+    }
+
+    /**
+     * Custom functions to match the item views inside Recycle View
+     */
+    private fun checkRecyclerSubViews(recyclerViewId: Int, position: Int, itemMatcher: Matcher<View?>, subViewId: Int) {
+        onView(withId(recyclerViewId)).perform(
+            RecyclerViewActions.scrollToPosition<RecyclerView.ViewHolder>(position))
+            .check(matches(atPositionOnView(position, itemMatcher, subViewId)))
+    }
+
+    private fun atPositionOnView(position: Int, itemMatcher: Matcher<View?>, targetViewId: Int): Matcher<View?> {
+        return object : BoundedMatcher<View?, RecyclerView>(RecyclerView::class.java) {
+            override fun describeTo(description: Description) {
+                description.appendText("has view id $itemMatcher at position $position")
+            }
+
+            override fun matchesSafely(recyclerView: RecyclerView): Boolean {
+                val viewHolder = recyclerView.findViewHolderForAdapterPosition(position)
+                val targetView = viewHolder!!.itemView.findViewById<View>(targetViewId)
+                return itemMatcher.matches(targetView)
+            }
+        }
+    }
+
 }
diff --git a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
index 2f304d4fa..37b6179b4 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
@@ -31,16 +31,15 @@ class AdapterHelper {
      * @param imageId ID of the image
      * @param itemView View contains the button and image
      */
-    fun changeBtnToImageHelper(buttonId: Int, imageId: Int, itemView: View) {
+    fun changeBtnToImage(buttonId: Int, imageId: Int, itemView: View) {
         itemView.findViewById<Button>(buttonId).visibility = INVISIBLE
         itemView.findViewById<ImageView>(imageId).visibility = VISIBLE
     }
 
     /**
      * change the view from image to button in itemView
-     * @param imageId ID of the image
-     * @param buttonId ID of the button
-     * @param itemView View contains the image and button
+     * inverse of changeBtnToImage
+     * no documentation for this function to avoid duplication
      */
     fun changeImageToBtn(imageId: Int, buttonId: Int, itemView: View) {
         itemView.findViewById<ImageView>(imageId).visibility = INVISIBLE
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
index 09c2689da..b47e9882f 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
@@ -1,11 +1,8 @@
 package ch.sdp.vibester.model
 
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Adapter
 import android.widget.Button
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
@@ -55,7 +52,7 @@ class SongListAdapter constructor( private val incorrectSongList: ArrayList<Stri
             val downloadSongBtn = itemView.findViewById<Button>(R.id.song_download)
 
             downloadSongBtn.setOnClickListener {
-                AdapterHelper().changeBtnToImageHelper(R.id.song_download, R.id.song_download_done, itemView)
+                AdapterHelper().changeBtnToImage(R.id.song_download, R.id.song_download_done, itemView)
             }
 
             // Make background red if song is guessed incorrectly
diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index 38ee4a1e2..6a45df2d5 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -64,7 +64,7 @@ class ProfileFollowingAdapter constructor(
             itemView.findViewById<Button>(R.id.profile_followingBtn).setOnClickListener {
                 if (currentUser != null) {
                     dataGetter.setFollowing(currentUser.uid, user.uid)
-                    AdapterHelper().changeBtnToImageHelper(R.id.profile_followingBtn, R.id.profile_unfollowIcon, itemView)
+                    AdapterHelper().changeBtnToImage(R.id.profile_followingBtn, R.id.profile_unfollowIcon, itemView)
                 }
             }
         }
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index 8a4e9ea10..b83278d62 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -106,7 +106,7 @@ class UserProfileAdapter constructor(
         }
 
         private fun changeBtnToImage() {
-            AdapterHelper().changeBtnToImageHelper(R.id.addFollowingBtn, R.id.addedFollowingIcon, itemView)
+            AdapterHelper().changeBtnToImage(R.id.addFollowingBtn, R.id.addedFollowingIcon, itemView)
         }
 
         private fun unFollowBtnListener(user: User) {
diff --git a/app/src/main/res/layout/profile_following_item.xml b/app/src/main/res/layout/profile_following_item.xml
index 8ada13608..b0a50d62a 100644
--- a/app/src/main/res/layout/profile_following_item.xml
+++ b/app/src/main/res/layout/profile_following_item.xml
@@ -30,7 +30,8 @@
         android:layout_marginStart="49dp"
         android:layout_marginTop="9dp"
         android:layout_marginEnd="25dp"
-        android:src="@drawable/green_tick"></ImageView>
+        android:src="@drawable/green_tick">
+    </ImageView>
 
     <Button
         android:id="@+id/profile_followingBtn"

From cc2df694d5fa5dec28899159a577e9e39e9c9028 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 16:44:20 +0200
Subject: [PATCH 15/26] refactor changeBtnToImage and changeImageToBtn

---
 .../java/ch/sdp/vibester/helper/AdapterHelper.kt  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
index 37b6179b4..59075b8a3 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
@@ -32,18 +32,23 @@ class AdapterHelper {
      * @param itemView View contains the button and image
      */
     fun changeBtnToImage(buttonId: Int, imageId: Int, itemView: View) {
-        itemView.findViewById<Button>(buttonId).visibility = INVISIBLE
-        itemView.findViewById<ImageView>(imageId).visibility = VISIBLE
+        switchViewVisibility(itemView.findViewById<Button>(buttonId), itemView.findViewById<ImageView>(imageId))
     }
 
     /**
      * change the view from image to button in itemView
      * inverse of changeBtnToImage
-     * no documentation for this function to avoid duplication
      */
     fun changeImageToBtn(imageId: Int, buttonId: Int, itemView: View) {
-        itemView.findViewById<ImageView>(imageId).visibility = INVISIBLE
-        itemView.findViewById<Button>(buttonId).visibility = VISIBLE
+        switchViewVisibility(itemView.findViewById<ImageView>(imageId), itemView.findViewById<Button>(buttonId))
+    }
+
+    /**
+     * switch the visibility between two view
+     */
+    private fun switchViewVisibility(invisible: View, visible: View) {
+        invisible.visibility = INVISIBLE
+        visible.visibility = VISIBLE
     }
 
     /**

From 23780ccb4350d1dc9c63b8ed8b9d2d017e5211ac Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 16:48:38 +0200
Subject: [PATCH 16/26] rename to switchViewsVisibility

---
 app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
index 59075b8a3..814583b2d 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
@@ -32,7 +32,7 @@ class AdapterHelper {
      * @param itemView View contains the button and image
      */
     fun changeBtnToImage(buttonId: Int, imageId: Int, itemView: View) {
-        switchViewVisibility(itemView.findViewById<Button>(buttonId), itemView.findViewById<ImageView>(imageId))
+        switchViewsVisibility(itemView.findViewById<Button>(buttonId), itemView.findViewById<ImageView>(imageId))
     }
 
     /**
@@ -40,13 +40,13 @@ class AdapterHelper {
      * inverse of changeBtnToImage
      */
     fun changeImageToBtn(imageId: Int, buttonId: Int, itemView: View) {
-        switchViewVisibility(itemView.findViewById<ImageView>(imageId), itemView.findViewById<Button>(buttonId))
+        switchViewsVisibility(itemView.findViewById<ImageView>(imageId), itemView.findViewById<Button>(buttonId))
     }
 
     /**
      * switch the visibility between two view
      */
-    private fun switchViewVisibility(invisible: View, visible: View) {
+    private fun switchViewsVisibility(invisible: View, visible: View) {
         invisible.visibility = INVISIBLE
         visible.visibility = VISIBLE
     }

From 7f4599e77eedecf6d34fc6c02b8fea7d1a1e0397 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 17:10:33 +0200
Subject: [PATCH 17/26] delete changeImageToBtn

---
 .../main/java/ch/sdp/vibester/helper/AdapterHelper.kt  | 10 +---------
 .../ch/sdp/vibester/user/ProfileFollowingAdapter.kt    |  3 ++-
 .../java/ch/sdp/vibester/user/UserProfileAdapter.kt    |  3 ++-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
index 814583b2d..1864deffe 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
@@ -35,18 +35,10 @@ class AdapterHelper {
         switchViewsVisibility(itemView.findViewById<Button>(buttonId), itemView.findViewById<ImageView>(imageId))
     }
 
-    /**
-     * change the view from image to button in itemView
-     * inverse of changeBtnToImage
-     */
-    fun changeImageToBtn(imageId: Int, buttonId: Int, itemView: View) {
-        switchViewsVisibility(itemView.findViewById<ImageView>(imageId), itemView.findViewById<Button>(buttonId))
-    }
-
     /**
      * switch the visibility between two view
      */
-    private fun switchViewsVisibility(invisible: View, visible: View) {
+    fun switchViewsVisibility(invisible: View, visible: View) {
         invisible.visibility = INVISIBLE
         visible.visibility = VISIBLE
     }
diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index 6a45df2d5..4384c7733 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -54,7 +54,8 @@ class ProfileFollowingAdapter constructor(
             itemView.findViewById<ImageView>(R.id.profile_unfollowIcon).setOnClickListener {
                 if (currentUser != null) {
                     dataGetter.setUnfollow(currentUser.uid, user.uid)
-                    AdapterHelper().changeImageToBtn(R.id.profile_unfollowIcon, R.id.profile_followingBtn, itemView)
+                    AdapterHelper().switchViewsVisibility(
+                        itemView.findViewById(R.id.profile_unfollowIcon), itemView.findViewById(R.id.profile_followingBtn))
                 }
             }
         }
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index b83278d62..7720ca87a 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -113,7 +113,8 @@ class UserProfileAdapter constructor(
             itemView.findViewById<ImageView>(R.id.addedFollowingIcon).setOnClickListener {
                 if (currentUser != null) {
                     dataGetter.setUnfollow(currentUser.uid, user.uid)
-                    AdapterHelper().changeImageToBtn(R.id.addedFollowingIcon, R.id.addFollowingBtn, itemView)
+                    AdapterHelper().switchViewsVisibility(
+                        itemView.findViewById(R.id.addedFollowingIcon), itemView.findViewById(R.id.addFollowingBtn))
                 }
             }
         }

From 39670ee5c90ef4fbecdced3786d3a1fe900d37a7 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 17:14:46 +0200
Subject: [PATCH 18/26] delete changeBtnToImage in AdapterHelper.kt

---
 .../main/java/ch/sdp/vibester/helper/AdapterHelper.kt  | 10 ----------
 .../main/java/ch/sdp/vibester/model/SongListAdapter.kt |  4 +++-
 .../ch/sdp/vibester/user/ProfileFollowingAdapter.kt    |  4 +++-
 .../java/ch/sdp/vibester/user/UserProfileAdapter.kt    |  4 +++-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
index 1864deffe..9b0c3bef5 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
@@ -25,16 +25,6 @@ class AdapterHelper {
         }
     }
 
-    /**
-     * change the view from button to image in itemView
-     * @param buttonId ID of the button
-     * @param imageId ID of the image
-     * @param itemView View contains the button and image
-     */
-    fun changeBtnToImage(buttonId: Int, imageId: Int, itemView: View) {
-        switchViewsVisibility(itemView.findViewById<Button>(buttonId), itemView.findViewById<ImageView>(imageId))
-    }
-
     /**
      * switch the visibility between two view
      */
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
index b47e9882f..91abe7ac4 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
@@ -52,7 +52,9 @@ class SongListAdapter constructor( private val incorrectSongList: ArrayList<Stri
             val downloadSongBtn = itemView.findViewById<Button>(R.id.song_download)
 
             downloadSongBtn.setOnClickListener {
-                AdapterHelper().changeBtnToImage(R.id.song_download, R.id.song_download_done, itemView)
+                AdapterHelper().switchViewsVisibility(
+                    itemView.findViewById(R.id.song_download), itemView.findViewById(R.id.song_download_done)
+                )
             }
 
             // Make background red if song is guessed incorrectly
diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index 4384c7733..4be04ce60 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -65,7 +65,9 @@ class ProfileFollowingAdapter constructor(
             itemView.findViewById<Button>(R.id.profile_followingBtn).setOnClickListener {
                 if (currentUser != null) {
                     dataGetter.setFollowing(currentUser.uid, user.uid)
-                    AdapterHelper().changeBtnToImage(R.id.profile_followingBtn, R.id.profile_unfollowIcon, itemView)
+                    AdapterHelper().switchViewsVisibility(
+                        itemView.findViewById(R.id.profile_followingBtn), itemView.findViewById(R.id.profile_unfollowIcon)
+                    )
                 }
             }
         }
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index 7720ca87a..25c4ef0dc 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -106,7 +106,9 @@ class UserProfileAdapter constructor(
         }
 
         private fun changeBtnToImage() {
-            AdapterHelper().changeBtnToImage(R.id.addFollowingBtn, R.id.addedFollowingIcon, itemView)
+            AdapterHelper().switchViewsVisibility(
+                itemView.findViewById(R.id.addFollowingBtn), itemView.findViewById(R.id.addedFollowingIcon)
+            )
         }
 
         private fun unFollowBtnListener(user: User) {

From 0e1db85421a979f517fa8b9480d15caf55a3ef5a Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 17:43:56 +0200
Subject: [PATCH 19/26] refactor changeBtnToImage

---
 .../vibester/activity/profile/MyProfileActivityTest.kt   | 1 +
 .../main/java/ch/sdp/vibester/helper/AdapterHelper.kt    | 9 +++++++++
 .../main/java/ch/sdp/vibester/model/SongListAdapter.kt   | 4 ++--
 .../main/java/ch/sdp/vibester/user/UserProfileAdapter.kt | 4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
index 6af4cc0dd..e1a576f68 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
@@ -397,6 +397,7 @@ class MyProfileActivityTest {
 
         checkRecyclerSubViews(R.id.profile_followingList, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.profile_followingBtn)
         checkRecyclerSubViews(R.id.profile_followingList, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.profile_unfollowIcon)
+
     }
 
     @Test
diff --git a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
index 9b0c3bef5..4e37474e3 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
@@ -25,6 +25,15 @@ class AdapterHelper {
         }
     }
 
+    /**
+     * change the view from button to image
+     */
+    fun changeBtnToImage(btnId: Int, imageId: Int, itemView: View) {
+        switchViewsVisibility(
+            itemView.findViewById(btnId), itemView.findViewById(imageId)
+        )
+    }
+
     /**
      * switch the visibility between two view
      */
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
index 91abe7ac4..6330c889c 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
@@ -52,8 +52,8 @@ class SongListAdapter constructor( private val incorrectSongList: ArrayList<Stri
             val downloadSongBtn = itemView.findViewById<Button>(R.id.song_download)
 
             downloadSongBtn.setOnClickListener {
-                AdapterHelper().switchViewsVisibility(
-                    itemView.findViewById(R.id.song_download), itemView.findViewById(R.id.song_download_done)
+                AdapterHelper().changeBtnToImage(
+                    R.id.song_download, R.id.song_download_done, itemView
                 )
             }
 
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index 25c4ef0dc..73ba1bf17 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -106,8 +106,8 @@ class UserProfileAdapter constructor(
         }
 
         private fun changeBtnToImage() {
-            AdapterHelper().switchViewsVisibility(
-                itemView.findViewById(R.id.addFollowingBtn), itemView.findViewById(R.id.addedFollowingIcon)
+            AdapterHelper().changeBtnToImage(
+                R.id.addFollowingBtn, R.id.addedFollowingIcon, itemView
             )
         }
 

From 136a1a0c02bd1be2d19ecd04b02ce074d3dfcc59 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sat, 21 May 2022 18:07:05 +0200
Subject: [PATCH 20/26] remove empty line in PublicProfileActivity.kt

---
 .../ch/sdp/vibester/activity/profile/PublicProfileActivity.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/profile/PublicProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/profile/PublicProfileActivity.kt
index 228fe8cd4..710921f97 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/profile/PublicProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/profile/PublicProfileActivity.kt
@@ -17,7 +17,6 @@ class PublicProfileActivity : ProfileActivity() {
         }
     }
 
-
     override fun queryDatabase() {
         dataGetter.getUserData(userId, this::setupProfile)
     }

From 877d3083915d6236a6452232ff651d9107636181 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 22 May 2022 14:13:07 +0200
Subject: [PATCH 21/26] address Margaux's comment

---
 .../java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt   | 1 -
 .../main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt b/app/src/androidTest/java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt
index b659b9d69..b55aac9ff 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt
@@ -65,7 +65,6 @@ class SearchUserFragmentTest {
 
         every { mockUsersRepo.updateSubFieldInt(any(), any(), any(), any(),any())} answers {}
         every { mockUsersRepo.setSubFieldValue(any(), any(), any(), any())} answers {}
-
         every { mockUsersRepo.setFollowing(any(), any())} answers {}
         every { mockUsersRepo.setUnfollow(any(), any())} answers {}
 
diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index 4be04ce60..e757f63e7 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -46,11 +46,11 @@ class ProfileFollowingAdapter constructor(
             itemView.findViewById<TextView>(R.id.profile_following_username).text = user.username
             itemView.findViewById<ImageView>(R.id.profile_following_profile_image).loadImg(user.image)
 
-            unFollowBtnListener(user)
+            unfollowBtnListener(user)
             followBtnListener(user)
         }
 
-        private fun unFollowBtnListener(user: User) {
+        private fun unfollowBtnListener(user: User) {
             itemView.findViewById<ImageView>(R.id.profile_unfollowIcon).setOnClickListener {
                 if (currentUser != null) {
                     dataGetter.setUnfollow(currentUser.uid, user.uid)

From ef83d88000a17e8a046f2085dfa01b11d4f0ab97 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 22 May 2022 14:15:22 +0200
Subject: [PATCH 22/26] address Maxime's comment

---
 .../sdp/vibester/activity/profile/MyProfileActivityTest.kt  | 4 ++--
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
index e1a576f68..2cbbc2816 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/profile/MyProfileActivityTest.kt
@@ -92,8 +92,8 @@ class MyProfileActivityTest {
         every { mockUsersRepo.setFieldValue(any(), any(), any()) } answers {}
         every { mockUsersRepo.setFieldValue(any(), any(), any()) } answers {}
 
-        every { mockUsersRepo.setFollowing(any(), any())} answers {}
-        every { mockUsersRepo.setUnfollow(any(), any())} answers {}
+        every { mockUsersRepo.setFollowing(any(), any()) } answers {}
+        every { mockUsersRepo.setUnfollow(any(), any()) } answers {}
     }
 
     private fun createMockImageGetter() {
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index a033e6685..40dd8ac91 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -44,7 +44,7 @@ class DataGetter @Inject constructor() {
     }
 
     /**
-     * set user with userId to follow user with followingId
+     * Set user with userId to follow user with followingId
      * @param userId id of of the current user
      * @param followingId id of the user to be following
      */
@@ -53,7 +53,7 @@ class DataGetter @Inject constructor() {
     }
 
     /**
-     * set user with userId to unfollow user with followingId
+     * Set user with userId to unfollow user with followingId
      * @param userId if of the current user
      * @param followingId id of the user to be unfollowing
      */
@@ -175,7 +175,7 @@ class DataGetter @Inject constructor() {
                 }
                 callback(users)
                 callbackUid(uidList)
-                queryUsers.removeEventListener(this);
+                queryUsers.removeEventListener(this)
             }
             override fun onCancelled(error: DatabaseError) {
                 Log.w(ContentValues.TAG, "searchByField:onCancelled", error.toException())

From fe65d83aee6b36352a0fff5a2dcb892af31e3576 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 22 May 2022 14:22:01 +0200
Subject: [PATCH 23/26] add space and delete empty line in
 SearchUserFragmentTest.kt

---
 .../vibester/fragment/SearchUserFragmentTest.kt   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt b/app/src/androidTest/java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt
index b55aac9ff..fc6d618c3 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/fragment/SearchUserFragmentTest.kt
@@ -49,8 +49,8 @@ class SearchUserFragmentTest {
         val mockUser3 = User("mockUser3", uid = "mockUser3uid")
         val mockUser = User("mockUser", uid = "mockUseruid", following = mapOf(Pair(mockUser2.uid,true), Pair(mockUser3.uid,true)))
 
-        val mockUIDs = arrayListOf<String>("mockUser1uid","mockUser2uid","mockUser3uid")
-        val mockUsers = arrayListOf<User>(mockUser1, mockUser2, mockUser3)
+        val mockUIDs = arrayListOf("mockUser1uid","mockUser2uid","mockUser3uid")
+        val mockUsers = arrayListOf(mockUser1, mockUser2, mockUser3)
 
         every { mockUsersRepo.searchByField(any(), any(), any(), any()) } answers  {
             thirdArg<(ArrayList<User>) -> Unit>().invoke(mockUsers)
@@ -61,13 +61,12 @@ class SearchUserFragmentTest {
             secondArg<(User) -> Unit>().invoke(mockUser)
         }
 
-        every { mockUsersRepo.getCurrentUser() } answers {createMockUser()}
-
-        every { mockUsersRepo.updateSubFieldInt(any(), any(), any(), any(),any())} answers {}
-        every { mockUsersRepo.setSubFieldValue(any(), any(), any(), any())} answers {}
-        every { mockUsersRepo.setFollowing(any(), any())} answers {}
-        every { mockUsersRepo.setUnfollow(any(), any())} answers {}
+        every { mockUsersRepo.getCurrentUser() } answers { createMockUser() }
 
+        every { mockUsersRepo.updateSubFieldInt(any(), any(), any(), any(),any()) } answers {}
+        every { mockUsersRepo.setSubFieldValue(any(), any(), any(), any()) } answers {}
+        every { mockUsersRepo.setFollowing(any(), any()) } answers {}
+        every { mockUsersRepo.setUnfollow(any(), any()) } answers {}
     }
 
     @BindValue @JvmField

From 1be3220cf03d870cce4d10f60921f035532f75ea Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 22 May 2022 14:43:56 +0200
Subject: [PATCH 24/26] add documentation in AdapterHelper.kt

---
 app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
index 4e37474e3..33636a3a6 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/AdapterHelper.kt
@@ -26,7 +26,10 @@ class AdapterHelper {
     }
 
     /**
-     * change the view from button to image
+     * change the view from button to image with given ids
+     * @param btnId ID of the button
+     * @param imageId ID of the image
+     * @param itemView View contains the button and image
      */
     fun changeBtnToImage(btnId: Int, imageId: Int, itemView: View) {
         switchViewsVisibility(
@@ -36,6 +39,8 @@ class AdapterHelper {
 
     /**
      * switch the visibility between two view
+     * @param invisible view to hide
+     * @param visible view to show
      */
     fun switchViewsVisibility(invisible: View, visible: View) {
         invisible.visibility = INVISIBLE

From aaea119393f8ab9b9c67fd732a8b5b06fd24ae82 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 22 May 2022 15:24:59 +0200
Subject: [PATCH 25/26] refactor ScoreBoardFragment.kt and
 genre_for_scoreboard.xml

---
 .../ch/sdp/vibester/fragment/ScoreBoardFragment.kt   |  6 +++---
 app/src/main/res/layout/genre_for_scoreboard.xml     | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
index 2d74e2eed..21ebc5ade 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
@@ -55,7 +55,7 @@ class ScoreBoardFragment : Fragment(), OnItemClickListener, View.OnClickListener
     }
 
     private fun selectScoreboard() {
-        val sortedBy = "scores/" + genre
+        val sortedBy = "scores/$genre"
 
         requireView().findViewById<ConstraintLayout>(R.id.genrePerScoreboard).visibility = GONE
         requireView().findViewById<NestedScrollView>(R.id.scoreboard_content_scrolling).visibility = VISIBLE
@@ -112,13 +112,13 @@ class ScoreBoardFragment : Fragment(), OnItemClickListener, View.OnClickListener
      */
     override fun onItemClick(position: Int) {
         val intent = Intent(requireActivity(), PublicProfileActivity::class.java)
-        intent.putExtra("UserId", players.get(position).uid)
+        intent.putExtra("UserId", players[position].uid)
         intent.putExtra("ScoresOrFollowing", R.string.profile_scores.toString() )
         startActivity(intent)
     }
 
     override fun onClick(v: View?) {
-            when(v!!.getId()) {
+            when(v!!.id) {
                 R.id.btsButton -> {
                     genre = "BTS"; selectScoreboard()
                 }
diff --git a/app/src/main/res/layout/genre_for_scoreboard.xml b/app/src/main/res/layout/genre_for_scoreboard.xml
index 5193403f9..944065c1c 100644
--- a/app/src/main/res/layout/genre_for_scoreboard.xml
+++ b/app/src/main/res/layout/genre_for_scoreboard.xml
@@ -37,7 +37,7 @@
                 app:layout_constraintHorizontal_bias="0.066"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.687"></androidx.appcompat.widget.AppCompatButton>
+                app:layout_constraintVertical_bias="0.687" />
 
             <Space
                 android:layout_width="wrap_content"
@@ -56,7 +56,7 @@
                 app:layout_constraintHorizontal_bias="0.933"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.687"></androidx.appcompat.widget.AppCompatButton>
+                app:layout_constraintVertical_bias="0.687" />
         </LinearLayout>
 
         <Space
@@ -80,7 +80,7 @@
                 app:layout_constraintHorizontal_bias="0.065"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.403"></androidx.appcompat.widget.AppCompatButton>
+                app:layout_constraintVertical_bias="0.403" />
 
             <Space
                 android:layout_width="wrap_content"
@@ -99,7 +99,7 @@
                 app:layout_constraintHorizontal_bias="0.933"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.402"></androidx.appcompat.widget.AppCompatButton>
+                app:layout_constraintVertical_bias="0.402" />
         </LinearLayout>
 
         <Space
@@ -123,7 +123,7 @@
                 app:layout_constraintHorizontal_bias="0.074"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.136"></androidx.appcompat.widget.AppCompatButton>
+                app:layout_constraintVertical_bias="0.136" />
 
             <Space
                 android:layout_width="wrap_content"
@@ -142,7 +142,7 @@
                 app:layout_constraintHorizontal_bias="0.937"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.136"></androidx.appcompat.widget.AppCompatButton>
+                app:layout_constraintVertical_bias="0.136" />
         </LinearLayout>
 
     </LinearLayout>

From 1edb23f6ff28e881387da9fcca79c8f4746a1b4d Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 22 May 2022 15:32:35 +0200
Subject: [PATCH 26/26] rename genre btns in scoreboard

---
 .../fragment/ScoreBoardFragmentTest.kt        | 17 +++++++------
 .../vibester/fragment/ScoreBoardFragment.kt   | 24 +++++++++----------
 .../main/res/layout/genre_for_scoreboard.xml  | 12 +++++-----
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/fragment/ScoreBoardFragmentTest.kt b/app/src/androidTest/java/ch/sdp/vibester/fragment/ScoreBoardFragmentTest.kt
index 2968ca0af..6a7673128 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/fragment/ScoreBoardFragmentTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/fragment/ScoreBoardFragmentTest.kt
@@ -1,7 +1,6 @@
 package ch.sdp.vibester.fragment
 
 import androidx.recyclerview.widget.RecyclerView
-import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -46,19 +45,19 @@ class ScoreBoardFragmentTest {
     @Test
     fun genreShouldDisappearAfterSelected() {
         onView(withId(R.id.genrePerScoreboard)).check(matches(isDisplayed()))
-        onView(withId(R.id.rockButton)).perform(click())
+        onView(withId(R.id.scoreboard_rockButton)).perform(click())
         onView(withId(R.id.genrePerScoreboard)).check(matches(not(isDisplayed())))
     }
 
     @Test
     fun rockBtnShouldSetUpRecycleView() {
-        onView(withId(R.id.rockButton)).perform(click())
+        onView(withId(R.id.scoreboard_rockButton)).perform(click())
         onView(withId(R.id.scoreboard_content_scrolling)).check(matches(isDisplayed()))
     }
 
     @Test
     fun clickOnItemShouldGoesToProfileAndDisplaysScores() {
-        onView(withId(R.id.rockButton)).perform(click())
+        onView(withId(R.id.scoreboard_rockButton)).perform(click())
 
         onView((withId(R.id.recycler_view)))
             .perform(
@@ -73,26 +72,26 @@ class ScoreBoardFragmentTest {
 
     @Test
     fun topBtnClick() {
-        onView(withId(R.id.topTracksButton)).perform(click())
+        onView(withId(R.id.scoreboard_topTracksButton)).perform(click())
     }
 
     @Test
     fun kpopBtnClick() {
-        onView(withId(R.id.kpopButton)).perform(click())
+        onView(withId(R.id.scoreboard_kpopButton)).perform(click())
     }
 
     @Test
     fun billieEilishButtonClick() {
-        onView(withId(R.id.billieEilishButton)).perform(click())
+        onView(withId(R.id.scoreboard_billieEilishButton)).perform(click())
     }
 
     @Test
     fun imagineDragonsButtonClick() {
-        onView(withId(R.id.imagDragonsButton)).perform(click())
+        onView(withId(R.id.scoreboard_imagDragonsButton)).perform(click())
     }
 
     @Test
     fun btsButtonClick() {
-        onView(withId(R.id.btsButton)).perform(click())
+        onView(withId(R.id.scoreboard_btsButton)).perform(click())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
index 21ebc5ade..401d4cc0d 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
@@ -43,12 +43,12 @@ class ScoreBoardFragment : Fragment(), OnItemClickListener, View.OnClickListener
         val view = inflater.inflate(R.layout.fragment_scoreboard, container, false)
         val ctx = inflater.context
 
-        view.findViewById<Button>(R.id.kpopButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.rockButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.btsButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.topTracksButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.imagDragonsButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.billieEilishButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_kpopButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_rockButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_btsButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_topTracksButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_imagDragonsButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_billieEilishButton).setOnClickListener(this)
         setupRecycleView(view, ctx)
 
         return view
@@ -119,22 +119,22 @@ class ScoreBoardFragment : Fragment(), OnItemClickListener, View.OnClickListener
 
     override fun onClick(v: View?) {
             when(v!!.id) {
-                R.id.btsButton -> {
+                R.id.scoreboard_btsButton -> {
                     genre = "BTS"; selectScoreboard()
                 }
-                R.id.kpopButton -> {
+                R.id.scoreboard_kpopButton -> {
                     genre = "kpop"; selectScoreboard()
                 }
-                R.id.imagDragonsButton -> {
+                R.id.scoreboard_imagDragonsButton -> {
                     genre = "Imagine Dragons"; selectScoreboard()
                 }
-                R.id.billieEilishButton -> {
+                R.id.scoreboard_billieEilishButton -> {
                     genre = "Billie Eilish"; selectScoreboard()
                 }
-                R.id.rockButton -> {
+                R.id.scoreboard_rockButton -> {
                     genre = "rock";selectScoreboard()
                 }
-                R.id.topTracksButton -> {
+                R.id.scoreboard_topTracksButton -> {
                     genre = "top tracks";selectScoreboard()
                 }
 
diff --git a/app/src/main/res/layout/genre_for_scoreboard.xml b/app/src/main/res/layout/genre_for_scoreboard.xml
index 944065c1c..aff950041 100644
--- a/app/src/main/res/layout/genre_for_scoreboard.xml
+++ b/app/src/main/res/layout/genre_for_scoreboard.xml
@@ -26,7 +26,7 @@
             android:orientation="horizontal">
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/imagDragonsButton"
+                android:id="@+id/scoreboard_imagDragonsButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"
@@ -45,7 +45,7 @@
                 android:layout_weight="1" />
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/billieEilishButton"
+                android:id="@+id/scoreboard_billieEilishButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"
@@ -69,7 +69,7 @@
             android:orientation="horizontal">
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/rockButton"
+                android:id="@+id/scoreboard_rockButton"
                 android:layout_width="170sp"
                 android:layout_height="130sp"
                 android:layout_weight="1"
@@ -88,7 +88,7 @@
                 android:layout_weight="1" />
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/btsButton"
+                android:id="@+id/scoreboard_btsButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"
@@ -112,7 +112,7 @@
             android:orientation="horizontal">
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/topTracksButton"
+                android:id="@+id/scoreboard_topTracksButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"
@@ -131,7 +131,7 @@
                 android:layout_weight="1" />
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/kpopButton"
+                android:id="@+id/scoreboard_kpopButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"