From ce29c0b8c4868877976503b02665e5e0f7eb4cbc Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Fri, 15 Apr 2022 17:22:38 +0200
Subject: [PATCH 01/28] SearchUsers: add activity to search for users

---
 app/src/main/AndroidManifest.xml                  |  3 +++
 app/src/main/java/ch/sdp/vibester/SearchUsers.kt  | 11 +++++++++++
 app/src/main/res/layout/activity_search_users.xml |  7 +++++++
 3 files changed, 21 insertions(+)
 create mode 100644 app/src/main/java/ch/sdp/vibester/SearchUsers.kt
 create mode 100644 app/src/main/res/layout/activity_search_users.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a944fe55..16d1a1e82 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication"
         android:usesCleartextTraffic="true">
+        <activity
+            android:name=".SearchUsers"
+            android:exported="false" />
         <activity
             android:name=".activity.DownloadActivity"
             android:exported="false" />
diff --git a/app/src/main/java/ch/sdp/vibester/SearchUsers.kt b/app/src/main/java/ch/sdp/vibester/SearchUsers.kt
new file mode 100644
index 000000000..fa30a0bfd
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/SearchUsers.kt
@@ -0,0 +1,11 @@
+package ch.sdp.vibester
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class SearchUsers : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_search_users)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_users.xml b/app/src/main/res/layout/activity_search_users.xml
new file mode 100644
index 000000000..67f3b8d05
--- /dev/null
+++ b/app/src/main/res/layout/activity_search_users.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".SearchUsers"/>
\ No newline at end of file

From d67cf79268c91880222268609f21c8310e3b7e7c Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 18:55:08 +0200
Subject: [PATCH 02/28] remove previously wrong added files

---
 app/src/main/java/ch/sdp/vibester/SearchUsers.kt  | 11 -----------
 app/src/main/res/layout/activity_search_users.xml |  7 -------
 2 files changed, 18 deletions(-)
 delete mode 100644 app/src/main/java/ch/sdp/vibester/SearchUsers.kt
 delete mode 100644 app/src/main/res/layout/activity_search_users.xml

diff --git a/app/src/main/java/ch/sdp/vibester/SearchUsers.kt b/app/src/main/java/ch/sdp/vibester/SearchUsers.kt
deleted file mode 100644
index fa30a0bfd..000000000
--- a/app/src/main/java/ch/sdp/vibester/SearchUsers.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ch.sdp.vibester
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class SearchUsers : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_search_users)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_users.xml b/app/src/main/res/layout/activity_search_users.xml
deleted file mode 100644
index 67f3b8d05..000000000
--- a/app/src/main/res/layout/activity_search_users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".SearchUsers"/>
\ No newline at end of file

From 8e2cf4df090018a643962ff56c58902441f4e871 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 18:55:29 +0200
Subject: [PATCH 03/28] AndroidManifest.xml: add new activity to search users

---
 app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16d1a1e82..f30ee09bf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
         android:theme="@style/Theme.MyApplication"
         android:usesCleartextTraffic="true">
         <activity
-            android:name=".SearchUsers"
+            android:name=".activity.SearchUserActivity"
             android:exported="false" />
         <activity
             android:name=".activity.DownloadActivity"

From 9f526ddc658b2259b8cd91030786f09993251add Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 18:56:30 +0200
Subject: [PATCH 04/28] WelcomeActivity: add new button to search users

