From fc89193852e1a451ed28303280037ce83e02683a Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:00:05 +0200
Subject: [PATCH 01/18] change var to val in DownloadActivity.kt

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

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 26c4c380c..183855eed 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -58,9 +58,9 @@ class DownloadActivity : AppCompatActivity() {
             IntentSwitcher.switch(this, MainActivity::class.java)
         }
 
-        var broadcast = object:BroadcastReceiver() {
+        val broadcast = object:BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
-                var id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
+                val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
                 if (id == downloadId) {
                     alert(
                         getString(R.string.download_download_complete),
@@ -190,7 +190,7 @@ class DownloadActivity : AppCompatActivity() {
      * Indicator of if the song already exists or not.
      */
     private fun checkExistingSong(): Boolean {
-        var existing = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$songName")
+        val existing = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$songName")
         return existing.exists()
     }
 
@@ -199,7 +199,7 @@ class DownloadActivity : AppCompatActivity() {
      * If the file does not exist, it is created.
      */
     private fun record() {
-        var records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+        val records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
 
         if (!records.exists()) {
             records.createNewFile()
@@ -213,7 +213,7 @@ class DownloadActivity : AppCompatActivity() {
      * Order of storage: Track name - artist name - artwork URL - preview URL.
      */
     private fun recordProperties() {
-        var properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        val properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
 
         if (!properties.exists()) {
             properties.createNewFile()

From bb20f9328b4ce0543d1009954398551b4a38591a Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:01:51 +0200
Subject: [PATCH 02/18] inline alert

---
 .../ch/sdp/vibester/activity/DownloadActivity.kt     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 183855eed..2b9b10e0c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -86,11 +86,7 @@ class DownloadActivity : AppCompatActivity() {
             songName = songView.text.toString()
 
             if (checkExistingSong()) {
-                alert(
-                    getString(R.string.download_already_done),
-                    getString(R.string.download_try_different),
-                    songView
-                )
+                alert(getString(R.string.download_already_done), getString(R.string.download_try_different), songView)
             } else {
                 getAndDownload(songView)
             }
@@ -104,11 +100,7 @@ class DownloadActivity : 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(getString(R.string.download_unable_to_find), getString(R.string.download_retry), songView)
         }
     }
 

From 9502fe009d8e02f818cf9e2eac0448173524aeab Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:02:43 +0200
Subject: [PATCH 03/18] inline alert

---
 .../main/java/ch/sdp/vibester/activity/DownloadActivity.kt  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 2b9b10e0c..6d1b38e0c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -62,11 +62,7 @@ class DownloadActivity : 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(getString(R.string.download_download_complete), getString(R.string.download_try_another), songNameView)
                 }
             }
         }

From c5f2698963f629f518d0b09c2f0704eee7860334 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:11:08 +0200
Subject: [PATCH 04/18] inline else statement and remove unnecessary val

---
 .../sdp/vibester/activity/DownloadActivity.kt | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 6d1b38e0c..f56a2864c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -83,9 +83,7 @@ class DownloadActivity : AppCompatActivity() {
 
             if (checkExistingSong()) {
                 alert(getString(R.string.download_already_done), getString(R.string.download_try_different), songView)
-            } else {
-                getAndDownload(songView)
-            }
+            } else { getAndDownload(songView) }
         }
     }
 
@@ -131,9 +129,7 @@ class DownloadActivity : AppCompatActivity() {
             if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 downloadId = startDownload()
             }
-        } else {
-            Toast.makeText(this, getString(R.string.download_permission_denied), Toast.LENGTH_LONG).show()
-        }
+        } else { Toast.makeText(this, getString(R.string.download_permission_denied), Toast.LENGTH_LONG).show() }
     }
 
     /**
@@ -144,12 +140,8 @@ class DownloadActivity : AppCompatActivity() {
             Build.VERSION.SDK_INT <  Build.VERSION_CODES.Q) {
             if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
                 requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION_CODE)
-            } else {
-                downloadId = startDownload()
-            }
-        } else {
-            downloadId = startDownload()
-        }
+            } else { downloadId = startDownload() }
+        } else { downloadId = startDownload() }
     }
 
     /**
@@ -166,9 +158,7 @@ class DownloadActivity : AppCompatActivity() {
             .setAllowedOverRoaming(true)
             .setDescription("Downloading extract of the song + $songName")
             .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-            .setDestinationInExternalFilesDir(this,
-            Environment.DIRECTORY_DOWNLOADS,
-            "extract_of_$songName")
+            .setDestinationInExternalFilesDir(this, Environment.DIRECTORY_DOWNLOADS, "extract_of_$songName")
 
         val downloader = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
         return downloader.enqueue(request)
@@ -192,6 +182,7 @@ class DownloadActivity : AppCompatActivity() {
         if (!records.exists()) {
             records.createNewFile()
         }
+
         records.appendText("$songName\n")
         recordProperties()
     }
@@ -207,11 +198,7 @@ class DownloadActivity : AppCompatActivity() {
             properties.createNewFile()
         }
 
-        val trackName = song.getTrackName()
-        val artistName = song.getArtistName()
-        val artworkURL = song.getArtworkUrl()
-        val previewURL = song.getPreviewUrl()
-        properties.appendText("$trackName - $artistName - $artworkURL - $previewURL\n")
+        properties.appendText("${song.getTrackName()} - ${song.getArtistName()} - ${song.getArtworkUrl()} - ${song.getPreviewUrl()}\n")
     }
 
     fun switchToDeleteSongs(view: View) {

From 96ce08b80d56b73aa7379fa8298e7e079e479a2b Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:23:03 +0200
Subject: [PATCH 05/18] rename ImageHelper.kt to Helper.kt and create
 setReturnToMainListener()

---
 .../sdp/vibester/activity/DeleteSongsActivity.kt |  6 ++----
 .../ch/sdp/vibester/activity/DownloadActivity.kt |  6 ++----
 .../sdp/vibester/activity/GameEndingActivity.kt  |  6 ++----
 .../vibester/activity/profile/ProfileActivity.kt |  4 ++--
 .../helper/{ImageHelper.kt => Helper.kt}         | 16 +++++++++++++++-
 .../ch/sdp/vibester/user/UserProfileAdapter.kt   |  4 ++--
 .../sdp/vibester/user/UserScoreboardAdapter.kt   |  6 ++----
 7 files changed, 27 insertions(+), 21 deletions(-)
 rename app/src/main/java/ch/sdp/vibester/helper/{ImageHelper.kt => Helper.kt} (72%)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
index 2406c3ddb..e2e8a7dfe 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
@@ -14,7 +14,7 @@ import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.TextView
 import android.widget.Toast
 import ch.sdp.vibester.R
-import ch.sdp.vibester.helper.IntentSwitcher
+import ch.sdp.vibester.helper.Helper
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import java.io.*
 /**
@@ -28,9 +28,7 @@ class DeleteSongsActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_delete_songs)
 
-        findViewById<FloatingActionButton>(R.id.delete_returnToMain).setOnClickListener {
-            IntentSwitcher.switch(this, MainActivity::class.java)
-        }
+        Helper().setReturnToMainListener(findViewById<FloatingActionButton>(R.id.delete_returnToMain), this)
 
         val layout: LinearLayout = findViewById(R.id.delete_songs_linear)
         generateButtons(layout)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index f56a2864c..4b585e5c7 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -18,7 +18,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.ItunesMusicApi
-import ch.sdp.vibester.helper.IntentSwitcher
+import ch.sdp.vibester.helper.Helper
 import ch.sdp.vibester.model.Song
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import okhttp3.OkHttpClient
@@ -54,9 +54,7 @@ class DownloadActivity : AppCompatActivity() {
             downloadListener(songNameView)
         }
 
-        findViewById<FloatingActionButton>(R.id.download_returnToMain).setOnClickListener {
-            IntentSwitcher.switch(this, MainActivity::class.java)
-        }
+        Helper().setReturnToMainListener(findViewById<FloatingActionButton>(R.id.download_returnToMain), this)
 
         val broadcast = object:BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
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 997d86b3e..1bd0a6aa0 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.AppPreferences
-import ch.sdp.vibester.helper.IntentSwitcher
+import ch.sdp.vibester.helper.Helper
 import ch.sdp.vibester.model.SongListAdapter
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 
@@ -51,9 +51,7 @@ class GameEndingActivity : AppCompatActivity() {
 
         setUpRecyclerView()
 
-        findViewById<FloatingActionButton>(R.id.end_returnToMain).setOnClickListener {
-                IntentSwitcher.switch(this, MainActivity::class.java)
-            }
+        Helper().setReturnToMainListener(findViewById<FloatingActionButton>(R.id.end_returnToMain), this)
     }
 
     private fun setUpRecyclerView() {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
index 3cf62a9f7..4e5187533 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/profile/ProfileActivity.kt
@@ -17,7 +17,7 @@ import ch.sdp.vibester.activity.MainActivity
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.ImageGetter
-import ch.sdp.vibester.helper.ImageHelper
+import ch.sdp.vibester.helper.Helper
 import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.user.OnItemClickListener
 import ch.sdp.vibester.user.ProfileFollowingAdapter
@@ -135,7 +135,7 @@ open class ProfileActivity : AppCompatActivity(), OnItemClickListener {
      */
     private fun setImage(imageURI: Uri) {
         val avatar = findViewById<ImageView>(R.id.profile_image_ImageView)
-        ImageHelper().setImage(imageURI, avatar, imageSize)
+        Helper().setImage(imageURI, avatar, imageSize)
     }
 
 
diff --git a/app/src/main/java/ch/sdp/vibester/helper/ImageHelper.kt b/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
similarity index 72%
rename from app/src/main/java/ch/sdp/vibester/helper/ImageHelper.kt
rename to app/src/main/java/ch/sdp/vibester/helper/Helper.kt
index c6ae539bf..6e620bd2f 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/ImageHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/Helper.kt
@@ -1,8 +1,11 @@
 package ch.sdp.vibester.helper
 
+import android.content.Context
 import android.graphics.Bitmap
 import android.net.Uri
+import android.view.View
 import android.widget.ImageView
+import ch.sdp.vibester.activity.MainActivity
 import ch.sdp.vibester.api.BitmapGetterApi
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -10,7 +13,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 
-class ImageHelper {
+class Helper {
 
     /**
      * Set the image of imageURI in avatar of given size
@@ -35,4 +38,15 @@ class ImageHelper {
             }
         }
     }
+
+    /**
+     * set up listener for return to main button
+     * @param btn view of the button
+     * @param ctx context
+     */
+    fun setReturnToMainListener(btn: View, ctx: Context) {
+        btn.setOnClickListener {
+            IntentSwitcher.switch(ctx, MainActivity::class.java)
+        }
+    }
 }
\ No newline at end of file
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 9628849da..73976249b 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -12,7 +12,7 @@ import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.ImageGetter
 import ch.sdp.vibester.helper.AdapterHelper
-import ch.sdp.vibester.helper.ImageHelper
+import ch.sdp.vibester.helper.Helper
 
 
 /**
@@ -88,7 +88,7 @@ class UserProfileAdapter constructor(
         private fun setImage(imageURI: Uri) {
             val avatar = itemView.findViewById<ImageView>(R.id.search_user_profile_image)
 
-            ImageHelper().setImage(imageURI, avatar, imageSize)
+            Helper().setImage(imageURI, avatar, imageSize)
         }
 
         private fun setFollowBtnListener(user: User) {
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserScoreboardAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserScoreboardAdapter.kt
index b1f3bf12e..6f5731bcd 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserScoreboardAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserScoreboardAdapter.kt
@@ -1,6 +1,5 @@
 package ch.sdp.vibester.user
 
-import android.graphics.Color
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
@@ -11,8 +10,7 @@ import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.ImageGetter
 import ch.sdp.vibester.helper.AdapterHelper
-import ch.sdp.vibester.helper.ImageHelper
-import ch.sdp.vibester.helper.loadImg
+import ch.sdp.vibester.helper.Helper
 
 /**
  * Set users list in recycleView in scoreboard
@@ -83,7 +81,7 @@ class UserScoreboardAdapter(
 
         private fun setImage(imageURI: Uri) {
             val avatar = itemView.findViewById<ImageView>(R.id.iv_photo)
-            ImageHelper().setImage(imageURI, avatar, imageSize)
+            Helper().setImage(imageURI, avatar, imageSize)
         }
 
 

From 0f3a8de540a0f1e023a06eac8dc2a9f74df1b01c Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:24:12 +0200
Subject: [PATCH 06/18] change var to val in DeleteSongsActivity.kt

---
 .../vibester/activity/DeleteSongsActivity.kt  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
index e2e8a7dfe..996d24413 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
@@ -39,17 +39,17 @@ class DeleteSongsActivity : AppCompatActivity() {
      * Assigns each button a call to the "deleteDownloadedSong" function as a listener.
      */
     private fun generateButtons(layout: LinearLayout) {
-        var records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+        val records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
 
         if(!records.exists() || records.length() == 0L) {
             createNoSongsView(layout)
         } else {
-            var reader = BufferedReader(FileReader(records))
+            val reader = BufferedReader(FileReader(records))
             var currentLine = reader.readLine()
             var iterator = 0
 
             while(currentLine != null) {
-                var trimmed = currentLine.trim()
+                val trimmed = currentLine.trim()
                 if(trimmed.isNotEmpty()) {
                     val deleteButton = createButton(trimmed, iterator, layout)
                     layout.addView(deleteButton)
@@ -81,18 +81,18 @@ class DeleteSongsActivity : AppCompatActivity() {
      * from the text file which keeps track of all downloads.
      */
     private fun deleteDownloadedSong(btn: View, layout: LinearLayout): Boolean {
-        var records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
-        var tempRecords = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "temp.txt")
+        val records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+        val tempRecords = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "temp.txt")
 
-        var recordReader = BufferedReader(FileReader(records))
-        var recordWriter = BufferedWriter(FileWriter(tempRecords, true))
+        val recordReader = BufferedReader(FileReader(records))
+        val recordWriter = BufferedWriter(FileWriter(tempRecords, true))
 
         var currentLine = recordReader.readLine()
-        var button: Button = btn as Button
+        val button: Button = btn as Button
         val buttonText = button.text.toString()
 
         while (currentLine != null) {
-            var trimmed = currentLine.trim()
+            val trimmed = currentLine.trim()
 
             if (trimmed == buttonText) {
                 currentLine = recordReader.readLine()
@@ -114,7 +114,7 @@ class DeleteSongsActivity : AppCompatActivity() {
         records.delete()
         if (tempRecords.renameTo(records) && removeFromProperties(buttonText)) {
             layout.removeView(btn)
-            var songToDelete = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_${button.text}")
+            val songToDelete = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_${button.text}")
             if (songToDelete.delete()) {
                 Toast.makeText(applicationContext, "Song successfully removed!", Toast.LENGTH_LONG).show()
                 return true
@@ -129,11 +129,11 @@ class DeleteSongsActivity : AppCompatActivity() {
      * @param buttonText: Text which contains song name - artist name
      */
     private fun removeFromProperties(buttonText: String): Boolean {
-        var properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
-        var tempProp = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "tempProp.txt")
+        val properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        val tempProp = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "tempProp.txt")
 
-        var propReader = BufferedReader(FileReader(properties))
-        var propWriter = BufferedWriter(FileWriter(tempProp, true))
+        val propReader = BufferedReader(FileReader(properties))
+        val propWriter = BufferedWriter(FileWriter(tempProp, true))
 
         var currentLine = propReader.readLine()
         val buttonSplit = buttonText.trim().split("-")
@@ -145,7 +145,7 @@ class DeleteSongsActivity : AppCompatActivity() {
          * We write every line on a new file except the one which we want to delete, thus we continue if we match.
          */
         while (currentLine != null) {
-            var trimmed = currentLine.trim()
+            val trimmed = currentLine.trim()
             val split = trimmed.split(" - ")
 
             if (split[0].trim().lowercase() == buttonSplit[0].trim().lowercase()

From 19d11b466da621c8fede0141133bc5a1ab16bcd3 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:26:07 +0200
Subject: [PATCH 07/18] clean song_item_layout.xml

---
 app/src/main/res/layout/song_item_layout.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/song_item_layout.xml b/app/src/main/res/layout/song_item_layout.xml
index 0c44272b1..6f72b046c 100644
--- a/app/src/main/res/layout/song_item_layout.xml
+++ b/app/src/main/res/layout/song_item_layout.xml
@@ -11,7 +11,7 @@
         android:layout_height="60dp"
         android:layout_alignParentStart="true"
         android:layout_marginStart="20dp"
-        android:textSize="20sp"></TextView>
+        android:textSize="20sp" />
 
     <Button
         android:id="@+id/song_download"
@@ -33,6 +33,6 @@
         android:layout_marginTop="11dp"
         android:layout_toEndOf="@+id/song_name"
         android:src="@drawable/green_tick"
-        android:visibility="invisible"></ImageView>
+        android:visibility="invisible" />
 
 </RelativeLayout>
\ No newline at end of file

From 8e3ae003e32ad9fbdc57d0015d55b80e26c5fa8d Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:33:25 +0200
Subject: [PATCH 08/18] clean up SongListAdapter.kt

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

diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
index c1299938c..c76705635 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
@@ -17,7 +17,7 @@ class SongListAdapter constructor( private val incorrectSongList: ArrayList<Stri
     RecyclerView.Adapter<SongListAdapter.SongListViewHolder>() {
     private val songList: ArrayList<String> = arrayListOf()
 
-    init{
+    init {
         songList.addAll(incorrectSongList)
         songList.addAll(correctSongList)
     }
@@ -38,13 +38,11 @@ class SongListAdapter constructor( private val incorrectSongList: ArrayList<Stri
     /**
      * Get amount of songs displayed
      */
-    override fun getItemCount(): Int {
-        return songList.size
-    }
+    override fun getItemCount() = songList.size
 
 
     /**
-     * Customer ViewHolder class for SongList. Each item contains songname and a button.
+     * Customer ViewHolder class for SongList. Each item contains the name of the song and a button.
      */
     inner class SongListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         fun bind(songName: String) {
@@ -58,7 +56,7 @@ class SongListAdapter constructor( private val incorrectSongList: ArrayList<Stri
             }
 
             // Make background red if song is guessed incorrectly
-            if(songName in incorrectSongList) {
+            if (songName in incorrectSongList) {
                 itemView.setBackgroundResource(R.color.light_coral)
             }
         }

From f6718bfd2daf1ff11e74d0cea21ad8a5de0f2bed Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 20:48:46 +0200
Subject: [PATCH 09/18] remove extra empty line in DownloadActivity.kt

---
 .../main/java/ch/sdp/vibester/activity/DownloadActivity.kt   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 4b585e5c7..bdb51e476 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -45,11 +45,9 @@ class DownloadActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_download)
 
-
         val songNameView = findViewById<TextView>(R.id.download_songName)
         val downloadButton = findViewById<Button>(R.id.download_downloadsong)
 
-
         downloadButton.setOnClickListener {
             downloadListener(songNameView)
         }
@@ -134,8 +132,7 @@ class DownloadActivity : AppCompatActivity() {
      * Checks if the required app permissions are already given. If not, request those permissions.
      */
     private fun checkPermissionsAndDownload() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-            Build.VERSION.SDK_INT <  Build.VERSION_CODES.Q) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <  Build.VERSION_CODES.Q) {
             if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
                 requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION_CODE)
             } else { downloadId = startDownload() }

From e8a01d0fe37042d6c986a4a9159ab2f2ae6ab379 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 21:13:43 +0200
Subject: [PATCH 10/18] set up listener for download btn

---
 .../vibester/activity/GameEndingActivity.kt   |  9 ++++++--
 .../ch/sdp/vibester/model/SongListAdapter.kt  | 21 +++++++++++++------
 2 files changed, 22 insertions(+), 8 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 1bd0a6aa0..a6966ce8e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -14,12 +14,13 @@ import ch.sdp.vibester.R
 import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.helper.Helper
 import ch.sdp.vibester.model.SongListAdapter
+import ch.sdp.vibester.user.OnItemClickListener
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 
 /**
  * Game ending activity with game stats and list of songs quessed correctly/wrong
  */
-class GameEndingActivity : AppCompatActivity() {
+class GameEndingActivity : AppCompatActivity(), OnItemClickListener {
 
     private val endStatArrayList = arrayListOf(R.id.end_stat1, R.id.end_stat2, R.id.end_stat3, R.id.end_stat4)
 
@@ -59,7 +60,7 @@ class GameEndingActivity : AppCompatActivity() {
         recyclerView!!.setHasFixedSize(true)
         recyclerView!!.layoutManager = LinearLayoutManager(this)
 
-        songListAdapter = SongListAdapter(incorrectSongList, correctSongList)
+        songListAdapter = SongListAdapter(incorrectSongList, correctSongList, this)
         recyclerView!!.adapter = songListAdapter
     }
 
@@ -138,4 +139,8 @@ class GameEndingActivity : AppCompatActivity() {
             }
         }
     }
+
+    override fun onItemClick(position: Int) {
+        TODO("Not yet implemented")
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
index c76705635..cc8dd3048 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
@@ -7,14 +7,17 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.helper.AdapterHelper
+import ch.sdp.vibester.user.OnItemClickListener
 
 
 /**
  * SongListAdapter to set correct/wrong guessed songs in the game.
  */
-class SongListAdapter constructor( private val incorrectSongList: ArrayList<String>,
-                                   correctSongList: ArrayList<String> ):
-    RecyclerView.Adapter<SongListAdapter.SongListViewHolder>() {
+class SongListAdapter constructor(
+    private val incorrectSongList: ArrayList<String>,
+    correctSongList: ArrayList<String>,
+    private val listener: OnItemClickListener?
+    ): RecyclerView.Adapter<SongListAdapter.SongListViewHolder>() {
     private val songList: ArrayList<String> = arrayListOf()
 
     init {
@@ -44,16 +47,18 @@ class SongListAdapter constructor( private val incorrectSongList: ArrayList<Stri
     /**
      * Customer ViewHolder class for SongList. Each item contains the name of the song and a button.
      */
-    inner class SongListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class SongListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
         fun bind(songName: String) {
             itemView.findViewById<TextView>(R.id.song_name).text = songName
             val downloadSongBtn = itemView.findViewById<Button>(R.id.song_download)
 
-            downloadSongBtn.setOnClickListener {
+            /*downloadSongBtn.setOnClickListener {
                 AdapterHelper().changeAToB(
                     R.id.song_download, R.id.song_download_done, itemView
                 )
-            }
+            }*/
+            downloadSongBtn.setOnClickListener(this)
 
             // Make background red if song is guessed incorrectly
             if (songName in incorrectSongList) {
@@ -61,6 +66,10 @@ class SongListAdapter constructor( private val incorrectSongList: ArrayList<Stri
             }
         }
 
+        override fun onClick(v: View?) {
+            AdapterHelper().onClickHelper(adapterPosition, listener)
+        }
+
     }
 
 

From 38c1fa65d5b2ce777ed5ecd36660551fa8c3e828 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 21:40:06 +0200
Subject: [PATCH 11/18] download song by copy paste

---
 .../vibester/activity/GameEndingActivity.kt   | 124 +++++++++++++++++-
 1 file changed, 123 insertions(+), 1 deletion(-)

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 a6966ce8e..50e40e255 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -1,21 +1,36 @@
 package ch.sdp.vibester.activity
 
+import android.Manifest
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
 import android.os.Bundle
+import android.os.Environment
 import android.view.Gravity
 import android.view.View
 import android.view.Window
 import android.widget.TableRow
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.api.ItunesMusicApi
 import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.helper.Helper
+import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.model.SongListAdapter
 import ch.sdp.vibester.user.OnItemClickListener
 import com.google.android.material.floatingactionbutton.FloatingActionButton
+import okhttp3.OkHttpClient
+import java.io.File
+import java.lang.IllegalArgumentException
 
 /**
  * Game ending activity with game stats and list of songs quessed correctly/wrong
@@ -32,6 +47,17 @@ class GameEndingActivity : AppCompatActivity(), OnItemClickListener {
     lateinit var songListAdapter: SongListAdapter
     private var recyclerView: RecyclerView? = null
 
+    //Companion object to indicate when the download completes.
+    companion object {
+        var downloadComplete = false
+        var downloadStarted = false
+    }
+
+    private val STORAGE_PERMISSION_CODE = 1000
+    private lateinit var song: Song
+    private lateinit var songName: String
+    private var downloadId: Long = 0
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         requestWindowFeature(Window.FEATURE_NO_TITLE)
@@ -53,6 +79,16 @@ class GameEndingActivity : AppCompatActivity(), OnItemClickListener {
         setUpRecyclerView()
 
         Helper().setReturnToMainListener(findViewById<FloatingActionButton>(R.id.end_returnToMain), this)
+
+        val broadcast = object: BroadcastReceiver() {
+            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))
+                }
+            }
+        }
+        registerReceiver(broadcast, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
     }
 
     private fun setUpRecyclerView() {
@@ -141,6 +177,92 @@ class GameEndingActivity : AppCompatActivity(), OnItemClickListener {
     }
 
     override fun onItemClick(position: Int) {
-        TODO("Not yet implemented")
+        val songList = incorrectSongList + correctSongList
+        downloadListener(songList[position])
+    }
+
+    private fun alert(toast: String) {
+        downloadComplete = true
+        downloadStarted = false
+        Toast.makeText(applicationContext, toast, Toast.LENGTH_LONG).show()
+    }
+
+    /**
+     * Function that handles deletion button pushes.
+     */
+    private fun downloadListener(songName0: String) {
+        if (downloadStarted) {
+            Toast.makeText(applicationContext, getString(R.string.download_already_downloading), Toast.LENGTH_LONG).show()
+        } else {
+            downloadStarted = true
+            downloadComplete = false
+            songName = songName0
+
+            if (checkExistingSong()) {
+                alert(getString(R.string.download_already_done))
+            } else { getAndDownload() }
+        }
+    }
+
+    private fun checkExistingSong(): Boolean {
+        val existing = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$songName")
+        return existing.exists()
+    }
+
+    private fun getAndDownload() {
+        val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
+        try {
+            song = Song.singleSong(songFuture.get())
+            songName = song.getTrackName().lowercase() + " - " + song.getArtistName().lowercase()
+            checkPermissionsAndDownload()
+        } catch (e: IllegalArgumentException) {
+            alert(getString(R.string.download_unable_to_find))
+        }
+    }
+
+    private fun checkPermissionsAndDownload() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <  Build.VERSION_CODES.Q) {
+            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
+                requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION_CODE)
+            } else { downloadId = startDownload() }
+        } else { downloadId = startDownload() }
+    }
+
+    private fun startDownload(): Long {
+        record()
+        val request = DownloadManager.Request(Uri.parse(song.getPreviewUrl()))
+        request.setAllowedNetworkTypes(
+            DownloadManager.Request.NETWORK_MOBILE
+                    or DownloadManager.Request.NETWORK_WIFI
+        )
+            .setTitle("extract_of_$songName")
+            .setAllowedOverRoaming(true)
+            .setDescription("Downloading extract of the song + $songName")
+            .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+            .setDestinationInExternalFilesDir(this, Environment.DIRECTORY_DOWNLOADS, "extract_of_$songName")
+
+        val downloader = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        return downloader.enqueue(request)
+    }
+
+    private fun record() {
+        val records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+
+        if (!records.exists()) {
+            records.createNewFile()
+        }
+
+        records.appendText("$songName\n")
+        recordProperties()
+    }
+
+    private fun recordProperties() {
+        val properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+
+        if (!properties.exists()) {
+            properties.createNewFile()
+        }
+
+        properties.appendText("${song.getTrackName()} - ${song.getArtistName()} - ${song.getArtworkUrl()} - ${song.getPreviewUrl()}\n")
     }
 }
\ No newline at end of file

From 2509853f966a83ee18ff0dadaa99a24412875045 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 24 May 2022 22:15:22 +0200
Subject: [PATCH 12/18] extract DownloadFunctionalityActivity.kt

---
 .../sdp/vibester/activity/DownloadActivity.kt | 164 +--------------
 .../activity/DownloadFunctionalityActivity.kt | 191 ++++++++++++++++++
 .../vibester/activity/GameEndingActivity.kt   | 124 +-----------
 3 files changed, 197 insertions(+), 282 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index bdb51e476..6d3168b01 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -1,45 +1,24 @@
 package ch.sdp.vibester.activity
 
-import android.Manifest
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
-import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import android.view.View
 import android.widget.Button
 import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
-import ch.sdp.vibester.api.ItunesMusicApi
 import ch.sdp.vibester.helper.Helper
-import ch.sdp.vibester.model.Song
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import okhttp3.OkHttpClient
-import java.io.File
-import java.lang.IllegalArgumentException
 
 /**
  * Activity that handles downloading of song extracts.
  */
-class DownloadActivity : AppCompatActivity() {
+class DownloadActivity : DownloadFunctionalityActivity() {
     //Companion object to indicate when the download completes.
     companion object {
         var downloadComplete = false
         var downloadStarted = false
     }
 
-    private val STORAGE_PERMISSION_CODE = 1000
-    private lateinit var song: Song
-    private lateinit var songName: String
-    private var downloadId: Long = 0
-
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -49,152 +28,15 @@ class DownloadActivity : AppCompatActivity() {
         val downloadButton = findViewById<Button>(R.id.download_downloadsong)
 
         downloadButton.setOnClickListener {
-            downloadListener(songNameView)
+            downloadListener(songNameView,  null)
         }
 
         Helper().setReturnToMainListener(findViewById<FloatingActionButton>(R.id.download_returnToMain), this)
 
-        val broadcast = object:BroadcastReceiver() {
-            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)
-                }
-            }
-        }
-        registerReceiver(broadcast, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
-    }
-
-    /**
-     * Function that handles deletion button pushes.
-     */
-    private fun downloadListener(songView: TextView) {
-        if (downloadStarted) {
-            Toast.makeText(applicationContext, getString(R.string.download_already_downloading), Toast.LENGTH_LONG).show()
-            editTextView(getString(R.string.download_please_retry_later), songView)
-        } else {
-            downloadStarted = true
-            downloadComplete = false
-            songName = songView.text.toString()
-
-            if (checkExistingSong()) {
-                alert(getString(R.string.download_already_done), getString(R.string.download_try_different), songView)
-            } else { getAndDownload(songView) }
-        }
-    }
-
-    private fun getAndDownload(songView: TextView) {
-        val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
-        try {
-            song = Song.singleSong(songFuture.get())
-            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)
-        }
-    }
-
-    /**
-     * Displays a Toast on the screen while editing the existing textView.
-     *
-     * @param toast: String to be displayed on the Toast.
-     * @param hint : String to be set as the hint of the textView.
-     * @param view : The textView that will be updated.
-     */
-    private fun alert(toast: String, hint: String, view: TextView) {
-        downloadComplete = true
-        downloadStarted = false
-        Toast.makeText(applicationContext, toast, Toast.LENGTH_LONG).show()
-        editTextView(hint, view)
-    }
-
-    /**
-     * Sets the hint of the given textview with the given hint, and clears the entered text.
-     *
-     * @param hint          : String to be set as the hint of the textView.
-     * @param songNameView  : The textView that will be updated.
-     */
-    private fun editTextView(hint: String, songNameView: TextView) {
-        songNameView.text = ""
-        songNameView.hint = hint
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == STORAGE_PERMISSION_CODE) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                downloadId = startDownload()
-            }
-        } else { Toast.makeText(this, getString(R.string.download_permission_denied), Toast.LENGTH_LONG).show() }
+        createDownloadReceiver(songNameView)
     }
 
-    /**
-     * Checks if the required app permissions are already given. If not, request those permissions.
-     */
-    private fun checkPermissionsAndDownload() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <  Build.VERSION_CODES.Q) {
-            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
-                requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION_CODE)
-            } else { downloadId = startDownload() }
-        } else { downloadId = startDownload() }
-    }
-
-    /**
-     * Download a file from the private URL value of the class.
-     */
-    private fun startDownload(): Long {
-        record()
-        val request = DownloadManager.Request(Uri.parse(song.getPreviewUrl()))
-        request.setAllowedNetworkTypes(
-            DownloadManager.Request.NETWORK_MOBILE
-                    or DownloadManager.Request.NETWORK_WIFI
-            )
-            .setTitle("extract_of_$songName")
-            .setAllowedOverRoaming(true)
-            .setDescription("Downloading extract of the song + $songName")
-            .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-            .setDestinationInExternalFilesDir(this, Environment.DIRECTORY_DOWNLOADS, "extract_of_$songName")
-
-        val downloader = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        return downloader.enqueue(request)
-    }
 
-    /**
-     * Indicator of if the song already exists or not.
-     */
-    private fun checkExistingSong(): Boolean {
-        val existing = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$songName")
-        return existing.exists()
-    }
-
-    /**
-     * Helps keep track of the currently downloaded songs in the form of a txt file.
-     * If the file does not exist, it is created.
-     */
-    private fun record() {
-        val records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
-
-        if (!records.exists()) {
-            records.createNewFile()
-        }
-
-        records.appendText("$songName\n")
-        recordProperties()
-    }
-
-    /**
-     * Records the properties of a song.
-     * Order of storage: Track name - artist name - artwork URL - preview URL.
-     */
-    private fun recordProperties() {
-        val properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
-
-        if (!properties.exists()) {
-            properties.createNewFile()
-        }
-
-        properties.appendText("${song.getTrackName()} - ${song.getArtistName()} - ${song.getArtworkUrl()} - ${song.getPreviewUrl()}\n")
-    }
 
     fun switchToDeleteSongs(view: View) {
         val intent = Intent(this, DeleteSongsActivity::class.java)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
new file mode 100644
index 000000000..c0bc281f3
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
@@ -0,0 +1,191 @@
+package ch.sdp.vibester.activity
+
+import android.Manifest
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import ch.sdp.vibester.R
+import ch.sdp.vibester.api.ItunesMusicApi
+import ch.sdp.vibester.model.Song
+import okhttp3.OkHttpClient
+import java.io.File
+import java.lang.IllegalArgumentException
+
+open class DownloadFunctionalityActivity : AppCompatActivity() {
+
+    companion object {
+        var downloadComplete = false
+        var downloadStarted = false
+    }
+
+    private val STORAGE_PERMISSION_CODE = 1000
+    private lateinit var song: Song
+    private lateinit var songName: String
+    private var downloadId: Long = 0
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (requestCode == STORAGE_PERMISSION_CODE) {
+            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                downloadId = startDownload()
+            }
+        } else { Toast.makeText(this, getString(R.string.download_permission_denied), Toast.LENGTH_LONG).show() }
+    }
+
+
+    fun createDownloadReceiver(songNameView: TextView?) {
+        val broadcast = object: BroadcastReceiver() {
+            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)
+                }
+            }
+        }
+        registerReceiver(broadcast, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+    }
+
+
+    /**
+     * Sets the hint of the given textview with the given hint, and clears the entered text.
+     *
+     * @param hint          : String to be set as the hint of the textView.
+     * @param songNameView  : The textView that will be updated.
+     */
+    private fun editTextView(hint: String, songNameView: TextView) {
+        songNameView.text = ""
+        songNameView.hint = hint
+    }
+
+
+    /**
+     * Displays a Toast on the screen while editing the existing textView.
+     *
+     * @param toast: String to be displayed on the Toast.
+     * @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?) {
+        downloadComplete = true
+        downloadStarted = false
+        Toast.makeText(applicationContext, toast, Toast.LENGTH_LONG).show()
+        if (hint != null && view != null) {
+            editTextView(hint, view)
+        }
+    }
+
+    /**
+     * set up listener for download
+     * @param songView TextView used for DownloadActivity
+     * @param songName0 String used for GameEndingActivity
+     */
+    fun downloadListener(songView: TextView?, songName0: String?) {
+        if (downloadStarted) {
+            Toast.makeText(applicationContext, getString(R.string.download_already_downloading), Toast.LENGTH_LONG).show()
+            if (songView != null) {
+                editTextView(getString(R.string.download_please_retry_later), songView)
+            }
+        } else {
+            downloadStarted = true
+            downloadComplete = false
+            if (songView != null ) {
+                songName = songView.text.toString()
+            } else if (songName0 != null) {
+                songName = songName0
+            }
+
+            if (checkExistingSong()) {
+                alert(getString(R.string.download_already_done), getString(R.string.download_try_different), songView)
+            } else { getAndDownload(songView) }
+        }
+    }
+
+    /**
+     * Indicator of if the song already exists or not.
+     */
+    private fun checkExistingSong(): Boolean {
+        val existing = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$songName")
+        return existing.exists()
+    }
+
+    private fun getAndDownload(songView: TextView?) {
+        val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
+        try {
+            song = Song.singleSong(songFuture.get())
+            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)
+        }
+    }
+
+    /**
+     * Checks if the required app permissions are already given. If not, request those permissions.
+     */
+    private fun checkPermissionsAndDownload() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <  Build.VERSION_CODES.Q) {
+            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
+                requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION_CODE)
+            } else { downloadId = startDownload() }
+        } else { downloadId = startDownload() }
+    }
+
+
+    /**
+     * Download a file from the private URL value of the class.
+     */
+    private fun startDownload(): Long {
+        record()
+        val request = DownloadManager.Request(Uri.parse(song.getPreviewUrl()))
+        request.setAllowedNetworkTypes(
+            DownloadManager.Request.NETWORK_MOBILE
+                    or DownloadManager.Request.NETWORK_WIFI
+        )
+            .setTitle("extract_of_$songName")
+            .setAllowedOverRoaming(true)
+            .setDescription("Downloading extract of the song + $songName")
+            .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+            .setDestinationInExternalFilesDir(this, Environment.DIRECTORY_DOWNLOADS, "extract_of_$songName")
+
+        val downloader = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        return downloader.enqueue(request)
+    }
+
+    /**
+     * Helps keep track of the currently downloaded songs in the form of a txt file.
+     * If the file does not exist, it is created.
+     */
+    private fun record() {
+        val records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+
+        if (!records.exists()) {
+            records.createNewFile()
+        }
+
+        records.appendText("$songName\n")
+        recordProperties()
+    }
+
+    /**
+     * Records the properties of a song.
+     * Order of storage: Track name - artist name - artwork URL - preview URL.
+     */
+    private fun recordProperties() {
+        val properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+
+        if (!properties.exists()) {
+            properties.createNewFile()
+        }
+
+        properties.appendText("${song.getTrackName()} - ${song.getArtistName()} - ${song.getArtworkUrl()} - ${song.getPreviewUrl()}\n")
+    }
+}
\ No newline at end of file
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 50e40e255..5c3990671 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -1,41 +1,25 @@
 package ch.sdp.vibester.activity
 
-import android.Manifest
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
-import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import android.view.Gravity
 import android.view.View
 import android.view.Window
 import android.widget.TableRow
 import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
-import ch.sdp.vibester.api.ItunesMusicApi
 import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.helper.Helper
-import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.model.SongListAdapter
 import ch.sdp.vibester.user.OnItemClickListener
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import okhttp3.OkHttpClient
-import java.io.File
-import java.lang.IllegalArgumentException
 
 /**
  * Game ending activity with game stats and list of songs quessed correctly/wrong
  */
-class GameEndingActivity : AppCompatActivity(), OnItemClickListener {
+class GameEndingActivity : DownloadFunctionalityActivity(), OnItemClickListener {
 
     private val endStatArrayList = arrayListOf(R.id.end_stat1, R.id.end_stat2, R.id.end_stat3, R.id.end_stat4)
 
@@ -47,17 +31,6 @@ class GameEndingActivity : AppCompatActivity(), OnItemClickListener {
     lateinit var songListAdapter: SongListAdapter
     private var recyclerView: RecyclerView? = null
 
-    //Companion object to indicate when the download completes.
-    companion object {
-        var downloadComplete = false
-        var downloadStarted = false
-    }
-
-    private val STORAGE_PERMISSION_CODE = 1000
-    private lateinit var song: Song
-    private lateinit var songName: String
-    private var downloadId: Long = 0
-
 
     override fun onCreate(savedInstanceState: Bundle?) {
         requestWindowFeature(Window.FEATURE_NO_TITLE)
@@ -80,15 +53,7 @@ class GameEndingActivity : AppCompatActivity(), OnItemClickListener {
 
         Helper().setReturnToMainListener(findViewById<FloatingActionButton>(R.id.end_returnToMain), this)
 
-        val broadcast = object: BroadcastReceiver() {
-            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))
-                }
-            }
-        }
-        registerReceiver(broadcast, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+        createDownloadReceiver(null)
     }
 
     private fun setUpRecyclerView() {
@@ -178,91 +143,8 @@ class GameEndingActivity : AppCompatActivity(), OnItemClickListener {
 
     override fun onItemClick(position: Int) {
         val songList = incorrectSongList + correctSongList
-        downloadListener(songList[position])
-    }
-
-    private fun alert(toast: String) {
-        downloadComplete = true
-        downloadStarted = false
-        Toast.makeText(applicationContext, toast, Toast.LENGTH_LONG).show()
-    }
-
-    /**
-     * Function that handles deletion button pushes.
-     */
-    private fun downloadListener(songName0: String) {
-        if (downloadStarted) {
-            Toast.makeText(applicationContext, getString(R.string.download_already_downloading), Toast.LENGTH_LONG).show()
-        } else {
-            downloadStarted = true
-            downloadComplete = false
-            songName = songName0
-
-            if (checkExistingSong()) {
-                alert(getString(R.string.download_already_done))
-            } else { getAndDownload() }
-        }
+        downloadListener(null, songList[position])
     }
 
-    private fun checkExistingSong(): Boolean {
-        val existing = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$songName")
-        return existing.exists()
-    }
 
-    private fun getAndDownload() {
-        val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
-        try {
-            song = Song.singleSong(songFuture.get())
-            songName = song.getTrackName().lowercase() + " - " + song.getArtistName().lowercase()
-            checkPermissionsAndDownload()
-        } catch (e: IllegalArgumentException) {
-            alert(getString(R.string.download_unable_to_find))
-        }
-    }
-
-    private fun checkPermissionsAndDownload() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <  Build.VERSION_CODES.Q) {
-            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
-                requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION_CODE)
-            } else { downloadId = startDownload() }
-        } else { downloadId = startDownload() }
-    }
-
-    private fun startDownload(): Long {
-        record()
-        val request = DownloadManager.Request(Uri.parse(song.getPreviewUrl()))
-        request.setAllowedNetworkTypes(
-            DownloadManager.Request.NETWORK_MOBILE
-                    or DownloadManager.Request.NETWORK_WIFI
-        )
-            .setTitle("extract_of_$songName")
-            .setAllowedOverRoaming(true)
-            .setDescription("Downloading extract of the song + $songName")
-            .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-            .setDestinationInExternalFilesDir(this, Environment.DIRECTORY_DOWNLOADS, "extract_of_$songName")
-
-        val downloader = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        return downloader.enqueue(request)
-    }
-
-    private fun record() {
-        val records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
-
-        if (!records.exists()) {
-            records.createNewFile()
-        }
-
-        records.appendText("$songName\n")
-        recordProperties()
-    }
-
-    private fun recordProperties() {
-        val properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
-
-        if (!properties.exists()) {
-            properties.createNewFile()
-        }
-
-        properties.appendText("${song.getTrackName()} - ${song.getArtistName()} - ${song.getArtworkUrl()} - ${song.getPreviewUrl()}\n")
-    }
 }
