From fbe524e184522d40dd7962df6c7d841eac6c8c96 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 16:37:02 +0200
Subject: [PATCH 01/22] extract gpToPlayerProfileWithSection

---
 .../ch/sdp/vibester/fragment/ScoreBoardFragment.kt    |  5 ++++-
 .../ch/sdp/vibester/fragment/SearchUserFragment.kt    |  4 +++-
 app/src/main/java/ch/sdp/vibester/helper/Helper.kt    | 11 +++++++++++
 3 files changed, 18 insertions(+), 2 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 2a888813f..f9c50159f 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
@@ -16,6 +16,7 @@ import ch.sdp.vibester.R
 import ch.sdp.vibester.activity.PublicProfileActivity
 import ch.sdp.vibester.database.Database
 import ch.sdp.vibester.database.ImageGetter
+import ch.sdp.vibester.helper.Helper
 import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.helper.ViewModel
 import ch.sdp.vibester.user.OnItemClickListener
@@ -110,9 +111,11 @@ class ScoreBoardFragment : Fragment(R.layout.fragment_layout_scoreboard), OnItem
      * go to the profile of the player at index position
      */
     override fun onItemClick(position: Int) {
+        val playerId = players[position].uid
+        //mapOf(Pair("UserId", players[position].uid), Pair("ScoresOrFollowing", R.string.profile_scores.toString()))
         IntentSwitcher.switch(vmScoreBoard.ctx,
             PublicProfileActivity::class.java,
-            mapOf(Pair("UserId", players[position].uid), Pair("ScoresOrFollowing", R.string.profile_scores.toString())))
+            Helper().goToPlayerProfileWithSection(playerId, true))
     }
 
     private fun setGenreListeners(genre: String){
diff --git a/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
index 446413055..e2394114d 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
@@ -14,6 +14,7 @@ import ch.sdp.vibester.activity.PublicProfileActivity
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.ImageGetter
+import ch.sdp.vibester.helper.Helper
 import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.helper.ViewModel
 import ch.sdp.vibester.user.OnItemClickListener
@@ -113,7 +114,8 @@ class SearchUserFragment : Fragment(R.layout.fragment_layout_search_user), OnIte
     }
 
     override fun onItemClick(position: Int) {
-        val extras = mapOf(Pair("UserId", users[position].uid), Pair("ScoresOrFollowing", R.string.profile_following.toString()))
+        //val extras = mapOf(Pair("UserId", users[position].uid), Pair("ScoresOrFollowing", R.string.profile_following.toString()))
+        val extras = Helper().goToPlayerProfileWithSection(users[position].uid, false)
         IntentSwitcher.switch(vmSearchUser.ctx, PublicProfileActivity::class.java, extras)
     }
 }
diff --git a/app/src/main/java/ch/sdp/vibester/helper/Helper.kt b/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
index 6e620bd2f..4237ae4d3 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
@@ -5,12 +5,14 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.view.View
 import android.widget.ImageView
+import ch.sdp.vibester.R
 import ch.sdp.vibester.activity.MainActivity
 import ch.sdp.vibester.api.BitmapGetterApi
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import java.io.Serializable
 import java.util.concurrent.TimeUnit
 
 class Helper {
@@ -49,4 +51,13 @@ class Helper {
             IntentSwitcher.switch(ctx, MainActivity::class.java)
         }
     }
+
+    /**
+     * @param uid uid of the player
+     * @param scoresOrFollowing True goes scores False goes to following
+     */
+    fun goToPlayerProfileWithSection(uid: String, scoresOrFollowing: Boolean): Map<String, Serializable> {
+        val section = if (scoresOrFollowing) R.string.profile_scores else R.string.profile_following
+        return mapOf(Pair("UserId", uid), Pair("ScoresOrFollowing", section.toString()))
+    }
 }
\ No newline at end of file

From 95050e71dcb5e75ce3b3c4cc966edc952766b9a1 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 16:38:14 +0200
Subject: [PATCH 02/22] clean up

---
 .../main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt  | 4 +---
 .../main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt  | 1 -
 2 files changed, 1 insertion(+), 4 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 f9c50159f..e52f47e89 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
@@ -112,9 +112,7 @@ class ScoreBoardFragment : Fragment(R.layout.fragment_layout_scoreboard), OnItem
      */
     override fun onItemClick(position: Int) {
         val playerId = players[position].uid
-        //mapOf(Pair("UserId", players[position].uid), Pair("ScoresOrFollowing", R.string.profile_scores.toString()))
-        IntentSwitcher.switch(vmScoreBoard.ctx,
-            PublicProfileActivity::class.java,
+        IntentSwitcher.switch(vmScoreBoard.ctx, PublicProfileActivity::class.java,
             Helper().goToPlayerProfileWithSection(playerId, true))
     }
 
diff --git a/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
index e2394114d..2d9558e1c 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
@@ -114,7 +114,6 @@ class SearchUserFragment : Fragment(R.layout.fragment_layout_search_user), OnIte
     }
 
     override fun onItemClick(position: Int) {
-        //val extras = mapOf(Pair("UserId", users[position].uid), Pair("ScoresOrFollowing", R.string.profile_following.toString()))
         val extras = Helper().goToPlayerProfileWithSection(users[position].uid, false)
         IntentSwitcher.switch(vmSearchUser.ctx, PublicProfileActivity::class.java, extras)
     }

From ad15012c353b5b92f111b50b551b17abc59e2363 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 16:39:45 +0200
Subject: [PATCH 03/22] change var to val in OfflineSongList.kt

