From 26c6bbb5b37be13f4e17b8dfb744643ff0551bca Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Mon, 21 Mar 2022 13:31:14 +0100
Subject: [PATCH 1/8] implement LyricsBelongGame.kt

---
 app/src/main/AndroidManifest.xml              |  4 +
 .../main/java/ch/sdp/vibester/MainActivity.kt |  8 +-
 .../sdp/vibester/api/LyricsOVHApiInterface.kt |  2 +-
 .../ch/sdp/vibester/games/LyricsBelongGame.kt | 87 +++++++++++++++++++
 app/src/main/res/drawable/ic_mic.xml          | 10 +++
 .../layout/activity_lyrics_belong_game.xml    | 52 +++++++++++
 6 files changed, 159 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/games/LyricsBelongGame.kt
 create mode 100644 app/src/main/res/drawable/ic_mic.xml
 create mode 100644 app/src/main/res/layout/activity_lyrics_belong_game.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 44d2adb97..38e67ced9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:allowBackup="true"
@@ -17,6 +18,9 @@
         <activity
             android:name=".IncorrectSongsScreen"
             android:exported="false" />
+        <activity
+            android:name=".games.LyricsBelongGame"
+            android:exported="false" />
         <activity
             android:name=".GameEndingScreen"
             android:exported="false" />
diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index d992a5a69..0e4c8ccf3 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
+import ch.sdp.vibester.games.LyricsBelongGame
 import ch.sdp.vibester.games.TypingGame
 import ch.sdp.vibester.profile.ProfileDataProvider
 import ch.sdp.vibester.scoreboard.ScoreBoardActivity
@@ -26,16 +27,17 @@ class MainActivity : AppCompatActivity() {
         }
 
         val btnLyric = findViewById<Button>(R.id.lyricButton)
-        val lyricIntent = Intent(this, LyricTemporary::class.java)
+        //val lyricIntent = Intent(this, LyricTemporary::class.java)
+        val lyricGameIntent = Intent(this, LyricsBelongGame::class.java)
         btnLyric.setOnClickListener {
-            startActivity(lyricIntent)
+            //startActivity(lyricIntent)
+            startActivity(lyricGameIntent)
         }
 
         val btnGenre = findViewById<Button>(R.id.genreButton)
         val genreIntent = Intent(this, GenreTemporary::class.java)
         btnGenre.setOnClickListener {
             startActivity(genreIntent)
-
         }
 
     }