\ No newline at end of file

From deb5658baf7bdc22e3c4acd75e805ca3d1167053 Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 26 May 2022 13:22:31 +0200
Subject: [PATCH 13/18] Test commit

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

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 6d3168b01..973875b1e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -36,8 +36,6 @@ class DownloadActivity : DownloadFunctionalityActivity() {
         createDownloadReceiver(songNameView)
     }
 
-
-
     fun switchToDeleteSongs(view: View) {
         val intent = Intent(this, DeleteSongsActivity::class.java)
         startActivity(intent)

From 1dc49478cf417744814f331c5d7f74eb0819265d Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 26 May 2022 13:44:51 +0200
Subject: [PATCH 14/18] Fixed weird test behavior

---
 .../java/ch/sdp/vibester/activity/DownloadActivityTest.kt     | 4 ++--
 .../main/java/ch/sdp/vibester/activity/DownloadActivity.kt    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
index e9d440657..abb890f03 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
@@ -49,14 +49,14 @@ class DownloadActivityTest {
     fun downloadIncorrectSong() {
         val intent = Intent(ApplicationProvider.getApplicationContext(), DownloadActivity::class.java)
         val scn: ActivityScenario<DownloadActivity> = ActivityScenario.launch(intent)
-        assertEquals(false, DownloadActivity.downloadStarted)
+        assertEquals(false, DownloadFunctionalityActivity.downloadStarted)
         val songName = "adsfasdgyasdfa"
 
         onView(withId(R.id.download_songName)).perform(typeText(songName), closeSoftKeyboard())
         Thread.sleep(waitForButton)
         onView(withId(R.id.download_downloadsong)).perform(click())
 
-        while(!DownloadActivity.downloadComplete) {
+        while(!DownloadFunctionalityActivity.downloadComplete) {
             Thread.sleep(waitForDownload)
         }
         Thread.sleep(waitForButton)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 973875b1e..9c0849e7c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -14,10 +14,10 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
  */
 class DownloadActivity : DownloadFunctionalityActivity() {
     //Companion object to indicate when the download completes.
-    companion object {
+    /*companion object {
         var downloadComplete = false
         var downloadStarted = false
-    }
+    }*/
 
 
     override fun onCreate(savedInstanceState: Bundle?) {

From be000208d730934bc5b0acf28943745fd2507a97 Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 26 May 2022 13:54:53 +0200
Subject: [PATCH 15/18] Modified test to see current coverage on the PR

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

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index 2683e2968..7cb2b3dd9 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -128,8 +128,11 @@ class GameEndingActivityTest {
                     0,
                     clickOnViewChild(R.id.song_download))
             )
-        checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.song_download)
-        checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.song_download_done)
+        //checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.song_download)
+        //checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.song_download_done)
+        //Get rid of these next ones and uncomment the lines above
+        checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.song_download)
+        checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.song_download_done)
     }
 
 

From 9d12478991615d646d1dc69106568c71fb2f6909 Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 26 May 2022 17:19:26 +0200
Subject: [PATCH 16/18] Halfway done with buttons

---
 .../activity/GameEndingActivityTest.kt        |  7 ++---
 .../activity/DownloadFunctionalityActivity.kt |  2 +-
 .../vibester/activity/GameEndingActivity.kt   | 27 +++++++++++++++++--
 .../ch/sdp/vibester/model/SongListAdapter.kt  |  8 +++---
 app/src/main/res/layout/song_item_layout.xml  | 11 ++++++++
 5 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index 7cb2b3dd9..4e57c9e5c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -128,11 +128,8 @@ class GameEndingActivityTest {
                     0,
                     clickOnViewChild(R.id.song_download))
             )