---
 app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index f5dd36b26..a7177a64f 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -31,18 +31,17 @@ class OfflineSongList(externalDir: File) {
      * Saves the list of songs in songList
      */
     private fun fillList() {
-        var records = File(externals, "records.txt")
-
+        val records = File(externals, "records.txt")
 
         if (!records.exists() || records.length() == 0L) {
             //There are no downloaded songs, keep the song list empty
             emptySongs = true
         } else {
-            var reader = BufferedReader(FileReader(records))
+            val reader = BufferedReader(FileReader(records))
             var currentLine = reader.readLine()
 
             while (currentLine != null) {
-                var trimmed = currentLine.trim()
+                val trimmed = currentLine.trim()
                 if (trimmed.isNotEmpty()) {
                     val split = trimmed.split("-")
                     if (split.size == 2) {

From 1e42393812d15ddc3bc7e47446306097b12c6b8c Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 16:44:55 +0200
Subject: [PATCH 04/22] refactor getShuffledList of songList

---
 app/src/main/java/ch/sdp/vibester/helper/Helper.kt         | 4 ++++
 app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt | 6 ++----
 app/src/main/java/ch/sdp/vibester/model/SongList.kt        | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/helper/Helper.kt b/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
index 4237ae4d3..0202ead44 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
@@ -60,4 +60,8 @@ class Helper {
         val section = if (scoresOrFollowing) R.string.profile_scores else R.string.profile_following
         return mapOf(Pair("UserId", uid), Pair("ScoresOrFollowing", section.toString()))
     }
+
+    fun getShuffledList(songList: MutableList<Pair<String, String>>): MutableList<Pair<String, String>> {
+        return songList.asSequence().shuffled().toMutableList()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index a7177a64f..63742e81a 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -1,8 +1,6 @@
 package ch.sdp.vibester.model
 
-import android.content.Context
-import android.os.Environment
-import ch.sdp.vibester.api.LastfmMethod
+import ch.sdp.vibester.helper.Helper
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileReader
@@ -68,7 +66,7 @@ class OfflineSongList(externalDir: File) {
      * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
      */
     fun getShuffledDownloadedSongList(): MutableList<Pair<String, String>> {
-        return songList.asSequence().shuffled().toMutableList()
+        return Helper().getShuffledList(songList)
     }
 
     /**
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongList.kt b/app/src/main/java/ch/sdp/vibester/model/SongList.kt
index 93c9a8b9d..940535074 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongList.kt
@@ -1,6 +1,7 @@
 package ch.sdp.vibester.model
 
 import ch.sdp.vibester.api.LastfmMethod
+import ch.sdp.vibester.helper.Helper
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -70,7 +71,7 @@ class SongList(jsonMeta: String, method: String) {
      * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
      */
     fun getShuffledSongList(): MutableList<Pair<String, String>> {
-        return songList.asSequence().shuffled().toMutableList()
+        return Helper().getShuffledList(songList)
     }
 
     /**

From a017886847725590237661353d04ca237962c3d9 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 16:47:08 +0200
Subject: [PATCH 05/22] clean doc

---
 app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index 63742e81a..245e788a0 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -8,8 +8,6 @@ import java.io.FileReader
 /**
  * Process the fetched data from the external storage of the app.
  * Mainly, it creates a list of songs in the form Pair("$songName", "$artistName")
- * @param ctx: Context of the caller, to fetch the downloaded folder
- * @param method: Chosen playlist type
  */
 class OfflineSongList(externalDir: File) {
     private var songList = mutableListOf<Pair<String, String>>()

From 91ba5a9965941e12ef8977b39f743a26796fa88d Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 16:47:31 +0200
Subject: [PATCH 06/22] rename OfflineSongList.kt

---
 .../main/java/ch/sdp/vibester/model/OfflineSongList.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index 245e788a0..9b9fa8e0c 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -10,7 +10,7 @@ import java.io.FileReader
  * Mainly, it creates a list of songs in the form Pair("$songName", "$artistName")
  */
 class OfflineSongList(externalDir: File) {
-    private var songList = mutableListOf<Pair<String, String>>()
+    private var offlineSongList = mutableListOf<Pair<String, String>>()
     private val page = "1"
     private val songsPerPage = "100"
     private val totalPages = "20"
@@ -41,7 +41,7 @@ class OfflineSongList(externalDir: File) {
                 if (trimmed.isNotEmpty()) {
                     val split = trimmed.split("-")
                     if (split.size == 2) {
-                        songList.add(Pair(split[0].trim(), split[1].trim()))
+                        offlineSongList.add(Pair(split[0].trim(), split[1].trim()))
                     }
                 }
                 currentLine = reader.readLine()
@@ -56,7 +56,7 @@ class OfflineSongList(externalDir: File) {
      * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
      */
     fun getSongList(): MutableList<Pair<String, String>> {
-        return songList
+        return offlineSongList
     }
 
     /**
@@ -64,7 +64,7 @@ class OfflineSongList(externalDir: File) {
      * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
      */
     fun getShuffledDownloadedSongList(): MutableList<Pair<String, String>> {
-        return Helper().getShuffledList(songList)
+        return Helper().getShuffledList(offlineSongList)
     }
 
     /**

From b5b018a16760406e612685dd73500d53acdc450d Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 16:57:52 +0200
Subject: [PATCH 07/22] use super class for SongList.kt

---
 .../main/java/ch/sdp/vibester/helper/Helper.kt |  4 ----
 .../ch/sdp/vibester/model/OfflineSongList.kt   | 16 +++-------------
 .../java/ch/sdp/vibester/model/SongList.kt     | 18 +-----------------
 .../ch/sdp/vibester/model/SuperSongList.kt     | 13 +++++++++++++
 4 files changed, 17 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/model/SuperSongList.kt

diff --git a/app/src/main/java/ch/sdp/vibester/helper/Helper.kt b/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
index 0202ead44..4237ae4d3 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
@@ -60,8 +60,4 @@ class Helper {
         val section = if (scoresOrFollowing) R.string.profile_scores else R.string.profile_following
         return mapOf(Pair("UserId", uid), Pair("ScoresOrFollowing", section.toString()))
     }
-
-    fun getShuffledList(songList: MutableList<Pair<String, String>>): MutableList<Pair<String, String>> {
-        return songList.asSequence().shuffled().toMutableList()
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index 9b9fa8e0c..ac21e4492 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -1,6 +1,5 @@
 package ch.sdp.vibester.model
 
-import ch.sdp.vibester.helper.Helper
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileReader
@@ -9,8 +8,7 @@ import java.io.FileReader
  * Process the fetched data from the external storage of the app.
  * Mainly, it creates a list of songs in the form Pair("$songName", "$artistName")
  */
-class OfflineSongList(externalDir: File) {
-    private var offlineSongList = mutableListOf<Pair<String, String>>()
+class OfflineSongList(externalDir: File): SuperSongList() {
     private val page = "1"
     private val songsPerPage = "100"
     private val totalPages = "20"
@@ -41,7 +39,7 @@ class OfflineSongList(externalDir: File) {
                 if (trimmed.isNotEmpty()) {
                     val split = trimmed.split("-")
                     if (split.size == 2) {
-                        offlineSongList.add(Pair(split[0].trim(), split[1].trim()))
+                        songList.add(Pair(split[0].trim(), split[1].trim()))
                     }
                 }
                 currentLine = reader.readLine()
@@ -51,20 +49,12 @@ class OfflineSongList(externalDir: File) {
         }
     }
 
-    /**
-     * Getter that return songs for the given tag
-     * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
-     */
-    fun getSongList(): MutableList<Pair<String, String>> {
-        return offlineSongList
-    }
-
     /**
      * Getter that return shuffled song list
      * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
      */
     fun getShuffledDownloadedSongList(): MutableList<Pair<String, String>> {
-        return Helper().getShuffledList(offlineSongList)
+        return super.getShuffledSongList()
     }
 
     /**
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongList.kt b/app/src/main/java/ch/sdp/vibester/model/SongList.kt
index 940535074..440a7a6bb 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongList.kt
@@ -10,8 +10,7 @@ import org.json.JSONObject
  * Mainly, it creates a list of songs in the form Pair("$songName", "$artistName")
  * @param jsonMeta: Lastfm fetched data
  */
-class SongList(jsonMeta: String, method: String) {
-    private var songList = mutableListOf<Pair<String, String>>()
+class SongList(jsonMeta: String, method: String): SuperSongList() {
     private var page = ""
     private var songsPerPage = ""
     private var totalPages = ""
@@ -58,21 +57,6 @@ class SongList(jsonMeta: String, method: String) {
         }
     }
 
-    /**
-     * Getter that return songs for the given tag
-     * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
-     */
-    fun getSongList(): MutableList<Pair<String, String>> {
-        return songList
-    }
-
-    /**
-     * Getter that return shuffled song list
-     * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
-     */
-    fun getShuffledSongList(): MutableList<Pair<String, String>> {
-        return Helper().getShuffledList(songList)
-    }
 
     /**
      * Getter that return page number from the query
diff --git a/app/src/main/java/ch/sdp/vibester/model/SuperSongList.kt b/app/src/main/java/ch/sdp/vibester/model/SuperSongList.kt
new file mode 100644
index 000000000..bf5e80032
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/model/SuperSongList.kt
@@ -0,0 +1,13 @@
+package ch.sdp.vibester.model
+
+open class SuperSongList {
+    var songList = mutableListOf<Pair<String, String>>()
+
+    /**
+     * Getter that return shuffled song list
+     * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
+     */
+    fun getShuffledSongList(): MutableList<Pair<String, String>> {
+        return songList.asSequence().shuffled().toMutableList()
+    }
+}
\ No newline at end of file

From 6fa51eb97cf68eaf8d9dbc3575c1a826062c7bff Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 19:45:49 +0200
Subject: [PATCH 08/22] update song list tests

---
 .../java/ch/sdp/vibester/model/OfflineSongListTest.kt      | 7 +++----
 .../androidTest/java/ch/sdp/vibester/model/SongListTest.kt | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
index e7be83155..fea884d8f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
@@ -2,7 +2,6 @@ package ch.sdp.vibester.model
 
 import android.os.Environment
 import androidx.test.platform.app.InstrumentationRegistry
-import ch.sdp.vibester.api.LastfmMethod
 import org.junit.Assert
 import org.junit.Test
 import java.io.File
@@ -24,7 +23,7 @@ class OfflineSongListTest {
         val totalPages = "20"
         val totalSongs = "2000"
 
-        Assert.assertEquals(inputSongsList, mySongsList.getSongList())
+        Assert.assertEquals(inputSongsList, mySongsList.songList)
         Assert.assertEquals(page, mySongsList.getPage())
         Assert.assertEquals(songsPerPage, mySongsList.getSongsPerPage())
         Assert.assertEquals(totalPages, mySongsList.getTotalPages())
@@ -35,7 +34,7 @@ class OfflineSongListTest {
     @Test
     fun addSpecificSongToList() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
-        var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+        val records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
         records.createNewFile()
         records.appendText("bones - imagine dragons\n")
 
@@ -53,7 +52,7 @@ class OfflineSongListTest {
         val totalPages = "20"
         val totalSongs = "2000"
 
-        Assert.assertEquals(inputSongsList, mySongsList.getSongList())
+        Assert.assertEquals(inputSongsList, mySongsList.songList)
         Assert.assertEquals(page, mySongsList.getPage())
         Assert.assertEquals(songsPerPage, mySongsList.getSongsPerPage())
         Assert.assertEquals(totalPages, mySongsList.getTotalPages())
diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/SongListTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/SongListTest.kt
index 4f2e8e8a1..3663f0063 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/model/SongListTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/model/SongListTest.kt
@@ -37,7 +37,7 @@ class SongListTest {
         assertEquals(songName, mySongsList.getShuffledSongList().get(0).first)
 
 
-        assertEquals(inputSongsList, mySongsList.getSongList())
+        assertEquals(inputSongsList, mySongsList.songList)
         assertEquals(page, mySongsList.getPage())
         assertEquals(songsPerPage, mySongsList.getSongsPerPage())
         assertEquals(totalPages, mySongsList.getTotalPages())

From e921d8dad7035a1a48e6e33074a39f45ee22acab Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 19:56:48 +0200
Subject: [PATCH 09/22] refactor skip btn in BuzzerScreenActivity.kt

---
 .../java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
index 826f2723d..7f0e82282 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
@@ -75,7 +75,8 @@ class BuzzerScreenActivity : GameActivity() {
             buildScores(getPlayers, allPoints)
             buildBuzzers(getPlayers, findViewById(R.id.answer))
 
-            findViewById<Button>(R.id.skip_buzzer).setOnClickListener { timeoutAnswer(ctx, null, gameManager) }
+            val skipBtn = findViewById<Button>(R.id.skip_buzzer)
+            skipBtn.setOnClickListener { timeoutAnswer(ctx, null, gameManager) }
             setAnswerButton(ctx, findViewById(R.id.buttonCorrect), buzzersToRows)
             setAnswerButton(ctx, findViewById(R.id.buttonWrong), buzzersToRows)
             setNextButton(ctx, gameManager)
@@ -293,7 +294,7 @@ class BuzzerScreenActivity : GameActivity() {
     /**
      * Fires an intent from the Gamescreen to the Ending Screen
      */
-    fun switchToEnding(gameManager: GameManager) {
+    private fun switchToEnding(gameManager: GameManager) {
         checkAndStopPlayer(gameManager)
         val intent = Intent(this, GameEndingActivity::class.java)
 

From 894d35ff0b0db6e852024f4ae8085e0319e38270 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 19:59:29 +0200
Subject: [PATCH 10/22] refactor set song title in BuzzerScreenActivity.kt

---
 .../java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
index 7f0e82282..e33bf59df 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
@@ -104,9 +104,10 @@ class BuzzerScreenActivity : GameActivity() {
         gameIsOn = true
         toggleBtnVisibility(R.id.skip_buzzer, true)
         findViewById<LinearLayout>(R.id.answer).visibility=View.INVISIBLE
-        val trackName = gameManager.getCurrentSong().getTrackName()
-        val artist = gameManager.getCurrentSong().getArtistName()
-        findViewById<TextView>(R.id.songTitle).text = "$trackName - $artist"
+        //val trackName = gameManager.getCurrentSong().getTrackName()
+        //val artist = gameManager.getCurrentSong().getArtistName()
+        findViewById<TextView>(R.id.songTitle).text =
+            "${gameManager.getCurrentSong().getTrackName()} - ${gameManager.getCurrentSong().getArtistName()}"
         //Checks if internet is available. If not, skip the loading of the artwork from url.
         if (gameManager.getInternet()) {
             Glide.with(ctx).load(gameManager.getCurrentSong().getArtworkUrl()).override(artworkDim, artworkDim).into(findViewById(R.id.songArtwork))

From a5a4d64f95e83baab9224cd97c9921ec519acf83 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:01:05 +0200
Subject: [PATCH 11/22] dedup skip btn

---
 .../java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt    | 3 +--
 .../main/java/ch/sdp/vibester/activity/TypingGameActivity.kt | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
index e33bf59df..6547cd26f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
@@ -75,8 +75,7 @@ class BuzzerScreenActivity : GameActivity() {
             buildScores(getPlayers, allPoints)
             buildBuzzers(getPlayers, findViewById(R.id.answer))
 
-            val skipBtn = findViewById<Button>(R.id.skip_buzzer)
-            skipBtn.setOnClickListener { timeoutAnswer(ctx, null, gameManager) }
+            findViewById<Button>(R.id.skip_buzzer).setOnClickListener { timeoutAnswer(ctx, null, gameManager) }
             setAnswerButton(ctx, findViewById(R.id.buttonCorrect), buzzersToRows)
             setAnswerButton(ctx, findViewById(R.id.buttonWrong), buzzersToRows)
             setNextButton(ctx, gameManager)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
index 9f29da664..a2a1e899d 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -45,9 +45,8 @@ class TypingGameActivity : GameActivity() {
         val inputTxt = findViewById<EditText>(R.id.yourGuessET)
         setGuessLayoutListener(inputTxt, guessLayout)
 
-        findViewById<Button>(R.id.skip_typing).setOnClickListener {
-            checkAnswer(ctx, null, gameManager)
-        }
+        val skipBtn = findViewById<Button>(R.id.skip_typing)
+        skipBtn.setOnClickListener { checkAnswer(ctx, null, gameManager) }
     }
 
     /**

From 868126bcd5a45f165943333dd7babeeff7bf6972 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:05:28 +0200
Subject: [PATCH 12/22] refactor choose genre btn in ScoreBoardFragment.kt

---
 .../vibester/fragment/ScoreBoardFragment.kt   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 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 e52f47e89..1a7c027cb 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
@@ -44,12 +44,19 @@ class ScoreBoardFragment : Fragment(R.layout.fragment_layout_scoreboard), OnItem
         vmScoreBoard.view = view
         vmScoreBoard.ctx = view.context
 
-        view.findViewById<Button>(R.id.scoreboard_kpopButton).setOnClickListener { setGenreListeners("Kpop") }
-        view.findViewById<Button>(R.id.scoreboard_rockButton).setOnClickListener {setGenreListeners("Rock") }
-        view.findViewById<Button>(R.id.scoreboard_btsButton).setOnClickListener { setGenreListeners("BTS") }
-        view.findViewById<Button>(R.id.scoreboard_topTracksButton).setOnClickListener{ setGenreListeners("top tracks") }
-        view.findViewById<Button>(R.id.scoreboard_imagDragonsButton).setOnClickListener{ setGenreListeners("Imagine Dragons") }
-        view.findViewById<Button>(R.id.scoreboard_billieEilishButton).setOnClickListener { setGenreListeners("Billie Eillish") }
+        val kpop = view.findViewById<Button>(R.id.scoreboard_kpopButton)
+        val rock = view.findViewById<Button>(R.id.scoreboard_rockButton)
+        val bts = view.findViewById<Button>(R.id.scoreboard_btsButton)
+        val topTracks = view.findViewById<Button>(R.id.scoreboard_topTracksButton)
+        val imagDragons = view.findViewById<Button>(R.id.scoreboard_imagDragonsButton)
+        val billieEilish = view.findViewById<Button>(R.id.scoreboard_billieEilishButton)
+
+        kpop.setOnClickListener { setGenreListeners("Kpop") }
+        rock.setOnClickListener {setGenreListeners("Rock") }
+        bts.setOnClickListener { setGenreListeners("BTS") }
+        topTracks.setOnClickListener{ setGenreListeners("top tracks") }
+        imagDragons.setOnClickListener{ setGenreListeners("Imagine Dragons") }
+        billieEilish.setOnClickListener { setGenreListeners("Billie Eillish") }
         setupRecycleView()
     }
 

From df4c9263b355ba2644a71381428f56718ab2af3b Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:11:12 +0200
Subject: [PATCH 13/22] dedup next btn start round in
 LyricsBelongGameActivity.kt

---
 .../ch/sdp/vibester/activity/LyricsBelongGameActivity.kt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
index 2334d9013..8ca7412b5 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -40,11 +40,12 @@ class LyricsBelongGameActivity : GameActivity() {
         if (getIntent != null) {
             gameManager = getIntent.getSerializable("gameManager") as GameManager
             // put in one line to increase coverage
-            findViewById<Button>(R.id.nextSongLyrics).setOnClickListener { startRound(ctx, gameManager) }
+            val nextSong = findViewById<Button>(R.id.nextSongLyrics)
+            nextSong.setOnClickListener { startRoundLyrics(ctx, gameManager) }
             findViewById<Button>(R.id.lyricMatchButton).setOnClickListener { getAndCheckLyrics(ctx, song, speechInput, gameManager) }
 
             gameManager.setNextSong()
-            startRound(ctx, gameManager)
+            startRoundLyrics(ctx, gameManager)
             super.setMax(intent)
         }
 
@@ -87,7 +88,7 @@ class LyricsBelongGameActivity : GameActivity() {
      * @param ctx: Context on which the round is happening.
      * @param gameManager: The gameManager instance that is managing the current game.
      */
-    private fun startRound(ctx: Context, gameManager: GameManager) {
+    private fun startRoundLyrics(ctx: Context, gameManager: GameManager) {
         toggleBtnVisibility(R.id.lyricMatchButton, false)
         toggleBtnVisibility(R.id.nextSongLyrics, false)
         song = gameManager.getCurrentSong()//Song.songBuilder("", "", gameManager.currentSong.getTrackName(), gameManager.currentSong.getArtistName())
@@ -227,7 +228,7 @@ class LyricsBelongGameActivity : GameActivity() {
     }
 
     fun testStartRound(ctx: Context, gameManager: GameManager) {
-        startRound(ctx, gameManager)
+        startRoundLyrics(ctx, gameManager)
     }
 
 }
\ No newline at end of file

From 8c11020add8f530e0c6cebe22fad098c594ffa19 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:17:24 +0200
Subject: [PATCH 14/22] refactor AuthenticationFragment.kt

---
 .../fragment/AuthenticationFragment.kt        | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/fragment/AuthenticationFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/AuthenticationFragment.kt
index f70ecf268..849890768 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/AuthenticationFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/AuthenticationFragment.kt
@@ -44,7 +44,7 @@ class AuthenticationFragment : Fragment(R.layout.fragment_layout_authentication)
 
     private lateinit var auth: FirebaseAuth
 
-    private lateinit var authentication_status: TextView
+    private lateinit var authenticationStatus: TextView
     private lateinit var username: EditText
     private lateinit var password: EditText
     private var vmAuth = ViewModel()
@@ -55,13 +55,10 @@ class AuthenticationFragment : Fragment(R.layout.fragment_layout_authentication)
         super.onViewCreated(view, savedInstanceState)
         vmAuth.view = view
         vmAuth.ctx = view.context
-        val googleSignInToken =
-            "7687769601-qiqrp6kt48v89ub76k9lkpefh9ls36ha.apps.googleusercontent.com"
+        val googleSignInToken = "7687769601-qiqrp6kt48v89ub76k9lkpefh9ls36ha.apps.googleusercontent.com"
 
         val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-            .requestIdToken(googleSignInToken)
-            .requestEmail()
-            .build()
+            .requestIdToken(googleSignInToken).requestEmail().build()
 
         googleSignInClient = GoogleSignIn.getClient(vmAuth.ctx, gso)
 
@@ -69,16 +66,16 @@ class AuthenticationFragment : Fragment(R.layout.fragment_layout_authentication)
 
         username = vmAuth.view.findViewById(R.id.username)
         password = vmAuth.view.findViewById(R.id.password)
-        authentication_status = vmAuth.view.findViewById(R.id.authentication_status)
-
-        vmAuth.view.findViewById<Button>(R.id.createAcc)
-            .setOnClickListener { createAccountListener() }
-        vmAuth.view.findViewById<Button>(R.id.logIn)
-            .setOnClickListener { logInListener() }
-        vmAuth.view.findViewById<Button>(R.id.googleBtn)
-            .setOnClickListener { googleSignInListener() }
-        vmAuth.view.findViewById<Button>(R.id.forgotPassword)
-            .setOnClickListener { resetPasswordListener() }
+        authenticationStatus = vmAuth.view.findViewById(R.id.authentication_status)
+
+        val createAccount = vmAuth.view.findViewById<Button>(R.id.createAcc)
+        createAccount.setOnClickListener { createAccountListener() }
+        val logIn = vmAuth.view.findViewById<Button>(R.id.logIn)
+        logIn.setOnClickListener { logInListener() }
+        val google = vmAuth.view.findViewById<Button>(R.id.googleBtn)
+        google.setOnClickListener { googleSignInListener() }
+        val forgetPass = vmAuth.view.findViewById<Button>(R.id.forgotPassword)
+        forgetPass.setOnClickListener { resetPasswordListener() }
     }
 
     /**
@@ -106,7 +103,7 @@ class AuthenticationFragment : Fragment(R.layout.fragment_layout_authentication)
     /**
      * Listener bound to the "Reset Password" button in the Authentication activity.
      */
-    fun resetPasswordListener() {
+    private fun resetPasswordListener() {
         resetPassword(username.text.toString())
     }
 
@@ -150,8 +147,8 @@ class AuthenticationFragment : Fragment(R.layout.fragment_layout_authentication)
             .addOnCompleteListener { task ->
                 if (task.isSuccessful) {
                     Log.d(getString(R.string.log_tag), "signInWithCredential:success")
-                    if (task.getResult().additionalUserInfo != null) {
-                        createAcc = task.getResult().additionalUserInfo!!.isNewUser
+                    if (task.result.additionalUserInfo != null) {
+                        createAcc = task.result.additionalUserInfo!!.isNewUser
                         if (createAcc) {
                             createAccount()
                         }
@@ -170,23 +167,23 @@ class AuthenticationFragment : Fragment(R.layout.fragment_layout_authentication)
 
     /**
      * A function validates email and password
-     * @param email email
-     * @param password passwprd
+     * @param username username
+     * @param password password
      * @return validity of email and password
      */
     private fun credentialsValidation(username: String, password: String): Boolean {
         if (username.isEmpty() || password.isEmpty()) {
-            authentication_status.setText(R.string.authentication_emptyField)
+            authenticationStatus.setText(R.string.authentication_emptyField)
             return false
         }
 
         if (!username.contains('@')) {
-            authentication_status.setText(R.string.authentication_notAnEmail)
+            authenticationStatus.setText(R.string.authentication_notAnEmail)
             return false
         }
 
         if (password.length < 6) {
-            authentication_status.setText(R.string.authentication_shortPassword)
+            authenticationStatus.setText(R.string.authentication_shortPassword)
             return false
         }
         return true
@@ -254,12 +251,11 @@ class AuthenticationFragment : Fragment(R.layout.fragment_layout_authentication)
 
     /**
      *  Reset Password function
-     *  @param email email adress for the password reset
+     *  @param email email address for the password reset
      */
     private fun resetPassword(email: String) {
         auth.sendPasswordResetEmail(email).addOnFailureListener {
-            Toast.makeText(vmAuth.ctx, R.string.authentication_forgotPassword, Toast.LENGTH_SHORT)
-                .show()
+            Toast.makeText(vmAuth.ctx, R.string.authentication_forgotPassword, Toast.LENGTH_SHORT).show()
         }
     }
 }
\ No newline at end of file

From 6683189560a4971b1a17979e66d7d5fd2c47d445 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:23:09 +0200
Subject: [PATCH 15/22] refactor alert in DownloadFunctionalityActivity.kt

---
 .../download/DownloadFunctionalityActivity.kt        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/download/DownloadFunctionalityActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/download/DownloadFunctionalityActivity.kt
index f9c242c16..1412e8b2e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/download/DownloadFunctionalityActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/download/DownloadFunctionalityActivity.kt
@@ -63,7 +63,7 @@ open class DownloadFunctionalityActivity : AppCompatActivity() {
             override fun onReceive(context: Context?, intent: Intent?) {
                 val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
                 if (id == downloadId) {
-                    alert(getString(R.string.download_download_complete), getString(R.string.download_try_another), songNameView)
+                    alert(R.string.download_download_complete, R.string.download_try_another, songNameView)
                 }
             }
         }
@@ -90,12 +90,12 @@ open class DownloadFunctionalityActivity : AppCompatActivity() {
      * @param hint : String to be set as the hint of the textView.
      * @param view : The textView that will be updated.
      */
-    fun alert(toast: String, hint: String?, view: TextView?) {
+    fun alert(toast: Int, hint: Int?, view: TextView?) {
         downloadComplete = true
         downloadStarted = false
-        Toast.makeText(applicationContext, toast, Toast.LENGTH_LONG).show()
+        Toast.makeText(applicationContext, getString(toast), Toast.LENGTH_LONG).show()
         if (hint != null && view != null) {
-            editTextView(hint, view)
+            editTextView(getString(hint), view)
         }
     }
 
@@ -120,7 +120,7 @@ open class DownloadFunctionalityActivity : AppCompatActivity() {
             }
 
             if (checkExistingSong()) {
-                alert(getString(R.string.download_already_done), getString(R.string.download_try_different), songView)
+                alert(R.string.download_already_done, R.string.download_try_different, songView)
             } else { getAndDownload(songView) }
         }
     }
@@ -144,7 +144,7 @@ open class DownloadFunctionalityActivity : AppCompatActivity() {
             songName = song.getTrackName().lowercase() + " - " + song.getArtistName().lowercase()
             checkPermissionsAndDownload()
         } catch (e: IllegalArgumentException) {
-            alert(getString(R.string.download_unable_to_find), getString(R.string.download_retry), songView)
+            alert(R.string.download_unable_to_find, R.string.download_retry, songView)
         }
     }
 

From d5e3ae2993197727160cec0af17e4af54e3bd777 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:27:28 +0200
Subject: [PATCH 16/22] refactor QrScanningActivity.kt

---
 .../ch/sdp/vibester/activity/QrScanningActivity.kt     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/QrScanningActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/QrScanningActivity.kt
index f3166ddff..e0880c93a 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/QrScanningActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/QrScanningActivity.kt
@@ -1,7 +1,6 @@
 package ch.sdp.vibester.activity
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.util.Log
@@ -13,8 +12,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.navigation.Navigation
-import androidx.navigation.findNavController
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
@@ -26,7 +23,6 @@ import com.google.android.gms.vision.barcode.Barcode
 import com.google.android.gms.vision.barcode.BarcodeDetector
 import dagger.hilt.android.AndroidEntryPoint
 import java.io.IOException
-import java.io.Serializable
 import javax.inject.Inject
 
 
@@ -134,7 +130,8 @@ class QrScanningActivity : AppCompatActivity() {
     private fun setupBarcodeDetector(barcodeDetector: BarcodeDetector) {
         barcodeDetector.setProcessor(object : Detector.Processor<Barcode> {
             override fun release() {
-                Toast.makeText(applicationContext, getString(R.string.qrScanning_scannerClosed), Toast.LENGTH_SHORT).show()
+                val text = getString(R.string.qrScanning_scannerClosed)
+                Toast.makeText(applicationContext, text, Toast.LENGTH_SHORT).show()
             }
 
             override fun receiveDetections(detections: Detector.Detections<Barcode>) {
@@ -186,7 +183,8 @@ class QrScanningActivity : AppCompatActivity() {
                 finish()
             } else {
                 // Camera permission not granted, come back to previous activity
-                Toast.makeText(applicationContext, getString(R.string.qrScanning_cameraError), Toast.LENGTH_LONG).show()
+                val text = getString(R.string.qrScanning_cameraError)
+                Toast.makeText(applicationContext, text, Toast.LENGTH_LONG).show()
                 finishActivity()
             }
         }

From 21b87d4832bc3c7e65bf08d8c6e4f3c1621702dd Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:29:53 +0200
Subject: [PATCH 17/22] dedup toast make text

---
 app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 73976249b..18b55da79 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -103,7 +103,8 @@ class UserProfileAdapter constructor(
                         dataGetter.setFollowing(currentUser.uid, user.uid)
                         changeBtnToImage()
                     } else {
-                        Toast.makeText(it.context, R.string.searchUser_pleaseLogInFirst, Toast.LENGTH_SHORT).show()
+                        val text = R.string.searchUser_pleaseLogInFirst
+                        Toast.makeText(it.context, text, Toast.LENGTH_SHORT).show()
                     }
                 }
             }

From e1408f49591bdc95099cccfef243ed4d47a19e74 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:34:41 +0200
Subject: [PATCH 18/22] dedup onCancelled msg in DataGetter.kt

---
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 935a77402..48cafa9c1 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -182,7 +182,8 @@ class DataGetter @Inject constructor() {
                 queryUsers.removeEventListener(this)
             }
             override fun onCancelled(error: DatabaseError) {
-                Log.w(TAG, "searchByField:onCancelled", error.toException())
+                val msg = "searchByField:onCancelled"
+                Log.w(TAG, msg, error.toException())
             }
         })
     }
@@ -196,7 +197,8 @@ class DataGetter @Inject constructor() {
         dbUserRef.child(userId).get().addOnSuccessListener {
             it.getValue<User>()?.let { it1 -> callback(it1) }
         }.addOnFailureListener{
-            Log.d("DataGetter", "getUserData:onCancelled", it)
+            val msg = "getUserData:onCancelled"
+            Log.d("DataGetter", msg, it)
         }
     }
 
@@ -284,7 +286,8 @@ class DataGetter @Inject constructor() {
                 }
             }
             override fun onCancelled(databaseError: DatabaseError) {
-                Log.w(TAG, "loadPost:onCancelled", databaseError.toException())
+                val msg = "loadPost:onCancelled"
+                Log.w(TAG, msg, databaseError.toException())
             }
         }
         queryRooms.addValueEventListener(startGameListener)

From 2942ed691a83817f29ce51ea419a5eec5347b08b Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:37:07 +0200
Subject: [PATCH 19/22] dedup return to main listener

---
 .../java/ch/sdp/vibester/activity/GameEndingActivity.kt     | 3 ++-
 .../vibester/activity/download/DownloadManagerActivity.kt   | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index af0259817..8551700b8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -55,7 +55,8 @@ class GameEndingActivity : DownloadFunctionalityActivity(), OnItemClickListener
 
         setUpRecyclerView()
 
-        Helper().setReturnToMainListener(findViewById<FloatingActionButton>(R.id.end_returnToMain), this)
+        val returnBtn = findViewById<FloatingActionButton>(R.id.end_returnToMain)
+        Helper().setReturnToMainListener(returnBtn, this)
 
         createDownloadReceiver(null)
     }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/download/DownloadManagerActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/download/DownloadManagerActivity.kt
index 1f225daa4..8afe30363 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/download/DownloadManagerActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/download/DownloadManagerActivity.kt
@@ -30,10 +30,8 @@ class DownloadManagerActivity : AppCompatActivity(), OnItemClickListener {
 
         setContentView(R.layout.activity_download_manager)
 
-        Helper().setReturnToMainListener(
-            findViewById<FloatingActionButton>(R.id.downloadManager_returnToMain),
-            this
-        )
+        val returnBtn = findViewById<FloatingActionButton>(R.id.downloadManager_returnToMain)
+        Helper().setReturnToMainListener(returnBtn, this)
 
         setUpRecyclerView()
     }

From 69d6853d6a9e2b510ebfa6e0cb8465c8eeed34e1 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:45:02 +0200
Subject: [PATCH 20/22] dedup onCancelled DataGetter.kt

---
 app/src/main/java/ch/sdp/vibester/database/DataGetter.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 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 48cafa9c1..086ce9cf7 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -182,8 +182,7 @@ class DataGetter @Inject constructor() {
                 queryUsers.removeEventListener(this)
             }
             override fun onCancelled(error: DatabaseError) {
-                val msg = "searchByField:onCancelled"
-                Log.w(TAG, msg, error.toException())
+                Log.w(TAG, "searchByField:onCancelled", error.toException())
             }
         })
     }
@@ -287,7 +286,8 @@ class DataGetter @Inject constructor() {
             }
             override fun onCancelled(databaseError: DatabaseError) {
                 val msg = "loadPost:onCancelled"
-                Log.w(TAG, msg, databaseError.toException())
+                val exception = databaseError.toException()
+                Log.w(TAG, msg, exception)
             }
         }
         queryRooms.addValueEventListener(startGameListener)

From d6abae39d2568d05ae66f7a5f4f3f7b79283fcf6 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:53:02 +0200
Subject: [PATCH 21/22] refactor onCreateViewHolder

---
 .../java/ch/sdp/vibester/model/SongListAdapterForDelete.kt   | 5 ++---
 .../java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForDelete.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForDelete.kt
index aa62ae193..d16ca9dd0 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForDelete.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForDelete.kt
@@ -15,9 +15,8 @@ class SongListAdapterForDelete constructor(
 ) : RecyclerView.Adapter<SongListAdapterForDelete.SongListForDeleteViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongListForDeleteViewHolder {
-        return SongListForDeleteViewHolder(
-            AdapterHelper().createViewForViewHolder(parent, R.layout.song_item_delete_layout)
-        )
+        val view = AdapterHelper().createViewForViewHolder(parent, R.layout.song_item_delete_layout)
+        return SongListForDeleteViewHolder(view)
     }
 
     override fun onBindViewHolder(holder: SongListForDeleteViewHolder, position: Int) {
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt
index 90cc5a9db..6f6593d2c 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt
@@ -29,9 +29,8 @@ class SongListAdapterForEndGame constructor(
      * Create a RecycleView layout with the Song view as an item
      */
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongListForEndGameViewHolder {
-        return SongListForEndGameViewHolder(
-            AdapterHelper().createViewForViewHolder(parent, R.layout.song_item_download_layout)
-        )
+        val view = AdapterHelper().createViewForViewHolder(parent, R.layout.song_item_download_layout)
+        return SongListForEndGameViewHolder(view)
     }
 
     override fun onBindViewHolder(holder: SongListForEndGameViewHolder, position: Int) {

From e9e96348a23e96c42349f419d0fc4128284d7c35 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 7 Jun 2022 20:54:22 +0200
Subject: [PATCH 22/22] refactor onCreateViewHolder

---
 .../java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt
index 6f6593d2c..03b8f97f0 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapterForEndGame.kt
@@ -29,7 +29,8 @@ class SongListAdapterForEndGame constructor(
      * Create a RecycleView layout with the Song view as an item
      */
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongListForEndGameViewHolder {
-        val view = AdapterHelper().createViewForViewHolder(parent, R.layout.song_item_download_layout)
+        val layout = R.layout.song_item_download_layout
+        val view = AdapterHelper().createViewForViewHolder(parent, layout)
         return SongListForEndGameViewHolder(view)
     }