diff --git a/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
index e65b54da0..b684d813b 100644
--- a/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
@@ -20,7 +20,7 @@ interface LyricsOVHApiInterface {
          * @param baseUrl base url of the api
          * return an instance of the api interface
          */
-        fun create(baseUrl:String): LyricsOVHApiInterface {
+        fun create(baseUrl:String = "https://api.lyrics.ovh/"): LyricsOVHApiInterface {
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl)
                 .addConverterFactory(GsonConverterFactory.create())
diff --git a/app/src/main/java/ch/sdp/vibester/games/LyricsBelongGame.kt b/app/src/main/java/ch/sdp/vibester/games/LyricsBelongGame.kt
new file mode 100644
index 000000000..4dffe1d33
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/games/LyricsBelongGame.kt
@@ -0,0 +1,87 @@
+package ch.sdp.vibester.games
+
+import android.content.Intent
+import android.os.Bundle
+import android.speech.RecognizerIntent
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import ch.sdp.vibester.R
+import ch.sdp.vibester.api.LyricsOVHApiInterface
+import ch.sdp.vibester.model.Lyric
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+
+private const val REQUEST_AUDIO = 100
+
+class LyricsBelongGame : AppCompatActivity() {
+    private lateinit var btnSpeak : ImageView
+    private lateinit var txtFromSpeech: TextView
+    private lateinit var btnCheck : Button
+    private lateinit var txtResult : TextView
+    private lateinit var originLyric : String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_lyrics_belong_game)
+
+        btnSpeak = findViewById(R.id.btnSpeak)
+        var btnSpeakIsClicked = false
+        btnSpeak.setOnClickListener {
+            btnSpeakIsClicked = true
+            getSpeechInput()
+        }
+
+        txtFromSpeech = findViewById(R.id.lyricResult)
+
+        btnCheck = findViewById(R.id.lyricMatchButton)
+        btnCheck.setOnClickListener {
+            if (btnSpeakIsClicked) {
+                getLyrics()
+            }
+        }
+
+        txtResult = findViewById(R.id.lyricMatchResult)
+    }
+
+    private fun getSpeechInput() {
+        val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
+        intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+        intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault())
+        startActivityForResult(intent, REQUEST_AUDIO)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == REQUEST_AUDIO || data != null) {
+            val res = data!!.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
+            txtFromSpeech.text = res?.get(0) ?: " Didn't catch"
+        }
+    }
+
+    private fun getLyrics() {
+        val service = LyricsOVHApiInterface.create()
+        val call = service.getLyrics("Imagine Dragons", "Thunder")
+        call.enqueue(object: Callback<Lyric> {
+            override fun onFailure(call: Call<Lyric>?, t: Throwable?) {}
+
+            override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
+                if (response != null) {
+                    originLyric = response.body().lyrics.toString()
+                    checkCorrectness()
+                }
+            }
+        })
+    }
+
+    private fun checkCorrectness() {
+        if (originLyric.contains(txtFromSpeech.text, ignoreCase = true)) {
+            txtResult.text = "correct!"
+        } else {
+            txtResult.text = "too bad"
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_mic.xml b/app/src/main/res/drawable/ic_mic.xml
new file mode 100644
index 000000000..791b47570
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mic.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_lyrics_belong_game.xml b/app/src/main/res/layout/activity_lyrics_belong_game.xml
new file mode 100644
index 000000000..cd2b44cc3
--- /dev/null
+++ b/app/src/main/res/layout/activity_lyrics_belong_game.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android
+    ="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+
+        android:id="@+id/lyricResult"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="100dp"
+        android:layout_marginRight="10dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:hint="Say something from Thunder (Imagine Dragons)"
+        android:textColor="#009688"
+        android:textColorHint="#009688"
+        android:textSize="26sp"
+        android:textStyle="bold" />
+
+    <ImageView
+
+        android:id="@+id/btnSpeak"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="60dp"
+        android:src="@drawable/ic_mic"
+        app:tint="#003300" />
+
+    <Button
+        android:id="@+id/lyricMatchButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="Check for correctness" />
+
+    <TextView
+        android:id="@+id/lyricMatchResult"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="253dp"
+        android:text="TextView" />
+
+</RelativeLayout>
\ No newline at end of file

From fdc96956855149beab0a681c9c0ea5149e110868 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 22 Mar 2022 08:30:07 +0100
Subject: [PATCH 2/8] create LyricsBelongGameActivity.kt

---
 app/src/main/AndroidManifest.xml              |  4 +
 .../activity/LyricsBelongGameActivity.kt      | 87 +++++++++++++++++++
 .../ch/sdp/vibester/activity/MainActivity.kt  |  6 +-
 app/src/main/res/drawable/ic_mic.xml          |  5 ++
 .../layout/activity_lyrics_belong_game.xml    | 52 +++++++++++
 5 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
 create mode 100644 app/src/main/res/drawable/ic_mic.xml
 create mode 100644 app/src/main/res/layout/activity_lyrics_belong_game.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 52675938b..a8feb0480 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:allowBackup="true"
@@ -17,6 +18,9 @@
         <activity
             android:name=".activity.IncorrectSongsActivity"
             android:exported="false" />
+        <activity
+            android:name=".activity.LyricsBelongGameActivity"
+            android:exported="false" />
         <activity
             android:name=".activity.GameEndingActivity"
             android:exported="false" />
diff --git a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
new file mode 100644
index 000000000..ac59cea11
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -0,0 +1,87 @@
+package ch.sdp.vibester.activity
+
+import android.content.Intent
+import android.os.Bundle
+import android.speech.RecognizerIntent
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import ch.sdp.vibester.R
+import ch.sdp.vibester.api.LyricsOVHApiInterface
+import ch.sdp.vibester.model.Lyric
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+
+private const val REQUEST_AUDIO = 100
+
+class LyricsBelongGameActivity : AppCompatActivity() {
+    private lateinit var btnSpeak : ImageView
+    private lateinit var txtFromSpeech: TextView
+    private lateinit var btnCheck : Button
+    private lateinit var txtResult : TextView
+    private lateinit var originLyric : String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_lyrics_belong_game)
+
+        btnSpeak = findViewById(R.id.btnSpeak)
+        var btnSpeakIsClicked = false
+        btnSpeak.setOnClickListener {
+            btnSpeakIsClicked = true
+            getSpeechInput()
+        }
+
+        txtFromSpeech = findViewById(R.id.lyricResult)
+
+        btnCheck = findViewById(R.id.lyricMatchButton)
+        btnCheck.setOnClickListener {
+            if (btnSpeakIsClicked) {
+                getLyrics()
+            }
+        }
+
+        txtResult = findViewById(R.id.lyricMatchResult)
+    }
+
+    private fun getSpeechInput() {
+        val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
+        intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+        intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault())
+        startActivityForResult(intent, REQUEST_AUDIO)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == REQUEST_AUDIO || data != null) {
+            val res = data!!.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
+            txtFromSpeech.text = res?.get(0) ?: " Didn't catch"
+        }
+    }
+
+    private fun getLyrics() {
+        val service = LyricsOVHApiInterface.create()
+        val call = service.getLyrics("Imagine Dragons", "Thunder")
+        call.enqueue(object: Callback<Lyric> {
+            override fun onFailure(call: Call<Lyric>?, t: Throwable?) {}
+
+            override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
+                if (response != null) {
+                    originLyric = response.body().lyrics.toString()
+                    checkCorrectness()
+                }
+            }
+        })
+    }
+
+    private fun checkCorrectness() {
+        if (originLyric.contains(txtFromSpeech.text, ignoreCase = true)) {
+            txtResult.text = "correct!"
+        } else {
+            txtResult.text = "too bad"
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
index 8a6fc1bb3..280da5d59 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
@@ -20,9 +20,11 @@ class MainActivity : AppCompatActivity() {
         }
 
         val btnLyric = findViewById<Button>(R.id.lyricButton)
-        val lyricIntent = Intent(this, LyricTemporary::class.java)
+        //val lyricIntent = Intent(this, LyricTemporary::class.java)
+        val lyricGameIntent = Intent(this, LyricsBelongGameActivity::class.java)
         btnLyric.setOnClickListener {
-            startActivity(lyricIntent)
+            //startActivity(lyricIntent)
+            startActivity(lyricGameIntent)
         }
 
         val btnGenre = findViewById<Button>(R.id.genreButton)
diff --git a/app/src/main/res/drawable/ic_mic.xml b/app/src/main/res/drawable/ic_mic.xml
new file mode 100644
index 000000000..887afd50a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mic.xml
@@ -0,0 +1,5 @@
+<vector android:height="30dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_lyrics_belong_game.xml b/app/src/main/res/layout/activity_lyrics_belong_game.xml
new file mode 100644
index 000000000..cd2b44cc3
--- /dev/null
+++ b/app/src/main/res/layout/activity_lyrics_belong_game.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android
+    ="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+
+        android:id="@+id/lyricResult"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="100dp"
+        android:layout_marginRight="10dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:hint="Say something from Thunder (Imagine Dragons)"
+        android:textColor="#009688"
+        android:textColorHint="#009688"
+        android:textSize="26sp"
+        android:textStyle="bold" />
+
+    <ImageView
+
+        android:id="@+id/btnSpeak"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="60dp"
+        android:src="@drawable/ic_mic"
+        app:tint="#003300" />
+
+    <Button
+        android:id="@+id/lyricMatchButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="Check for correctness" />
+
+    <TextView
+        android:id="@+id/lyricMatchResult"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="253dp"
+        android:text="TextView" />
+
+</RelativeLayout>
\ No newline at end of file

From bcd6e59c54edff05e001629b2ec0c3226b263dcf Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Wed, 23 Mar 2022 14:59:53 +0100
Subject: [PATCH 3/8] try to test

---
 app/build.gradle                              |   2 +
 .../activity/LyricsBelongGameActivityTest.kt  | 185 ++++++++++++++++++
 .../sdp/vibester/activity/MainActivityTest.kt |   2 +-
 .../activity/LyricsBelongGameActivity.kt      |  16 +-
 .../ch/sdp/vibester/activity/MainActivity.kt  |   3 -
 5 files changed, 196 insertions(+), 12 deletions(-)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index a803a168a..19d2d9b3d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,6 +77,8 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.6'
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
+    testImplementation 'org.mockito:mockito-inline:2.13.0'
+    androidTestImplementation 'org.mockito:mockito-android:2.24.5'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
new file mode 100644
index 000000000..bc48cde5d
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -0,0 +1,185 @@
+package ch.sdp.vibester.activity
+
+import android.app.Activity
+import android.app.Instrumentation
+import android.content.Context
+import android.content.Intent
+import android.speech.RecognizerIntent
+import android.speech.SpeechRecognizer
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intending
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.GrantPermissionRule
+import ch.sdp.vibester.R
+import ch.sdp.vibester.api.LyricsOVHApiInterface
+import ch.sdp.vibester.model.Lyric
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import retrofit2.Call
+import java.util.ArrayList
+
+@RunWith(AndroidJUnit4::class)
+class LyricsBelongGameActivityTest {
+
+    @get: Rule
+    val activityRule = ActivityScenarioRule(LyricsBelongGameActivity::class.java)
+
+    private val lyricsBelongGameActivityClass = Mockito.spy(LyricsBelongGameActivity::class.java)
+
+    @get:Rule
+    var permissionRule: GrantPermissionRule =
+        GrantPermissionRule.grant(android.Manifest.permission.RECORD_AUDIO)
+
+    @Before
+    fun setUp() {
+        Intents.init()
+
+            //Mockito.spy(LyricsBelongGameActivity())
+    }
+
+    @After
+    fun clean() {
+        Intents.release()
+    }
+
+    @Test
+    fun getLyricsFromAPICorrectly() {
+        val service = LyricsOVHApiInterface.create()
+        val lyric = service.getLyrics("Imagine Dragons", "Thunder").execute()
+
+        assertThat(
+            lyric.body().lyrics?.replace("\n", "")?.replace("\r", ""),
+            equalTo(("Just a young gun with a quick fuse\n" +
+                    "I was uptight, wanna let loose\n" +
+                    "I was dreaming of bigger things in\n" +
+                    "And wanna leave my own life behind\n" +
+                    "Not a yes sir, not a follower\n" +
+                    "Fit the box, fit the mold\n" +
+                    "Have a seat in the foyer, take a number\n" +
+                    "I was lightning before the thunder\n" +
+                    "Thunder, thunder\n" +
+                    "Thunder, thun-, thunder\n" +
+                    "Thun-thun-thunder, thunder, thunder\n" +
+                    "Thunder, thun-, thunder\n" +
+                    "Thun-thun-thunder, thunder\n" +
+                    "Thunder, feel the thunder\n" +
+                    "Lightning and the thunder\n" +
+                    "Thunder, feel the thunder\n" +
+                    "Lightning and the thunder\n" +
+                    "Thunder, thunder\n" +
+                    "Thunder\n" +
+
+                    "Kids were laughing in my classes\n" +
+                    "While I was scheming for the masses\n" +
+                    "Who do you think you are?\n" +
+                    "Dreaming 'bout being a big star\n" +
+                    "You say you're basic, you say you're easy\n" +
+                    "You're always riding in the back seat\n" +
+                    "Now I'm smiling from the stage while\n" +
+                    "You were clapping in the nose bleeds\n" +
+
+                    "Thunder, thunder\n" +
+                    "Thunder, thun-, thunder\n" +
+                    "Thun-thun-thunder, thunder, thunder\n" +
+                    "Thunder, thun-, thunder\n" +
+                    "Thun-thun-thunder, thunder\n" +
+
+                    "Thunder, feel the thunder\n" +
+                    "Lightning and the thunder\n" +
+                    "Thunder, feel the thunder\n" +
+                    "Lightning and the thunder\n" +
+                    "Thunder\n" +
+                    "Thunder, feel the thunder\n" +
+                    "Lightning and the thunder, thunder\n" +
+
+                    "Thunder, feel the thunder\n" +
+                    "Lightning and the thunder, thunder\n" +
+                    "Thunder, feel the thunder\n" +
+                    "Lightning and the thunder, thunder\n" +
+                    "Thunder, feel the thunder\n" +
+                    "Lightning and the thunder, thunder\n" +
+                    "Thunder, feel the thunder (feel the)\n" +
+                    "Lightning and the thunder, thunder\n" +
+
+                    "Thunder, thun-, thunder\n" +
+                    "Thun-thun-thunder, thunder\n" +
+                    "Thunder, thun-, thunder\n" +
+                    "Thun-thun-thunder, thunder\n" +
+                    "Thunder, thun-, thunder\n" +
+                    "Thun-thun-thunder, thunder\n" +
+                    "Thunder, thun-, thunder\n" +
+                    "Thun-thun-thunder, thunder").replace("\r", "").replace("\n", ""))
+        )
+    }
+
+    @Test
+    fun btnCheckDoesNotWorkBeforeSpeak() {
+        onView(withId(R.id.lyricMatchButton)).perform(click())
+        onView(withId(R.id.lyricMatchResult)).check(matches(withText("TextView")))
+    }
+
+    //intending(hasComponent(DummyActivity.class.getName())).respondWith(new ActivityResult(resultCode, dataIntent));
+    //rule.getActivity().startActivityForResult(new Intent(context,DummyActivity.class));
+
+    //intending(hasAction(equalTo(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)))
+    //                .respondWith(new ActivityResult(Activity.RESULT_OK, new Intent().putExtra(
+    //                        SpeechRecognizer.RESULTS_RECOGNITION, new String[]{"I am uttering."})));
+
+    /*@Test
+    fun speechRecognizerWorks() {
+        onView(withId(R.id.btnSpeak)).perform(click())
+        val audioIntent = Mockito.mock(Intent::class.java)
+        val retList = ArrayList<String>()
+        retList.add("Just a young gun with a quick fuse")
+        *//*Mockito.`when`(audioIntent.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS))
+            .thenReturn(retList as ArrayList<String>?)*//*
+        intending(hasAction(RecognizerIntent.ACTION_RECOGNIZE_SPEECH))
+            .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, Intent().putExtra(
+                SpeechRecognizer.RESULTS_RECOGNITION, retList
+            )))
+        activityRule.scenario.onActivity {  }
+        onView(withId(R.id.lyricResult)).check(matches(withText("Just a young gun with a quick fuse")))
+    }*/
+
+    //private val LyricsBelongGameActivityClass = Mockito.spy(LyricsBelongGameActivity())
+    @Test
+    fun checkCorrectnessShowCorrect() {
+        /*val txtFromSpeech = Mockito.mock(TextView::class.java)
+        Mockito.`when`(txtFromSpeech.toString()).thenReturn("Just a young gun with a quick fuse")*/
+
+        /*val method = lyricsBelongGameActivityClass.javaClass
+            .getDeclaredMethod("checkCorrectness", String::class.java, String::class.java)
+        method.isAccessible = true
+        val parameters = arrayOfNulls<Any>(2)
+        parameters[0] = "Just a young gun with a quick fuse\n" +
+                "I was uptight, wanna let loose\n" +
+                "I was dreaming of bigger things in\n" +
+                "And wanna leave my own life behind\n" +
+                "Not a yes sir, not a follower\n" +
+                "Fit the box, fit the mold\n"
+        parameters[1] = "Just a young gun with a quick fuse"
+        method.invoke(lyricsBelongGameActivityClass, *parameters)*/
+
+        ApplicationProvider.getApplicationContext<Context>()
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/MainActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/MainActivityTest.kt
index aef7c193c..a204acd21 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/MainActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/MainActivityTest.kt
@@ -52,6 +52,6 @@ class MainActivityTest {
     @Test
     fun checkIntentOnLyric() {
         onView(withId(R.id.lyricButton)).perform(click())
-        intended(hasComponent(LyricTemporary::class.qualifiedName))
+        intended(hasComponent(LyricsBelongGameActivity::class.qualifiedName))
     }
 }
\ No newline at end of file
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 ac59cea11..8b37abdce 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -40,7 +40,7 @@ class LyricsBelongGameActivity : AppCompatActivity() {
         btnCheck = findViewById(R.id.lyricMatchButton)
         btnCheck.setOnClickListener {
             if (btnSpeakIsClicked) {
-                getLyrics()
+                checkLyrics(txtFromSpeech.text.toString())
             }
         }
 
@@ -58,11 +58,11 @@ class LyricsBelongGameActivity : AppCompatActivity() {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == REQUEST_AUDIO || data != null) {
             val res = data!!.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
-            txtFromSpeech.text = res?.get(0) ?: " Didn't catch"
+            txtFromSpeech.text = res?.get(0) ?: "Didn't catch"
         }
     }
 
-    private fun getLyrics() {
+    private fun checkLyrics(lyricToBeCheck: String) {
         val service = LyricsOVHApiInterface.create()
         val call = service.getLyrics("Imagine Dragons", "Thunder")
         call.enqueue(object: Callback<Lyric> {
@@ -71,17 +71,17 @@ class LyricsBelongGameActivity : AppCompatActivity() {
             override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
                 if (response != null) {
                     originLyric = response.body().lyrics.toString()
-                    checkCorrectness()
+                    txtResult.text = checkCorrectness(originLyric, lyricToBeCheck)
                 }
             }
         })
     }
 
-    private fun checkCorrectness() {
-        if (originLyric.contains(txtFromSpeech.text, ignoreCase = true)) {
-            txtResult.text = "correct!"
+    private fun checkCorrectness(originLyric: String, txtFromSpeech: String): String {
+        return if (originLyric.contains(txtFromSpeech, ignoreCase = true)) {
+            "correct!"
         } else {
-            txtResult.text = "too bad"
+            "too bad"
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
index 280da5d59..3e4810abf 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.GenreTemporary
-import ch.sdp.vibester.LyricTemporary
 import ch.sdp.vibester.R
 import ch.sdp.vibester.helper.IntentSwitcher
 
@@ -20,10 +19,8 @@ class MainActivity : AppCompatActivity() {
         }
 
         val btnLyric = findViewById<Button>(R.id.lyricButton)
-        //val lyricIntent = Intent(this, LyricTemporary::class.java)
         val lyricGameIntent = Intent(this, LyricsBelongGameActivity::class.java)
         btnLyric.setOnClickListener {
-            //startActivity(lyricIntent)
             startActivity(lyricGameIntent)
         }
 

From bbcb3811046e6f54f5caf05760ae2adc5221d751 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Thu, 24 Mar 2022 08:16:55 +0100
Subject: [PATCH 4/8] update test

---
 .../ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
index bc48cde5d..40b7c224f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -42,7 +42,7 @@ class LyricsBelongGameActivityTest {
     @get: Rule
     val activityRule = ActivityScenarioRule(LyricsBelongGameActivity::class.java)
 
-    private val lyricsBelongGameActivityClass = Mockito.spy(LyricsBelongGameActivity::class.java)
+    // private val lyricsBelongGameActivityClass = Mockito.spy(LyricsBelongGameActivity::class.java)
 
     @get:Rule
     var permissionRule: GrantPermissionRule =
@@ -178,7 +178,7 @@ class LyricsBelongGameActivityTest {
         parameters[1] = "Just a young gun with a quick fuse"
         method.invoke(lyricsBelongGameActivityClass, *parameters)*/
 
-        ApplicationProvider.getApplicationContext<Context>()
+        //ApplicationProvider.getApplicationContext<Context>()
 
 
     }

From 9f86a1b7e46ceddc587062c730c6368ee268237c Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Thu, 24 Mar 2022 15:29:51 +0100
Subject: [PATCH 5/8] reformat code

---
 .../activity/LyricsBelongGameActivityTest.kt  | 15 +++++++--
 .../activity/LyricsBelongGameActivity.kt      | 31 +++++--------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
index 40b7c224f..9b4ec3cc2 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -9,14 +9,15 @@ import android.speech.SpeechRecognizer
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.Intents.intending
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.intent.matcher.IntentMatchers.*
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
@@ -179,7 +180,15 @@ class LyricsBelongGameActivityTest {
         method.invoke(lyricsBelongGameActivityClass, *parameters)*/
 
         //ApplicationProvider.getApplicationContext<Context>()
-
+        val intent = Intent(ApplicationProvider.getApplicationContext(), LyricsBelongGameActivity::class.java)
+        val originLyrics = "Just a young gun with a quick fuse\n" +
+                "I was uptight, wanna let loose\n" +
+                "I was dreaming of bigger things in\n" +
+                "And wanna leave my own life behind\n" +
+                "Not a yes sir, not a follower\n" +
+                "Fit the box, fit the mold\n"
+        intent.putExtra("originLyric", originLyrics)
+        val scn: ActivityScenario<LyricsBelongGameActivity> = ActivityScenario.launch(intent)
 
     }
 }
\ No newline at end of file
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 8b37abdce..60705f534 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -18,33 +18,25 @@ import java.util.*
 private const val REQUEST_AUDIO = 100
 
 class LyricsBelongGameActivity : AppCompatActivity() {
-    private lateinit var btnSpeak : ImageView
-    private lateinit var txtFromSpeech: TextView
-    private lateinit var btnCheck : Button
-    private lateinit var txtResult : TextView
-    private lateinit var originLyric : String
+    private lateinit var speechInput : String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_lyrics_belong_game)
 
-        btnSpeak = findViewById(R.id.btnSpeak)
+        val btnSpeak = findViewById<ImageView>(R.id.btnSpeak)
         var btnSpeakIsClicked = false
         btnSpeak.setOnClickListener {
             btnSpeakIsClicked = true
             getSpeechInput()
         }
 
-        txtFromSpeech = findViewById(R.id.lyricResult)
-
-        btnCheck = findViewById(R.id.lyricMatchButton)
+        val btnCheck = findViewById<Button>(R.id.lyricMatchButton)
         btnCheck.setOnClickListener {
             if (btnSpeakIsClicked) {
-                checkLyrics(txtFromSpeech.text.toString())
+                checkLyrics(speechInput)
             }
         }
-
-        txtResult = findViewById(R.id.lyricMatchResult)
     }
 
     private fun getSpeechInput() {
@@ -58,7 +50,8 @@ class LyricsBelongGameActivity : AppCompatActivity() {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == REQUEST_AUDIO || data != null) {
             val res = data!!.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
-            txtFromSpeech.text = res?.get(0) ?: "Didn't catch"
+            speechInput = res?.get(0) ?: "Didn't catch"
+            findViewById<TextView>(R.id.lyricResult).text = speechInput
         }
     }
 
@@ -70,18 +63,10 @@ class LyricsBelongGameActivity : AppCompatActivity() {
 
             override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
                 if (response != null) {
-                    originLyric = response.body().lyrics.toString()
-                    txtResult.text = checkCorrectness(originLyric, lyricToBeCheck)
+                    val originLyric = response.body().lyrics.toString()
+                    findViewById<TextView>(R.id.lyricResult).text = if (originLyric.contains(lyricToBeCheck, ignoreCase = true)) "correct!" else "too bad"
                 }
             }
         })
     }
-
-    private fun checkCorrectness(originLyric: String, txtFromSpeech: String): String {
-        return if (originLyric.contains(txtFromSpeech, ignoreCase = true)) {
-            "correct!"
-        } else {
-            "too bad"
-        }
-    }
 }
\ No newline at end of file

From 32338c78fed258db552a12aaffbd8893f7056527 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Thu, 24 Mar 2022 19:51:54 +0100
Subject: [PATCH 6/8] test checkLyrics

---
 .../activity/LyricsBelongGameActivityTest.kt  | 36 +++++++++++++++----
 .../activity/LyricsBelongGameActivity.kt      |  7 +++-
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
index 9b4ec3cc2..857a6a97c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -137,6 +137,28 @@ class LyricsBelongGameActivityTest {
         onView(withId(R.id.lyricMatchResult)).check(matches(withText("TextView")))
     }
 
+    @Test
+    fun checkLyricsShouldReturnCorrect() {
+        val intent = Intent(ApplicationProvider.getApplicationContext(), LyricsBelongGameActivity::class.java)
+        val scn: ActivityScenario<LyricsBelongGameActivity> = ActivityScenario.launch(intent)
+        scn.onActivity { activity ->
+            activity.testCheckLyrics("Just a young gun with a quick fuse")
+        }
+        Thread.sleep(5000)
+        onView(withId(R.id.lyricMatchResult)).check(matches(withText("correct")))
+    }
+
+    @Test
+    fun checkLyricsShouldReturnTooBad() {
+        val intent = Intent(ApplicationProvider.getApplicationContext(), LyricsBelongGameActivity::class.java)
+        val scn: ActivityScenario<LyricsBelongGameActivity> = ActivityScenario.launch(intent)
+        scn.onActivity { activity ->
+            activity.testCheckLyrics("I don't remember the lyrics")
+        }
+        Thread.sleep(5000)
+        onView(withId(R.id.lyricMatchResult)).check(matches(withText("too bad")))
+    }
+
     //intending(hasComponent(DummyActivity.class.getName())).respondWith(new ActivityResult(resultCode, dataIntent));
     //rule.getActivity().startActivityForResult(new Intent(context,DummyActivity.class));
 
@@ -161,12 +183,12 @@ class LyricsBelongGameActivityTest {
     }*/
 
     //private val LyricsBelongGameActivityClass = Mockito.spy(LyricsBelongGameActivity())
-    @Test
+    /*@Test
     fun checkCorrectnessShowCorrect() {
-        /*val txtFromSpeech = Mockito.mock(TextView::class.java)
-        Mockito.`when`(txtFromSpeech.toString()).thenReturn("Just a young gun with a quick fuse")*/
+        *//*val txtFromSpeech = Mockito.mock(TextView::class.java)
+        Mockito.`when`(txtFromSpeech.toString()).thenReturn("Just a young gun with a quick fuse")*//*
 
-        /*val method = lyricsBelongGameActivityClass.javaClass
+        *//*val method = lyricsBelongGameActivityClass.javaClass
             .getDeclaredMethod("checkCorrectness", String::class.java, String::class.java)
         method.isAccessible = true
         val parameters = arrayOfNulls<Any>(2)
@@ -177,7 +199,7 @@ class LyricsBelongGameActivityTest {
                 "Not a yes sir, not a follower\n" +
                 "Fit the box, fit the mold\n"
         parameters[1] = "Just a young gun with a quick fuse"
-        method.invoke(lyricsBelongGameActivityClass, *parameters)*/
+        method.invoke(lyricsBelongGameActivityClass, *parameters)*//*
 
         //ApplicationProvider.getApplicationContext<Context>()
         val intent = Intent(ApplicationProvider.getApplicationContext(), LyricsBelongGameActivity::class.java)
@@ -190,5 +212,7 @@ class LyricsBelongGameActivityTest {
         intent.putExtra("originLyric", originLyrics)
         val scn: ActivityScenario<LyricsBelongGameActivity> = ActivityScenario.launch(intent)
 
-    }
+    }*/
+
+
 }
\ No newline at end of file
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 60705f534..f43f51e34 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -64,9 +64,14 @@ class LyricsBelongGameActivity : AppCompatActivity() {
             override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
                 if (response != null) {
                     val originLyric = response.body().lyrics.toString()
-                    findViewById<TextView>(R.id.lyricResult).text = if (originLyric.contains(lyricToBeCheck, ignoreCase = true)) "correct!" else "too bad"
+                    findViewById<TextView>(R.id.lyricMatchResult).text = if (originLyric.contains(lyricToBeCheck, ignoreCase = true)) "correct" else "too bad"
                 }
             }
         })
     }