-        //checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.song_download)
-        //checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.song_download_done)
-        //Get rid of these next ones and uncomment the lines above
-        checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.song_download)
-        checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.song_download_done)
+        checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.INVISIBLE), R.id.song_download)
+        checkRecyclerSubViews(R.id.end_song_list, 0, withEffectiveVisibility(Visibility.VISIBLE), R.id.song_download_ongoing)
     }
 
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
index c0bc281f3..37e237935 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
@@ -23,7 +23,7 @@ import java.lang.IllegalArgumentException
 open class DownloadFunctionalityActivity : AppCompatActivity() {
 
     companion object {
-        var downloadComplete = false
+        var downloadComplete = true
         var downloadStarted = false
     }
 
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 5c3990671..498467b75 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -2,15 +2,17 @@ package ch.sdp.vibester.activity
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.Window
-import android.widget.TableRow
-import android.widget.TextView
+import android.widget.*
+import androidx.core.view.children
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.AppPreferences
+import ch.sdp.vibester.helper.AdapterHelper
 import ch.sdp.vibester.helper.Helper
 import ch.sdp.vibester.model.SongListAdapter
 import ch.sdp.vibester.user.OnItemClickListener
@@ -142,7 +144,28 @@ class GameEndingActivity : DownloadFunctionalityActivity(), OnItemClickListener
     }
 
     override fun onItemClick(position: Int) {
+        val parentActual = findViewById<Button>(R.id.song_download).parent as RelativeLayout
+        val parentOfParent = parentActual.parent as RecyclerView
+        Log.d("parent name of button is ============================ ", "${parentOfParent.javaClass}")
+        Log.d("parent's number of children is ============================ ", "${parentOfParent.childCount}")
+        val relative = parentOfParent.children.elementAt(position) as RelativeLayout
+        val children = relative.children
+        val songName = children.elementAt(0) as TextView
+        val downloadButton = children.elementAt(1) as Button
+        val downloadOngoing = children.elementAt(3) as ProgressBar
+        val downloadDone = children.elementAt(2) as ImageView
+        Log.d("child song is =============================== ", "${songName.text}")
+        Log.d("child song is =============================== ", "${downloadButton.id}")
+        Log.d("child song is =============================== ", "${downloadOngoing.id}")
+
         val songList = incorrectSongList + correctSongList
+        if(downloadComplete) {
+            Log.d("-----------------------------","++++++++++++++++++++++++++++++++++++")
+            downloadButton.visibility = View.INVISIBLE
+            downloadOngoing.visibility = View.VISIBLE
+            Log.d("name of button is ============================ ", "${downloadButton.id}")
+            Log.d("name of ongoing is ============================ ", "${downloadOngoing.id}")
+        }
         downloadListener(null, songList[position])
     }
 
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
index cc8dd3048..b832ccbc8 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongListAdapter.kt
@@ -1,11 +1,14 @@
 package ch.sdp.vibester.model
 
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Adapter
 import android.widget.Button
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.activity.DownloadFunctionalityActivity
 import ch.sdp.vibester.helper.AdapterHelper
 import ch.sdp.vibester.user.OnItemClickListener
 
