From 0f2e9ac1bbd7ca7e4c818043d7d5f5553a9055d8 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 13 Mar 2022 11:32:37 +0100
Subject: [PATCH 01/11] stuck using musixmatch api

---
 .../ch/sdp/vibester/MusicTemporaryTest.kt     |  6 +-
 app/src/main/AndroidManifest.xml              | 93 ++++++++++---------
 .../java/ch/sdp/vibester/LyricTemporary.kt    | 36 +++++++
 .../main/java/ch/sdp/vibester/MainActivity.kt |  8 ++
 .../java/ch/sdp/vibester/MusicTemporary.kt    |  4 +-
 .../ch/sdp/vibester/api/ItunesMusicApi.kt     |  2 +-
 .../java/ch/sdp/vibester/api/LyricsOVHApi.kt  |  5 +
 .../java/ch/sdp/vibester/api/MusixmatchApi.kt | 34 +++++++
 .../main/java/ch/sdp/vibester/model/Lyric.kt  | 27 ++++++
 .../main/java/ch/sdp/vibester/model/Song.kt   |  2 +-
 .../res/layout/activity_lyric_temporary.xml   | 88 ++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     | 19 +++-
 .../res/layout/activity_music_temporary.xml   |  6 +-
 13 files changed, 269 insertions(+), 61 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/api/LyricsOVHApi.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/api/MusixmatchApi.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/model/Lyric.kt
 create mode 100644 app/src/main/res/layout/activity_lyric_temporary.xml

diff --git a/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
index e17ef6f00..ef861edfd 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
@@ -3,13 +3,9 @@ package ch.sdp.vibester
 import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.*
-import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -28,7 +24,7 @@ class MusicTemporaryTest{
             val scn: ActivityScenario<GreetingActivity> = ActivityScenario.launch(intent)
             onView(withId(R.id.musicName))
                 .perform(typeText(inputName), closeSoftKeyboard())
-            onView(withId(R.id.validate)).perform(click())
+            onView(withId(R.id.validateForMusic)).perform(click())
             onView(withId(R.id.textViewPlaying))
                 .check(matches(withText("Imagine Dragons - Believer")))
         }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5ede2fe17..351593b31 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,45 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ch.sdp.vibester">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.MyApplication">