+
+    // used to test the private checkLyrics function
+    fun testCheckLyrics(lyricToBeCheck: String) {
+        checkLyrics(lyricToBeCheck)
+    }
 }
\ No newline at end of file

From aa7fe7b97f1c071f1471710572101b91fff0cbb5 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Thu, 24 Mar 2022 21:26:03 +0100
Subject: [PATCH 7/8] change checkBtn and test speech input

---
 .../activity/LyricsBelongGameActivityTest.kt  | 97 ++++---------------
 .../activity/LyricsBelongGameActivity.kt      | 24 +++--
 2 files changed, 34 insertions(+), 87 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
index 857a6a97c..15fa44d97 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -1,31 +1,18 @@
 package ch.sdp.vibester.activity
 
-import android.app.Activity
-import android.app.Instrumentation
-import android.content.Context
 import android.content.Intent
-import android.speech.RecognizerIntent
-import android.speech.SpeechRecognizer
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.intent.Intents.intended
-import androidx.test.espresso.intent.Intents.intending
-import androidx.test.espresso.intent.matcher.IntentMatchers.*
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.GrantPermissionRule
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.LyricsOVHApiInterface
-import ch.sdp.vibester.model.Lyric
+
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.After
@@ -33,9 +20,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mockito
-import retrofit2.Call
-import java.util.ArrayList
 
 @RunWith(AndroidJUnit4::class)
 class LyricsBelongGameActivityTest {
@@ -43,8 +27,6 @@ class LyricsBelongGameActivityTest {
     @get: Rule
     val activityRule = ActivityScenarioRule(LyricsBelongGameActivity::class.java)
 
-    // private val lyricsBelongGameActivityClass = Mockito.spy(LyricsBelongGameActivity::class.java)
-
     @get:Rule
     var permissionRule: GrantPermissionRule =
         GrantPermissionRule.grant(android.Manifest.permission.RECORD_AUDIO)
@@ -52,8 +34,6 @@ class LyricsBelongGameActivityTest {
     @Before
     fun setUp() {
         Intents.init()
-
-            //Mockito.spy(LyricsBelongGameActivity())
     }
 
     @After
@@ -132,9 +112,13 @@ class LyricsBelongGameActivityTest {
     }
 
     @Test
-    fun btnCheckDoesNotWorkBeforeSpeak() {
-        onView(withId(R.id.lyricMatchButton)).perform(click())
-        onView(withId(R.id.lyricMatchResult)).check(matches(withText("TextView")))
+    fun btnCheckVisibleAfterSpeak() {
+        val intent = Intent(ApplicationProvider.getApplicationContext(), LyricsBelongGameActivity::class.java)
+        val scn: ActivityScenario<LyricsBelongGameActivity> = ActivityScenario.launch(intent)
+        scn.onActivity { activity ->
+            activity.testUpdateSpeechResult("hey")
+        }
+        onView(withId(R.id.lyricMatchResult)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
     }
 
     @Test
@@ -145,7 +129,7 @@ class LyricsBelongGameActivityTest {
             activity.testCheckLyrics("Just a young gun with a quick fuse")
         }
         Thread.sleep(5000)
-        onView(withId(R.id.lyricMatchResult)).check(matches(withText("correct")))
+        onView(withId(R.id.lyricMatchResult)).check(matches(withText("res: correct")))
     }
 
     @Test
@@ -156,63 +140,18 @@ class LyricsBelongGameActivityTest {
             activity.testCheckLyrics("I don't remember the lyrics")
         }
         Thread.sleep(5000)
-        onView(withId(R.id.lyricMatchResult)).check(matches(withText("too bad")))
+        onView(withId(R.id.lyricMatchResult)).check(matches(withText("res: too bad")))
     }
 
-    //intending(hasComponent(DummyActivity.class.getName())).respondWith(new ActivityResult(resultCode, dataIntent));
-    //rule.getActivity().startActivityForResult(new Intent(context,DummyActivity.class));
-
-    //intending(hasAction(equalTo(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)))
-    //                .respondWith(new ActivityResult(Activity.RESULT_OK, new Intent().putExtra(
-    //                        SpeechRecognizer.RESULTS_RECOGNITION, new String[]{"I am uttering."})));
-
-    /*@Test
-    fun speechRecognizerWorks() {
-        onView(withId(R.id.btnSpeak)).perform(click())
-        val audioIntent = Mockito.mock(Intent::class.java)
-        val retList = ArrayList<String>()
-        retList.add("Just a young gun with a quick fuse")
-        *//*Mockito.`when`(audioIntent.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS))
-            .thenReturn(retList as ArrayList<String>?)*//*
-        intending(hasAction(RecognizerIntent.ACTION_RECOGNIZE_SPEECH))
-            .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, Intent().putExtra(
-                SpeechRecognizer.RESULTS_RECOGNITION, retList
-            )))
-        activityRule.scenario.onActivity {  }
-        onView(withId(R.id.lyricResult)).check(matches(withText("Just a young gun with a quick fuse")))
-    }*/
-
-    //private val LyricsBelongGameActivityClass = Mockito.spy(LyricsBelongGameActivity())
-    /*@Test
-    fun checkCorrectnessShowCorrect() {
-        *//*val txtFromSpeech = Mockito.mock(TextView::class.java)
-        Mockito.`when`(txtFromSpeech.toString()).thenReturn("Just a young gun with a quick fuse")*//*
-
-        *//*val method = lyricsBelongGameActivityClass.javaClass
-            .getDeclaredMethod("checkCorrectness", String::class.java, String::class.java)
-        method.isAccessible = true
-        val parameters = arrayOfNulls<Any>(2)
-        parameters[0] = "Just a young gun with a quick fuse\n" +
-                "I was uptight, wanna let loose\n" +
-                "I was dreaming of bigger things in\n" +
-                "And wanna leave my own life behind\n" +
-                "Not a yes sir, not a follower\n" +
-                "Fit the box, fit the mold\n"
-        parameters[1] = "Just a young gun with a quick fuse"
-        method.invoke(lyricsBelongGameActivityClass, *parameters)*//*
-
-        //ApplicationProvider.getApplicationContext<Context>()
+    @Test
+    fun shouldUpdateSpeechFromInput() {
         val intent = Intent(ApplicationProvider.getApplicationContext(), LyricsBelongGameActivity::class.java)
-        val originLyrics = "Just a young gun with a quick fuse\n" +
-                "I was uptight, wanna let loose\n" +
-                "I was dreaming of bigger things in\n" +
-                "And wanna leave my own life behind\n" +
-                "Not a yes sir, not a follower\n" +
-                "Fit the box, fit the mold\n"
-        intent.putExtra("originLyric", originLyrics)
         val scn: ActivityScenario<LyricsBelongGameActivity> = ActivityScenario.launch(intent)
-
-    }*/
+        scn.onActivity { activity ->
+            activity.testUpdateSpeechResult("hey")
+        }
+        onView(withId(R.id.lyricResult)).check(matches(withText("hey")))
+    }
 
 
 }
\ No newline at end of file
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 f43f51e34..4a42f68b8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.activity
 import android.content.Intent
 import android.os.Bundle
 import android.speech.RecognizerIntent
+import android.view.View
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
@@ -25,17 +26,14 @@ class LyricsBelongGameActivity : AppCompatActivity() {
         setContentView(R.layout.activity_lyrics_belong_game)
 
         val btnSpeak = findViewById<ImageView>(R.id.btnSpeak)
-        var btnSpeakIsClicked = false
         btnSpeak.setOnClickListener {
-            btnSpeakIsClicked = true
             getSpeechInput()
         }
 
         val btnCheck = findViewById<Button>(R.id.lyricMatchButton)
+        btnCheck.visibility = View.INVISIBLE
         btnCheck.setOnClickListener {
-            if (btnSpeakIsClicked) {
-                checkLyrics(speechInput)
-            }
+            checkLyrics(speechInput)
         }
     }
 
@@ -51,10 +49,15 @@ class LyricsBelongGameActivity : AppCompatActivity() {
         if (requestCode == REQUEST_AUDIO || data != null) {
             val res = data!!.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
             speechInput = res?.get(0) ?: "Didn't catch"
-            findViewById<TextView>(R.id.lyricResult).text = speechInput
+            updateSpeechResult(speechInput)
         }
     }
 
+    private fun updateSpeechResult(speechInput: String) {
+        findViewById<TextView>(R.id.lyricResult).text = speechInput
+        findViewById<Button>(R.id.lyricMatchButton).visibility = View.VISIBLE
+    }
+
     private fun checkLyrics(lyricToBeCheck: String) {
         val service = LyricsOVHApiInterface.create()
         val call = service.getLyrics("Imagine Dragons", "Thunder")
@@ -64,14 +67,19 @@ class LyricsBelongGameActivity : AppCompatActivity() {
             override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
                 if (response != null) {
                     val originLyric = response.body().lyrics.toString()
-                    findViewById<TextView>(R.id.lyricMatchResult).text = if (originLyric.contains(lyricToBeCheck, ignoreCase = true)) "correct" else "too bad"
+                    findViewById<TextView>(R.id.lyricMatchResult).text = if (originLyric.contains(lyricToBeCheck, ignoreCase = true)) "res: correct" else "res: too bad"
                 }
             }
         })
     }
 