@@ -53,11 +56,6 @@ class SongListAdapter constructor(
             itemView.findViewById<TextView>(R.id.song_name).text = songName
             val downloadSongBtn = itemView.findViewById<Button>(R.id.song_download)
 
-            /*downloadSongBtn.setOnClickListener {
-                AdapterHelper().changeAToB(
-                    R.id.song_download, R.id.song_download_done, itemView
-                )
-            }*/
             downloadSongBtn.setOnClickListener(this)
 
             // Make background red if song is guessed incorrectly
diff --git a/app/src/main/res/layout/song_item_layout.xml b/app/src/main/res/layout/song_item_layout.xml
index 6f72b046c..fdbb139c7 100644
--- a/app/src/main/res/layout/song_item_layout.xml
+++ b/app/src/main/res/layout/song_item_layout.xml
@@ -35,4 +35,15 @@
         android:src="@drawable/green_tick"
         android:visibility="invisible" />
 
+    <ProgressBar
+        android:id="@+id/song_download_ongoing"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="10dp"
+        android:layout_toEndOf="@id/song_name"
+        android:visibility="invisible" />
+
 </RelativeLayout>
\ No newline at end of file

From 711d85a6a682e4690835c7725f1621497942c765 Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 26 May 2022 17:41:43 +0200
Subject: [PATCH 17/18] Added docs and some readability updates

---
 .../sdp/vibester/activity/DownloadActivity.kt  | 12 ++++++------
 .../activity/DownloadFunctionalityActivity.kt  | 17 ++++++++++++++++-
 .../vibester/activity/GameEndingActivity.kt    | 18 +++++++++++++++++-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 9c0849e7c..39eca9421 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -13,13 +13,10 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
  * Activity that handles downloading of song extracts.
  */
 class DownloadActivity : DownloadFunctionalityActivity() {
-    //Companion object to indicate when the download completes.
-    /*companion object {
-        var downloadComplete = false
-        var downloadStarted = false
-    }*/
-
 
+    /**
+     * Generic onCreate function, nothing of interest.
+     */
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_download)
@@ -36,6 +33,9 @@ class DownloadActivity : DownloadFunctionalityActivity() {
         createDownloadReceiver(songNameView)
     }
 
+    /**
+     * Generic function to switch to a different, namely DeleteSongsActivity activity.
+     */
     fun switchToDeleteSongs(view: View) {
         val intent = Intent(this, DeleteSongsActivity::class.java)
         startActivity(intent)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
index 37e237935..de1d54abd 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
@@ -32,6 +32,12 @@ open class DownloadFunctionalityActivity : AppCompatActivity() {
     private lateinit var songName: String
     private var downloadId: Long = 0
 
+    /**
+     * Asks for the requested permission code in case it is not already granted to the app.
+     * @param requestCode: request code of the permission being asked
+     * @param permissions: an Array of permissions to pass to the super.onRPS
+     * @param grantResults: IntArray in which the results for the permission inquiries are stored
+     */
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (requestCode == STORAGE_PERMISSION_CODE) {
@@ -41,7 +47,12 @@ open class DownloadFunctionalityActivity : AppCompatActivity() {
         } else { Toast.makeText(this, getString(R.string.download_permission_denied), Toast.LENGTH_LONG).show() }
     }
 
-
+    /**
+     * Creates a broadcast receiver and registers it to the caller class. This receiver is used to
+     * listen to actions indicating a download has been done.
+     * @param songNameView: The TextView instance which will be modified in accordance to the current
+     * state of the broadcast receiver. Used for DownloadActivity.
+     */
     fun createDownloadReceiver(songNameView: TextView?) {
         val broadcast = object: BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
@@ -117,6 +128,10 @@ open class DownloadFunctionalityActivity : AppCompatActivity() {
         return existing.exists()
     }
 
+    /**
+     * Retrieves the song to be downloaded from the ITunes API and initiates the download procedure.
+     * @param songView: TextView to be edited and alerted.
+     */
     private fun getAndDownload(songView: TextView?) {
         val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
         try {
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 498467b75..5ef3457ea 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -33,7 +33,9 @@ class GameEndingActivity : DownloadFunctionalityActivity(), OnItemClickListener
     lateinit var songListAdapter: SongListAdapter
     private var recyclerView: RecyclerView? = null
 
-
+    /**
+     * Generic onCreate method. Nothing of interested here.
+     */
     override fun onCreate(savedInstanceState: Bundle?) {
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         super.onCreate(savedInstanceState)
@@ -58,6 +60,10 @@ class GameEndingActivity : DownloadFunctionalityActivity(), OnItemClickListener
         createDownloadReceiver(null)
     }
 
+    /**
+     * Sets up the recycler view which hosts the multitude of songs that were in the previously played
+     * game session.
+     */
     private fun setUpRecyclerView() {
         recyclerView = findViewById(R.id.end_song_list)
         recyclerView!!.setHasFixedSize(true)
@@ -143,13 +149,22 @@ class GameEndingActivity : DownloadFunctionalityActivity(), OnItemClickListener
         }
     }
 
+    /**
+     * Handles the case where an item in the recycler view is clicked, i.e the download buttons.
+     * @param position: The position of the clicked song in the list of songs.
+     */
     override fun onItemClick(position: Int) {
+        //Retrieval of the top-most parent which is the RecyclerView
         val parentActual = findViewById<Button>(R.id.song_download).parent as RelativeLayout
         val parentOfParent = parentActual.parent as RecyclerView
         Log.d("parent name of button is ============================ ", "${parentOfParent.javaClass}")
         Log.d("parent's number of children is ============================ ", "${parentOfParent.childCount}")
+
+        //Retrieve the RelativeLayout that hosts its children, and those children
         val relative = parentOfParent.children.elementAt(position) as RelativeLayout
         val children = relative.children
+
+        //Retrieve items of the child that is currently being selected by the position argument
         val songName = children.elementAt(0) as TextView
         val downloadButton = children.elementAt(1) as Button
         val downloadOngoing = children.elementAt(3) as ProgressBar
@@ -158,6 +173,7 @@ class GameEndingActivity : DownloadFunctionalityActivity(), OnItemClickListener
         Log.d("child song is =============================== ", "${downloadButton.id}")
         Log.d("child song is =============================== ", "${downloadOngoing.id}")
 
+        //Logic to switch item visibility and start the download attempt
         val songList = incorrectSongList + correctSongList
         if(downloadComplete) {
             Log.d("-----------------------------","++++++++++++++++++++++++++++++++++++")

From 8ccdabc387de32d9140f6ec6331d5746e6d791e5 Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 26 May 2022 17:53:31 +0200
Subject: [PATCH 18/18] Added class doc

---
 .../sdp/vibester/activity/DownloadFunctionalityActivity.kt   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
index de1d54abd..5b6201b49 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadFunctionalityActivity.kt
@@ -20,6 +20,11 @@ import okhttp3.OkHttpClient
 import java.io.File
 import java.lang.IllegalArgumentException
 
+/**
+ * This is a class that handles downloading songs on demand. This is an AppCompatActivity instance,
+ * which means all the inheritors can inherit only from this class to be fully functional at the
+ * minimum.
+ */
 open class DownloadFunctionalityActivity : AppCompatActivity() {
 
     companion object {