-        <activity
-            android:name="ch.sdp.vibester.GamescreenActivity"
-            android:exported="false" />
-        <activity
-            android:name=".profile.ProfileSetup"
-            android:exported="false" />
-        <activity
-            android:name=".MusicTemporary"
-            android:exported="false" />
-       <activity
-            android:name=".GameSetupScreen"
-            android:exported="false" />
-        <activity android:name=".scoreboard.ScoreBoardActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".WelcomeScreen"
-            android:exported="false" />
-        <activity
-            android:name=".GreetingActivity"
-            android:exported="false" />
-        <activity
-            android:name=".MainActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ch.sdp.vibester">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
+        android:theme="@style/Theme.MyApplication">
+        <activity
+            android:name="ch.sdp.vibester.GamescreenActivity"
+            android:exported="false" />
+        <activity
+            android:name=".profile.ProfileSetup"
+            android:exported="false" />
+        <activity
+            android:name=".MusicTemporary"
+            android:exported="false" />
+        <activity
+            android:name=".LyricTemporary"
+            android:exported="false" />
+        <activity
+            android:name=".GameSetupScreen"
+            android:exported="false" />
+        <activity
+            android:name=".scoreboard.ScoreBoardActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".WelcomeScreen"
+            android:exported="false" />
+        <activity
+            android:name=".GreetingActivity"
+            android:exported="false" />
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt b/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
new file mode 100644
index 000000000..d8b48a1b7
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
@@ -0,0 +1,36 @@
+package ch.sdp.vibester
+
+import android.os.Bundle
+import android.text.method.ScrollingMovementMethod
+import android.widget.Button
+import android.widget.EditText
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import ch.sdp.vibester.api.MusixmatchApi
+import ch.sdp.vibester.model.Lyric
+import okhttp3.OkHttpClient
+
+
+class LyricTemporary: AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_lyric_temporary)
+
+        val artistName = findViewById<EditText>(R.id.artistForLyric)
+
+        val trackName = findViewById<EditText>(R.id.trackForLyric)
+
+        val btnValidate = findViewById<Button>(R.id.validateForLyric)
+
+        val textViewLyric = findViewById<TextView>(R.id.lyricBody)
+
+        btnValidate.setOnClickListener {
+            val lyric = Lyric(MusixmatchApi.queryLyric(
+                artistName.text.toString(), trackName.text.toString(),
+                OkHttpClient()).get())
+
+            textViewLyric.text = lyric.getLyricBody()
+            textViewLyric.movementMethod = ScrollingMovementMethod()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index d5a1e6440..c9fea4441 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -50,6 +50,14 @@ class MainActivity : AppCompatActivity() {
             startActivity(scoreboardIntent)
         }
 
+        // button to lyric
+        val btnLyric = findViewById<Button>(R.id.lyricButton)
+        val lyricIntent = Intent(this, LyricTemporary::class.java)
+
+        btnLyric.setOnClickListener {
+            startActivity(lyricIntent)
+        }
+
     }
 
     fun switchToWelcome(view: View) {
diff --git a/app/src/main/java/ch/sdp/vibester/MusicTemporary.kt b/app/src/main/java/ch/sdp/vibester/MusicTemporary.kt
index 7dc7a1dcf..3d5b10a96 100644
--- a/app/src/main/java/ch/sdp/vibester/MusicTemporary.kt
+++ b/app/src/main/java/ch/sdp/vibester/MusicTemporary.kt
@@ -16,14 +16,14 @@ class MusicTemporary : AppCompatActivity() {
 
         val txtInput = findViewById<EditText>(R.id.musicName)
 
-        val btnValidate = findViewById<Button>(R.id.validate)
+        val btnValidate = findViewById<Button>(R.id.validateForMusic)
 
         val textViewPlaying = findViewById<TextView>(R.id.textViewPlaying)
 
         btnValidate.setOnClickListener {
             val song = Song(ItunesMusicApi.querySong(txtInput.text.toString(), OkHttpClient()).get())
             ItunesMusicApi.playAudio(song.getPreviewUrl())
-            textViewPlaying.setText(song.getArtistName() + " - " + song.getTrackName())
+            textViewPlaying.text = song.getArtistName() + " - " + song.getTrackName()
         }
 
 
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 20424b037..28a44598b 100644
--- a/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
@@ -67,7 +67,7 @@ class ItunesMusicApi private constructor(){
         /**
          * The Callback class when calling the querySong(...) method
          */
-        private class SongCallback(val retFuture: CompletableFuture<String>): Callback{
+        class SongCallback(val retFuture: CompletableFuture<String>): Callback{
             override fun onResponse(call: Call, response: Response) {
                 retFuture.complete(response.body?.string())
             }
diff --git a/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApi.kt b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApi.kt
new file mode 100644
index 000000000..e93829175
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApi.kt
@@ -0,0 +1,5 @@
+package ch.sdp.vibester.api
+
+class LyricsOVHApi {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/api/MusixmatchApi.kt b/app/src/main/java/ch/sdp/vibester/api/MusixmatchApi.kt
new file mode 100644
index 000000000..afbf52a71
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/api/MusixmatchApi.kt
@@ -0,0 +1,34 @@
+package ch.sdp.vibester.api
+
+import okhttp3.OkHttpClient
+import java.util.concurrent.CompletableFuture
+
+class MusixmatchApi private constructor(){
+
+    companion object {
+        // musixmatch api base url
+        private const val BASE_URL = "https://api.musixmatch.com/ws/1.1/"
+
+        private const val API_KEY = "&apikey=c0c85b22538a6b16bdfbbf64b4078c"
+
+        private const val FORMAT_URL = "?format=json&callback=callback"
+
+        private const val LYRICS_MATCHER = "matcher.lyrics.get"
+
+        private const val ARTIST_SEARCH_PARAMETER = "&q_artist="
+
+        private const val TRACK_SEARCH_PARAMETER = "&q_track="
+
+        fun queryLyric(artistName: String, trackName: String, okHttpClient: OkHttpClient): CompletableFuture<String> {
+            val apiCall = BASE_URL + LYRICS_MATCHER + FORMAT_URL + ARTIST_SEARCH_PARAMETER + artistName + TRACK_SEARCH_PARAMETER + trackName + API_KEY
+
+            val request = okhttp3.Request.Builder().url(apiCall).build()
+
+            var retFuture = CompletableFuture<String>()
+
+            okHttpClient.newCall(request).enqueue(ItunesMusicApi.Companion.SongCallback(retFuture))
+
+            return retFuture
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/Lyric.kt b/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
new file mode 100644
index 000000000..3311a1144
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
@@ -0,0 +1,27 @@
+package ch.sdp.vibester.model
+
+import org.json.JSONObject
+import java.lang.Exception
+import java.lang.IllegalArgumentException
+
+class Lyric(jsonMeta: String) {
+
+    private var lyricBody = ""
+
+    init {
+        try {
+            val jsonObject = JSONObject(jsonMeta)
+            val jsonArrayMessage = jsonObject.getJSONArray("message")
+            val jsonArrayBody = jsonArrayMessage.getJSONArray(1)
+            val jsonLyric = jsonArrayBody.getJSONObject(0)
+
+            lyricBody = jsonLyric.getString("lyrics_body")
+        } catch (e: Exception) {
+            throw IllegalArgumentException("Lyric constructor, bad argument")
+        }
+    }
+
+    fun getLyricBody():String {
+        return lyricBody
+    }
+}
\ No newline at end of file
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 07d9f8df8..2965c67a7 100644
--- a/app/src/main/java/ch/sdp/vibester/model/Song.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/Song.kt
@@ -25,7 +25,7 @@ class Song(jsonMeta: String) {
             artworkUrl = jsonRes.getString("artworkUrl100")
             trackName = jsonRes.getString("trackName")
             artistName = jsonRes.getString("artistName")
-        } catch(e: Exception){
+        } catch(e: Exception) {
             throw IllegalArgumentException("Song constructor, bad argument")
         }
     }
diff --git a/app/src/main/res/layout/activity_lyric_temporary.xml b/app/src/main/res/layout/activity_lyric_temporary.xml
new file mode 100644
index 000000000..c953a6a76
--- /dev/null
+++ b/app/src/main/res/layout/activity_lyric_temporary.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".LyricTemporary">
+
+
+    <TextView
+        android:id="@+id/askArtistForLyric"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="97dp"
+        android:layout_marginBottom="5dp"
+        android:text="What's the name of the artist?"
+        app:layout_constraintBottom_toTopOf="@+id/artistForLyric"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/artistForLyric"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="8dp"
+        android:ems="10"
+        android:hint="artist name"
+        android:inputType="textPersonName"
+        app:layout_constraintBottom_toTopOf="@+id/askTrackForLyric"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/askArtistForLyric" />
+
+    <TextView
+        android:id="@+id/askTrackForLyric"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="What's the name of the track?"
+        app:layout_constraintBottom_toTopOf="@+id/trackForLyric"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/artistForLyric" />
+
+    <EditText
+        android:id="@+id/trackForLyric"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="18dp"
+        android:ems="10"
+        android:hint="track name"
+        android:inputType="textPersonName"
+        app:layout_constraintBottom_toTopOf="@+id/validateForLyric"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/askTrackForLyric" />
+
+    <Button
+        android:id="@+id/validateForLyric"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_marginStart="158dp"
+        android:layout_marginTop="18dp"
+        android:layout_marginEnd="159dp"
+        android:text="Validate"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/trackForLyric" />
+
+    <TextView
+        android:id="@+id/lyricBody"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:scrollbars="vertical"
+        android:text="display the lyric here"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/validateForLyric" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9deea89ad..806546502 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -44,13 +44,12 @@
         android:id="@+id/scoreboardButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="37dp"
         android:text="@string/scoreboard"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintHorizontal_bias="0.485"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.653" />
+        app:layout_constraintTop_toBottomOf="@+id/placeholder_welcome" />
 
     <Button
         android:id="@+id/profileButton"
@@ -61,7 +60,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.803" />
+        app:layout_constraintVertical_bias="0.841" />
 
     <Button
         android:id="@+id/placeholder_welcome"
@@ -77,4 +76,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/mainButton"
         app:layout_constraintVertical_bias="0.0" />
+
+    <Button
+        android:id="@+id/lyricButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:text="Lyric"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/scoreboardButton" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_music_temporary.xml b/app/src/main/res/layout/activity_music_temporary.xml
index 92cb1296c..287639c98 100644
--- a/app/src/main/res/layout/activity_music_temporary.xml
+++ b/app/src/main/res/layout/activity_music_temporary.xml
@@ -33,13 +33,13 @@
         android:ems="10"
         android:hint="Music Name"
         android:inputType="textPersonName"
-        app:layout_constraintBottom_toTopOf="@+id/validate"
+        app:layout_constraintBottom_toTopOf="@+id/validateForMusic"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textWelcome" />
 
     <Button
-        android:id="@+id/validate"
+        android:id="@+id/validateForMusic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="158dp"
@@ -64,5 +64,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/validate" />
+        app:layout_constraintTop_toBottomOf="@+id/validateForMusic" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From a5838d74f3d6582f5b36f00e0336abd8f6df320a Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Sun, 13 Mar 2022 14:33:18 +0100
Subject: [PATCH 02/11] show lyric using Lyrics.ovh

---
 app/build.gradle                              |  2 ++
 .../java/ch/sdp/vibester/LyricTemporary.kt    | 34 ++++++++++++++-----
 .../ch/sdp/vibester/api/ItunesMusicApi.kt     |  2 +-
 .../java/ch/sdp/vibester/api/LyricsOVHApi.kt  |  5 ---
 .../sdp/vibester/api/LyricsOVHApiInterface.kt | 11 ++++++
 .../java/ch/sdp/vibester/api/MusixmatchApi.kt | 34 -------------------
 .../main/java/ch/sdp/vibester/model/Lyric.kt  | 28 ++++-----------
 7 files changed, 46 insertions(+), 70 deletions(-)
 delete mode 100644 app/src/main/java/ch/sdp/vibester/api/LyricsOVHApi.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
 delete mode 100644 app/src/main/java/ch/sdp/vibester/api/MusixmatchApi.kt

diff --git a/app/build.gradle b/app/build.gradle
index 530f79359..8412f1b9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,6 +51,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.0.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.0.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.json:json:20180813'
     testImplementation 'org.robolectric:robolectric:4.6'
diff --git a/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt b/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
index d8b48a1b7..553de38de 100644
--- a/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
+++ b/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
@@ -6,12 +6,18 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import ch.sdp.vibester.api.MusixmatchApi
+import ch.sdp.vibester.api.LyricsOVHApiInterface
 import ch.sdp.vibester.model.Lyric
-import okhttp3.OkHttpClient
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
 
 
 class LyricTemporary: AppCompatActivity() {
+    val baseUrl = "https://api.lyrics.ovh/"
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_lyric_temporary)
@@ -23,14 +29,26 @@ class LyricTemporary: AppCompatActivity() {
         val btnValidate = findViewById<Button>(R.id.validateForLyric)
 
         val textViewLyric = findViewById<TextView>(R.id.lyricBody)
+        textViewLyric.movementMethod = ScrollingMovementMethod()
 
         btnValidate.setOnClickListener {
-            val lyric = Lyric(MusixmatchApi.queryLyric(
-                artistName.text.toString(), trackName.text.toString(),
-                OkHttpClient()).get())
-
-            textViewLyric.text = lyric.getLyricBody()
-            textViewLyric.movementMethod = ScrollingMovementMethod()
+            var retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build()
+            val service = retrofit.create(LyricsOVHApiInterface::class.java)
+            val call = service.getLyrics(artistName.text.toString(), trackName.text.toString())
+            call.enqueue(object: Callback<Lyric>{
+                override fun onFailure(call: Call<Lyric>?, t: Throwable?) {
+                    TODO("Not yet implemented")
+                }
+
+                override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
+                    if (response != null) {
+                        textViewLyric.text = response.body().lyrics
+                    }
+                }
+            })
         }
     }
 }
\ No newline at end of file
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 28a44598b..20424b037 100644
--- a/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
@@ -67,7 +67,7 @@ class ItunesMusicApi private constructor(){
         /**
          * The Callback class when calling the querySong(...) method
          */
-        class SongCallback(val retFuture: CompletableFuture<String>): Callback{
+        private class SongCallback(val retFuture: CompletableFuture<String>): Callback{
             override fun onResponse(call: Call, response: Response) {
                 retFuture.complete(response.body?.string())
             }
diff --git a/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApi.kt b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApi.kt
deleted file mode 100644
index e93829175..000000000
--- a/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApi.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package ch.sdp.vibester.api
-
-class LyricsOVHApi {
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
new file mode 100644
index 000000000..f5c427b71
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
@@ -0,0 +1,11 @@
+package ch.sdp.vibester.api
+
+import ch.sdp.vibester.model.Lyric
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+interface LyricsOVHApiInterface {
+    @GET("v1/{artist}/{title}")
+    fun getLyrics(@Path("artist") artist: String, @Path("title") title: String): Call<Lyric>
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/api/MusixmatchApi.kt b/app/src/main/java/ch/sdp/vibester/api/MusixmatchApi.kt
deleted file mode 100644
index afbf52a71..000000000
--- a/app/src/main/java/ch/sdp/vibester/api/MusixmatchApi.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package ch.sdp.vibester.api
-
-import okhttp3.OkHttpClient
-import java.util.concurrent.CompletableFuture
-
-class MusixmatchApi private constructor(){
-
-    companion object {
-        // musixmatch api base url
-        private const val BASE_URL = "https://api.musixmatch.com/ws/1.1/"
-
-        private const val API_KEY = "&apikey=c0c85b22538a6b16bdfbbf64b4078c"
-
-        private const val FORMAT_URL = "?format=json&callback=callback"
-
-        private const val LYRICS_MATCHER = "matcher.lyrics.get"
-
-        private const val ARTIST_SEARCH_PARAMETER = "&q_artist="
-
-        private const val TRACK_SEARCH_PARAMETER = "&q_track="
-
-        fun queryLyric(artistName: String, trackName: String, okHttpClient: OkHttpClient): CompletableFuture<String> {
-            val apiCall = BASE_URL + LYRICS_MATCHER + FORMAT_URL + ARTIST_SEARCH_PARAMETER + artistName + TRACK_SEARCH_PARAMETER + trackName + API_KEY
-
-            val request = okhttp3.Request.Builder().url(apiCall).build()
-
-            var retFuture = CompletableFuture<String>()
-
-            okHttpClient.newCall(request).enqueue(ItunesMusicApi.Companion.SongCallback(retFuture))
-
-            return retFuture
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/Lyric.kt b/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
index 3311a1144..1e2886e2c 100644
--- a/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
@@ -1,27 +1,11 @@
 package ch.sdp.vibester.model
 
-import org.json.JSONObject
-import java.lang.Exception
-import java.lang.IllegalArgumentException
+import com.google.gson.annotations.SerializedName
 
-class Lyric(jsonMeta: String) {
 
-    private var lyricBody = ""
-
-    init {
-        try {
-            val jsonObject = JSONObject(jsonMeta)
-            val jsonArrayMessage = jsonObject.getJSONArray("message")
-            val jsonArrayBody = jsonArrayMessage.getJSONArray(1)
-            val jsonLyric = jsonArrayBody.getJSONObject(0)
-
-            lyricBody = jsonLyric.getString("lyrics_body")
-        } catch (e: Exception) {
-            throw IllegalArgumentException("Lyric constructor, bad argument")
-        }
-    }
-
-    fun getLyricBody():String {
-        return lyricBody
-    }
+class Lyric {
+    @SerializedName("lyrics")
+    var lyrics: String? = null
+    @SerializedName("error")
+    var error: String? = null
 }
\ No newline at end of file

From ba0edb0ca9d3134d63b3173c3a5170182d50fecf Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 15 Mar 2022 10:09:34 +0100
Subject: [PATCH 03/11] refactor LyricsOVHApiInterface.kt and add tests

---
 .../ch/sdp/vibester/LyricTemporaryTest.kt     | 70 +++++++++++++++++++
 .../java/ch/sdp/vibester/LyricTemporary.kt    | 10 +--
 .../sdp/vibester/api/LyricsOVHApiInterface.kt | 12 ++++
 3 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
new file mode 100644
index 000000000..e3f8ffac2
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
@@ -0,0 +1,70 @@
+package ch.sdp.vibester
+
+import android.content.Intent
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import ch.sdp.vibester.api.LyricsOVHApiInterface
+import org.hamcrest.CoreMatchers.containsString
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Test
+
+class LyricTemporaryTest {
+    @Test
+    fun canGetLyricsFromAPI() {
+        val service = LyricsOVHApiInterface.create("https://api.lyrics.ovh/")
+        val lyric = service.getLyrics("Imagine Dragons", "Believer").execute()
+        assertThat(lyric.body().lyrics, equalTo("First things first\r\n" +
+                "I'm say all the words inside my head\r\n" +
+                "I'm fired up and tired of the way that things have been, oh-ooh\r\n" +
+                "The way that things have been, oh-ooh\r\nSecond thing second\r\n" +
+                "Don't you tell me what you think that I can be\n\n" +
+                "I'm the one at the sail, I'm the master of my sea, oh-ooh\n\n" +
+                "The master of my sea, oh-ooh\n\n\n\nI was broken from a young age\n\n" +
+                "Taking my sulkin to the masses\n\nWrite down my poems for the few\n\n" +
+                "That looked at me took to me, shook to me, feeling me\n\n" +
+                "Singing from heart ache from the pain\n\nTake up my message from the veins\n\n" +
+                "Speaking my lesson from the brain\n\nSeeing the beauty through the...\n\n\n\n" +
+                "Pain!\n\nYou made me a, you made me a believer, believer\n\nPain!" +
+                "\n\nYou break me down, you build me up, believer, believer\n\nPain!\n\n" +
+                "I let the bullets fly, oh let them rain\n\nMy life, my love, my drive, it came from...\n\n" +
+                "Pain!\n\nYou made me a, you made me a believer, believer\n\n\n\n" +
+                "Third things third\n\nSend a prayer to the ones up above\n\n" +
+                "All the hate that you've heard has turned your spirit to a dove, oh-ooh\n\n" +
+                "Your spirit up above, oh-ooh\n\n\n\nI was choking in the crowd\n\nLiving my brain up in the cloud\n\n" +
+                "Falling like ashes to the ground\n\nHoping my feelings, they would drown\n\n" +
+                "But they never did, ever lived, ebbing and flowing\n\nInhibited, limited\n\n" +
+                "Till it broke up and it rained down\n\nIt rained down, like...\n\n\n\nPain!\n\n" +
+                "You made me a, you made me a believer, believer\n\nPain!\n\n" +
+                "You break me down, you build me up, believer, believer\n\nPain!\n\n" +
+                "I let the bullets fly, oh let them rain\n\nMy life, my love, my drive, they came from...\n\n" +
+                "Pain!\n\nYou made me a, you made me a believer, believer\n\n\n\nLast things last\n\n" +
+                "By the grace of the fire and the flames\n\nYou're the face of the future, you're the blood in my veins, oh-ooh\n\n" +
+                "The blood in my veins, oh-ooh\n\nBut they never did, ever lived, ebbing and flowing\n\nInhibited, limited\n\n" +
+                "Till it broke up and it rained down\n\nIt rained down, like...\n\n\n\nPain!" +
+                "\n\nYou made me a, you made me a believer, believer\n\nPain!\n\n" +
+                "You break me down, you build me up, believer, believer\n\nPain!\n\n" +
+                "I let the bullets fly, oh let them rain\n\nMy life, my love, my drive, they came from...\n\n" +
+                "Pain!\n\nYou made me a, you made me a believer, believer"))
+    }
+
+    @Test
+    fun lyricTemporaryTest() {
+        val inputArtistName = "Imagine Dragons"
+        val inputTrackName = "Believer"
+        val intent = Intent(
+            ApplicationProvider.getApplicationContext(), LyricTemporary::class.java
+        )
+        val scn: ActivityScenario<GreetingActivity> = ActivityScenario.launch(intent)
+        onView(withId(R.id.artistForLyric)).perform(typeText(inputArtistName), closeSoftKeyboard())
+        onView(withId(R.id.trackForLyric)).perform(typeText(inputTrackName), closeSoftKeyboard())
+        onView(withId(R.id.validateForLyric)).perform(click())
+        Thread.sleep(1000) // wait for API response
+        onView(withId(R.id.lyricBody)).check(matches(withText(containsString("First things first"))))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt b/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
index 553de38de..42ad31488 100644
--- a/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
+++ b/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
@@ -11,8 +11,6 @@ import ch.sdp.vibester.model.Lyric
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 
 
 class LyricTemporary: AppCompatActivity() {
@@ -32,15 +30,11 @@ class LyricTemporary: AppCompatActivity() {
         textViewLyric.movementMethod = ScrollingMovementMethod()
 
         btnValidate.setOnClickListener {
-            var retrofit = Retrofit.Builder()
-                .baseUrl(baseUrl)
-                .addConverterFactory(GsonConverterFactory.create())
-                .build()
-            val service = retrofit.create(LyricsOVHApiInterface::class.java)
+            val service = LyricsOVHApiInterface.create(baseUrl)
+
             val call = service.getLyrics(artistName.text.toString(), trackName.text.toString())
             call.enqueue(object: Callback<Lyric>{
                 override fun onFailure(call: Call<Lyric>?, t: Throwable?) {
-                    TODO("Not yet implemented")
                 }
 
                 override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
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 f5c427b71..15faf52e3 100644
--- a/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
@@ -2,10 +2,22 @@ package ch.sdp.vibester.api
 
 import ch.sdp.vibester.model.Lyric
 import retrofit2.Call
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Path
 
 interface LyricsOVHApiInterface {
     @GET("v1/{artist}/{title}")
     fun getLyrics(@Path("artist") artist: String, @Path("title") title: String): Call<Lyric>
+
+    companion object {
+        fun create(baseUrl:String): LyricsOVHApiInterface {
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build()
+            return retrofit.create(LyricsOVHApiInterface::class.java)
+        }
+    }
 }
\ No newline at end of file

From f7f508e5caaf49b041f005248edada48905f80c1 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 15 Mar 2022 10:12:34 +0100
Subject: [PATCH 04/11] refactor MainActivity.kt

---
 app/src/main/java/ch/sdp/vibester/MainActivity.kt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index c9fea4441..57dcb6a9b 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -41,19 +41,15 @@ class MainActivity : AppCompatActivity() {
             startActivity(profileIntent)
         }
 
-        // button to scoreboard
         // FIXME: scoreboard enter button need to be move to the welcome screen
         val btnScoreboard = findViewById<Button>(R.id.scoreboardButton)
         val scoreboardIntent = Intent(this, ScoreBoardActivity::class.java)
-
         btnScoreboard.setOnClickListener {
             startActivity(scoreboardIntent)
         }
 
-        // button to lyric
         val btnLyric = findViewById<Button>(R.id.lyricButton)
         val lyricIntent = Intent(this, LyricTemporary::class.java)
-
         btnLyric.setOnClickListener {
             startActivity(lyricIntent)
         }

From d0d1fd39a9449320a0389d25949b3b710905365f Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 15 Mar 2022 10:17:09 +0100
Subject: [PATCH 05/11] delete scoreboard on MainActivity.kt

---
 .../main/java/ch/sdp/vibester/MainActivity.kt  |  9 ---------
 app/src/main/res/layout/activity_main.xml      | 18 +++++-------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index 57dcb6a9b..2cbf9b012 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -23,13 +23,11 @@ class MainActivity : AppCompatActivity() {
         val btnGreeting = findViewById<Button>(R.id.mainButton)
 
         val greetingIntent = Intent(this, GreetingActivity::class.java)
-
             btnGreeting.setOnClickListener {
                 greetingIntent.putExtra("name", txtInput.text.toString())
                 startActivity(greetingIntent)
         }
 
-
         val btnProfile = findViewById<Button>(R.id.profileButton)
         val profileIntent = Intent(this, ProfileSetup::class.java)
 
@@ -41,13 +39,6 @@ class MainActivity : AppCompatActivity() {
             startActivity(profileIntent)
         }
 
-        // FIXME: scoreboard enter button need to be move to the welcome screen
-        val btnScoreboard = findViewById<Button>(R.id.scoreboardButton)
-        val scoreboardIntent = Intent(this, ScoreBoardActivity::class.java)
-        btnScoreboard.setOnClickListener {
-            startActivity(scoreboardIntent)
-        }
-
         val btnLyric = findViewById<Button>(R.id.lyricButton)
         val lyricIntent = Intent(this, LyricTemporary::class.java)
         btnLyric.setOnClickListener {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 806546502..ca2922fc6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,17 +40,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/scoreboardButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="37dp"
-        android:text="@string/scoreboard"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.485"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/placeholder_welcome" />
-
     <Button
         android:id="@+id/profileButton"
         android:layout_width="wrap_content"
@@ -81,9 +70,12 @@
         android:id="@+id/lyricButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="22dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginBottom="93dp"
         android:text="Lyric"
+        app:layout_constraintBottom_toTopOf="@+id/profileButton"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scoreboardButton" />
+        app:layout_constraintTop_toBottomOf="@+id/placeholder_welcome" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 3d4287aa7af3955e7cb0634b5be1bd8ca45ad1ad Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 15 Mar 2022 10:38:29 +0100
Subject: [PATCH 06/11] remove profile in MainActivity.kt and test LyricButton

---
 .../java/ch/sdp/vibester/MainActivityTest.kt   | 18 ++++++------------
 .../main/java/ch/sdp/vibester/MainActivity.kt  | 11 -----------
 app/src/main/res/layout/activity_main.xml      | 14 +-------------
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
index 4c971c21a..e883fcbf8 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
@@ -44,21 +44,15 @@ class MainActivityTest {
         intended(hasExtra("name", inputName))
     }
 
-    @Test
-    fun scoreboardTest() {
-        onView(withId(R.id.scoreboardButton)).perform(click())
-        intended(hasComponent(ScoreBoardActivity::class.qualifiedName))
-    }
-
-    @Test
-    fun profileTest() {
-        onView(withId(R.id.profileButton)).perform(click())
-        intended(hasComponent(ProfileSetup::class.qualifiedName))
-    }
-
     @Test
     fun checkIntentOnWelcome(){ //FILLER TESTING
         onView(withId(R.id.placeholder_welcome)).perform(click())
         intended(hasComponent(WelcomeScreen::class.qualifiedName))
     }
+
+    @Test
+    fun checkIntentOnLyric() {
+        onView(withId(R.id.lyricButton)).perform(click())
+        intended(hasComponent(LyricTemporary::class.qualifiedName))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index 2cbf9b012..5eaa0945b 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -28,17 +28,6 @@ class MainActivity : AppCompatActivity() {
                 startActivity(greetingIntent)
         }
 
-        val btnProfile = findViewById<Button>(R.id.profileButton)
-        val profileIntent = Intent(this, ProfileSetup::class.java)
-
-        btnProfile.setOnClickListener{
-            val userID = (0..5).random().toString()
-            val dataProvider = userID.let { ProfileDataProvider(it) }
-            val user: UserProfile = dataProvider.getUserProfileData()
-            profileIntent.putExtra("userProfile",  user)
-            startActivity(profileIntent)
-        }
-
         val btnLyric = findViewById<Button>(R.id.lyricButton)
         val lyricIntent = Intent(this, LyricTemporary::class.java)
         btnLyric.setOnClickListener {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ca2922fc6..78e3bfd11 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,17 +40,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/profileButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="P R O F I L E"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.841" />
-
     <Button
         android:id="@+id/placeholder_welcome"
         android:layout_width="wrap_content"
@@ -59,7 +48,7 @@
         android:layout_marginBottom="44dp"
         android:onClick="switchToWelcome"
         android:text="@string/welcome_screen"
-        app:layout_constraintBottom_toTopOf="@+id/scoreboardButton"
+        app:layout_constraintBottom_toTopOf="@+id/lyricButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.494"
         app:layout_constraintStart_toStartOf="parent"
@@ -73,7 +62,6 @@
         android:layout_marginTop="32dp"
         android:layout_marginBottom="93dp"
         android:text="Lyric"
-        app:layout_constraintBottom_toTopOf="@+id/profileButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"

From 4f31ce1ddd12da1dfdc70ae5e392a00852669f3d Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 15 Mar 2022 10:40:13 +0100
Subject: [PATCH 07/11] adjust api waiting time

---
 app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
index e3f8ffac2..02271b02d 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
@@ -64,7 +64,7 @@ class LyricTemporaryTest {
         onView(withId(R.id.artistForLyric)).perform(typeText(inputArtistName), closeSoftKeyboard())
         onView(withId(R.id.trackForLyric)).perform(typeText(inputTrackName), closeSoftKeyboard())
         onView(withId(R.id.validateForLyric)).perform(click())
-        Thread.sleep(1000) // wait for API response
+        Thread.sleep(10000) // wait for API response
         onView(withId(R.id.lyricBody)).check(matches(withText(containsString("First things first"))))
     }
 }
\ No newline at end of file

From f891b05cb576718ff9d8ca712c09351c34dd3f11 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 15 Mar 2022 10:55:26 +0100
Subject: [PATCH 08/11] adjust waiting time

---
 app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
index 02271b02d..e3f8ffac2 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
@@ -64,7 +64,7 @@ class LyricTemporaryTest {
         onView(withId(R.id.artistForLyric)).perform(typeText(inputArtistName), closeSoftKeyboard())
         onView(withId(R.id.trackForLyric)).perform(typeText(inputTrackName), closeSoftKeyboard())
         onView(withId(R.id.validateForLyric)).perform(click())
-        Thread.sleep(10000) // wait for API response
+        Thread.sleep(1000) // wait for API response
         onView(withId(R.id.lyricBody)).check(matches(withText(containsString("First things first"))))
     }
 }
\ No newline at end of file

From 8293b6cced6719fedf575066f534a31b8a690909 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 15 Mar 2022 11:39:06 +0100
Subject: [PATCH 09/11] clean up

---
 app/src/main/java/ch/sdp/vibester/LyricTemporary.kt | 5 ++---
 app/src/main/java/ch/sdp/vibester/model/Lyric.kt    | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt b/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
index 42ad31488..c81429f76 100644
--- a/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
+++ b/app/src/main/java/ch/sdp/vibester/LyricTemporary.kt
@@ -14,7 +14,7 @@ import retrofit2.Response
 
 
 class LyricTemporary: AppCompatActivity() {
-    val baseUrl = "https://api.lyrics.ovh/"
+    private val baseUrl = "https://api.lyrics.ovh/"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -34,8 +34,7 @@ class LyricTemporary: AppCompatActivity() {
 
             val call = service.getLyrics(artistName.text.toString(), trackName.text.toString())
             call.enqueue(object: Callback<Lyric>{
-                override fun onFailure(call: Call<Lyric>?, t: Throwable?) {
-                }
+                override fun onFailure(call: Call<Lyric>?, t: Throwable?) {}
 
                 override fun onResponse(call: Call<Lyric>?, response: Response<Lyric>?) {
                     if (response != null) {
diff --git a/app/src/main/java/ch/sdp/vibester/model/Lyric.kt b/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
index 1e2886e2c..a7410c0ee 100644
--- a/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
@@ -6,6 +6,7 @@ import com.google.gson.annotations.SerializedName
 class Lyric {
     @SerializedName("lyrics")
     var lyrics: String? = null
-    @SerializedName("error")
-    var error: String? = null
+    //not used
+    //@SerializedName("error")
+    //var error: String? = null
 }
\ No newline at end of file

From 1c0aca42dc57cbc5d86e566500c569e4b97ace08 Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Tue, 15 Mar 2022 20:36:06 +0100
Subject: [PATCH 10/11] add documentation

---
 .../java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt     | 8 ++++++++
 app/src/main/java/ch/sdp/vibester/model/Lyric.kt          | 1 +
 2 files changed, 9 insertions(+)

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 15faf52e3..e65b54da0 100644
--- a/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/LyricsOVHApiInterface.kt
@@ -8,10 +8,18 @@ import retrofit2.http.GET
 import retrofit2.http.Path
 
 interface LyricsOVHApiInterface {
+    /**
+     * Given the name of the artist and the title of the track
+     * return a Call<Lyric> contains the lyric of the track
+     */
     @GET("v1/{artist}/{title}")
     fun getLyrics(@Path("artist") artist: String, @Path("title") title: String): Call<Lyric>
 
     companion object {
+        /**
+         * @param baseUrl base url of the api
+         * return an instance of the api interface
+         */
         fun create(baseUrl:String): LyricsOVHApiInterface {
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl)
diff --git a/app/src/main/java/ch/sdp/vibester/model/Lyric.kt b/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
index a7410c0ee..1e0b74909 100644
--- a/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/Lyric.kt
@@ -6,6 +6,7 @@ import com.google.gson.annotations.SerializedName
 class Lyric {
     @SerializedName("lyrics")
     var lyrics: String? = null
+
     //not used
     //@SerializedName("error")
     //var error: String? = null

From c399a023b738ef9fb64f8f3c94cad09c3fd1b39b Mon Sep 17 00:00:00 2001
From: jiabaow <jiabaowenwendy@gmail.com>
Date: Wed, 16 Mar 2022 08:43:53 +0100
Subject: [PATCH 11/11] adjust waiting time

---
 app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
index e3f8ffac2..02995771c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
@@ -64,7 +64,7 @@ class LyricTemporaryTest {
         onView(withId(R.id.artistForLyric)).perform(typeText(inputArtistName), closeSoftKeyboard())
         onView(withId(R.id.trackForLyric)).perform(typeText(inputTrackName), closeSoftKeyboard())
         onView(withId(R.id.validateForLyric)).perform(click())
-        Thread.sleep(1000) // wait for API response
+        Thread.sleep(1500) // wait for API response
         onView(withId(R.id.lyricBody)).check(matches(withText(containsString("First things first"))))
     }
 }
\ No newline at end of file