---
 .../ch/sdp/vibester/activity/WelcomeActivity.kt     |  3 +++
 app/src/main/res/layout/activity_welcome_screen.xml | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index 34c5f6b47..5de6065e4 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -65,4 +65,7 @@ class WelcomeActivity : AppCompatActivity() {
     /*fun switchToLogin(view: View) { //FILLER INTENT
         sendDirectIntent(GameSetupScreen::class.java)
     }*/
+    fun switchToSearch(view: View) {
+        sendDirectIntent(SearchUserActivity::class.java)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_welcome_screen.xml b/app/src/main/res/layout/activity_welcome_screen.xml
index 5e418582e..3bca38e03 100644
--- a/app/src/main/res/layout/activity_welcome_screen.xml
+++ b/app/src/main/res/layout/activity_welcome_screen.xml
@@ -112,6 +112,19 @@
                 android:translationZ="10dp"
                 app:icon="@android:drawable/stat_sys_download" />
 
+            <Button
+                android:id="@+id/welcome_search"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+                android:layout_marginTop="10dp"
+                android:backgroundTint="@color/cg_blue"
+                android:elevation="10dp"
+                android:onClick="switchToSearch"
+                android:stateListAnimator="@null"
+                android:text="SEARCH USERS"
+                android:translationZ="10dp"/>
+
+
             <Space
                 android:layout_width="match_parent"
                 android:layout_height="42dp" />

From b54d61532e43e8beceef2f1781bc3415be31fff3 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 18:56:57 +0200
Subject: [PATCH 05/28] WelcomeActivity: remove unnecessary lines

---
 .../java/ch/sdp/vibester/activity/WelcomeActivity.kt   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index 5de6065e4..d6625710d 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -3,13 +3,11 @@ package ch.sdp.vibester.activity
 //import ch.sdp.vibester.profile.ProfileDataProvider
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.view.Window.FEATURE_NO_TITLE
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
-import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.model.UserSharedPref
 
 class WelcomeActivity : AppCompatActivity() {
@@ -57,14 +55,6 @@ class WelcomeActivity : AppCompatActivity() {
         sendDirectIntent(DownloadActivity::class.java)
     }
 
-    /*
-     * Belongs to a previously implemented button, taken out for UI purposes.
-     * Might bring it back, thus leaving the code for now.
-     */
-
-    /*fun switchToLogin(view: View) { //FILLER INTENT
-        sendDirectIntent(GameSetupScreen::class.java)
-    }*/
     fun switchToSearch(view: View) {
         sendDirectIntent(SearchUserActivity::class.java)
     }

From b7d18da6a7837efbc01ce8c1ffb2080b9a9d33de Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 18:57:32 +0200
Subject: [PATCH 06/28] activity_search_user.xml: with editText and recycler
 view

---
 .../main/res/layout/activity_search_user.xml  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 app/src/main/res/layout/activity_search_user.xml

diff --git a/app/src/main/res/layout/activity_search_user.xml b/app/src/main/res/layout/activity_search_user.xml
new file mode 100644
index 000000000..6e445950a
--- /dev/null
+++ b/app/src/main/res/layout/activity_search_user.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/floral_white"
+    tools:context=".activity.SearchUserActivity">
+
+    <EditText
+        android:id="@+id/searchUserET"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="6dp"
+        android:autofillHints="">
+    </EditText>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/searchList"
+        android:layout_below="@+id/searchUserET"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </androidx.recyclerview.widget.RecyclerView>
+
+</RelativeLayout>
\ No newline at end of file

From 3b2ea071d2ea19210fcb63767a50065df2a750ec Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 18:57:50 +0200
Subject: [PATCH 07/28] user_search_item_layout: add user view

---
 .../res/layout/user_search_item_layout.xml    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 app/src/main/res/layout/user_search_item_layout.xml

diff --git a/app/src/main/res/layout/user_search_item_layout.xml b/app/src/main/res/layout/user_search_item_layout.xml
new file mode 100644
index 000000000..a8b70c6b5
--- /dev/null
+++ b/app/src/main/res/layout/user_search_item_layout.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/floral_white"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/profile_image"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:src="@drawable/logo">
+    </ImageView>
+
+    <TextView
+        android:id="@+id/username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/profile_image"
+        android:layout_centerInParent="true"
+        android:layout_marginStart="12dp"
+        android:text="user name"
+        android:textSize="19sp">
+    </TextView>
+
+</RelativeLayout>
\ No newline at end of file

From 59ab29851d0613887782389a016d6cf2e157979c Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 18:58:16 +0200
Subject: [PATCH 08/28] UserAdapter: adapter that hold UserProfiles based on
 search

---
 .../ch/sdp/vibester/activity/UserAdapter.kt   | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 app/src/main/java/ch/sdp/vibester/activity/UserAdapter.kt

diff --git a/app/src/main/java/ch/sdp/vibester/activity/UserAdapter.kt b/app/src/main/java/ch/sdp/vibester/activity/UserAdapter.kt
new file mode 100644
index 000000000..a5aa43574
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/activity/UserAdapter.kt
@@ -0,0 +1,46 @@
+package ch.sdp.vibester.activity
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import ch.sdp.vibester.R
+import ch.sdp.vibester.profile.UserProfile
+
+/**
+ * UserAdapter that is used in the RecycleView to search users
+ */
+class UserAdapter(
+    private val mContext: Context,
+    private val mUsers: List<UserProfile>,
+): RecyclerView.Adapter<UserAdapter.UserProfileViewHolder?>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserProfileViewHolder {
+        val view: View = LayoutInflater.from(mContext).inflate(R.layout.user_search_item_layout, parent, false)
+        return UserProfileViewHolder(view)
+    }
+
+    override fun getItemCount(): Int {
+        return  mUsers.size
+    }
+
+    /**
+     * Customer ViewHolder class for UserProfile
+     */
+    inner class UserProfileViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        /**
+         * @param userProfile with all the parameters
+         */
+        fun bind(user: UserProfile) {
+            itemView.findViewById<TextView>(R.id.username).text = user.username
+//            itemView.findViewById<ImageView>(R.id.iv_photo).loadImg(player.photo)
+        }
+    }
+
+    override fun onBindViewHolder(holder: UserProfileViewHolder, position: Int) {
+        holder.bind(mUsers[position])
+    }
+
+}
\ No newline at end of file

From f4d346965d9c1d76fb3adf3be8783b2c16866b23 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 18:58:38 +0200
Subject: [PATCH 09/28] SearchUserActivity: activity to search the user

---
 .../vibester/activity/SearchUserActivity.kt   | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt

diff --git a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
new file mode 100644
index 000000000..9e6c9ad94
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -0,0 +1,82 @@
+package ch.sdp.vibester.activity
+
+import android.content.ContentValues
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.Log
+import android.view.Window
+import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import ch.sdp.vibester.R
+import ch.sdp.vibester.database.Database
+import ch.sdp.vibester.profile.UserProfile
+import com.google.firebase.database.DataSnapshot
+import com.google.firebase.database.DatabaseError
+import com.google.firebase.database.DatabaseReference
+import com.google.firebase.database.ValueEventListener
+
+
+
+
+class SearchUserActivity : AppCompatActivity() {
+
+    private var userAdapter: UserAdapter? = null
+    private var mUsers: List<UserProfile>? = null
+    private var recyclerView: RecyclerView? = null
+    private var searchEditText: EditText? = null
+    private val dbRef: DatabaseReference = Database.get().getReference("users")
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        supportActionBar?.hide()
+        setContentView(R.layout.activity_search_user)
+
+        recyclerView = findViewById(R.id.searchList)
+        recyclerView!!.setHasFixedSize(true)
+        recyclerView!!.layoutManager = LinearLayoutManager(this)
+
+        mUsers = ArrayList()
+
+        searchEditText = findViewById(R.id.searchUserET)
+
+        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) {
+                searchForUsers(p0.toString())
+            }
+
+            override fun afterTextChanged(p0: Editable?) {
+            }
+        })
+    }
+
+    private fun searchForUsers(str:String){
+        val queryUsers = Database.get().getReference("users")
+            .orderByChild("username")
+            .startAt(str)
+            .endAt(str+"\uf8ff")
+
+        queryUsers.addValueEventListener(object : ValueEventListener {
+            override fun onDataChange(snapshot: DataSnapshot) {
+                (mUsers as ArrayList<UserProfile>).clear()
+                for (dataSnapShot in snapshot.children) {
+                    val user:UserProfile? = dataSnapShot.getValue(UserProfile::class.java)
+                    if (user != null) {
+                        (mUsers as ArrayList<UserProfile>).add(user)
+                    }
+                }
+                userAdapter = UserAdapter(this@SearchUserActivity, mUsers!!)
+                recyclerView!!.adapter = userAdapter
+            }
+            override fun onCancelled(error: DatabaseError) {
+            }
+        })
+    }
+}
+