-    // used to test the private checkLyrics function
+    // helper functions to test private functions
+
     fun testCheckLyrics(lyricToBeCheck: String) {
         checkLyrics(lyricToBeCheck)
     }
+
+    fun testUpdateSpeechResult(speechInput: String) {
+        updateSpeechResult(speechInput)
+    }
 }
\ No newline at end of file

From 5c000633bed306295021200d4ac0f30d7309e0f5 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Thu, 24 Mar 2022 22:21:15 +0100
Subject: [PATCH 8/8] add doc and reformat

---
 .../ch/sdp/vibester/GenreTemporaryTest.kt     |  2 +-
 .../activity/LyricsBelongGameActivity.kt      |  6 +++++
 .../ch/sdp/vibester/activity/MainActivity.kt  |  1 -
 .../vibester/activity/TypingGameActivity.kt   | 16 +++++------
 .../ch/sdp/vibester/api/ItunesMusicApi.kt     |  8 +++---
 .../java/ch/sdp/vibester/api/LastfmApi.kt     |  8 +++---
 .../java/ch/sdp/vibester/api/LastfmHelper.kt  | 27 ++++++++++++-------
 .../vibester/auth/FireBaseAuthenticator.kt    |  1 -
 .../main/java/ch/sdp/vibester/model/Song.kt   |  2 +-
 .../java/ch/sdp/vibester/model/SongList.kt    |  8 +++---
 10 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GenreTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GenreTemporaryTest.kt