From 832ede4d1da83d40417c463ce51af9cd7884021a Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 19:25:34 +0200
Subject: [PATCH 10/28] WelcomActivityTest: add test for new button

---
 .../java/ch/sdp/vibester/activity/WelcomeActivityTest.kt    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index 014175c04..04b282ca0 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -68,4 +68,10 @@ class WelcomeActivityTest {
         onView(withId(R.id.welcome_download)).perform(click())
         intended(hasComponent(DownloadActivity::class.java.name))
     }
+
+    @Test
+    fun checkIntentOnSearch() {
+        onView(withId(R.id.welcome_search)).perform(click())
+        intended(hasComponent(SearchUserActivity::class.java.name))
+    }
 }
\ No newline at end of file

From 8b874a587b787be88631b7c395b922e920ee303b Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 19:26:03 +0200
Subject: [PATCH 11/28] UserProfileAdapterTest: add tests to check the adapter,
 similar to PlayerAdapterTest

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

diff --git a/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt b/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
new file mode 100644
index 000000000..500ae35bd
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
@@ -0,0 +1,69 @@
+package ch.sdp.vibester.profile
+
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ApplicationProvider
+import ch.sdp.vibester.profile.UserProfileAdapter
+import ch.sdp.vibester.profile.UserProfile
+import org.hamcrest.CoreMatchers
+import org.hamcrest.MatcherAssert
+import org.junit.Test
+
+class UserProfileAdapterTest {
+    @Test
+    fun recyclerViewShowsCorrectCount() {
+        val user1 = UserProfile("test1", "Brownie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test1@gmail.com")
+        val user2 = UserProfile("test2", "Cookie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test2@gmail.com")
+        val users: MutableList<UserProfile> = arrayListOf()
+        users.addAll(listOf(user1, user2))
+        val userProfileViewHolder: RecyclerView.Adapter<UserProfileAdapter.UserProfileViewHolder> = UserProfileAdapter(users)
+        MatcherAssert.assertThat(userProfileViewHolder.itemCount, CoreMatchers.equalTo(2))
+    }
+
+    @Test
+    fun itemTypeIsCorrect() {
+        val user1 = UserProfile("test1", "Brownie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test1@gmail.com")
+        val user2 = UserProfile("test2", "Cookie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test2@gmail.com")
+        val users: MutableList<UserProfile> = arrayListOf()
+        users.addAll(listOf(user1, user2))
+        val userProfileViewHolder: RecyclerView.Adapter<UserProfileAdapter.UserProfileViewHolder> = UserProfileAdapter(users)
+        val defaultType = 0
+        MatcherAssert.assertThat(
+            userProfileViewHolder.getItemViewType(0),
+            CoreMatchers.equalTo(defaultType)
+        )
+    }
+
+    @Test
+    fun setupAdapterForRecyclerView() {
+        val user1 = UserProfile("test1", "Brownie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test1@gmail.com")
+        val user2 = UserProfile("test2", "Cookie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test2@gmail.com")
+        val users: MutableList<UserProfile> = arrayListOf()
+        users.addAll(listOf(user1, user2))
+        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
+        recyclerView.layoutManager =
+            LinearLayoutManager(ApplicationProvider.getApplicationContext())
+        val userAdapter = UserProfileAdapter(users)
+        recyclerView.adapter = userAdapter
+        val newUsers: MutableList<UserProfile> = arrayListOf()
+        newUsers.add(UserProfile("test3", "Cake", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test3@gmail.com"))
+        userAdapter.addUsers(newUsers)
+        userAdapter.notifyDataSetChanged()
+    }
+
+    @Test
+    fun addPlayersWorks() {
+        val user1 = UserProfile("test1", "Brownie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test1@gmail.com")
+        val user2 = UserProfile("test2", "Cookie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test2@gmail.com")
+        val users: MutableList<UserProfile> = arrayListOf()
+        users.addAll(listOf(user1, user2))
+        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
+        recyclerView.layoutManager =
+            LinearLayoutManager(ApplicationProvider.getApplicationContext())
+        val userAdapter = UserProfileAdapter(users)
+        val user3 = UserProfile("test3", "Cake", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test3@gmail.com")
+        val updatedList = arrayListOf(user3)
+        userAdapter.addUsers(updatedList)
+        MatcherAssert.assertThat(userAdapter.users == updatedList, CoreMatchers.equalTo(true))
+    }
+}
\ No newline at end of file

From 55ee0e8f59ac79e57c9deff2ff10bd3ddf245976 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 19:26:27 +0200
Subject: [PATCH 12/28] UserProfileAdapter: rename and move file

---
 .../UserProfileAdapter.kt}                    | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)
 rename app/src/main/java/ch/sdp/vibester/{activity/UserAdapter.kt => profile/UserProfileAdapter.kt} (61%)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/UserAdapter.kt b/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
similarity index 61%
rename from app/src/main/java/ch/sdp/vibester/activity/UserAdapter.kt
rename to app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
index a5aa43574..9bca08465 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/UserAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
@@ -1,29 +1,30 @@
-package ch.sdp.vibester.activity
+package ch.sdp.vibester.profile
 
-import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
-import ch.sdp.vibester.profile.UserProfile
 
 /**
  * UserAdapter that is used in the RecycleView to search users
  */
-class UserAdapter(
-    private val mContext: Context,
-    private val mUsers: List<UserProfile>,
-): RecyclerView.Adapter<UserAdapter.UserProfileViewHolder?>() {
+class UserProfileAdapter(val users: MutableList<UserProfile>):
+    RecyclerView.Adapter<UserProfileAdapter.UserProfileViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserProfileViewHolder {
-        val view: View = LayoutInflater.from(mContext).inflate(R.layout.user_search_item_layout, parent, false)
+        val view: View = LayoutInflater.from(parent.context)
+            .inflate(R.layout.user_search_item_layout, parent, false)
         return UserProfileViewHolder(view)
     }
 
+    override fun onBindViewHolder(holder: UserProfileViewHolder, position: Int) {
+        holder.bind(users[position])
+    }
+
     override fun getItemCount(): Int {
-        return  mUsers.size
+        return  users.size
     }
 
     /**
@@ -35,12 +36,21 @@ class UserAdapter(
          */
         fun bind(user: UserProfile) {
             itemView.findViewById<TextView>(R.id.username).text = user.username
-//            itemView.findViewById<ImageView>(R.id.iv_photo).loadImg(player.photo)
+//            itemView.findViewById<ImageView>(R.id.iv_photo).loadImg(player.photo) TODO fix the image upload
         }
     }
 
-    override fun onBindViewHolder(holder: UserProfileViewHolder, position: Int) {
-        holder.bind(mUsers[position])
+    /**
+     * Functions for testing
+     */
+
+    fun addUsers(users: List<UserProfile>) {
+        this.users.apply {
+            clear()
+            addAll(users)
+        }
+        notifyDataSetChanged()
     }
 
+
 }
\ No newline at end of file

From f6e69eda0191fd99555f5df555d2c7266dfb74d6 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 19:26:50 +0200
Subject: [PATCH 13/28] SarchActivity: fix the names and types

---
 .../ch/sdp/vibester/activity/SearchUserActivity.kt    | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 9e6c9ad94..b94e560a9 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -1,10 +1,8 @@
 package ch.sdp.vibester.activity
 
-import android.content.ContentValues
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
-import android.util.Log
 import android.view.Window
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
@@ -13,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.Database
 import ch.sdp.vibester.profile.UserProfile
+import ch.sdp.vibester.profile.UserProfileAdapter
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.DatabaseReference
@@ -23,8 +22,8 @@ import com.google.firebase.database.ValueEventListener
 
 class SearchUserActivity : AppCompatActivity() {
 
-    private var userAdapter: UserAdapter? = null
-    private var mUsers: List<UserProfile>? = null
+    private var userProfileAdapter: UserProfileAdapter? = null
+    private var mUsers: MutableList<UserProfile>? = null
     private var recyclerView: RecyclerView? = null
     private var searchEditText: EditText? = null
     private val dbRef: DatabaseReference = Database.get().getReference("users")
@@ -71,8 +70,8 @@ class SearchUserActivity : AppCompatActivity() {
                         (mUsers as ArrayList<UserProfile>).add(user)
                     }
                 }
-                userAdapter = UserAdapter(this@SearchUserActivity, mUsers!!)
-                recyclerView!!.adapter = userAdapter
+                userProfileAdapter = UserProfileAdapter(mUsers!!)
+                recyclerView!!.adapter = userProfileAdapter
             }
             override fun onCancelled(error: DatabaseError) {
             }

From 25a500e08d345f5de3001725348ccc6590c7b769 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 20:12:18 +0200
Subject: [PATCH 14/28] SearchUserActivityTest: add tests

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

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
new file mode 100644
index 000000000..4b26cd264
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
@@ -0,0 +1,67 @@
+package ch.sdp.vibester.activity
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import ch.sdp.vibester.R
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SearchUserActivityTest {
+
+    @Rule
+    @JvmField
+    val activityRule = ActivityScenarioRule(SearchUserActivity::class.java)
+
+    @Before
+    fun setUp() {
+        Intents.init()
+    }
+
+    @After
+    fun clean() {
+        Intents.release()
+    }
+
+
+    @Test
+    fun recycleViewToViewTest() {
+        Espresso.onView(ViewMatchers.withId(R.id.searchList))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    @Test
+    fun recycleViewClickTest() {
+        Espresso.onView((ViewMatchers.withId(R.id.searchList)))
+            .perform(
+                RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
+                    2,
+                    ViewActions.click()
+                )
+            )
+    }
+
+    @Test
+    fun recycleViewScrollDownTest() {
+        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
+        val itemCount = recyclerView.adapter?.itemCount
+        if (itemCount != null) {
+            Espresso.onView(ViewMatchers.withId(R.id.searchList)).perform(
+                RecyclerViewActions.scrollToPosition<RecyclerView.ViewHolder>(
+                    itemCount.minus(1)
+                )
+            )
+        }
+    }
+}
\ No newline at end of file