index da50ebd09..b2d7bf879 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GenreTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GenreTemporaryTest.kt
@@ -34,7 +34,7 @@ class GenreTemporaryTest {
     }
 
     @Test
-    fun GenreLayoutIsDisplayed() {
+    fun genreLayoutIsDisplayed() {
         onView(withId(R.id.rockButton)).check(matches(isDisplayed()))
         onView(withId(R.id.kpopButton)).check(matches(isDisplayed()))
         onView(withId(R.id.topTracksButton)).check(matches(isDisplayed()))
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 4a42f68b8..32689f53d 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -53,11 +53,17 @@ class LyricsBelongGameActivity : AppCompatActivity() {
         }
     }
 
+    /**
+     * display the given String in lyricResult
+     */
     private fun updateSpeechResult(speechInput: String) {
         findViewById<TextView>(R.id.lyricResult).text = speechInput
         findViewById<Button>(R.id.lyricMatchButton).visibility = View.VISIBLE
     }
 
+    /**
+     * check if the given string belongs to the lyrics of the song
+     */
     private fun checkLyrics(lyricToBeCheck: String) {
         val service = LyricsOVHApiInterface.create()
         val call = service.getLyrics("Imagine Dragons", "Thunder")
diff --git a/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
index 3e4810abf..8fad9f4ec 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
@@ -28,7 +28,6 @@ class MainActivity : AppCompatActivity() {
         val genreIntent = Intent(this, GenreTemporary::class.java)
         btnGenre.setOnClickListener {
             startActivity(genreIntent)
-
         }
 
     }
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 fd75ad875..266f1891d 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -38,27 +38,27 @@ class TypingGameActivity : AppCompatActivity() {
         /**
          * Print Toast message to announce the user if he wons or not
          */
-        private fun hasWon(ctx: Context, hasWon: Boolean, itwas: Song){
+        private fun hasWon(ctx: Context, hasWon: Boolean, itWas: Song){
             if(hasWon){
                 Toast.makeText(ctx,"Well Done!",Toast.LENGTH_SHORT).show()
             }else{
-                Toast.makeText(ctx,"Sadly you're wrong, it was: "+itwas.getTrackName()+" by "+itwas.getArtistName(),Toast.LENGTH_SHORT).show()
+                Toast.makeText(ctx,"Sadly you're wrong, it was: "+itWas.getTrackName()+" by "+itWas.getArtistName(),Toast.LENGTH_SHORT).show()
             }
         }
 
         /**
          * Generate a change of intent at the end of the game
          */
-        fun intentGen(ctx: Context, choosenSong: Song?, playedSong: Song):Intent{
+        fun intentGen(ctx: Context, chosenSong: Song?, playedSong: Song):Intent{
             val newIntent = Intent(ctx, TypingGameActivity::class.java)
             newIntent.putExtra("song", playedSong)
             newIntent.putExtra("isPlaying", false)
-            if(choosenSong != null && choosenSong.getTrackName() == playedSong.getTrackName() && choosenSong.getArtistName() == playedSong.getArtistName()){
+            if(chosenSong != null && chosenSong.getTrackName() == playedSong.getTrackName() && chosenSong.getArtistName() == playedSong.getArtistName()){
                 newIntent.putExtra("hasWon", true)
             }else{
                 newIntent.putExtra("hasWon", false)
             }
-            newIntent.setFlags(FLAG_ACTIVITY_NEW_TASK)
+            newIntent.flags = FLAG_ACTIVITY_NEW_TASK
             return newIntent
         }
 
@@ -82,7 +82,7 @@ class TypingGameActivity : AppCompatActivity() {
             frameLay.addView(linLay)
             guessLayout.addView(frameLay)
 
-            //Create the Listener that is executed if we click on the framelayer
+            //Create the Listener that is executed if we click on the frameLayer
             frameLay.setOnClickListener {
                 frameLay.setBackgroundColor(getColor(ctx, R.color.tiffany_blue))
                 guessLayout.removeAllViews()
@@ -124,7 +124,7 @@ class TypingGameActivity : AppCompatActivity() {
          */
         fun generateText(txt: String, ctx: Context): TextView {
             val txtView = TextView(ctx)
-            txtView.setText(txt)
+            txtView.text = txt
             txtView.gravity = Gravity.CENTER
             txtView.minHeight= 200
             txtView.textSize = 20F
@@ -178,7 +178,7 @@ class TypingGameActivity : AppCompatActivity() {
             if(!isPlaying){
                 //Is the activity showing the result
                 hasWon(this, hasWon, playableSong)
-                inputTxt.setKeyListener(null)
+                inputTxt.keyListener = null
             }else{
                 //Is the activity playing music
                 mediaPlayer = AudioPlayer.playAudio(playableSong.getPreviewUrl())
diff --git a/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt b/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
index d6e04b1aa..8f6f4052a 100644
--- a/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
@@ -9,7 +9,7 @@ import java.util.concurrent.CompletableFuture
 class ItunesMusicApi private constructor(){
 
     companion object{
-        private val LOOKUP_URL_BASE = "https://itunes.apple.com/search?media=music&"
+        private const val LOOKUP_URL_BASE = "https://itunes.apple.com/search?media=music&"
 
         /**
          * Given a String query it will provide the music url preview
@@ -19,10 +19,10 @@ class ItunesMusicApi private constructor(){
          * @return CompletableFuture<String> that contains the result of the query
          */
         fun querySong(query: String, okHttp: OkHttpClient, limit: Int, baseUrl: String = LOOKUP_URL_BASE): CompletableFuture<String> {
-            val buildedUrl = baseUrl+"limit="+limit+"&term="+query.replace(' ', '+')
-            val req = okhttp3.Request.Builder().url(buildedUrl).build()
+            val builtUrl = baseUrl+"limit="+limit+"&term="+query.replace(' ', '+')
+            val req = okhttp3.Request.Builder().url(builtUrl).build()
 
-            var retFuture = CompletableFuture<String>()
+            val retFuture = CompletableFuture<String>()
 
             okHttp.newCall(req).enqueue(ApiCallback(retFuture))
 
diff --git a/app/src/main/java/ch/sdp/vibester/api/LastfmApi.kt b/app/src/main/java/ch/sdp/vibester/api/LastfmApi.kt
index e339a0262..19f9701b2 100644
--- a/app/src/main/java/ch/sdp/vibester/api/LastfmApi.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/LastfmApi.kt
@@ -12,8 +12,8 @@ import java.util.concurrent.CompletableFuture
 class LastfmApi private constructor(){
 
         companion object{
-            private val API_KEY = "52bfdc690dd8373bba5351571a01ac14"
-            private val LOOKUP_URL_BASE ="https://ws.audioscrobbler.com/2.0/"
+            private const val API_KEY = "52bfdc690dd8373bba5351571a01ac14"
+            private const val LOOKUP_URL_BASE ="https://ws.audioscrobbler.com/2.0/"
 
             /**
              * Provide a list of songs by given tag or chart
@@ -22,7 +22,7 @@ class LastfmApi private constructor(){
              * @param baseUrl: baseUrl if changed
              */
             fun querySongList(okHttp: OkHttpClient, params:LastfmUri, baseUrl: String = LOOKUP_URL_BASE): CompletableFuture<String> {
-                var builtUri: Uri= Uri.parse(baseUrl)
+                val builtUri: Uri= Uri.parse(baseUrl)
                     .buildUpon()
                     .appendQueryParameter("method", params.method)
                     .appendQueryParameter("api_key", API_KEY)
@@ -34,7 +34,7 @@ class LastfmApi private constructor(){
                 val uri = builtUri.toString()
                 val req = Request.Builder().url(uri).build()
 
-                var retFuture = CompletableFuture<String>()
+                val retFuture = CompletableFuture<String>()
 
                 okHttp.newCall(req).enqueue(ApiCallback(retFuture))
 
diff --git a/app/src/main/java/ch/sdp/vibester/api/LastfmHelper.kt b/app/src/main/java/ch/sdp/vibester/api/LastfmHelper.kt
index 2ffc6563f..119927bc8 100644
--- a/app/src/main/java/ch/sdp/vibester/api/LastfmHelper.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/LastfmHelper.kt
@@ -16,7 +16,7 @@ class LastfmHelper {
 
     companion object{
         private var pageLimitQueryTwo = 200;
-        private val GAME_SIZE = 10;
+        private const val GAME_SIZE = 10;
 
         /**
          * Function that performs queries to two pages within given tag
@@ -24,24 +24,31 @@ class LastfmHelper {
          * @param tag: tag to retrieve songs. If method BY_CHART is used, tag is empty.
          * @return list of songs in a format ("$songName $artistName")
          */
-        fun getRandomSongList(method: String, tag:String = ""): List<String> {
-            val firstQuery = SongList(LastfmApi.querySongList(OkHttpClient(),
-                LastfmUri(method = method, tag = tag)).get())
+        fun getRandomSongList(method: String, tag: String = ""): List<String> {
+            val firstQuery = SongList(
+                LastfmApi.querySongList(
+                    OkHttpClient(),
+                    LastfmUri(method = method, tag = tag)
+                ).get()
+            )
             val firstSongList = firstQuery.getSongList()
             val pagesQueryOne = firstQuery.getTotalPages().toInt()
 
-            if(pagesQueryOne < pageLimitQueryTwo){
+            if (pagesQueryOne < pageLimitQueryTwo) {
                 pageLimitQueryTwo = pagesQueryOne
             }
 
-            val pageQueryTwo =(2..pageLimitQueryTwo).random()
-            val secondQuery = SongList(LastfmApi.querySongList(OkHttpClient(),
-                LastfmUri(method = method, tag = tag, page = pageQueryTwo.toString())).get())
+            val pageQueryTwo = (2..pageLimitQueryTwo).random()
+            val secondQuery = SongList(
+                LastfmApi.querySongList(
+                    OkHttpClient(),
+                    LastfmUri(method = method, tag = tag, page = pageQueryTwo.toString())
+                ).get()
+            )
             val secondSongList = secondQuery.getSongList()
 
             val mergedLists = merge(firstSongList, secondSongList)
-            var finalList = mergedLists.asSequence().shuffled().take(GAME_SIZE).toList()
-            return finalList
+            return mergedLists.asSequence().shuffled().take(GAME_SIZE).toList()
         }
 
         fun <T> merge(first: List<T>, second: List<T>): List<T> {
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index c9a0fcce9..dc256f7cc 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -11,7 +11,6 @@ import com.google.firebase.ktx.Firebase
 
 class FireBaseAuthenticator() {
 
-
     val auth: FirebaseAuth = Firebase.auth
 
 
diff --git a/app/src/main/java/ch/sdp/vibester/model/Song.kt b/app/src/main/java/ch/sdp/vibester/model/Song.kt
index fb41c77bf..d0ce89877 100644
--- a/app/src/main/java/ch/sdp/vibester/model/Song.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/Song.kt
@@ -76,7 +76,7 @@ class Song(jsonO: JSONObject): Serializable{
                 val jsonObj = JSONObject(str)
                 val countResult = jsonObj.getInt("resultCount")
                 val jsonArray = jsonObj.getJSONArray("results")
-                for (i in 0..(countResult-1)){
+                for (i in 0 until countResult){
                     myList.add(Song(jsonArray.getJSONObject(i)))
                 }
                 return myList
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 fd2183726..80036523a 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongList.kt
@@ -19,11 +19,11 @@ class SongList(jsonMeta: String) {
     init {
         try {
             val jsonObj = JSONObject(jsonMeta)
-            var jsonRes = jsonObj.getJSONObject("tracks")
-            var nonFilteredSongs = jsonRes.getJSONArray("track")
+            val jsonRes = jsonObj.getJSONObject("tracks")
+            val nonFilteredSongs = jsonRes.getJSONArray("track")
             filterSongs(nonFilteredSongs)
 
-            var attributes = jsonRes.getJSONObject("@attr")
+            val attributes = jsonRes.getJSONObject("@attr")
             page = attributes.getString("page")
             songsPerPage = attributes.getString("perPage")
             totalPages = attributes.getString("totalPages")
@@ -43,7 +43,7 @@ class SongList(jsonMeta: String) {
         val songsLength = nonFilteredSongs.length()
         var  i = 0
         while(i < songsLength) {
-            var songObj = nonFilteredSongs.getJSONObject(i)
+            val songObj = nonFilteredSongs.getJSONObject(i)
             val songName = songObj.getString("name")
             val artistDetails = songObj.getJSONObject("artist")
             val artistName = artistDetails.getString("name")