From d7a26f30ce42c693c251e3f15d21bd28976f3fe3 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 20:12:39 +0200
Subject: [PATCH 15/28] UserProfileAdapterTest: remove unnecessary files

---
 .../java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt b/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
index 500ae35bd..d0c5e5721 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
@@ -3,8 +3,6 @@ package ch.sdp.vibester.profile
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.core.app.ApplicationProvider
-import ch.sdp.vibester.profile.UserProfileAdapter
-import ch.sdp.vibester.profile.UserProfile
 import org.hamcrest.CoreMatchers
 import org.hamcrest.MatcherAssert
 import org.junit.Test

From 71e96491f1c7afcf8f4a650a038ae5bec104fe60 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 20:12:57 +0200
Subject: [PATCH 16/28] SearchUserActivity: add function to display all the
 users

---
 .../vibester/activity/SearchUserActivity.kt   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

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 b94e560a9..2a7d79a30 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -41,6 +41,7 @@ class SearchUserActivity : AppCompatActivity() {
         mUsers = ArrayList()
 
         searchEditText = findViewById(R.id.searchUserET)
+        displayAllUsers()
 
         searchEditText!!.addTextChangedListener(object:TextWatcher{
             override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
@@ -55,6 +56,28 @@ class SearchUserActivity : AppCompatActivity() {
         })
     }
 
+    private fun displayAllUsers(){
+        val dbRef = Database.get().getReference("users")
+
+        dbRef.addValueEventListener(object : ValueEventListener {
+            override fun onDataChange(snapshot: DataSnapshot) {
+                (mUsers as ArrayList<UserProfile>).clear()
+                if (searchEditText!!.text.isEmpty()) {
+                    for (dataSnapShot in snapshot.children) {
+                        val user: UserProfile? = dataSnapShot.getValue(UserProfile::class.java)
+                        if (user != null) {
+                            (mUsers as ArrayList<UserProfile>).add(user)
+                        }
+                    }
+                    userProfileAdapter = UserProfileAdapter(mUsers!!)
+                    recyclerView!!.adapter = userProfileAdapter
+                }
+            }
+            override fun onCancelled(error: DatabaseError) {
+            }
+        })
+    }
+
     private fun searchForUsers(str:String){
         val queryUsers = Database.get().getReference("users")
             .orderByChild("username")

From 5144feb176d526b1cc81102b108affc3b346649b Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 20:13:09 +0200
Subject: [PATCH 17/28] rename the edittext id

---
 app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt | 2 +-
 app/src/main/res/layout/user_search_item_layout.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
index 9bca08465..6f05d7b3b 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
@@ -35,7 +35,7 @@ class UserProfileAdapter(val users: MutableList<UserProfile>):
          * @param userProfile with all the parameters
          */
         fun bind(user: UserProfile) {
-            itemView.findViewById<TextView>(R.id.username).text = user.username
+            itemView.findViewById<TextView>(R.id.search_user_username).text = user.username
 //            itemView.findViewById<ImageView>(R.id.iv_photo).loadImg(player.photo) TODO fix the image upload
         }
     }
diff --git a/app/src/main/res/layout/user_search_item_layout.xml b/app/src/main/res/layout/user_search_item_layout.xml
index a8b70c6b5..61bbf5d0d 100644
--- a/app/src/main/res/layout/user_search_item_layout.xml
+++ b/app/src/main/res/layout/user_search_item_layout.xml
@@ -13,7 +13,7 @@
     </ImageView>
 
     <TextView
-        android:id="@+id/username"
+        android:id="@+id/search_user_username"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toEndOf="@+id/profile_image"

From e9251806e29efe1a7d21081e1b27c9d950d43ef0 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 20:40:37 +0200
Subject: [PATCH 18/28] SearchUserActivity: remove unnecessary function

---
 .../vibester/activity/SearchUserActivity.kt   | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 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 2a7d79a30..ddb09c8a8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -41,7 +41,8 @@ class SearchUserActivity : AppCompatActivity() {
         mUsers = ArrayList()
 
         searchEditText = findViewById(R.id.searchUserET)
-        displayAllUsers()
+        searchForUsers("")
+
 
         searchEditText!!.addTextChangedListener(object:TextWatcher{
             override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
@@ -56,28 +57,6 @@ class SearchUserActivity : AppCompatActivity() {
         })
     }
 
-    private fun displayAllUsers(){
-        val dbRef = Database.get().getReference("users")
-
-        dbRef.addValueEventListener(object : ValueEventListener {
-            override fun onDataChange(snapshot: DataSnapshot) {
-                (mUsers as ArrayList<UserProfile>).clear()
-                if (searchEditText!!.text.isEmpty()) {
-                    for (dataSnapShot in snapshot.children) {
-                        val user: UserProfile? = dataSnapShot.getValue(UserProfile::class.java)
-                        if (user != null) {
-                            (mUsers as ArrayList<UserProfile>).add(user)
-                        }
-                    }
-                    userProfileAdapter = UserProfileAdapter(mUsers!!)
-                    recyclerView!!.adapter = userProfileAdapter
-                }
-            }
-            override fun onCancelled(error: DatabaseError) {
-            }
-        })
-    }
-
     private fun searchForUsers(str:String){
         val queryUsers = Database.get().getReference("users")
             .orderByChild("username")

From d0a715c1745f71db25ea93a722da62b44122a243 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 20:40:59 +0200
Subject: [PATCH 19/28] SearchUserActivityTest: add extra test

---
 .../sdp/vibester/activity/SearchUserActivityTest.kt | 13 +++++++++++++
 .../sdp/vibester/profile/UserProfileAdapterTest.kt  |  1 +
 2 files changed, 14 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 4b26cd264..2a6a26ab6 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.activity
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.contrib.RecyclerViewActions
@@ -12,6 +13,8 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertThat
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -64,4 +67,14 @@ class SearchUserActivityTest {
             )
         }
     }
+    @Test
+    fun recycleViewCheckEmpty() {
+        val inputTxt= "TESTESTESTEST"
+        onView(ViewMatchers.withId(R.id.searchUserET)).perform(ViewActions.typeText(inputTxt),
+            ViewActions.closeSoftKeyboard()
+        )
+        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
+        val itemCount = recyclerView.adapter?.itemCount
+        assertEquals(itemCount, null)
+    }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt b/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
index d0c5e5721..473647ba1 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
@@ -8,6 +8,7 @@ import org.hamcrest.MatcherAssert
 import org.junit.Test
 
 class UserProfileAdapterTest {
+
     @Test
     fun recyclerViewShowsCorrectCount() {
         val user1 = UserProfile("test1", "Brownie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test1@gmail.com")

From 4d5983ccd614d3ce11e446d4a86cc365c2cc8ec2 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 21:54:10 +0200
Subject: [PATCH 20/28] SearchUserActivityTest: remove redundant code

---
 .../ch/sdp/vibester/activity/SearchUserActivityTest.kt    | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 2a6a26ab6..a45306562 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
@@ -14,7 +14,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import org.junit.After
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertThat
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -37,16 +36,15 @@ class SearchUserActivityTest {
         Intents.release()
     }
 
-
     @Test
     fun recycleViewToViewTest() {
-        Espresso.onView(ViewMatchers.withId(R.id.searchList))
+        onView(ViewMatchers.withId(R.id.searchList))
             .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
     }
 
     @Test
     fun recycleViewClickTest() {
-        Espresso.onView((ViewMatchers.withId(R.id.searchList)))
+        onView((ViewMatchers.withId(R.id.searchList)))
             .perform(
                 RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
                     2,
@@ -60,7 +58,7 @@ class SearchUserActivityTest {
         val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
         val itemCount = recyclerView.adapter?.itemCount
         if (itemCount != null) {
-            Espresso.onView(ViewMatchers.withId(R.id.searchList)).perform(
+            onView(ViewMatchers.withId(R.id.searchList)).perform(
                 RecyclerViewActions.scrollToPosition<RecyclerView.ViewHolder>(
                     itemCount.minus(1)
                 )

From f451da79cda7cae033438a21c30a6044ae2f72d9 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 21:54:27 +0200
Subject: [PATCH 21/28] UserProfileAdapterTest: remove redundant tests

---
 .../profile/UserProfileAdapterTest.kt         | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt b/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
index 473647ba1..f602fdf41 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/profile/UserProfileAdapterTest.kt
@@ -32,37 +32,4 @@ class UserProfileAdapterTest {
             CoreMatchers.equalTo(defaultType)
         )
     }
-
-    @Test
-    fun setupAdapterForRecyclerView() {
-        val user1 = UserProfile("test1", "Brownie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test1@gmail.com")
-        val user2 = UserProfile("test2", "Cookie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test2@gmail.com")
-        val users: MutableList<UserProfile> = arrayListOf()
-        users.addAll(listOf(user1, user2))
-        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
-        recyclerView.layoutManager =
-            LinearLayoutManager(ApplicationProvider.getApplicationContext())
-        val userAdapter = UserProfileAdapter(users)
-        recyclerView.adapter = userAdapter
-        val newUsers: MutableList<UserProfile> = arrayListOf()
-        newUsers.add(UserProfile("test3", "Cake", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test3@gmail.com"))
-        userAdapter.addUsers(newUsers)
-        userAdapter.notifyDataSetChanged()
-    }
-
-    @Test
-    fun addPlayersWorks() {
-        val user1 = UserProfile("test1", "Brownie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test1@gmail.com")
-        val user2 = UserProfile("test2", "Cookie", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test2@gmail.com")
-        val users: MutableList<UserProfile> = arrayListOf()
-        users.addAll(listOf(user1, user2))
-        val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
-        recyclerView.layoutManager =
-            LinearLayoutManager(ApplicationProvider.getApplicationContext())
-        val userAdapter = UserProfileAdapter(users)
-        val user3 = UserProfile("test3", "Cake", "https://images.app.goo.gl/yiPpy7JDRFaZRiAg9", "test3@gmail.com")
-        val updatedList = arrayListOf(user3)
-        userAdapter.addUsers(updatedList)
-        MatcherAssert.assertThat(userAdapter.users == updatedList, CoreMatchers.equalTo(true))
-    }
 }
\ No newline at end of file

From 634e4976924a15be7ca2ebe601449d39e00e7e1b Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 21:54:48 +0200
Subject: [PATCH 22/28] SearchUserActivity: fix variables names and spaces

---
 .../vibester/activity/SearchUserActivity.kt   | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 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 ddb09c8a8..aeebecddd 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -17,13 +17,12 @@ import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.ValueEventListener
 
-
-
-
+/**
+ * Search for users based on their usernames.
+ */
 class SearchUserActivity : AppCompatActivity() {
-
     private var userProfileAdapter: UserProfileAdapter? = null
-    private var mUsers: MutableList<UserProfile>? = null
+    private var users: MutableList<UserProfile>? = null
     private var recyclerView: RecyclerView? = null
     private var searchEditText: EditText? = null
     private val dbRef: DatabaseReference = Database.get().getReference("users")
@@ -38,41 +37,42 @@ class SearchUserActivity : AppCompatActivity() {
         recyclerView!!.setHasFixedSize(true)
         recyclerView!!.layoutManager = LinearLayoutManager(this)
 
-        mUsers = ArrayList()
+        users = ArrayList()
 
         searchEditText = findViewById(R.id.searchUserET)
         searchForUsers("")
 
-
         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) {
                 searchForUsers(p0.toString())
             }
-
             override fun afterTextChanged(p0: Editable?) {
             }
         })
     }
 
-    private fun searchForUsers(str:String){
-        val queryUsers = Database.get().getReference("users")
+    /**
+     * Search for users by usernames in Firebase Realtime Database
+     * @param inputUsername search text inputed by user
+     */
+    private fun searchForUsers(inputUsername:String){
+        val queryUsers = dbRef
             .orderByChild("username")
-            .startAt(str)
-            .endAt(str+"\uf8ff")
+            .startAt(inputUsername)
+            .endAt(inputUsername+"\uf8ff")
 
         queryUsers.addValueEventListener(object : ValueEventListener {
-            override fun onDataChange(snapshot: DataSnapshot) {
-                (mUsers as ArrayList<UserProfile>).clear()
-                for (dataSnapShot in snapshot.children) {
-                    val user:UserProfile? = dataSnapShot.getValue(UserProfile::class.java)
-                    if (user != null) {
-                        (mUsers as ArrayList<UserProfile>).add(user)
+            override fun onDataChange(dataSnapshot: DataSnapshot) {
+                (users as ArrayList<UserProfile>).clear()
+                for (snapshot in dataSnapshot.children) {
+                    val userProfile:UserProfile? = snapshot.getValue(UserProfile::class.java)
+                    if (userProfile != null) {
+                        (users as ArrayList<UserProfile>).add(userProfile)
                     }
                 }
-                userProfileAdapter = UserProfileAdapter(mUsers!!)
+                userProfileAdapter = UserProfileAdapter(users!!)
                 recyclerView!!.adapter = userProfileAdapter
             }
             override fun onCancelled(error: DatabaseError) {

From b9b36470e066ffb454dfd9f4bc0d97098689ed69 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 21:55:39 +0200
Subject: [PATCH 23/28] UserProfileAdapter: remove addUsers function

---
 .../ch/sdp/vibester/profile/UserProfileAdapter.kt | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
index 6f05d7b3b..026051af4 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
@@ -36,21 +36,10 @@ class UserProfileAdapter(val users: MutableList<UserProfile>):
          */
         fun bind(user: UserProfile) {
             itemView.findViewById<TextView>(R.id.search_user_username).text = user.username
-//            itemView.findViewById<ImageView>(R.id.iv_photo).loadImg(player.photo) TODO fix the image upload
+//                TODO fix the image upload
+//            itemView.findViewById<ImageView>(R.id.iv_photo).loadImg(player.photo)
         }
     }
 
-    /**
-     * Functions for testing
-     */
-
-    fun addUsers(users: List<UserProfile>) {
-        this.users.apply {
-            clear()
-            addAll(users)
-        }
-        notifyDataSetChanged()
-    }
-
 
 }
\ No newline at end of file

From 241cf0d92248c8baef250bdf4b4a3a60e378979d Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 21:55:51 +0200
Subject: [PATCH 24/28] UserProfileAdapter: fix comments

---
 .../ch/sdp/vibester/profile/UserProfileAdapter.kt    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
index 026051af4..7e8e2dc26 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/profile/UserProfileAdapter.kt
@@ -8,11 +8,14 @@ import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 
 /**
- * UserAdapter that is used in the RecycleView to search users
+ * UserAdapter to set userProfile views with username and image in RecycleView. It is used to search for users.
  */
 class UserProfileAdapter(val users: MutableList<UserProfile>):
     RecyclerView.Adapter<UserProfileAdapter.UserProfileViewHolder>() {
 
+    /**
+     * Create a RecycleView layout with the userProfile view as an item
+     */
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserProfileViewHolder {
         val view: View = LayoutInflater.from(parent.context)
             .inflate(R.layout.user_search_item_layout, parent, false)
@@ -23,12 +26,15 @@ class UserProfileAdapter(val users: MutableList<UserProfile>):
         holder.bind(users[position])
     }
 
+    /**
+     * Get amount of users displayed
+     */
     override fun getItemCount(): Int {
-        return  users.size
+        return users.size
     }
 
     /**
-     * Customer ViewHolder class for UserProfile
+     * Customer ViewHolder class for UserProfile. Each item contains username and image.
      */
     inner class UserProfileViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         /**

From 431b30c6f66e346372df928daed9ed722bcf8bcd Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 22:13:06 +0200
Subject: [PATCH 25/28] SearchUserActivity: put log on database errror

---
 .../main/java/ch/sdp/vibester/activity/SearchUserActivity.kt | 5 ++++-
 1 file changed, 4 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 aeebecddd..1ae8c2c22 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -1,8 +1,10 @@
 package ch.sdp.vibester.activity
 
+import android.content.ContentValues
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
 import android.view.Window
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
@@ -25,7 +27,7 @@ class SearchUserActivity : AppCompatActivity() {
     private var users: MutableList<UserProfile>? = null
     private var recyclerView: RecyclerView? = null
     private var searchEditText: EditText? = null
-    private val dbRef: DatabaseReference = Database.get().getReference("users")
+    private var dbRef: DatabaseReference = Database.get().getReference("users")
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -76,6 +78,7 @@ class SearchUserActivity : AppCompatActivity() {
                 recyclerView!!.adapter = userProfileAdapter
             }
             override fun onCancelled(error: DatabaseError) {
+                Log.w(ContentValues.TAG, "searchForUsers:onCancelled", error.toException())
             }
         })
     }

From 44387f6bf4288ab5db35b4c064f5d2199196b80c Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sat, 16 Apr 2022 22:42:14 +0200
Subject: [PATCH 26/28] rerun tests

---
 .../java/ch/sdp/vibester/activity/SearchUserActivityTest.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 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 a45306562..98c33034e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/SearchUserActivityTest.kt
@@ -69,8 +69,7 @@ class SearchUserActivityTest {
     fun recycleViewCheckEmpty() {
         val inputTxt= "TESTESTESTEST"
         onView(ViewMatchers.withId(R.id.searchUserET)).perform(ViewActions.typeText(inputTxt),
-            ViewActions.closeSoftKeyboard()
-        )
+            ViewActions.closeSoftKeyboard())
         val recyclerView = RecyclerView(ApplicationProvider.getApplicationContext())
         val itemCount = recyclerView.adapter?.itemCount
         assertEquals(itemCount, null)

From a883b46f04fa098d4ce8ac8146fb31b189ac4b39 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sun, 17 Apr 2022 17:16:03 +0200
Subject: [PATCH 27/28] SearchUserActivity: add comment, change var to val

---
 .../main/java/ch/sdp/vibester/activity/SearchUserActivity.kt | 5 ++++-
 1 file changed, 4 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 1ae8c2c22..2280b9ced 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -27,7 +27,7 @@ class SearchUserActivity : AppCompatActivity() {
     private var users: MutableList<UserProfile>? = null
     private var recyclerView: RecyclerView? = null
     private var searchEditText: EditText? = null
-    private var dbRef: DatabaseReference = Database.get().getReference("users")
+    private val dbRef: DatabaseReference = Database.get().getReference("users")
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -58,6 +58,9 @@ class SearchUserActivity : AppCompatActivity() {
     /**
      * Search for users by usernames in Firebase Realtime Database
      * @param inputUsername search text inputed by user
+     * Comment about \uf8ff:
+     * The \uf8ff character used in the query above is a very high code point in the Unicode range.
+     * Because it is after most regular characters in Unicode, the query matches all values that start with a inputUsername.
      */
     private fun searchForUsers(inputUsername:String){
         val queryUsers = dbRef

From 354458c4dace602d7d6b916089af822acda6d347 Mon Sep 17 00:00:00 2001
From: Kamila Babayeva <kamifai14@gmail.com>
Date: Sun, 17 Apr 2022 17:16:28 +0200
Subject: [PATCH 28/28] Add strings, change hint text

---
 app/src/main/res/layout/activity_search_user.xml    | 2 +-
 app/src/main/res/layout/activity_welcome_screen.xml | 2 +-
 app/src/main/res/layout/user_search_item_layout.xml | 2 +-
 app/src/main/res/values/strings.xml                 | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/activity_search_user.xml b/app/src/main/res/layout/activity_search_user.xml
index 6e445950a..329ceca64 100644
--- a/app/src/main/res/layout/activity_search_user.xml
+++ b/app/src/main/res/layout/activity_search_user.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="6dp"
-        android:autofillHints="">
+        android:autofillHints="Enter username to search">
     </EditText>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/activity_welcome_screen.xml b/app/src/main/res/layout/activity_welcome_screen.xml
index 3bca38e03..3da539b22 100644
--- a/app/src/main/res/layout/activity_welcome_screen.xml
+++ b/app/src/main/res/layout/activity_welcome_screen.xml
@@ -121,7 +121,7 @@
                 android:elevation="10dp"
                 android:onClick="switchToSearch"
                 android:stateListAnimator="@null"
-                android:text="SEARCH USERS"
+                android:text="@string/search_users"
                 android:translationZ="10dp"/>
 
 
diff --git a/app/src/main/res/layout/user_search_item_layout.xml b/app/src/main/res/layout/user_search_item_layout.xml
index 61bbf5d0d..4a93d0f25 100644
--- a/app/src/main/res/layout/user_search_item_layout.xml
+++ b/app/src/main/res/layout/user_search_item_layout.xml
@@ -19,7 +19,7 @@
         android:layout_toEndOf="@+id/profile_image"
         android:layout_centerInParent="true"
         android:layout_marginStart="12dp"
-        android:text="user name"
+        android:text="@string/profile_username"
         android:textSize="19sp">
     </TextView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 652444b7d..15e744fd1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -101,4 +101,6 @@
     <string name="result_will_show_here">result will show here</string>
     <string name="welcome_not_logged_in">"User: Not Logged In"</string>
     <string name="game_lyrics">Local Lyrics</string>
+    <string name="profile_username">Profile Username</string>
+    <string name="search_users">SEARCH USERS</string>
 </resources>
\ No newline at end of file