From 1e86ed6f62c1397fd9b63461842db4faa8663c03 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sat, 19 Mar 2022 00:09:22 +0100
Subject: [PATCH 01/15] deleting greeting activity

---
 .../java/ch/sdp/vibester/EndToEndTest.kt      | 49 -------------------
 .../ch/sdp/vibester/GameEndingScreenTest.kt   | 22 ++++++---
 .../ch/sdp/vibester/GreetingActivityTest.kt   | 29 -----------
 .../sdp/vibester/IncorrectSongsScreenTest.kt  |  2 +-
 .../ch/sdp/vibester/LyricTemporaryTest.kt     |  2 +-
 .../ch/sdp/vibester/MusicTemporaryTest.kt     |  2 +-
 app/src/main/AndroidManifest.xml              |  3 --
 .../java/ch/sdp/vibester/GreetingActivity.kt  | 23 ---------
 .../main/java/ch/sdp/vibester/MainActivity.kt |  9 ----
 app/src/main/res/layout/activity_greeting.xml | 40 ---------------
 10 files changed, 18 insertions(+), 163 deletions(-)
 delete mode 100644 app/src/androidTest/java/ch/sdp/vibester/EndToEndTest.kt
 delete mode 100644 app/src/androidTest/java/ch/sdp/vibester/GreetingActivityTest.kt
 delete mode 100644 app/src/main/java/ch/sdp/vibester/GreetingActivity.kt
 delete mode 100644 app/src/main/res/layout/activity_greeting.xml

diff --git a/app/src/androidTest/java/ch/sdp/vibester/EndToEndTest.kt b/app/src/androidTest/java/ch/sdp/vibester/EndToEndTest.kt
deleted file mode 100644
index 39b7218c2..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/EndToEndTest.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package ch.sdp.vibester
-
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
-import androidx.test.espresso.assertion.ViewAssertions.matches
-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.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class EndToEndTest {
-
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("ch.sdp.vibester", appContext.packageName)
-    }
-
-    @get:Rule
-    val testRule = ActivityScenarioRule(
-        MainActivity::class.java
-    )
-
-
-    @Test
-    fun endToEndTest() {
-        // Context of the app under test.
-        val name = "SDPUser"
-        onView(withId(R.id.mainNameInput)).perform(ViewActions.typeText(name), closeSoftKeyboard())
-        onView(withId(R.id.mainButton)).perform(click())
-        onView(withId(R.id.greetName)).check(matches(withText("Hello $name!")))
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/GameEndingScreenTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GameEndingScreenTest.kt
index 9c5aa100b..d96ba21cd 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GameEndingScreenTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/GameEndingScreenTest.kt
@@ -1,6 +1,8 @@
 package ch.sdp.vibester
 
 import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import androidx.core.content.ContextCompat
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
@@ -56,6 +58,10 @@ class GameEndingScreenTest {
     @Test
     fun checkIntentOnCalled() {
         val intent = Intent(ApplicationProvider.getApplicationContext(), GameEndingScreen::class.java)
+
+        //Start an activity from outside an activity
+        intent.setFlags(FLAG_ACTIVITY_NEW_TASK)
+
         intent.putExtra("playerName", name)
         intent.putExtra("nbIncorrectSong", nbInc)
         //intent.putExtra("incorrect_songs", inc)
@@ -67,7 +73,9 @@ class GameEndingScreenTest {
 
         intent.putExtra("stat_1", "Hello there")
         intent.putExtra("stat_res_1", "General Kenobi")
-        val scn: ActivityScenario<GreetingActivity> = ActivityScenario.launch(intent)
+
+        //keep this val to help kotlin inferring value type
+        val uselessVal: ActivityScenario<GameEndingScreen> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.end_stat1)).check(matches(withText(stats[0])))
         onView(withId(R.id.end_stat1_res)).check(matches(withText(statsRes[0])))
@@ -77,25 +85,25 @@ class GameEndingScreenTest {
     @Test
     fun checkIntentOnIncorrectSongs() {
         val intent = Intent(ApplicationProvider.getApplicationContext(), GameEndingScreen::class.java)
+
         intent.putExtra("playerName", name)
         intent.putExtra("nbIncorrectSong", nbInc)
-        //intent.putExtra("incorrect_songs", inc)
-        //intent.putExtra("Stat_names", stats)
-        //intent.putExtra("Stat_values", statsRes)
         intent.putExtra("incorrect_song_1", "One")
         intent.putExtra("incorrect_song_2", "Two")
         intent.putExtra("incorrect_song_3", "Three")
 
         intent.putExtra("stat_1", "Hello There")
         intent.putExtra("stat_res_1", "General Kenobi")
-        val scn: ActivityScenario<GreetingActivity> = ActivityScenario.launch(intent)
+
+        //keep this val to help kotlin inferring value type
+        val uselessVal: ActivityScenario<GameEndingScreen> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.end_go_to_inc)).perform(click())
+
+        intended(hasComponent(IncorrectSongsScreen::class.java.name))
         intended(hasExtra("nb_false", nbInc))
-        //intended(hasExtra("incorrect_songs", inc))
         intended(hasExtra("incorrect_song_1", inc[0]))
         intended(hasExtra("incorrect_song_2", inc[1]))
         intended(hasExtra("incorrect_song_3", inc[2]))
-        intended(hasComponent(IncorrectSongsScreen::class.java.name))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/GreetingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GreetingActivityTest.kt
deleted file mode 100644
index 9f114d0c7..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/GreetingActivityTest.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-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.assertion.ViewAssertions.matches
-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 org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class GreetingActivityTest {
-
-    @Test
-    fun mainTest(){
-        val inputName = "SDPUser"
-        val intent = Intent(ApplicationProvider.getApplicationContext(), GreetingActivity::class.java)
-        intent.putExtra("name", inputName)
-        val scn: ActivityScenario<GreetingActivity> = ActivityScenario.launch(intent)
-        onView(withId(R.id.greetName)).check(matches(withText("Hello $inputName!")))
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/IncorrectSongsScreenTest.kt b/app/src/androidTest/java/ch/sdp/vibester/IncorrectSongsScreenTest.kt
index d6d0bc223..0e8bbf833 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/IncorrectSongsScreenTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/IncorrectSongsScreenTest.kt
@@ -43,7 +43,7 @@ class IncorrectSongsScreenTest {
         intent.putExtra("nbIncorrectSong", nbInc)
         intent.putExtra("incorrect_songs", inc)
 
-        val scn: ActivityScenario<GreetingActivity> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<IncorrectSongsScreen> = ActivityScenario.launch(intent)
 
         if(nbInc != 0) {
             for(x in 0 until nbInc) {
diff --git a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
index d7153e5d6..1e3a3de65 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
@@ -60,7 +60,7 @@ class LyricTemporaryTest {
         val intent = Intent(
             ApplicationProvider.getApplicationContext(), LyricTemporary::class.java
         )
-        val scn: ActivityScenario<GreetingActivity> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<LyricTemporary> = 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())
diff --git a/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
index ef861edfd..e761fbe10 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
@@ -21,7 +21,7 @@ class MusicTemporaryTest{
             val inputName = "Imagine Dragons Believer"
             val intent =
                 Intent(ApplicationProvider.getApplicationContext(), MusicTemporary::class.java)
-            val scn: ActivityScenario<GreetingActivity> = ActivityScenario.launch(intent)
+            val scn: ActivityScenario<MusicTemporary> = ActivityScenario.launch(intent)
             onView(withId(R.id.musicName))
                 .perform(typeText(inputName), closeSoftKeyboard())
             onView(withId(R.id.validateForMusic)).perform(click())
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 44d2adb97..717622b1e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,9 +47,6 @@
         <activity
             android:name=".Register"
             android:exported="true" />
-        <activity
-            android:name=".GreetingActivity"
-            android:exported="false" />
         <activity
             android:name=".GenreTemporary"
             android:exported="false" />
diff --git a/app/src/main/java/ch/sdp/vibester/GreetingActivity.kt b/app/src/main/java/ch/sdp/vibester/GreetingActivity.kt
deleted file mode 100644
index 3b87fec7e..000000000
--- a/app/src/main/java/ch/sdp/vibester/GreetingActivity.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package ch.sdp.vibester
-
-import android.os.Bundle
-import android.util.Log
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-
-class GreetingActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_greeting)
-
-        val textViewActivity = findViewById<TextView>(R.id.greetName)
-
-        val getIntent = intent.extras
-        val name: String = getIntent?.get("name") as String
-
-        Log.d("NameGet: ", name)
-
-        textViewActivity.text = "Hello $name!"
-
-    }
-}
\ 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 d992a5a69..249ebbe6c 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -15,15 +15,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val txtInput = findViewById<EditText>(R.id.mainNameInput)
-
-        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 btnLyric = findViewById<Button>(R.id.lyricButton)
         val lyricIntent = Intent(this, LyricTemporary::class.java)
diff --git a/app/src/main/res/layout/activity_greeting.xml b/app/src/main/res/layout/activity_greeting.xml
deleted file mode 100644
index c3d913148..000000000
--- a/app/src/main/res/layout/activity_greeting.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".GreetingActivity">
-
-    <TextView
-        android:id="@+id/greetName"
-        android:layout_width="112dp"
-        android:layout_height="50dp"
-        android:layout_marginStart="149dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="150dp"
-        android:layout_marginBottom="341dp"
-        android:gravity="center"
-        android:text="@string/default_txtview_txt"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="174dp"
-        android:layout_marginTop="311dp"
-        android:layout_marginEnd="180dp"
-        android:layout_marginBottom="11dp"
-        android:text="@string/greeting_txt"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        app:layout_constraintBottom_toTopOf="@+id/greetName"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From d0a499bd6b79770299514802ef4fd460a9aef8fc Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sat, 19 Mar 2022 00:22:18 +0100
Subject: [PATCH 02/15] patching test 1 (from deletion greeting)

---
 .../androidTest/java/ch/sdp/vibester/MainActivityTest.kt  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
index 05f41c44a..0ec5721a8 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
@@ -35,14 +35,6 @@ class MainActivityTest {
         Intents.release()
     }
 
-    @Test
-    fun mainTest(){
-        val inputName = "SDPUser"
-        onView(withId(R.id.mainNameInput)).perform(typeText(inputName))
-        onView(withId(R.id.mainButton)).perform(click())
-        intended(toPackage("ch.sdp.vibester"))
-        intended(hasExtra("name", inputName))
-    }
 
     @Test
     fun checkIntentOnWelcome(){ //FILLER TESTING

From 8f5b535fd040c1a453ce922a65c3c1c90c9f9625 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sat, 19 Mar 2022 16:42:16 +0100
Subject: [PATCH 03/15] updated welcomescreen

---
 app/build.gradle                              |   3 +
 app/src/main/AndroidManifest.xml              | 125 ++++++-------
 .../java/ch/sdp/vibester/WelcomeScreen.kt     |   7 +
 app/src/main/res/drawable/attempt_logo3.png   | Bin 0 -> 2927 bytes
 .../res/layout/activity_welcome_screen.xml    | 173 +++++++++---------
 app/src/main/res/values-night/themes.xml      |   5 +
 app/src/main/res/values/attrs.xml             |   6 +
 app/src/main/res/values/colors.xml            |   5 +
 app/src/main/res/values/strings.xml           |   3 +
 app/src/main/res/values/styles.xml            |  11 ++
 app/src/main/res/values/themes.xml            |  12 ++
 11 files changed, 199 insertions(+), 151 deletions(-)
 create mode 100644 app/src/main/res/drawable/attempt_logo3.png
 create mode 100644 app/src/main/res/values/attrs.xml
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/app/build.gradle b/app/build.gradle
index bc1008df7..a803a168a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,6 +54,9 @@ android {
             includeAndroidResources = true
         }
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 717622b1e..1c06a5e59 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,63 +1,64 @@
-<?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" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
-    <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=".IncorrectSongsScreen"
-            android:exported="false" />
-        <activity
-            android:name=".GameEndingScreen"
-            android:exported="false" />
-        <activity
-            android:name=".games.TypingGame"
-            android:exported="false" />
-        <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=".Register"
-            android:exported="true" />
-        <activity
-            android:name=".GenreTemporary"
-            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" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+    <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"
+        android:usesCleartextTraffic="true">
+        <activity
+            android:name=".IncorrectSongsScreen"
+            android:exported="false" />
+        <activity
+            android:name=".GameEndingScreen"
+            android:exported="false" />
+        <activity
+            android:name=".games.TypingGame"
+            android:exported="false" />
+        <activity
+            android:name=".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=".Register"
+            android:exported="true" />
+        <activity
+            android:name=".GenreTemporary"
+            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/WelcomeScreen.kt b/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
index a31e5358f..e082a32db 100644
--- a/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
+++ b/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
@@ -1,9 +1,12 @@
 package ch.sdp.vibester
 
 import android.content.Intent
+import android.graphics.Outline
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
+import android.view.Window.FEATURE_NO_TITLE
+import android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN
 import ch.sdp.vibester.games.TypingGame
 import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.profile.ProfileDataProvider
@@ -14,6 +17,10 @@ import ch.sdp.vibester.scoreboard.ScoreBoardActivity
 class WelcomeScreen : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        requestWindowFeature(FEATURE_NO_TITLE)
+        this.window.setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN)
+        supportActionBar?.hide()
+
         setContentView(R.layout.activity_welcome_screen)
     }
 
diff --git a/app/src/main/res/drawable/attempt_logo3.png b/app/src/main/res/drawable/attempt_logo3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0727710c479cba9249bb092096b90c76f489489f
GIT binary patch
literal 2927
zcmZWrc{tQx7oQDdFn#Tk^u;Kpgorj~1{q8CUC}UFEQu^3j3Gu1CPcz`8~mtYEQzQ@
z*%c|fn5?O>hwu~c^vC<x`^UNGe$GA1bDndbdq0U*7RDkdSrh~U5iubc+VFH6PhKPW
zdFwguxCu`|Z`l~*A?z->A3T7#io1Y=Kq^v%wuyW^EO?XPd<z0WzyB-HR{vrW1R{hm
zF~r&3cAFnHqscYz=U;mKBaGq)0;wtlTu2Er@GcyKlG3Q<Q`4OgJABRZ!OM;G`ziOO
zV`)imgaqcu4PqAMcu>%WiHw_6!6^c6VM|V@T0pAD5`1oLZo&LnNXHl>i@}KMeaqlj
zdS7_4r`*<_W9JwetOJKYR0<UJ#Y;KWZ=3ZOrbhPPc@^V7up-i6Z@jsV;xML1o^1Yj
z%D0?yy@fw6!2sbY&0#xl3P9e<eIId<Pc`^6N>YN3Hx@7N5v4^q>_8j*pWhM3IsaTl
zKkMk$jf3MAx9VnpCGwvK!kpHEqW6F*uBqr6HGV^jHqP|E896{v<Is@q*?^P-9*I5h
zak5on{c%loP#y?4A`Oz1_EH55FMfw0hY0)=&_*LHa+JWIYViw3jw3?~uvmx<2tp16
z09gWw#NOMmNn;$PC@$u1B^-Ua_OX+lschvJ74CgGQW3^P+RIepuk~WF5*qudCcq<)
zcsS)00j($@eR8CBwPsitn$?hyJo7$OoeygA?N-9d<|}I~)&tMgMRt&oNa=86oK=gE
z9ylw*vXaiHh#;f1)1J8T^GO3iWM3=G$VLQ0#LawmP0A1p&{puJ24!%ut+G6Ch5n)%
zp9)`Zf<2dcXWOD$(4&Ico?P&1GH&%!@RA-_cZTMdi&<TC&lq5Z1&5$}G<@ge>UP!A
zlpdkoXkeXed!M^muVu(s5_nqH{dZZVcim3Z0b}tZIDQml3wS<CUYv9#<cJ`>3^t@_
z#9mH!5nXpL@Qi=yoXmTbw`Io_0@T3taik<(lkqDpND_~3<x9^`?94$?f4XCW?pZ(M
zzF)I$$|76E!BZ75tQ;h@1JzReAn9j#pf;voplMA()}eMV!$AO{lo0l0Alo)=mC5VS
zuJ4IYKJ^9E+WrAD;j}`0QwJH8TSpzk;N(1@5?+_EcH5Oy_fs_aAiKUYp?u_d-jE#l
z4EtuG;c@EsZfjFOxvfpN@BN6ThtFlzpZOAeZ$zlVC<dzK+88%E4+XiI&0+o)xXpSd
ze7rm%#c#Y1v;XUrNn%D1`SR*gioYL46j9<aqB7x&RSzHREUMO!0$eS*F<~dyL=G7P
zH2L*kg-PlHPy!JHdc|AO<QJBnl&Vw64}G%|{$83Y0Yri$@$i=`Cuxc@IEam|I4@=)
zuy$UZ0x9?;3uLqDFj5S!#+5DOzC`lnopC+K5kLuvMIjL2-D>h>3R>+Q64rlWbJFEO
zp6{RPKj)k=)~jYMheDlq_dV+6S{IzNTZNnc`eG}6Lc!?(T@#Ry)vKAliG8itBqnm5
zsSzpZ5y`J1fFpDWy+Fri6)0hv?_LbW<u>C9D?)F&UNZ^~nPkuTU39ygxn5^(XIS%&
z_0NFkB_@Yn<8#cpV`ilDyVJwnbF|${6Si7k8+>hI2D~%dJ|B@DzEJp|E{~)W>`MQ|
z9MT@fzl4RJjxXOh+#I65{_mKt`M+Yd_YL0ZO^>)ymF3MV*ukxBnXWWkoGI+~x?cIQ
z^C~H^>&^=e06i<D30{9oOVMG|m0fCr0uiJKdf@YqEYj2Ne|p|yXrRH2i+hH$OLj(O
z@Rom2_j6W6XJATlSI-w^WE;Kvi1xZmx<BkvQ~a2s>#2R}jlXZvw2aR6Z=@b=R7YSM
z$Kn~*Q|rxXm0DwdW<_3!UA{g`ODG2gP!O%tU&%gdJDg5rMoq4qa%L{q6o0f>wiZuS
z06pjSKCZGE)FQ4#`XofH4vzGmaH&H<_Zqa4BKPOTm2i{u$efG-MfYA9C%JcEH53$u
zX~w^F_=BIfsWrZ8c6IwKsdM76GgBj>$5Ro3xtnZF`ubx`#BAbsZokrFi|en1p(e}W
zL4yBQ;a!b%j^#Zp#ARn*w_Mz*k2hc)1?Yl7IV*p{L#;C$Mk9BkD-AuR@{JE7+Ypx3
z>~!VRp}~4-h4s{KGW%yw?zJ6i-=Kbe_19P}B!R!Xx4&I1>0@qV`^F4<euy=6@_b4O
zKo_2IaqJXJO7a*o`C!?VM^~18+gk;G5#U7_=eKkO-ZUL(?s6F&EPNHdBO#?cLm`u@
zGB-N5Ql#`RZEp8#&i@!4eYyTX2$tI8PmK<XRymFui>yB&f%127oilu)_8SyJU<5k6
z#xw8#`?2=SiISybrUP%(^l;d~|F}I~&TT$UN^Cj6_3;v{#A5?>os$Mx_H|qVeb)`c
zjNWX&&+gsJqOer)X~|jct03{!(bBRuv8fpHRM24K^!Rb3RaR=`U9v=ZXN7Iy9%7)I
z49un>C;pX){i#O9_4Dt<#TE7;3aF-c-^{iVJLTlttWYqUPj1F&S4P7S%LbrRnuwiQ
zjGwK>tTppLn$8p^Ko<+Cp4SVmOS>%@h~y!()_kPm_?d_N|H^RLrUqEkE$!uxc1GhF
zF4_P+)i<|9pVP2yz=tR(*fqScPHbiyWJTVVd7+7<!uB|wyf;_AJr!dH0DMtCJ$@z8
zrPYoMl%O{V-Wyy=P7(<4c07zQ6x}ygv22u5;mCEWWr@L<)Z48suJ&6xwuM>EvrlrW
z$+O`}WhQ4vuAG_8XQ-KL4TY*xR8|kg?um=4zww>VY(N3LmsOYbbLSwsOy!yg0h!=@
zP`>mQtvfo|xXLn0t2rpI5sCjsojJ1+;u&ahJ_1X5RN@mwX}iVH^B;(>r-;TiWLsw+
zyT;35a+dZu{Q;TxOnxo;k-lioWmQf|yKYe{M4L!_vm4O|KHWUN!O5560&fg@ey_Kq
z5}e|qjPLkOK+U___li&x-BG!_-MMiC2QxO-HJ9(2a7GRZO)63SB$=NpiW~Ka+O<Xf
z2J-dD)|UFq%?cUCGW#ETGND(f2e~QN>cFS0OXgJ<q#QotR8-sT;8tJF*O)Wf?t0Z`
z4*eHCA3pLSNJ*}k70H@=!|&$x&GQwBcnOQJ4v?<awA<FPvkJ@PM5~IPk=34NxE&d3
ziVtaj*FkQQd}=--`z=V@W0zg*Y)%Nfa#Z!eFot!XtI+R1!im0*p>Hfqe4kr>-a6$L
zpcbN;`N7gsq(rnb3bEWQ%IE*jX{XjY)lmRQnvtE($n$Oe#jY~IY7N^nV|Q7@q^p~V
z{i}GaRz&SLpMtC93mr&=;q$DJis>KG?6QZ-p9G;jbEPiX!4aDlG7AB-g-_~nSm8(Q
zr=*8s->Z5809?LPLs2ey33W9M01S4lI!_iox*mNYqXB_vqGt&Up)H@IA_hLysm>Z;
zg*QR(a&d9C&)m{#jIbIn(Xa+lV$;ZWUNfw14^(5;@vx5V{%4cQIVZ7L;fU}Lu%>z4
z*Of4shtp@$pFgIN)AC~KJU?>;vHtY!6MgHHPHXHrL=)_{NRr}l;^;$d01$c&2sOQT
z3iXmiG>N5j3=k%@yFzf-qZP5;XLcyTj{Us-%B1!{hu9zt3MIt+KN<S_OYy;A^#2`G
z1*TqZBanT6c~qED6fDjg179YeRn>>$wNqnmW6>+~lTo6eE_3m|u<%P6`d`wwQ}N=h
z0FYCv35QQ8QIUy+PxU+USoQVxdVLQN{A{@yPsgelx=Tmu^)#sZPx1yCExkL~taCP&
z{|;tGZle51z|_mjzF35Os?;uktBv*7S(=xvhrTqu_#G$;Y#w?RYjO+C<HQiKWpEdo
Wn1#MUeM(jNYcMggFl6H|Q~nEH3PLLY

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_welcome_screen.xml b/app/src/main/res/layout/activity_welcome_screen.xml
index 7855b05cd..713e577df 100644
--- a/app/src/main/res/layout/activity_welcome_screen.xml
+++ b/app/src/main/res/layout/activity_welcome_screen.xml
@@ -4,110 +4,105 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FF00E0"
+    android:background="#FEF9EF"
     tools:context=".WelcomeScreen">
 
     <ImageView
         android:id="@+id/vibester_welcome_logo"
-        android:layout_width="130dp"
-        android:layout_height="120dp"
-        android:layout_marginTop="8dp"
+        android:layout_width="190dp"
+        android:layout_height="154dp"
+        android:layout_marginTop="70dp"
         android:contentDescription="@string/app_logo"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/vibester_welcome_text"
-        app:srcCompat="@android:drawable/star_big_on" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/attempt_logo3" />
 
-    <TextView
-        android:id="@+id/vibester_welcome_text"
-        android:layout_width="232dp"
-        android:layout_height="41dp"
-        android:layout_marginTop="28dp"
-        android:fontFamily="casual"
-        android:gravity="center_horizontal"
-        android:text="@string/welcome_text"
-        android:textAlignment="center"
-        android:textAllCaps="false"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        android:typeface="normal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/welcome_play"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="5dp"
-        android:backgroundTint="#90953D"
-        android:onClick="switchToPlay"
-        android:text="@string/play_a_game"
-        app:icon="@android:drawable/btn_star_big_on"
+    <ScrollView
+        android:layout_width="468dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="27dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.502"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/vibester_welcome_logo"
-        app:layout_constraintVertical_bias="0.052" />
+        app:layout_constraintVertical_bias="0.0">
 
-    <Button
-        android:id="@+id/welcome_profile"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="8dp"
-        android:backgroundTint="#90953D"
-        android:onClick="switchToProfile"
-        android:text="@string/profile"
-        app:icon="@android:drawable/ic_menu_edit"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.502"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/welcome_play" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical">
 
-    <Button
-        android:id="@+id/welcome_scoreboard"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="4dp"
-        android:backgroundTint="#90953D"
-        android:onClick="switchToScoreboard"
-        android:text="@string/welcome_scoreboard"
-        app:icon="@android:drawable/ic_menu_share"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.502"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/welcome_profile" />
+            <Button
+                android:id="@+id/welcome_play"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+                android:layout_marginTop="10dp"
+                android:backgroundTint="#227C9D"
+                android:elevation="10dp"
+                android:translationZ="10dp"
+                android:stateListAnimator="@null"
+                android:onClick="switchToPlay"
+                android:text="@string/play_a_game"
+                app:icon="@android:drawable/ic_media_play" />
 
-    <Button
-        android:id="@+id/welcome_listen"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="8dp"
-        android:backgroundTint="#90953D"
-        android:onClick="switchToListen"
-        android:text="@string/listen_to_music"
-        app:icon="@android:drawable/stat_sys_headset"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/welcome_scoreboard" />
+            <Button
+                android:id="@+id/welcome_scoreboard"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+                android:layout_marginTop="10dp"
+                android:backgroundTint="#227C9D"
+                android:elevation="10dp"
+                android:translationZ="10dp"
+                android:stateListAnimator="@null"
+                android:onClick="switchToScoreboard"
+                android:text="@string/welcome_scoreboard"
+                app:icon="@android:drawable/ic_menu_share" />
 
-    <Button
-        android:id="@+id/welcome_settings"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="10dp"
-        android:backgroundTint="#90953D"
-        android:onClick="switchToSettings"
-        android:text="@string/settings"
-        app:icon="@android:drawable/ic_menu_manage"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/welcome_listen"
-        app:layout_constraintVertical_bias="0.0" />
+            <Button
+                android:id="@+id/welcome_profile"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+                android:layout_marginTop="10dp"
+                android:backgroundTint="#227C9D"
+                android:elevation="10dp"
+                android:translationZ="10dp"
+                android:stateListAnimator="@null"
+                android:onClick="switchToProfile"
+                android:text="@string/profile"
+                app:icon="@android:drawable/ic_menu_edit" />
+
+            <Button
+                android:id="@+id/welcome_listen"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+                android:layout_marginTop="10dp"
+                android:backgroundTint="#227C9D"
+                android:elevation="10dp"
+                android:translationZ="10dp"
+                android:stateListAnimator="@null"
+                android:onClick="switchToListen"
+                android:text="@string/listen_to_music"
+                app:icon="@android:drawable/stat_sys_headset" />
+
+            <Button
+                android:id="@+id/welcome_settings"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+                android:layout_marginTop="10dp"
+                android:backgroundTint="#227C9D"
+                android:elevation="10dp"
+                android:translationZ="10dp"
+                android:stateListAnimator="@null"
+                android:onClick="switchToSettings"
+                android:text="@string/settings"
+                app:icon="@android:drawable/ic_menu_manage" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="42dp" />
+        </LinearLayout>
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 203e2191b..1764a42bb 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -13,4 +13,9 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+
+    <style name="ThemeOverlay.Vibester.FullscreenContainer" parent="">
+        <item name="fullscreenBackgroundColor">@color/light_blue_900</item>
+        <item name="fullscreenTextColor">@color/light_blue_A400</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..e52391d20
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,6 @@
+<resources>
+    <declare-styleable name="FullscreenAttrs">
+        <attr name="fullscreenBackgroundColor" format="color" />
+        <attr name="fullscreenTextColor" format="color" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 553d12bb0..ae2d40e02 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,4 +12,9 @@
     <color name="colorAccent">#FF4081</color>
     <color name="colorText">#FF000000</color>
     <color name="colorBtpn">#f58220</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="light_blue_900">#FF01579B</color>
+    <color name="light_blue_A200">#FF40C4FF</color>
+    <color name="light_blue_A400">#FF00B0FF</color>
+    <color name="black_overlay">#66000000</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 18bd820a1..284c711b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,4 +59,7 @@
         <item>Three</item>
         <item>Four</item>
     </string-array>
+    <string name="title_activity_fullscreen">FullscreenActivity</string>
+    <string name="dummy_button">Dummy Button</string>
+    <string name="dummy_content">DUMMY\nCONTENT</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..624d2437e
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <style name="Widget.Theme.MyApplication.ActionBar.Fullscreen" parent="Widget.AppCompat.ActionBar">
+        <item name="android:background">@color/black_overlay</item>
+    </style>
+
+    <style name="Widget.Theme.MyApplication.ButtonBar.Fullscreen" parent="">
+        <item name="android:background">@color/black_overlay</item>
+        <item name="android:buttonBarStyle">?android:attr/buttonBarStyle</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eebc2d049..3f765befd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,4 +13,16 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+
+    <style name="Theme.MyApplication.Fullscreen" parent="Theme.MyApplication">
+        <item name="android:actionBarStyle">@style/Widget.Theme.MyApplication.ActionBar.Fullscreen
+        </item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowBackground">@null</item>
+    </style>
+
+    <style name="ThemeOverlay.Vibester.FullscreenContainer" parent="">
+        <item name="fullscreenBackgroundColor">@color/light_blue_600</item>
+        <item name="fullscreenTextColor">@color/light_blue_A200</item>
+    </style>
 </resources>
\ No newline at end of file

From af8bbb4cdde78b3b51948e4567d2f2cd2898e4db Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sat, 19 Mar 2022 17:18:02 +0100
Subject: [PATCH 04/15] upload palette in xml

---
 .../java/ch/sdp/vibester/WelcomeScreen.kt     |  1 -
 .../res/layout/activity_welcome_screen.xml    | 32 +++++++++----------
 app/src/main/res/values/colors.xml            |  6 ++++
 app/src/main/res/values/themes.xml            |  2 +-
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt b/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
index e082a32db..eb785818b 100644
--- a/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
+++ b/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
@@ -18,7 +18,6 @@ class WelcomeScreen : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestWindowFeature(FEATURE_NO_TITLE)
-        this.window.setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN)
         supportActionBar?.hide()
 
         setContentView(R.layout.activity_welcome_screen)
diff --git a/app/src/main/res/layout/activity_welcome_screen.xml b/app/src/main/res/layout/activity_welcome_screen.xml
index 713e577df..9032fde0b 100644
--- a/app/src/main/res/layout/activity_welcome_screen.xml
+++ b/app/src/main/res/layout/activity_welcome_screen.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FEF9EF"
+    android:background="@color/floral_white"
     tools:context=".WelcomeScreen">
 
     <ImageView
@@ -39,12 +39,12 @@
                 android:layout_width="200dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="10dp"
-                android:backgroundTint="#227C9D"
+                android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
-                android:translationZ="10dp"
-                android:stateListAnimator="@null"
                 android:onClick="switchToPlay"
+                android:stateListAnimator="@null"
                 android:text="@string/play_a_game"
+                android:translationZ="10dp"
                 app:icon="@android:drawable/ic_media_play" />
 
             <Button
@@ -52,12 +52,12 @@
                 android:layout_width="200dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="10dp"
-                android:backgroundTint="#227C9D"
+                android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
-                android:translationZ="10dp"
-                android:stateListAnimator="@null"
                 android:onClick="switchToScoreboard"
+                android:stateListAnimator="@null"
                 android:text="@string/welcome_scoreboard"
+                android:translationZ="10dp"
                 app:icon="@android:drawable/ic_menu_share" />
 
             <Button
@@ -65,12 +65,12 @@
                 android:layout_width="200dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="10dp"
-                android:backgroundTint="#227C9D"
+                android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
-                android:translationZ="10dp"
-                android:stateListAnimator="@null"
                 android:onClick="switchToProfile"
+                android:stateListAnimator="@null"
                 android:text="@string/profile"
+                android:translationZ="10dp"
                 app:icon="@android:drawable/ic_menu_edit" />
 
             <Button
@@ -78,12 +78,12 @@
                 android:layout_width="200dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="10dp"
-                android:backgroundTint="#227C9D"
+                android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
-                android:translationZ="10dp"
-                android:stateListAnimator="@null"
                 android:onClick="switchToListen"
+                android:stateListAnimator="@null"
                 android:text="@string/listen_to_music"
+                android:translationZ="10dp"
                 app:icon="@android:drawable/stat_sys_headset" />
 
             <Button
@@ -91,12 +91,12 @@
                 android:layout_width="200dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="10dp"
-                android:backgroundTint="#227C9D"
+                android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
-                android:translationZ="10dp"
-                android:stateListAnimator="@null"
                 android:onClick="switchToSettings"
+                android:stateListAnimator="@null"
                 android:text="@string/settings"
+                android:translationZ="10dp"
                 app:icon="@android:drawable/ic_menu_manage" />
 
             <Space
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ae2d40e02..f1ef2992f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,4 +17,10 @@
     <color name="light_blue_A200">#FF40C4FF</color>
     <color name="light_blue_A400">#FF00B0FF</color>
     <color name="black_overlay">#66000000</color>
+    <!-- Our Color Palette -->
+    <color name="cg_blue">#FF227C9D</color>
+    <color name="tiffany_blue">#FF17c3b2</color>
+    <color name="maximum_yellow_red">#FFFFCB77</color>
+    <color name="floral_white">#FFFEF9EF</color>
+    <color name="light_coral">#FFFE6D73</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3f765befd..046ba8c92 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor" tools:targetApi="l">@color/floral_white</item>
         <!-- Customize your theme here. -->
     </style>
 

From 58fc8bbf8b749b8c57dc9113b127a5e37b7072ed Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sat, 19 Mar 2022 17:38:01 +0100
Subject: [PATCH 05/15] lyric test

---
 .../ch/sdp/vibester/LyricTemporaryTest.kt     |  4 ++-
 .../java/ch/sdp/vibester/WelcomeScreenTest.kt |  4 +--
 ...gGameTest.kt => TypingGameActivityTest.kt} | 31 ++++---------------
 app/src/main/AndroidManifest.xml              |  2 +-
 .../java/ch/sdp/vibester/AppGlideModule.kt    |  3 ++
 .../main/java/ch/sdp/vibester/MainActivity.kt |  4 ---
 .../java/ch/sdp/vibester/WelcomeScreen.kt     |  6 ++--
 .../java/ch/sdp/vibester/api/ApiCallback.kt   |  2 +-
 .../vibester/auth/FireBaseAuthenticator.kt    |  1 +
 .../{TypingGame.kt => TypingGameActivity.kt}  | 11 +++----
 .../main/res/layout/activity_typing_game.xml  |  2 +-
 11 files changed, 24 insertions(+), 46 deletions(-)
 rename app/src/androidTest/java/ch/sdp/vibester/games/{TypingGameTest.kt => TypingGameActivityTest.kt} (82%)
 rename app/src/main/java/ch/sdp/vibester/games/{TypingGame.kt => TypingGameActivity.kt} (96%)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
index 1e3a3de65..f16400a9b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
@@ -19,7 +19,9 @@ class LyricTemporaryTest {
     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" +
+        //Adding a replace because sometimes the api put some additional text
+        assertThat(
+            lyric.body().lyrics?.replace("Paroles de la chanson Believer par Imagine Dragons\r\n",""), 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" +
diff --git a/app/src/androidTest/java/ch/sdp/vibester/WelcomeScreenTest.kt b/app/src/androidTest/java/ch/sdp/vibester/WelcomeScreenTest.kt
index cede06ad2..09693fb3d 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/WelcomeScreenTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/WelcomeScreenTest.kt
@@ -7,7 +7,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.intent.Intents
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.espresso.intent.matcher.IntentMatchers.*
-import ch.sdp.vibester.games.TypingGame
+import ch.sdp.vibester.games.TypingGameActivity
 import ch.sdp.vibester.profile.ProfileSetup
 import ch.sdp.vibester.scoreboard.ScoreBoardActivity
 import org.junit.After
@@ -50,7 +50,7 @@ class WelcomeScreenTest {
     @Test
     fun checkIntentOnListen(){ //FILLER TESTING
         onView(withId(R.id.welcome_listen)).perform(click())
-        intended(hasComponent(TypingGame::class.java.name))
+        intended(hasComponent(TypingGameActivity::class.java.name))
     }
 
     @Test
diff --git a/app/src/androidTest/java/ch/sdp/vibester/games/TypingGameTest.kt b/app/src/androidTest/java/ch/sdp/vibester/games/TypingGameActivityTest.kt
similarity index 82%
rename from app/src/androidTest/java/ch/sdp/vibester/games/TypingGameTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/games/TypingGameActivityTest.kt
index 02438dc8d..28ea4ab02 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/games/TypingGameTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/games/TypingGameActivityTest.kt
@@ -1,38 +1,19 @@
 package ch.sdp.vibester.games
 
-import android.app.Activity
-import android.app.Application
 import android.content.Context
-import android.util.Log
-import android.widget.EditText
-import android.widget.FrameLayout
 import android.widget.LinearLayout
-import android.widget.Space
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.action.ViewActions.*
-import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.*
-import androidx.test.ext.junit.rules.ActivityScenarioRule
 import ch.sdp.vibester.R
 import ch.sdp.vibester.model.Song
-import okhttp3.internal.wait
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import java.util.concurrent.TimeUnit
 
-class TypingGameTest{
+class TypingGameActivityTest{
 
     @Before
     fun setUp() {
@@ -69,7 +50,7 @@ class TypingGameTest{
 
     @Test
     fun borderGenTest(){
-        val border = TypingGame.borderGen()
+        val border = TypingGameActivity.borderGen()
         assertEquals(-0x1, border.color?.defaultColor)
     }
 
@@ -77,7 +58,7 @@ class TypingGameTest{
     fun spaceGenTest(){
         val height = 10
         val width = 10
-        val spaceeeeee = TypingGame.generateSpace(width, height, ApplicationProvider.getApplicationContext())
+        val spaceeeeee = TypingGameActivity.generateSpace(width, height, ApplicationProvider.getApplicationContext())
         assertEquals(width, spaceeeeee.minimumWidth)
         assertEquals(height, spaceeeeee.minimumHeight)
     }
@@ -86,7 +67,7 @@ class TypingGameTest{
     fun textGenTest(){
         val txtInput = "hello"
         val ctx = ApplicationProvider.getApplicationContext() as Context
-        val mytest = TypingGame.generateText(txtInput, ctx)
+        val mytest = TypingGameActivity.generateText(txtInput, ctx)
         assertEquals(txtInput, mytest.text.toString())
         assertEquals(200, mytest.minHeight)
         assertEquals(ContextCompat.getColor(ctx, R.color.black), mytest.textColors.defaultColor)
@@ -107,7 +88,7 @@ class TypingGameTest{
 
         val txtInput = "hello"
         val ctx = ApplicationProvider.getApplicationContext() as Context
-        val mytest = TypingGame.generateImage(mySong, ctx)
+        val mytest = TypingGameActivity.generateImage(mySong, ctx)
         assertEquals(200, mytest.minimumHeight)
         assertEquals(200, mytest.minimumWidth)
     }
@@ -125,7 +106,7 @@ class TypingGameTest{
 
         val songTest = Song.singleSong(inputTxt)
         val ctx = ApplicationProvider.getApplicationContext() as Context
-        val frameLay= TypingGame.guess(songTest, LinearLayout(ctx), ctx, songTest, null)
+        val frameLay= TypingGameActivity.guess(songTest, LinearLayout(ctx), ctx, songTest, null)
         frameLay.performClick()
         Intents.intended(IntentMatchers.toPackage("ch.sdp.vibester"))
         val mysong = Intents.getIntents()[0].extras?.get("song") as Song
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1c06a5e59..9db3f7715 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
             android:name=".GameEndingScreen"
             android:exported="false" />
         <activity
-            android:name=".games.TypingGame"
+            android:name=".games.TypingGameActivity"
             android:exported="false" />
         <activity
             android:name=".GamescreenActivity"
diff --git a/app/src/main/java/ch/sdp/vibester/AppGlideModule.kt b/app/src/main/java/ch/sdp/vibester/AppGlideModule.kt
index 1faada6f0..6cddb0b48 100644
--- a/app/src/main/java/ch/sdp/vibester/AppGlideModule.kt
+++ b/app/src/main/java/ch/sdp/vibester/AppGlideModule.kt
@@ -6,6 +6,9 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.module.AppGlideModule
 import com.bumptech.glide.request.RequestOptions
 
+/**
+ * TODO ADD DOC
+ */
 @GlideModule
 class AppGlideModule : AppGlideModule() {
     override fun applyOptions(context: Context, builder: GlideBuilder) {
diff --git a/app/src/main/java/ch/sdp/vibester/MainActivity.kt b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
index 249ebbe6c..e54377e8a 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/MainActivity.kt
@@ -4,11 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
-import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
-import ch.sdp.vibester.games.TypingGame
-import ch.sdp.vibester.profile.ProfileDataProvider
-import ch.sdp.vibester.scoreboard.ScoreBoardActivity
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt b/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
index eb785818b..fa7d89db2 100644
--- a/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
+++ b/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
@@ -1,13 +1,11 @@
 package ch.sdp.vibester
 
 import android.content.Intent
-import android.graphics.Outline
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.view.Window.FEATURE_NO_TITLE
-import android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN
-import ch.sdp.vibester.games.TypingGame
+import ch.sdp.vibester.games.TypingGameActivity
 import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.profile.ProfileDataProvider
 import ch.sdp.vibester.profile.ProfileSetup
@@ -59,7 +57,7 @@ class WelcomeScreen : AppCompatActivity() {
 
         val mySong = Song.singleSong(inputTxt)
 
-        val newIntent = Intent(this, TypingGame::class.java)
+        val newIntent = Intent(this, TypingGameActivity::class.java)
         newIntent.putExtra("song", mySong)
         newIntent.putExtra("isPlaying", true)
         newIntent.putExtra("hasWon", true)
diff --git a/app/src/main/java/ch/sdp/vibester/api/ApiCallback.kt b/app/src/main/java/ch/sdp/vibester/api/ApiCallback.kt
index 6a88d86b9..2e82ddc0b 100644
--- a/app/src/main/java/ch/sdp/vibester/api/ApiCallback.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/ApiCallback.kt
@@ -7,7 +7,7 @@ import java.io.IOException
 import java.util.concurrent.CompletableFuture
 
 /**
- * The Callback class when calling the querySong(...) method
+ * The Callback class when calling different API method
  */
 class ApiCallback(val retFuture: CompletableFuture<String>): Callback {
     override fun onResponse(call: Call, response: Response) {
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 824c22719..11ad2b7f5 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -29,6 +29,7 @@ class FireBaseAuthenticator() {
         return auth.createUserWithEmailAndPassword(email, password)
     }
 
+    //TODO look for that ???
 //    @FixMe
 //      Commenting this for now until we find a proper way to test it, then will merge it to main
     fun googleActivityResult(requestCode: Int, resultCode: Int, data: Intent?): String? {
diff --git a/app/src/main/java/ch/sdp/vibester/games/TypingGame.kt b/app/src/main/java/ch/sdp/vibester/games/TypingGameActivity.kt
similarity index 96%
rename from app/src/main/java/ch/sdp/vibester/games/TypingGame.kt
rename to app/src/main/java/ch/sdp/vibester/games/TypingGameActivity.kt
index 36f69a031..194d52239 100644
--- a/app/src/main/java/ch/sdp/vibester/games/TypingGame.kt
+++ b/app/src/main/java/ch/sdp/vibester/games/TypingGameActivity.kt
@@ -1,7 +1,5 @@
 package ch.sdp.vibester.games
 
-import android.app.Activity
-import android.app.PendingIntent.getActivity
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
@@ -12,7 +10,6 @@ import android.os.Handler
 import android.view.Gravity
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat.getColor
 import androidx.core.content.ContextCompat.startActivity
 import androidx.core.widget.addTextChangedListener
@@ -31,7 +28,7 @@ import java.util.concurrent.CompletableFuture
 /**
  * Class that represent a game
  */
-class TypingGame : AppCompatActivity() {
+class TypingGameActivity : AppCompatActivity() {
 
     companion object{
 
@@ -50,7 +47,7 @@ class TypingGame : AppCompatActivity() {
          * Generate a change of intent at the end of the game
          */
         fun intentGen(ctx: Context, choosenSong: Song?, playedSong: Song):Intent{
-            val newIntent = Intent(ctx, TypingGame::class.java)
+            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()){
@@ -213,9 +210,9 @@ class TypingGame : AppCompatActivity() {
                     val list = Song.listSong(task.await())
                     for(x: Song in list){
                         if (mysong != null) {
-                            guess(x, findViewById(R.id.displayGuess), this@TypingGame, mysong, mediaPlayer)
+                            guess(x, findViewById(R.id.displayGuess), this@TypingGameActivity, mysong, mediaPlayer)
                         }else{
-                            guess(x, findViewById(R.id.displayGuess), this@TypingGame, x, mediaPlayer)
+                            guess(x, findViewById(R.id.displayGuess), this@TypingGameActivity, x, mediaPlayer)
                         }
                     }
                 }
diff --git a/app/src/main/res/layout/activity_typing_game.xml b/app/src/main/res/layout/activity_typing_game.xml
index ef9eacb0a..29441e8d9 100644
--- a/app/src/main/res/layout/activity_typing_game.xml
+++ b/app/src/main/res/layout/activity_typing_game.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".games.TypingGame">
+    tools:context=".games.TypingGameActivity">
 
     <LinearLayout
         android:layout_width="match_parent"

From d710dc02b556647bc62e638dce6cc3133a852a19 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sat, 19 Mar 2022 19:06:41 +0100
Subject: [PATCH 06/15] refactor architecture

---
 .../ch/sdp/vibester/MusicTemporaryTest.kt     | 33 -------------------
 .../GameEndingActivityTest.kt}                | 19 +++++------
 .../GameSetupActivityTest.kt}                 | 13 +++-----
 .../{ => activity}/GamescreenActivityTest.kt  |  8 ++---
 .../IncorrectSongsActivityTest.kt}            | 17 ++++------
 .../{ => activity}/MainActivityTest.kt        | 10 +++---
 .../ProfileActivityTest.kt}                   | 29 ++++++++--------
 .../ScoreBoardActivityTest.kt                 |  2 +-
 .../TypingGameActivityTest.kt                 |  3 +-
 .../WelcomeActivityTest.kt}                   | 15 ++++-----
 .../sdp/vibester/api/BitmapGetterApiTest.kt   | 14 --------
 app/src/main/AndroidManifest.xml              | 21 +++++-------
 .../java/ch/sdp/vibester/MusicTemporary.kt    | 32 ------------------
 .../GameEndingActivity.kt}                    |  7 ++--
 .../GameSetupActivity.kt}                     |  6 ++--
 .../{ => activity}/GamescreenActivity.kt      | 12 +++----
 .../IncorrectSongsActivity.kt}                |  7 ++--
 .../vibester/{ => activity}/MainActivity.kt   |  7 ++--
 .../ProfileActivity.kt}                       |  8 +++--
 .../ScoreBoardActivity.kt                     |  4 ++-
 .../{games => activity}/TypingGameActivity.kt |  2 +-
 .../WelcomeActivity.kt}                       | 13 ++++----
 .../layout/activity_game_ending_screen.xml    |  2 +-
 .../res/layout/activity_game_setup_screen.xml |  2 +-
 .../activity_incorrect_songs_screen.xml       |  2 +-
 app/src/main/res/layout/activity_main.xml     |  2 +-
 .../main/res/layout/activity_typing_game.xml  |  2 +-
 .../res/layout/activity_welcome_screen.xml    |  2 +-
 28 files changed, 104 insertions(+), 190 deletions(-)
 delete mode 100644 app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
 rename app/src/androidTest/java/ch/sdp/vibester/{GameEndingScreenTest.kt => activity/GameEndingActivityTest.kt} (86%)
 rename app/src/androidTest/java/ch/sdp/vibester/{GameSetupScreenTest.kt => activity/GameSetupActivityTest.kt} (90%)
 rename app/src/androidTest/java/ch/sdp/vibester/{ => activity}/GamescreenActivityTest.kt (91%)
 rename app/src/androidTest/java/ch/sdp/vibester/{IncorrectSongsScreenTest.kt => activity/IncorrectSongsActivityTest.kt} (80%)
 rename app/src/androidTest/java/ch/sdp/vibester/{ => activity}/MainActivityTest.kt (81%)
 rename app/src/androidTest/java/ch/sdp/vibester/{profile/ProfileSetupTest.kt => activity/ProfileActivityTest.kt} (82%)
 rename app/src/androidTest/java/ch/sdp/vibester/{scoreboard => activity}/ScoreBoardActivityTest.kt (98%)
 rename app/src/androidTest/java/ch/sdp/vibester/{games => activity}/TypingGameActivityTest.kt (96%)
 rename app/src/androidTest/java/ch/sdp/vibester/{WelcomeScreenTest.kt => activity/WelcomeActivityTest.kt} (81%)
 delete mode 100644 app/src/main/java/ch/sdp/vibester/MusicTemporary.kt
 rename app/src/main/java/ch/sdp/vibester/{GameEndingScreen.kt => activity/GameEndingActivity.kt} (93%)
 rename app/src/main/java/ch/sdp/vibester/{GameSetupScreen.kt => activity/GameSetupActivity.kt} (90%)
 rename app/src/main/java/ch/sdp/vibester/{ => activity}/GamescreenActivity.kt (91%)
 rename app/src/main/java/ch/sdp/vibester/{IncorrectSongsScreen.kt => activity/IncorrectSongsActivity.kt} (92%)
 rename app/src/main/java/ch/sdp/vibester/{ => activity}/MainActivity.kt (81%)
 rename app/src/main/java/ch/sdp/vibester/{profile/ProfileSetup.kt => activity/ProfileActivity.kt} (92%)
 rename app/src/main/java/ch/sdp/vibester/{scoreboard => activity}/ScoreBoardActivity.kt (94%)
 rename app/src/main/java/ch/sdp/vibester/{games => activity}/TypingGameActivity.kt (99%)
 rename app/src/main/java/ch/sdp/vibester/{WelcomeScreen.kt => activity/WelcomeActivity.kt} (91%)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
deleted file mode 100644
index e761fbe10..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/MusicTemporaryTest.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-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 androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class MusicTemporaryTest{
-
-        // Temporary test
-        @Test
-        fun musicTemporaryTest() {
-            val inputName = "Imagine Dragons Believer"
-            val intent =
-                Intent(ApplicationProvider.getApplicationContext(), MusicTemporary::class.java)
-            val scn: ActivityScenario<MusicTemporary> = ActivityScenario.launch(intent)
-            onView(withId(R.id.musicName))
-                .perform(typeText(inputName), closeSoftKeyboard())
-            onView(withId(R.id.validateForMusic)).perform(click())
-            onView(withId(R.id.textViewPlaying))
-                .check(matches(withText("Imagine Dragons - Believer")))
-        }
-
-
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/GameEndingScreenTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
similarity index 86%
rename from app/src/androidTest/java/ch/sdp/vibester/GameEndingScreenTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index d96ba21cd..e5590f184 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GameEndingScreenTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -1,8 +1,7 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import androidx.core.content.ContextCompat
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
@@ -16,7 +15,7 @@ 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 ch.sdp.vibester.scoreboard.ScoreBoardActivity
+import ch.sdp.vibester.R
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -24,11 +23,11 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class GameEndingScreenTest {
+class GameEndingActivityTest {
 
     @Rule
     @JvmField
-    val activityRule = ActivityScenarioRule(GameEndingScreen::class.java)
+    val activityRule = ActivityScenarioRule(GameEndingActivity::class.java)
 
     @Before
     fun setUp() {
@@ -57,7 +56,7 @@ class GameEndingScreenTest {
 
     @Test
     fun checkIntentOnCalled() {
-        val intent = Intent(ApplicationProvider.getApplicationContext(), GameEndingScreen::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), GameEndingActivity::class.java)
 
         //Start an activity from outside an activity
         intent.setFlags(FLAG_ACTIVITY_NEW_TASK)
@@ -75,7 +74,7 @@ class GameEndingScreenTest {
         intent.putExtra("stat_res_1", "General Kenobi")
 
         //keep this val to help kotlin inferring value type
-        val uselessVal: ActivityScenario<GameEndingScreen> = ActivityScenario.launch(intent)
+        val uselessVal: ActivityScenario<GameEndingActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.end_stat1)).check(matches(withText(stats[0])))
         onView(withId(R.id.end_stat1_res)).check(matches(withText(statsRes[0])))
@@ -84,7 +83,7 @@ class GameEndingScreenTest {
 
     @Test
     fun checkIntentOnIncorrectSongs() {
-        val intent = Intent(ApplicationProvider.getApplicationContext(), GameEndingScreen::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), GameEndingActivity::class.java)
 
         intent.putExtra("playerName", name)
         intent.putExtra("nbIncorrectSong", nbInc)
@@ -96,11 +95,11 @@ class GameEndingScreenTest {
         intent.putExtra("stat_res_1", "General Kenobi")
 
         //keep this val to help kotlin inferring value type
-        val uselessVal: ActivityScenario<GameEndingScreen> = ActivityScenario.launch(intent)
+        val uselessVal: ActivityScenario<GameEndingActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.end_go_to_inc)).perform(click())
 
-        intended(hasComponent(IncorrectSongsScreen::class.java.name))
+        intended(hasComponent(IncorrectSongsActivity::class.java.name))
         intended(hasExtra("nb_false", nbInc))
         intended(hasExtra("incorrect_song_1", inc[0]))
         intended(hasExtra("incorrect_song_2", inc[1]))
diff --git a/app/src/androidTest/java/ch/sdp/vibester/GameSetupScreenTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
similarity index 90%
rename from app/src/androidTest/java/ch/sdp/vibester/GameSetupScreenTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
index 8fba2ef38..cc628715e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GameSetupScreenTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
@@ -1,31 +1,26 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
-import android.widget.AdapterView
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onData
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.ViewAssertion
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.intent.matcher.IntentMatchers.*
 import androidx.test.espresso.matcher.ViewMatchers.withSpinnerText
+import ch.sdp.vibester.R
 import org.hamcrest.Matchers
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-class GameSetupScreenTest {
+class GameSetupActivityTest {
 
     @get: Rule
-    val activityRule = ActivityScenarioRule(GameSetupScreen::class.java)
+    val activityRule = ActivityScenarioRule(GameSetupActivity::class.java)
 
     @Before
     fun setUp() {
diff --git a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GamescreenActivityTest.kt
similarity index 91%
rename from app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/GamescreenActivityTest.kt
index 7a3264ec5..5bfa30a0b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/GamescreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GamescreenActivityTest.kt
@@ -1,18 +1,16 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
-import android.app.AlertDialog
 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.matcher.IntentMatchers
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.hamcrest.CoreMatchers.allOf
+import ch.sdp.vibester.R
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -84,7 +82,7 @@ class GamescreenActivityTest {
     @Test
     fun checkIntentOnEnding() {
         onView(withId(R.id.go_to_end)).perform(click())
-        intended(hasComponent(GameEndingScreen::class.java.name))
+        intended(hasComponent(GameEndingActivity::class.java.name))
         intended(hasExtra("playerName", "Arda"))
         intended(hasExtra("nbIncorrectSong", 3))
         /*intended(hasExtra("incorrect_songs", arrayOf("One", "Two", "Three")))
diff --git a/app/src/androidTest/java/ch/sdp/vibester/IncorrectSongsScreenTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/IncorrectSongsActivityTest.kt
similarity index 80%
rename from app/src/androidTest/java/ch/sdp/vibester/IncorrectSongsScreenTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/IncorrectSongsActivityTest.kt
index 0e8bbf833..a1f83c381 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/IncorrectSongsScreenTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/IncorrectSongsActivityTest.kt
@@ -1,28 +1,25 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import android.content.Intent
-import android.content.res.Resources
-import android.widget.TextView
 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.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import org.hamcrest.Matchers.allOf
+import ch.sdp.vibester.R
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-class IncorrectSongsScreenTest {
+class IncorrectSongsActivityTest {
     @Rule
     @JvmField
-    val activityRule = ActivityScenarioRule(IncorrectSongsScreen::class.java)
+    val activityRule = ActivityScenarioRule(IncorrectSongsActivity::class.java)
 
     private var nbInc = 3
     private var inc: Array<String> = arrayOf("One", "Two", "Three")
@@ -39,11 +36,11 @@ class IncorrectSongsScreenTest {
 
     @Test
     fun checkIntentOnCalled() {
-        val intent = Intent(ApplicationProvider.getApplicationContext(), IncorrectSongsScreen::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), IncorrectSongsActivity::class.java)
         intent.putExtra("nbIncorrectSong", nbInc)
         intent.putExtra("incorrect_songs", inc)
 
-        val scn: ActivityScenario<IncorrectSongsScreen> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<IncorrectSongsActivity> = ActivityScenario.launch(intent)
 
         if(nbInc != 0) {
             for(x in 0 until nbInc) {
@@ -65,6 +62,6 @@ class IncorrectSongsScreenTest {
     @Test
     fun checkIntentOnGoBack(){
         onView(withId(R.id.incorrect_songs_back_to_welcome)).perform(click())
-        intended(hasComponent(WelcomeScreen::class.java.name))
+        intended(hasComponent(WelcomeActivity::class.java.name))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/MainActivityTest.kt
similarity index 81%
rename from app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/MainActivityTest.kt
index 0ec5721a8..aef7c193c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/MainActivityTest.kt
@@ -1,16 +1,16 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.matcher.IntentMatchers.*
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import ch.sdp.vibester.profile.ProfileSetup
-import ch.sdp.vibester.scoreboard.ScoreBoardActivity
+import ch.sdp.vibester.GenreTemporary
+import ch.sdp.vibester.LyricTemporary
+import ch.sdp.vibester.R
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -39,7 +39,7 @@ class MainActivityTest {
     @Test
     fun checkIntentOnWelcome(){ //FILLER TESTING
         onView(withId(R.id.placeholder_welcome)).perform(click())
-        intended(hasComponent(WelcomeScreen::class.qualifiedName))
+        intended(hasComponent(WelcomeActivity::class.qualifiedName))
     }
 
     @Test
diff --git a/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileSetupTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
similarity index 82%
rename from app/src/androidTest/java/ch/sdp/vibester/profile/ProfileSetupTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index e238f146d..6f08789e3 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileSetupTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester.profile
+package ch.sdp.vibester.activity
 
 import android.content.Intent
 import androidx.test.core.app.ActivityScenario
@@ -9,19 +9,20 @@ import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.*
 import ch.sdp.vibester.R
+import ch.sdp.vibester.profile.UserProfile
 import org.junit.Test
 import org.junit.runner.RunWith
 
 
 @RunWith(AndroidJUnit4::class)
-class ProfileSetupTest {
+class ProfileActivityTest {
 
     @Test
     fun checkProfileData() {
         val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
-        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("userProfile", inputProfile)
-        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
         onView(withId(R.id.handle)).check(matches(withText(inputProfile.handle)))
         onView(withId(R.id.username)).check(matches(withText(inputProfile.username)))
         onView(withId(R.id.correctSongs)).check(matches(withText(inputProfile.correctSongs.toString())))
@@ -32,9 +33,9 @@ class ProfileSetupTest {
     @Test
     fun checkProfileLayout() {
         val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
-        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("userProfile", inputProfile)
-        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
         onView(withId(R.id.profileStatistics)).check(matches(isDisplayed()))
         onView(withId(R.id.handle)).check(matches(isDisplayed()))
         onView(withId(R.id.username)).check(matches(isDisplayed()))
@@ -44,9 +45,9 @@ class ProfileSetupTest {
     @Test
     fun checkEditProfile() {
         val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
-        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("userProfile", inputProfile)
-        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         val newUsername = "newUser"
         onView(withId(R.id.editUser)).perform(ViewActions.click())
@@ -59,9 +60,9 @@ class ProfileSetupTest {
     @Test
     fun checkEditProfileClickCancel() {
         val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
-        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("userProfile", inputProfile)
-        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.editUser)).perform(ViewActions.click())
         onView(withText("Cancel")).perform(ViewActions.click())
@@ -71,9 +72,9 @@ class ProfileSetupTest {
     @Test
     fun checkEditHandle() {
         val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
-        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("userProfile", inputProfile)
-        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         val newUserHandle = "newHandle"
         onView(withId(R.id.editHandle)).perform(ViewActions.click())
@@ -86,9 +87,9 @@ class ProfileSetupTest {
     @Test
     fun checkEditHandleClickCancel() {
         val inputProfile = UserProfile("user0", "username0","bit.ly/3IUnyAF",  5, 8, 34, 2)
-        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileSetup::class.java)
+        val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("userProfile", inputProfile)
-        val scn: ActivityScenario<ProfileSetup> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.editHandle)).perform(ViewActions.click())
         onView(withText("Cancel")).perform(ViewActions.click())
diff --git a/app/src/androidTest/java/ch/sdp/vibester/scoreboard/ScoreBoardActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
similarity index 98%
rename from app/src/androidTest/java/ch/sdp/vibester/scoreboard/ScoreBoardActivityTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
index dad1f3d95..a5791c9b9 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/scoreboard/ScoreBoardActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester.scoreboard
+package ch.sdp.vibester.activity
 
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.core.app.ApplicationProvider
diff --git a/app/src/androidTest/java/ch/sdp/vibester/games/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
similarity index 96%
rename from app/src/androidTest/java/ch/sdp/vibester/games/TypingGameActivityTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index 28ea4ab02..d4c257a60 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/games/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester.games
+package ch.sdp.vibester.activity
 
 import android.content.Context
 import android.widget.LinearLayout
@@ -7,6 +7,7 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import ch.sdp.vibester.R
+import ch.sdp.vibester.activity.TypingGameActivity
 import ch.sdp.vibester.model.Song
 import org.junit.After
 import org.junit.Assert.assertEquals
diff --git a/app/src/androidTest/java/ch/sdp/vibester/WelcomeScreenTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
similarity index 81%
rename from app/src/androidTest/java/ch/sdp/vibester/WelcomeScreenTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index 09693fb3d..8b020e6bc 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/WelcomeScreenTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.Espresso.onView
@@ -7,17 +7,16 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.intent.Intents
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.espresso.intent.matcher.IntentMatchers.*
-import ch.sdp.vibester.games.TypingGameActivity
-import ch.sdp.vibester.profile.ProfileSetup
-import ch.sdp.vibester.scoreboard.ScoreBoardActivity
+import ch.sdp.vibester.R
+import ch.sdp.vibester.Register
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-class WelcomeScreenTest {
+class WelcomeActivityTest {
     @get: Rule
-    val activityRule = ActivityScenarioRule(WelcomeScreen::class.java)
+    val activityRule = ActivityScenarioRule(WelcomeActivity::class.java)
 
     @Before
     fun setUp() {
@@ -32,13 +31,13 @@ class WelcomeScreenTest {
     @Test
     fun checkIntentOnPlay(){
         onView(withId(R.id.welcome_play)).perform(click())
-        intended(hasComponent(GameSetupScreen::class.java.name))
+        intended(hasComponent(GameSetupActivity::class.java.name))
     }
 
     @Test
     fun checkIntentOnProfile(){ //FILLER TESTING
         onView(withId(R.id.welcome_profile)).perform(click())
-        intended(hasComponent(ProfileSetup::class.java.name))
+        intended(hasComponent(ProfileActivity::class.java.name))
     }
 
     @Test
diff --git a/app/src/androidTest/java/ch/sdp/vibester/api/BitmapGetterApiTest.kt b/app/src/androidTest/java/ch/sdp/vibester/api/BitmapGetterApiTest.kt
index aa76ea3af..6bb077d07 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/api/BitmapGetterApiTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/api/BitmapGetterApiTest.kt
@@ -1,29 +1,15 @@
 package ch.sdp.vibester.api
 
-import android.app.PendingIntent.getActivity
 import android.content.Context
-import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.util.Log
-import androidx.appcompat.content.res.AppCompatResources.getDrawable
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.toBitmap
-import androidx.core.graphics.get
 import androidx.test.core.app.ApplicationProvider
-import ch.sdp.vibester.MainActivity
 import ch.sdp.vibester.R
-import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.ExpectedException
-import java.io.IOException
 import java.lang.Exception
-import java.security.AccessController.getContext
 
 
 class BitmapGetterApiTest {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9db3f7715..d3cdd8bb7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,34 +15,31 @@
         android:theme="@style/Theme.MyApplication"
         android:usesCleartextTraffic="true">
         <activity
-            android:name=".IncorrectSongsScreen"
+            android:name=".activity.IncorrectSongsActivity"
             android:exported="false" />
         <activity
-            android:name=".GameEndingScreen"
+            android:name=".activity.GameEndingActivity"
             android:exported="false" />
         <activity
-            android:name=".games.TypingGameActivity"
+            android:name=".activity.TypingGameActivity"
             android:exported="false" />
         <activity
-            android:name=".GamescreenActivity"
+            android:name=".activity.GamescreenActivity"
             android:exported="false" />
         <activity
-            android:name=".profile.ProfileSetup"
-            android:exported="false" />
-        <activity
-            android:name=".MusicTemporary"
+            android:name=".activity.ProfileActivity"
             android:exported="false" />
         <activity
             android:name=".LyricTemporary"
             android:exported="false" />
         <activity
-            android:name=".GameSetupScreen"
+            android:name=".activity.GameSetupActivity"
             android:exported="false" />
         <activity
-            android:name=".scoreboard.ScoreBoardActivity"
+            android:name=".activity.ScoreBoardActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".WelcomeScreen"
+            android:name=".activity.WelcomeActivity"
             android:exported="false" />
         <activity
             android:name=".Register"
@@ -51,7 +48,7 @@
             android:name=".GenreTemporary"
             android:exported="false" />
         <activity
-            android:name=".MainActivity"
+            android:name=".activity.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/ch/sdp/vibester/MusicTemporary.kt b/app/src/main/java/ch/sdp/vibester/MusicTemporary.kt
deleted file mode 100644
index 51b214b55..000000000
--- a/app/src/main/java/ch/sdp/vibester/MusicTemporary.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package ch.sdp.vibester
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
-import ch.sdp.vibester.api.AudioPlayer
-import ch.sdp.vibester.api.ItunesMusicApi
-import ch.sdp.vibester.model.Song
-import okhttp3.OkHttpClient
-
-class MusicTemporary : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_music_temporary)
-
-        val txtInput = findViewById<EditText>(R.id.musicName)
-
-        val btnValidate = findViewById<Button>(R.id.validateForMusic)
-
-        val textViewPlaying = findViewById<TextView>(R.id.textViewPlaying)
-
-        btnValidate.setOnClickListener {
-            val song = Song.singleSong(ItunesMusicApi.querySong(txtInput.text.toString(), OkHttpClient(), 1).get())
-            AudioPlayer.playAudio(song.getPreviewUrl())
-            textViewPlaying.setText(song.getArtistName() + " - " + song.getTrackName())
-        }
-
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/GameEndingScreen.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
similarity index 93%
rename from app/src/main/java/ch/sdp/vibester/GameEndingScreen.kt
rename to app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index 95a504fe1..f029cd27c 100644
--- a/app/src/main/java/ch/sdp/vibester/GameEndingScreen.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -1,12 +1,13 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import androidx.appcompat.app.AppCompatActivity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.*
+import ch.sdp.vibester.R
 
-class GameEndingScreen : AppCompatActivity() {
+class GameEndingActivity : AppCompatActivity() {
     /*
     private var statNames: Array<String> = arrayOf("")
     private var statValues: Array<String> = arrayOf("")
@@ -62,7 +63,7 @@ class GameEndingScreen : AppCompatActivity() {
 
 
     fun goToIncorrectlyGuessedSongs(view: View) {
-        val intent = Intent(this, IncorrectSongsScreen::class.java)
+        val intent = Intent(this, IncorrectSongsActivity::class.java)
         intent.putExtra("nb_false", nbIncorrectSongs)
         //intent.putExtra("incorrect_songs", incorrectSongs)
         intent.putExtra("incorrect_song_1", incorrect1)
diff --git a/app/src/main/java/ch/sdp/vibester/GameSetupScreen.kt b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
similarity index 90%
rename from app/src/main/java/ch/sdp/vibester/GameSetupScreen.kt
rename to app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
index 40af5f351..36701a2eb 100644
--- a/app/src/main/java/ch/sdp/vibester/GameSetupScreen.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
@@ -7,9 +7,9 @@ import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
-import android.widget.Toast
+import ch.sdp.vibester.R
 
-class GameSetupScreen : AppCompatActivity(), AdapterView.OnItemSelectedListener {
+class GameSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
     var text = "One"
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GamescreenActivity.kt
similarity index 91%
rename from app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
rename to app/src/main/java/ch/sdp/vibester/activity/GamescreenActivity.kt
index b344fff4e..4d68b2f4f 100644
--- a/app/src/main/java/ch/sdp/vibester/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GamescreenActivity.kt
@@ -1,15 +1,12 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import android.content.Intent
-import android.opengl.Visibility
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
 import android.widget.*
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AlertDialogLayout
-import androidx.core.view.get
+import ch.sdp.vibester.R
 
 
 class GamescreenActivity: AppCompatActivity() {
@@ -111,8 +108,9 @@ class GamescreenActivity: AppCompatActivity() {
     }
 
     fun switchToEnding(view: View) {
-        val intent = Intent(this, GameEndingScreen::class.java)
+        val intent = Intent(this, GameEndingActivity::class.java)
         //MOCK VALUES FOR INCORRECT SONGS, ADAPT FROM GAME DATA IN THE FUTURE
+        /*
         val incArray: Array<String> = arrayOf("One", "Two", "Three")
         val statNames: Array<String> = arrayOf("Hello there",
             "Second Stat",
@@ -124,7 +122,7 @@ class GamescreenActivity: AppCompatActivity() {
             "----- *3 -----",
             "----- *4 -----",
             "----- *5 -----")
-
+*/
         intent.putExtra("playerName", "Arda")
         intent.putExtra("nbIncorrectSong", 3)
         /*
diff --git a/app/src/main/java/ch/sdp/vibester/IncorrectSongsScreen.kt b/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
similarity index 92%
rename from app/src/main/java/ch/sdp/vibester/IncorrectSongsScreen.kt
rename to app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
index a3450da8d..8ab1398b6 100644
--- a/app/src/main/java/ch/sdp/vibester/IncorrectSongsScreen.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
@@ -8,8 +8,9 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.LinearLayout.*
 import android.widget.TextView
+import ch.sdp.vibester.R
 
-class IncorrectSongsScreen : AppCompatActivity() {
+class IncorrectSongsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_incorrect_songs_screen)
@@ -47,7 +48,7 @@ class IncorrectSongsScreen : AppCompatActivity() {
     }
 
     fun switchBackToWelcome(view: View) {
-        val intent = Intent(this, WelcomeScreen::class.java)
+        val intent = Intent(this, WelcomeActivity::class.java)
         startActivity(intent)
     }
 }
\ 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/activity/MainActivity.kt
similarity index 81%
rename from app/src/main/java/ch/sdp/vibester/MainActivity.kt
rename to app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
index e54377e8a..1a2b211fe 100644
--- a/app/src/main/java/ch/sdp/vibester/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
@@ -1,10 +1,13 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
+import ch.sdp.vibester.GenreTemporary
+import ch.sdp.vibester.LyricTemporary
+import ch.sdp.vibester.R
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -28,7 +31,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun switchToWelcome(view: View) {
-        val intent = Intent(this, WelcomeScreen::class.java)
+        val intent = Intent(this, WelcomeActivity::class.java)
         startActivity(intent)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
similarity index 92%
rename from app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
rename to app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 5aa3b9602..c812475f2 100644
--- a/app/src/main/java/ch/sdp/vibester/profile/ProfileSetup.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester.profile
+package ch.sdp.vibester.activity
 
 import android.content.DialogInterface
 import androidx.appcompat.app.AppCompatActivity
@@ -9,9 +9,11 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import ch.sdp.vibester.R
+import ch.sdp.vibester.profile.UserProfile
+
 const val EXTRA_ID = "userProfile"
 
-class ProfileSetup: AppCompatActivity() {
+class ProfileActivity: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_profile)
@@ -65,7 +67,7 @@ class ProfileSetup: AppCompatActivity() {
         findViewById<TextView>(R.id.correctSongs).text = user.correctSongs.toString()
         findViewById<TextView>(R.id.bestScore).text = user.bestScore.toString()
         findViewById<TextView>(R.id.ranking).text = user.ranking.toString()
-        /* TODO: add functionality to display the image
+        /* TODO: add functionality to display the image (may be using )
         findViewById<ImageView>(R.id.avatar).loadImg(user.image)*/
     }
 }
diff --git a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ScoreBoardActivity.kt
similarity index 94%
rename from app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
rename to app/src/main/java/ch/sdp/vibester/activity/ScoreBoardActivity.kt
index 726f33077..16ef24c8f 100644
--- a/app/src/main/java/ch/sdp/vibester/scoreboard/ScoreBoardActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ScoreBoardActivity.kt
@@ -1,10 +1,12 @@
-package ch.sdp.vibester.scoreboard
+package ch.sdp.vibester.activity
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.scoreboard.Player
+import ch.sdp.vibester.scoreboard.PlayerAdapter
 
 class ScoreBoardActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/ch/sdp/vibester/games/TypingGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
similarity index 99%
rename from app/src/main/java/ch/sdp/vibester/games/TypingGameActivity.kt
rename to app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
index 194d52239..1573c1b32 100644
--- a/app/src/main/java/ch/sdp/vibester/games/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester.games
+package ch.sdp.vibester.activity
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
similarity index 91%
rename from app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
rename to app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index fa7d89db2..6119dd9ea 100644
--- a/app/src/main/java/ch/sdp/vibester/WelcomeScreen.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -1,18 +1,17 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.view.Window.FEATURE_NO_TITLE
-import ch.sdp.vibester.games.TypingGameActivity
+import ch.sdp.vibester.R
+import ch.sdp.vibester.Register
 import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.profile.ProfileDataProvider
-import ch.sdp.vibester.profile.ProfileSetup
 import ch.sdp.vibester.profile.UserProfile
-import ch.sdp.vibester.scoreboard.ScoreBoardActivity
 
-class WelcomeScreen : AppCompatActivity() {
+class WelcomeActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestWindowFeature(FEATURE_NO_TITLE)
@@ -27,12 +26,12 @@ class WelcomeScreen : AppCompatActivity() {
     }
 
     fun switchToPlay(view: View) {
-        sendDirectIntent(GameSetupScreen::class.java)
+        sendDirectIntent(GameSetupActivity::class.java)
     }
 
     fun switchToProfile(view: View) { //FILLER INTENT
 //        sendDirectIntent(GameSetupScreen::class.java)
-        val profileIntent = Intent(this, ProfileSetup::class.java)
+        val profileIntent = Intent(this, ProfileActivity::class.java)
         val userID = (0..5).random().toString()
         val dataProvider = userID.let { ProfileDataProvider(it) }
         val user: UserProfile = dataProvider.getUserProfileData()
diff --git a/app/src/main/res/layout/activity_game_ending_screen.xml b/app/src/main/res/layout/activity_game_ending_screen.xml
index 7fc724d08..6be0073d5 100644
--- a/app/src/main/res/layout/activity_game_ending_screen.xml
+++ b/app/src/main/res/layout/activity_game_ending_screen.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FF00E0"
-    tools:context=".GameEndingScreen">
+    tools:context=".activity.GameEndingActivity">
 
     <TextView
         android:id="@+id/end_player_name"
diff --git a/app/src/main/res/layout/activity_game_setup_screen.xml b/app/src/main/res/layout/activity_game_setup_screen.xml
index 392d882f7..456d8b830 100644
--- a/app/src/main/res/layout/activity_game_setup_screen.xml
+++ b/app/src/main/res/layout/activity_game_setup_screen.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FF00E0"
-    tools:context=".GameSetupScreen">
+    tools:context=".activity.GameSetupActivity">
 
     <TextView
         android:id="@+id/getPlayerNumberText"
diff --git a/app/src/main/res/layout/activity_incorrect_songs_screen.xml b/app/src/main/res/layout/activity_incorrect_songs_screen.xml
index 65d8fbd8c..be3bdc33e 100644
--- a/app/src/main/res/layout/activity_incorrect_songs_screen.xml
+++ b/app/src/main/res/layout/activity_incorrect_songs_screen.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#ff00e0"
-    tools:context=".IncorrectSongsScreen">
+    tools:context=".activity.IncorrectSongsActivity">
 
     <ScrollView
         android:id="@+id/incorrect_songs_scroll"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 605b10339..996e9328d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:id="@+id/profileSetup"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".activity.MainActivity">
 
     <Button
         android:id="@+id/mainButton"
diff --git a/app/src/main/res/layout/activity_typing_game.xml b/app/src/main/res/layout/activity_typing_game.xml
index 29441e8d9..6a3fe8c2f 100644
--- a/app/src/main/res/layout/activity_typing_game.xml
+++ b/app/src/main/res/layout/activity_typing_game.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".games.TypingGameActivity">
+    tools:context=".activity.TypingGameActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_welcome_screen.xml b/app/src/main/res/layout/activity_welcome_screen.xml
index 9032fde0b..f0045ab47 100644
--- a/app/src/main/res/layout/activity_welcome_screen.xml
+++ b/app/src/main/res/layout/activity_welcome_screen.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/floral_white"
-    tools:context=".WelcomeScreen">
+    tools:context=".activity.WelcomeActivity">
 
     <ImageView
         android:id="@+id/vibester_welcome_logo"

From 3035dad9e9298cccb574df129753f688abe01527 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sun, 20 Mar 2022 18:29:32 +0100
Subject: [PATCH 07/15] attempt test correction

---
 .../ch/sdp/vibester/LyricTemporaryTest.kt     |   5 +-
 .../AuthenticationActivityTest.kt}            |   7 +-
 .../vibester/activity/WelcomeActivityTest.kt  |   3 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../AuthenticationActivity.kt}                |   5 +-
 .../sdp/vibester/activity/ProfileActivity.kt  | 148 +++++++++---------
 .../sdp/vibester/activity/WelcomeActivity.kt  |   3 +-
 .../res/layout/activity_google_log_in.xml     |   2 +-
 8 files changed, 88 insertions(+), 87 deletions(-)
 rename app/src/androidTest/java/ch/sdp/vibester/{SignInActivityTest.kt => activity/AuthenticationActivityTest.kt} (97%)
 rename app/src/main/java/ch/sdp/vibester/{Register.kt => activity/AuthenticationActivity.kt} (97%)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
index f16400a9b..3c8352e4b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt
@@ -21,7 +21,8 @@ class LyricTemporaryTest {
         val lyric = service.getLyrics("Imagine Dragons", "Believer").execute()
         //Adding a replace because sometimes the api put some additional text
         assertThat(
-            lyric.body().lyrics?.replace("Paroles de la chanson Believer par Imagine Dragons\r\n",""), equalTo("First things first\r\n" +
+            lyric.body().lyrics?.replace("\n", "")?.replace("\r","")
+                ?.replace("Paroles de la chanson Believer par Imagine Dragons",""), 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" +
@@ -52,7 +53,7 @@ class LyricTemporaryTest {
                 "\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"))
+                "Pain!\n\nYou made me a, you made me a believer, believer").replace("\r", "").replace("\n","")))
     }
 
     @Test
diff --git a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
similarity index 97%
rename from app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
index 9d7bd379e..a4cb3d454 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/SignInActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
@@ -10,6 +10,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import org.junit.Assert.assertEquals
 import org.junit.Rule
@@ -24,7 +25,7 @@ import kotlin.random.Random
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 @RunWith(AndroidJUnit4::class)
-class SignInActivityTest {
+class AuthenticationActivityTest {
 
     @Test
     fun useAppContext() {
@@ -35,7 +36,7 @@ class SignInActivityTest {
 
     @get:Rule
     val testRule = ActivityScenarioRule(
-        Register::class.java
+        AuthenticationActivity::class.java
     )
 
     @Test
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index 8b020e6bc..b212e1495 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -8,7 +8,6 @@ import androidx.test.espresso.intent.Intents
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.espresso.intent.matcher.IntentMatchers.*
 import ch.sdp.vibester.R
-import ch.sdp.vibester.Register
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -55,7 +54,7 @@ class WelcomeActivityTest {
     @Test
     fun checkIntentOnSettings(){ //FILLER TESTING
         onView(withId(R.id.welcome_settings)).perform(click())
-        intended(hasComponent(Register::class.java.name))
+        intended(hasComponent(AuthenticationActivity::class.java.name))
     }
 
     /*
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d3cdd8bb7..ef56e934d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
             android:name=".activity.WelcomeActivity"
             android:exported="false" />
         <activity
-            android:name=".Register"
+            android:name=".activity.AuthenticationActivity"
             android:exported="true" />
         <activity
             android:name=".GenreTemporary"
diff --git a/app/src/main/java/ch/sdp/vibester/Register.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
similarity index 97%
rename from app/src/main/java/ch/sdp/vibester/Register.kt
rename to app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index ed14001c8..29de75936 100644
--- a/app/src/main/java/ch/sdp/vibester/Register.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.activity
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
@@ -7,6 +7,7 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
+import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
@@ -14,7 +15,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
 
-class Register : AppCompatActivity() {
+class AuthenticationActivity : AppCompatActivity() {
 
     private lateinit var googleSignInClient: GoogleSignInClient
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index c812475f2..e14ff97ad 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -1,74 +1,74 @@
-package ch.sdp.vibester.activity
-
-import android.content.DialogInterface
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.text.InputType
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import ch.sdp.vibester.R
-import ch.sdp.vibester.profile.UserProfile
-
-const val EXTRA_ID = "userProfile"
-
-class ProfileActivity: AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_profile)
-        val bundle = intent.extras;
-        val user: UserProfile = bundle?.getSerializable(EXTRA_ID) as UserProfile
-        setupProfile(user)
-
-        val editUsername = findViewById<Button>(R.id.editUser)
-        val editHandle = findViewById<Button>(R.id.editHandle)
-
-        editUsername.setOnClickListener {
-            showGeneralDialog(R.id.username, "username")
-        }
-
-        editHandle.setOnClickListener {
-            showGeneralDialog(R.id.handle, "handle")
-        }
-    }
-
-
-
-    private fun showDialog(title: String, hint: String, id: Int, textId: Int) {
-        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-        builder.setTitle(title)
-
-        val input = EditText(this)
-        input.hint = hint
-        input.inputType = InputType.TYPE_CLASS_TEXT
-        input.id = id
-
-        builder.setView(input)
-        builder.setPositiveButton("OK", DialogInterface.OnClickListener { _, _ ->
-            findViewById<TextView>(textId).text = input.text.toString()
-        })
-        builder.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() }
-        builder.show()
-    }
-
-    private fun showGeneralDialog(id: Int, name: String) {
-        val title = "Create $name"
-        val hint = "Enter new $name"
-
-        showDialog(title, hint, 0, id)
-    }
-
-
-    private fun setupProfile(user: UserProfile){
-        findViewById<TextView>(R.id.handle).text =  user.handle
-        findViewById<TextView>(R.id.username).text = user.username
-        findViewById<TextView>(R.id.totalGames).text = user.totalGames.toString()
-        findViewById<TextView>(R.id.correctSongs).text = user.correctSongs.toString()
-        findViewById<TextView>(R.id.bestScore).text = user.bestScore.toString()
-        findViewById<TextView>(R.id.ranking).text = user.ranking.toString()
-        /* TODO: add functionality to display the image (may be using )
-        findViewById<ImageView>(R.id.avatar).loadImg(user.image)*/
-    }
-}
-
+package ch.sdp.vibester.activity
+
+import android.content.DialogInterface
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.text.InputType
+import android.widget.Button
+import android.widget.EditText
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import ch.sdp.vibester.R
+import ch.sdp.vibester.profile.UserProfile
+
+const val EXTRA_ID = "userProfile"
+
+class ProfileActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_profile)
+        val bundle = intent.extras;
+        val user: UserProfile = bundle?.getSerializable(EXTRA_ID) as UserProfile
+        setupProfile(user)
+
+        val editUsername = findViewById<Button>(R.id.editUser)
+        val editHandle = findViewById<Button>(R.id.editHandle)
+
+        editUsername.setOnClickListener {
+            showGeneralDialog(R.id.username, "username")
+        }
+
+        editHandle.setOnClickListener {
+            showGeneralDialog(R.id.handle, "handle")
+        }
+    }
+
+
+
+    private fun showDialog(title: String, hint: String, id: Int, textId: Int) {
+        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+        builder.setTitle(title)
+
+        val input = EditText(this)
+        input.hint = hint
+        input.inputType = InputType.TYPE_CLASS_TEXT
+        input.id = id
+
+        builder.setView(input)
+        builder.setPositiveButton("OK", DialogInterface.OnClickListener { _, _ ->
+            findViewById<TextView>(textId).text = input.text.toString()
+        })
+        builder.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() }
+        builder.show()
+    }
+
+    private fun showGeneralDialog(id: Int, name: String) {
+        val title = "Create $name"
+        val hint = "Enter new $name"
+
+        showDialog(title, hint, 0, id)
+    }
+
+
+    private fun setupProfile(user: UserProfile){
+        findViewById<TextView>(R.id.handle).text =  user.handle
+        findViewById<TextView>(R.id.username).text = user.username
+        findViewById<TextView>(R.id.totalGames).text = user.totalGames.toString()
+        findViewById<TextView>(R.id.correctSongs).text = user.correctSongs.toString()
+        findViewById<TextView>(R.id.bestScore).text = user.bestScore.toString()
+        findViewById<TextView>(R.id.ranking).text = user.ranking.toString()
+        /* TODO: add functionality to display the image (may be using )
+        findViewById<ImageView>(R.id.avatar).loadImg(user.image)*/
+    }
+}
+
diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index 6119dd9ea..67b38bae8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.Window.FEATURE_NO_TITLE
 import ch.sdp.vibester.R
-import ch.sdp.vibester.Register
 import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.profile.ProfileDataProvider
 import ch.sdp.vibester.profile.UserProfile
@@ -64,7 +63,7 @@ class WelcomeActivity : AppCompatActivity() {
     }
 
     fun switchToSettings(view: View) { //FILLER INTENT
-        sendDirectIntent(Register::class.java)
+        sendDirectIntent(AuthenticationActivity::class.java)
     }
 
     /*
diff --git a/app/src/main/res/layout/activity_google_log_in.xml b/app/src/main/res/layout/activity_google_log_in.xml
index 6ea809751..23496ddf5 100644
--- a/app/src/main/res/layout/activity_google_log_in.xml
+++ b/app/src/main/res/layout/activity_google_log_in.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Register">
+    tools:context=".activity.AuthenticationActivity">
 
     <Button
         android:id="@+id/createAcc"

From 1ace06d5b0a6a1eeb984a1eb60a63e708612cd84 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sun, 20 Mar 2022 23:28:30 +0100
Subject: [PATCH 08/15] refactor code climate

---
 .../activity/GameSetupActivityTest.kt         |  8 ++++++++
 .../activity/AuthenticationActivity.kt        | 19 ++++++++++++++-----
 .../activity/IncorrectSongsActivity.kt        | 17 +++++++++++------
 .../ch/sdp/vibester/activity/MainActivity.kt  |  9 +++++----
 .../ch/sdp/vibester/helper/IntentSwitcher.kt  | 14 ++++++++++++++
 .../activity_incorrect_songs_screen.xml       |  1 -
 app/src/main/res/layout/activity_main.xml     |  1 -
 7 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/helper/IntentSwitcher.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
index cc628715e..de867f648 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
@@ -1,5 +1,7 @@
 package ch.sdp.vibester.activity
 
+import android.widget.AdapterView
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onData
 import androidx.test.espresso.intent.Intents
 import androidx.test.ext.junit.rules.ActivityScenarioRule
@@ -17,6 +19,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
+
 class GameSetupActivityTest {
 
     @get: Rule
@@ -37,6 +40,11 @@ class GameSetupActivityTest {
         onView(withId(R.id.nb_player_spinner)).check(matches(withSpinnerText("One")))
     }
 
+    @Test
+    fun checkNothingSelect() {
+        onView(withId(R.id.nb_player_spinner)).check(matches(withSpinnerText("One")))
+    }
+
     @Test
     fun checkCustomSelectOne() {
         onView(withId(R.id.nb_player_spinner)).perform(click())
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index 29de75936..3b1398d5d 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -88,12 +88,17 @@ class AuthenticationActivity : AppCompatActivity() {
 
     private fun authenticate(email: String, password: String, creatAcc: Boolean) {
         if(stringValidation(email, password)) {
+            var auth: Task<AuthResult>
             if(creatAcc) {
-                createAccount(email, password)
-            }
-            else {
-                signIn(email, password)
+                auth = authenticator.createAccount(email, password)
+                //createAccount(email, password)
+            }else {
+                auth = authenticator.signIn(email, password)
+                //signIn(email, password)
             }
+                auth.addOnCompleteListener(this) { task ->
+                    onCompleteAuthentication(task)
+                }
         }
     }
 
@@ -101,7 +106,7 @@ class AuthenticationActivity : AppCompatActivity() {
         val intent = googleSignInClient.signInIntent
         startActivityForResult(intent, 1000)
     }
-
+/*
     private fun createAccount(email: String, password: String) {
         authenticator.createAccount(email, password)
             .addOnCompleteListener(this) { task ->
@@ -116,6 +121,10 @@ class AuthenticationActivity : AppCompatActivity() {
             }
     }
 
+ */
+
+
+
     private fun onCompleteAuthentication(task: Task<AuthResult>) {
         if (task.isSuccessful) {
             Toast.makeText(
diff --git a/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
index 8ab1398b6..4d9080c5f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
@@ -1,14 +1,17 @@
 package ch.sdp.vibester.activity
 
+import android.content.Context
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
+import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.LinearLayout.*
 import android.widget.TextView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.helper.IntentSwitcher
 
 class IncorrectSongsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -17,6 +20,9 @@ class IncorrectSongsActivity : AppCompatActivity() {
 
         val layout: LinearLayout = findViewById(R.id.incorrect_songs_linear)
 
+        val bWelcome: Button = findViewById(R.id.incorrect_songs_back_to_welcome)
+        bWelcome.setOnClickListener { IntentSwitcher.switchBackToWelcome(this) }
+
         //val incorrectSongs: Array<String> = intent.getStringArrayExtra("incorrect_songs") as Array<String>
         val incorrect1 = intent.getStringExtra("incorrect_song_1").toString()
         val incorrect2 = intent.getStringExtra("incorrect_song_2").toString()
@@ -24,8 +30,11 @@ class IncorrectSongsActivity : AppCompatActivity() {
         val incorrectSongs: Array<String> = arrayOf(incorrect1, incorrect2, incorrect3)
         val nbIncorrect: Int = intent.getIntExtra("nb_false", 0)
 
-        if(nbIncorrect != 0) {
+        generateTextView(nbIncorrect, incorrectSongs, layout)
+    }
 
+    private fun generateTextView(nbIncorrect: Int, incorrectSongs: Array<String>, layout: LinearLayout) {
+        if(nbIncorrect != 0) {
             for(x in 0 until nbIncorrect) {
                 val textView = TextView(this)
                 val resNb: Int = (x+1)
@@ -44,11 +53,7 @@ class IncorrectSongsActivity : AppCompatActivity() {
             textView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
             layout.addView(textView)
         }
-
     }
 
-    fun switchBackToWelcome(view: View) {
-        val intent = Intent(this, WelcomeActivity::class.java)
-        startActivity(intent)
-    }
+
 }
\ 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 1a2b211fe..955cdd0ce 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
@@ -8,12 +8,17 @@ 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
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        val btnWelcome = findViewById<Button>(R.id.placeholder_welcome)
+        btnWelcome.setOnClickListener {
+            IntentSwitcher.switchBackToWelcome(this)
+        }
 
         val btnLyric = findViewById<Button>(R.id.lyricButton)
         val lyricIntent = Intent(this, LyricTemporary::class.java)
@@ -30,8 +35,4 @@ class MainActivity : AppCompatActivity() {
 
     }
 
-    fun switchToWelcome(view: View) {
-        val intent = Intent(this, WelcomeActivity::class.java)
-        startActivity(intent)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/helper/IntentSwitcher.kt b/app/src/main/java/ch/sdp/vibester/helper/IntentSwitcher.kt
new file mode 100644
index 000000000..18445f7f8
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/helper/IntentSwitcher.kt
@@ -0,0 +1,14 @@
+package ch.sdp.vibester.helper
+
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.ContextCompat.startActivity
+import ch.sdp.vibester.activity.WelcomeActivity
+
+class IntentSwitcher private constructor() {
+    companion object{
+        fun switchBackToWelcome(ctx: Context) {
+            ctx.startActivity(Intent(ctx, WelcomeActivity::class.java))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_incorrect_songs_screen.xml b/app/src/main/res/layout/activity_incorrect_songs_screen.xml
index be3bdc33e..eaed45f7a 100644
--- a/app/src/main/res/layout/activity_incorrect_songs_screen.xml
+++ b/app/src/main/res/layout/activity_incorrect_songs_screen.xml
@@ -42,7 +42,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:onClick="switchBackToWelcome"
         android:text="@string/game_end__go_back"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 996e9328d..8a5826cad 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -46,7 +46,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="41dp"
         android:layout_marginBottom="44dp"
-        android:onClick="switchToWelcome"
         android:text="@string/welcome_screen"
         app:layout_constraintBottom_toTopOf="@+id/lyricButton"
         app:layout_constraintEnd_toEndOf="parent"

From 5492c5f4c07a530ae113750cdb471d78c76b4dc4 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 21 Mar 2022 00:15:33 +0100
Subject: [PATCH 09/15] begin refactoring typinggame

---
 .../activity/TypingGameActivityTest.kt        | 25 +-----------
 .../vibester/activity/TypingGameActivity.kt   | 39 ++++++++++++++-----
 .../main/res/layout/activity_typing_game.xml  | 12 +++---
 3 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index d4c257a60..bb74cf73f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -26,32 +26,9 @@ class TypingGameActivityTest{
         Intents.release()
     }
 
-    /*
-    //Weird Test but it's working
-    @Test
-    fun globalTypingTest(){
-        val inputName = "1574210894"
-        Espresso.onView(withId(R.id.yourGuessET))
-            .perform(ViewActions.typeText(inputName)).perform(closeSoftKeyboard())
-        val currenttime = System.currentTimeMillis()
-        while(System.currentTimeMillis() < currenttime + 10000){
-            //do nothing
-        }
-        Espresso.onView(withText("Imagine Dragons - Monday")).perform(scrollTo(), click())
-        while(System.currentTimeMillis() < currenttime + 1000){
-            //do nothing
-        }
-        Intents.intended(IntentMatchers.toPackage("ch.sdp.vibester"))
-        val mysong = Intents.getIntents()[0].extras?.get("song") as Song
-        assertEquals("Imagine Dragons", mysong.getArtistName())
-        assertEquals("Monday", mysong.getTrackName())
-    }
-
-     */
-
     @Test
     fun borderGenTest(){
-        val border = TypingGameActivity.borderGen()
+        val border = TypingGameActivity.borderGen(ApplicationProvider.getApplicationContext())
         assertEquals(-0x1, border.color?.defaultColor)
     }
 
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 1573c1b32..b460fad42 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -7,7 +7,9 @@ import android.graphics.drawable.GradientDrawable
 import android.media.MediaPlayer
 import android.os.Bundle
 import android.os.Handler
+import android.util.Log
 import android.view.Gravity
+import android.view.Window
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat.getColor
@@ -23,6 +25,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
+import java.lang.Exception
 import java.util.concurrent.CompletableFuture
 
 /**
@@ -64,7 +67,7 @@ class TypingGameActivity : AppCompatActivity() {
          */
         fun guess(song: Song, guessLayout: LinearLayout, ctx: Context, playedSong: Song, player: CompletableFuture<MediaPlayer>?): FrameLayout{
             val frameLay = FrameLayout(ctx)
-            frameLay.background = borderGen()
+            frameLay.background = borderGen(ctx)
 
             // Horizontal Linear Layout to put Images and Text next one another
             val linLay = LinearLayout(ctx)
@@ -99,9 +102,9 @@ class TypingGameActivity : AppCompatActivity() {
         /**
          * Generate the border for a box
          */
-        fun borderGen(): GradientDrawable{
+        fun borderGen(ctx: Context): GradientDrawable{
             val border = GradientDrawable()
-            border.setColor(-0x1) //white background
+            border.setColor(getColor(ctx, R.color.maximum_yellow_red)) //white background
             border.setStroke(1, -0x1000000)
             return border
         }
@@ -153,6 +156,8 @@ class TypingGameActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        supportActionBar?.hide()
         setContentView(R.layout.activity_typing_game)
 
         val guessLayout = findViewById<LinearLayout>(R.id.displayGuess)
@@ -207,13 +212,29 @@ class TypingGameActivity : AppCompatActivity() {
                     val task = async(Dispatchers.IO){
                         ItunesMusicApi.querySong(txtInp, OkHttpClient(), 3).get()
                     }
-                    val list = Song.listSong(task.await())
-                    for(x: Song in list){
-                        if (mysong != null) {
-                            guess(x, findViewById(R.id.displayGuess), this@TypingGameActivity, mysong, mediaPlayer)
-                        }else{
-                            guess(x, findViewById(R.id.displayGuess), this@TypingGameActivity, x, mediaPlayer)
+                    try {
+                        val list = Song.listSong(task.await())
+                        for (x: Song in list) {
+                            if (mysong != null) {
+                                guess(
+                                    x,
+                                    findViewById(R.id.displayGuess),
+                                    this@TypingGameActivity,
+                                    mysong,
+                                    mediaPlayer
+                                )
+                            } else {
+                                guess(
+                                    x,
+                                    findViewById(R.id.displayGuess),
+                                    this@TypingGameActivity,
+                                    x,
+                                    mediaPlayer
+                                )
+                            }
                         }
+                    } catch (e: Exception){
+                        Log.e("Exception: ", e.toString())
                     }
                 }
             }
diff --git a/app/src/main/res/layout/activity_typing_game.xml b/app/src/main/res/layout/activity_typing_game.xml
index 6a3fe8c2f..842b98df1 100644
--- a/app/src/main/res/layout/activity_typing_game.xml
+++ b/app/src/main/res/layout/activity_typing_game.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/floral_white"
     tools:context=".activity.TypingGameActivity">
 
     <LinearLayout
@@ -35,11 +36,11 @@
             android:id="@+id/textView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/what_music"
             android:textAlignment="center"
-            android:textSize="25sp"
             android:textColor="@color/black"
-            android:textStyle="bold"
-            android:text="@string/what_music" />
+            android:textSize="25sp"
+            android:textStyle="bold" />
 
         <Space
             android:layout_width="match_parent"
@@ -50,11 +51,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ems="10"
-            android:inputType="textPersonName"
             android:hint="@string/your_guess"
+            android:inputType="textPersonName"
             android:paddingLeft="10sp"
-            android:paddingRight="10sp"
-            />
+            android:paddingRight="10sp" />
 
         <ScrollView
             android:layout_width="match_parent"

From ebc647eb0bd13c3ed35eaaa1c1dddb9493e3acb5 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 21 Mar 2022 09:02:09 +0100
Subject: [PATCH 10/15] update typing game border test

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

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index bb74cf73f..8a064c73f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.activity
 import android.content.Context
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
+import androidx.core.content.ContextCompat.getColor
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
@@ -28,8 +29,9 @@ class TypingGameActivityTest{
 
     @Test
     fun borderGenTest(){
-        val border = TypingGameActivity.borderGen(ApplicationProvider.getApplicationContext())
-        assertEquals(-0x1, border.color?.defaultColor)
+        val ctx = ApplicationProvider.getApplicationContext() as Context
+        val border = TypingGameActivity.borderGen(ctx)
+        assertEquals(getColor(ctx, R.color.maximum_yellow_red), border.color?.defaultColor)
     }
 
     @Test

From ff2a273298ffbb78980b7f2626682696373e7007 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 21 Mar 2022 09:43:08 +0100
Subject: [PATCH 11/15] improve typingGame

---
 .../activity/TypingGameActivityTest.kt        | 33 ++++++++++++-
 .../vibester/activity/TypingGameActivity.kt   | 47 +++++++++++--------
 .../main/res/layout/activity_typing_game.xml  |  1 +
 3 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index 8a064c73f..37eee2cb2 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -1,6 +1,7 @@
 package ch.sdp.vibester.activity
 
 import android.content.Context
+import android.media.MediaPlayer
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getColor
@@ -14,6 +15,7 @@ import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import java.util.concurrent.CompletableFuture
 
 class TypingGameActivityTest{
 
@@ -86,7 +88,9 @@ class TypingGameActivityTest{
 
         val songTest = Song.singleSong(inputTxt)
         val ctx = ApplicationProvider.getApplicationContext() as Context
-        val frameLay= TypingGameActivity.guess(songTest, LinearLayout(ctx), ctx, songTest, null)
+        val cfmp = CompletableFuture<MediaPlayer>()
+        cfmp.complete(MediaPlayer())
+        val frameLay= TypingGameActivity.guess(songTest, LinearLayout(ctx), ctx, songTest, cfmp)
         frameLay.performClick()
         Intents.intended(IntentMatchers.toPackage("ch.sdp.vibester"))
         val mysong = Intents.getIntents()[0].extras?.get("song") as Song
@@ -94,4 +98,31 @@ class TypingGameActivityTest{
         assertEquals(songTest.getTrackName(), mysong.getTrackName())
     }
 
+    @Test
+    fun intentGenWrongTest(){
+        val inputTxt = """
+            {
+                "resultCount":1,
+                "results": [
+                {"wrapperType":"track", "kind":"song", "artistId":358714030, "collectionId":1574210519, "trackId":1574210894, "artistName":"Imagine Dragons", "collectionName":"Mercury - Act 1", "trackName":"Monday", "collectionCensoredName":"Mercury - Act 1", "trackCensoredName":"Monday", "artistViewUrl":"https://music.apple.com/us/artist/imagine-dragons/358714030?uo=4", "collectionViewUrl":"https://music.apple.com/us/album/monday/1574210519?i=1574210894&uo=4", "trackViewUrl":"https://music.apple.com/us/album/monday/1574210519?i=1574210894&uo=4",
+                    "previewUrl":"https://audio-ssl.itunes.apple.com/itunes-assets/AudioPreview125/v4/bc/71/fc/bc71fca4-e0bb-609b-5b6e-92296df7b4b6/mzaf_8907306752631175088.plus.aac.p.m4a", "artworkUrl30":"https://is3-ssl.mzstatic.com/image/thumb/Music115/v4/3e/04/c4/3e04c4e7-1863-34cb-e8f3-f168ae5b213e/source/30x30bb.jpg", "artworkUrl60":"https://is3-ssl.mzstatic.com/image/thumb/Music115/v4/3e/04/c4/3e04c4e7-1863-34cb-e8f3-f168ae5b213e/source/60x60bb.jpg", "artworkUrl100":"https://is3-ssl.mzstatic.com/image/thumb/Music115/v4/3e/04/c4/3e04c4e7-1863-34cb-e8f3-f168ae5b213e/source/100x100bb.jpg", "releaseDate":"2021-09-03T12:00:00Z", "collectionExplicitness":"notExplicit", "trackExplicitness":"notExplicit", "discCount":1, "discNumber":1, "trackCount":13, "trackNumber":4, "trackTimeMillis":187896, "country":"USA", "currency":"USD", "primaryGenreName":"Alternative", "isStreamable":true}]
+            }
+            """
+        val inputTxt2 = """
+            {
+                "resultCount":1,
+                "results": [
+                {"wrapperType":"track", "kind":"song", "artistId":358714030, "collectionId":1574210519, "trackId":1574210894, "artistName":"The Placeholder", "collectionName":"Mercury - Act 1", "trackName":"Demo", "collectionCensoredName":"Mercury - Act 1", "trackCensoredName":"Monday", "artistViewUrl":"https://music.apple.com/us/artist/imagine-dragons/358714030?uo=4", "collectionViewUrl":"https://music.apple.com/us/album/monday/1574210519?i=1574210894&uo=4", "trackViewUrl":"https://music.apple.com/us/album/monday/1574210519?i=1574210894&uo=4",
+                    "previewUrl":"https://audio-ssl.itunes.apple.com/itunes-assets/AudioPreview125/v4/bc/71/fc/bc71fca4-e0bb-609b-5b6e-92296df7b4b6/mzaf_8907306752631175088.plus.aac.p.m4a", "artworkUrl30":"https://is3-ssl.mzstatic.com/image/thumb/Music115/v4/3e/04/c4/3e04c4e7-1863-34cb-e8f3-f168ae5b213e/source/30x30bb.jpg", "artworkUrl60":"https://is3-ssl.mzstatic.com/image/thumb/Music115/v4/3e/04/c4/3e04c4e7-1863-34cb-e8f3-f168ae5b213e/source/60x60bb.jpg", "artworkUrl100":"https://is3-ssl.mzstatic.com/image/thumb/Music115/v4/3e/04/c4/3e04c4e7-1863-34cb-e8f3-f168ae5b213e/source/100x100bb.jpg", "releaseDate":"2021-09-03T12:00:00Z", "collectionExplicitness":"notExplicit", "trackExplicitness":"notExplicit", "discCount":1, "discNumber":1, "trackCount":13, "trackNumber":4, "trackTimeMillis":187896, "country":"USA", "currency":"USD", "primaryGenreName":"Alternative", "isStreamable":true}]
+            }
+            """
+
+        val songTest = Song.singleSong(inputTxt)
+        val songTest2 = Song.singleSong(inputTxt2)
+        val ctx = ApplicationProvider.getApplicationContext() as Context
+        val myIntent = TypingGameActivity.intentGen(ctx, songTest, songTest2)
+        assertEquals(false, myIntent.getBooleanExtra("hasWon", true))
+    }
+
+
 }
\ No newline at end of file
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 b460fad42..684314afd 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.activity
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.res.ColorStateList
 import android.graphics.drawable.GradientDrawable
 import android.media.MediaPlayer
 import android.os.Bundle
@@ -84,7 +85,7 @@ class TypingGameActivity : AppCompatActivity() {
 
             //Create the Listener that is executed if we click on the framelayer
             frameLay.setOnClickListener {
-                frameLay.setBackgroundColor(getColor(ctx, R.color.teal_200))
+                frameLay.setBackgroundColor(getColor(ctx, R.color.tiffany_blue))
                 guessLayout.removeAllViews()
                 guessLayout.addView(frameLay)
                 val playerMedia = player?.get()
@@ -183,22 +184,7 @@ class TypingGameActivity : AppCompatActivity() {
             }else{
                 //Is the activity playing music
                 mediaPlayer = AudioPlayer.playAudio(playableSong.getPreviewUrl())
-                val h = Handler()
-                h.post(object : Runnable {
-                    override fun run() {
-                        if(myBar.progress>0){
-                            myBar.progress -= 1
-                            h.postDelayed(this, 999) //just a bit shorter than a second for safety
-                        }else if (myBar.progress==0){
-                            if(mysong != null){
-                                if(mediaPlayer.get().isPlaying){
-                                    startActivity(intentGen(ctx, null, playableSong))
-                                    finish()
-                                }
-                            }
-                        }
-                    }
-                })
+                barTimer(myBar, mediaPlayer, mysong, ctx)
             }
             mysong = playableSong
         }
@@ -207,7 +193,7 @@ class TypingGameActivity : AppCompatActivity() {
         inputTxt.addTextChangedListener{
             guessLayout.removeAllViews()
             val txtInp = inputTxt.text.toString()
-            if (txtInp.length>4){
+            if (txtInp.length>3){
                 CoroutineScope(Dispatchers.Main).launch {
                     val task = async(Dispatchers.IO){
                         ItunesMusicApi.querySong(txtInp, OkHttpClient(), 3).get()
@@ -239,9 +225,32 @@ class TypingGameActivity : AppCompatActivity() {
                 }
             }
         }
+    }
 
 
-
+    fun barTimer(myBar: ProgressBar, mediaPlayer: CompletableFuture<MediaPlayer>, mySong: Song?, ctx:Context){
+        val h = Handler()
+        h.post(object : Runnable {
+            override fun run() {
+                if(myBar.progress>0){
+                    if(myBar.progress == 15){
+                        myBar.progressTintList = ColorStateList.valueOf(getColor(R.color.maximum_yellow_red))
+                    }else if(myBar.progress == 5){
+                        myBar.progressTintList = ColorStateList.valueOf(getColor(R.color.light_coral))
+                    }
+                    myBar.progress -= 1
+                    h.postDelayed(this, 999) //just a bit shorter than a second for safety
+                }else if (myBar.progress==0){
+                    if(mySong != null){
+                        if(mediaPlayer.get().isPlaying){
+                            //TODO Intent Switch for end
+                            finish()
+                        }
+                    }
+                }
+            }
+        })
     }
 
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_typing_game.xml b/app/src/main/res/layout/activity_typing_game.xml
index 842b98df1..9553e0aec 100644
--- a/app/src/main/res/layout/activity_typing_game.xml
+++ b/app/src/main/res/layout/activity_typing_game.xml
@@ -26,6 +26,7 @@
             android:paddingLeft="25sp"
             android:paddingRight="25sp"
             android:progress="15"
+            android:progressTint="@color/tiffany_blue"
             android:scaleY="3" />
 
         <Space

From 69547e186d339721814b415261abaf410538f5f7 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 21 Mar 2022 10:00:08 +0100
Subject: [PATCH 12/15] update typingGame

---
 .../sdp/vibester/activity/TypingGameActivity.kt  | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

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 684314afd..583b87f38 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -202,21 +202,7 @@ class TypingGameActivity : AppCompatActivity() {
                         val list = Song.listSong(task.await())
                         for (x: Song in list) {
                             if (mysong != null) {
-                                guess(
-                                    x,
-                                    findViewById(R.id.displayGuess),
-                                    this@TypingGameActivity,
-                                    mysong,
-                                    mediaPlayer
-                                )
-                            } else {
-                                guess(
-                                    x,
-                                    findViewById(R.id.displayGuess),
-                                    this@TypingGameActivity,
-                                    x,
-                                    mediaPlayer
-                                )
+                                guess(x, findViewById(R.id.displayGuess),this@TypingGameActivity, mysong, mediaPlayer)
                             }
                         }
                     } catch (e: Exception){

From 33d4c4af0f6581a0c4e7b6aff905dbd491c32ee2 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 21 Mar 2022 10:23:03 +0100
Subject: [PATCH 13/15] update typingGame num 2

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

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 583b87f38..74c09462d 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -163,13 +163,12 @@ class TypingGameActivity : AppCompatActivity() {
 
         val guessLayout = findViewById<LinearLayout>(R.id.displayGuess)
         val inputTxt = findViewById<EditText>(R.id.yourGuessET)
-        val myBar = findViewById<ProgressBar>(R.id.progressBar)
 
         var mysong: Song? = null
         var mediaPlayer: CompletableFuture<MediaPlayer>? = null
         val ctx: Context = this
 
-        myBar.progress = 30
+
 
         val getIntent = intent.extras
         if(getIntent != null){
@@ -184,7 +183,7 @@ class TypingGameActivity : AppCompatActivity() {
             }else{
                 //Is the activity playing music
                 mediaPlayer = AudioPlayer.playAudio(playableSong.getPreviewUrl())
-                barTimer(myBar, mediaPlayer, mysong, ctx)
+                barTimer(findViewById<ProgressBar>(R.id.progressBar), mediaPlayer, mysong, ctx)
             }
             mysong = playableSong
         }
@@ -215,6 +214,7 @@ class TypingGameActivity : AppCompatActivity() {
 
 
     fun barTimer(myBar: ProgressBar, mediaPlayer: CompletableFuture<MediaPlayer>, mySong: Song?, ctx:Context){
+        myBar.progress = 30
         val h = Handler()
         h.post(object : Runnable {
             override fun run() {

From 7dce2910162702bf4ce82c7f88d2a6d2c7e8b302 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 21 Mar 2022 11:16:07 +0100
Subject: [PATCH 14/15] improve pr

---
 .../ch/sdp/vibester/profile}/ProfileDataProviderTest.kt   | 2 +-
 .../main/java/ch/sdp/vibester/activity/ProfileActivity.kt | 4 ++--
 app/src/test/java/ch/sdp/vibester/ExampleUnitTest.kt      | 8 --------
 3 files changed, 3 insertions(+), 11 deletions(-)
 rename app/src/{test/java/ch/sdp/vibester => androidTest/java/ch/sdp/vibester/profile}/ProfileDataProviderTest.kt (97%)

diff --git a/app/src/test/java/ch/sdp/vibester/ProfileDataProviderTest.kt b/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileDataProviderTest.kt
similarity index 97%
rename from app/src/test/java/ch/sdp/vibester/ProfileDataProviderTest.kt
rename to app/src/androidTest/java/ch/sdp/vibester/profile/ProfileDataProviderTest.kt
index c8113f2b0..84ab47f43 100644
--- a/app/src/test/java/ch/sdp/vibester/ProfileDataProviderTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileDataProviderTest.kt
@@ -1,4 +1,4 @@
-package ch.sdp.vibester
+package ch.sdp.vibester.profile
 
 import ch.sdp.vibester.profile.ProfileDataProvider
 import ch.sdp.vibester.profile.UserProfile
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index e14ff97ad..1bdeb8e2c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -11,9 +11,9 @@ import androidx.appcompat.app.AlertDialog
 import ch.sdp.vibester.R
 import ch.sdp.vibester.profile.UserProfile
 
-const val EXTRA_ID = "userProfile"
-
 class ProfileActivity : AppCompatActivity() {
+    private val EXTRA_ID = "userProfile"
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_profile)
diff --git a/app/src/test/java/ch/sdp/vibester/ExampleUnitTest.kt b/app/src/test/java/ch/sdp/vibester/ExampleUnitTest.kt
index 622abda01..3bbd27ed4 100644
--- a/app/src/test/java/ch/sdp/vibester/ExampleUnitTest.kt
+++ b/app/src/test/java/ch/sdp/vibester/ExampleUnitTest.kt
@@ -1,6 +1,5 @@
 package ch.sdp.vibester
 
-import ch.sdp.vibester.auth.FireBaseAuthenticator
 import org.junit.Test
 
 import org.junit.Assert.*
@@ -15,11 +14,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-
-//    @Test
-//    fun badRequest() {
-//        val mockAuth = FireBaseAuthenticator()
-//        val returnText = mockAuth.googleActivityResult(-1, -1, null)
-//        assertEquals(returnText, "Authentication error")
-//    }
 }
\ No newline at end of file

From 8c8c726a85a837e2ad55ded93a7abdaf9adfd62e Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 21 Mar 2022 11:20:38 +0100
Subject: [PATCH 15/15] optimize imports

---
 .../java/ch/sdp/vibester/GenreTemporary.kt    |  2 +-
 .../activity/AuthenticationActivity.kt        |  2 +-
 .../vibester/activity/GameEndingActivity.kt   |  4 +--
 .../vibester/activity/GameSetupActivity.kt    |  2 +-
 .../vibester/activity/GamescreenActivity.kt   |  5 +++-
 .../activity/IncorrectSongsActivity.kt        | 25 +++++++++++--------
 .../ch/sdp/vibester/activity/MainActivity.kt  |  1 -
 .../sdp/vibester/activity/ProfileActivity.kt  |  2 +-
 .../vibester/activity/TypingGameActivity.kt   |  1 -
 .../sdp/vibester/activity/WelcomeActivity.kt  |  2 +-
 .../ch/sdp/vibester/api/BitmapGetterApi.kt    |  8 ------
 .../ch/sdp/vibester/api/ItunesMusicApi.kt     |  7 ------
 .../java/ch/sdp/vibester/api/LastfmApi.kt     |  4 +--
 .../vibester/auth/FireBaseAuthenticator.kt    |  6 -----
 .../ch/sdp/vibester/helper/IntentSwitcher.kt  |  1 -
 .../main/java/ch/sdp/vibester/model/Song.kt   |  2 --
 .../java/ch/sdp/vibester/model/SongList.kt    |  1 -
 17 files changed, 27 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/GenreTemporary.kt b/app/src/main/java/ch/sdp/vibester/GenreTemporary.kt
index 557201100..8f996c368 100644
--- a/app/src/main/java/ch/sdp/vibester/GenreTemporary.kt
+++ b/app/src/main/java/ch/sdp/vibester/GenreTemporary.kt
@@ -1,10 +1,10 @@
 package ch.sdp.vibester
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.ArrayAdapter
 import android.widget.ListView
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.api.LastfmHelper
 
 /**
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index 3b1398d5d..8cf15be7f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -1,12 +1,12 @@
 package ch.sdp.vibester.activity
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import com.google.android.gms.auth.api.signin.GoogleSignIn
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index f029cd27c..0a74e2007 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -1,10 +1,10 @@
 package ch.sdp.vibester.activity
 
-import androidx.appcompat.app.AppCompatActivity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import android.widget.*
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 
 class GameEndingActivity : AppCompatActivity() {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
index 36701a2eb..f44d87162 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
@@ -1,12 +1,12 @@
 package ch.sdp.vibester.activity
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 
 class GameSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GamescreenActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GamescreenActivity.kt
index 4d68b2f4f..25bcdec23 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GamescreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GamescreenActivity.kt
@@ -4,7 +4,10 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
-import android.widget.*
+import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TableRow
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
index 4d9080c5f..055bfdef5 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/IncorrectSongsActivity.kt
@@ -1,15 +1,12 @@
 package ch.sdp.vibester.activity
 
-import android.content.Context
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.Gravity
-import android.view.View
 import android.widget.Button
 import android.widget.LinearLayout
-import android.widget.LinearLayout.*
+import android.widget.LinearLayout.LayoutParams
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.helper.IntentSwitcher
 
@@ -33,16 +30,21 @@ class IncorrectSongsActivity : AppCompatActivity() {
         generateTextView(nbIncorrect, incorrectSongs, layout)
     }
 
-    private fun generateTextView(nbIncorrect: Int, incorrectSongs: Array<String>, layout: LinearLayout) {
-        if(nbIncorrect != 0) {
-            for(x in 0 until nbIncorrect) {
+    private fun generateTextView(
+        nbIncorrect: Int,
+        incorrectSongs: Array<String>,
+        layout: LinearLayout
+    ) {
+        if (nbIncorrect != 0) {
+            for (x in 0 until nbIncorrect) {
                 val textView = TextView(this)
-                val resNb: Int = (x+1)
+                val resNb: Int = (x + 1)
                 val resName: String = "incorrect_song_$resNb"
                 textView.id = resources.getIdentifier(resName, "id", packageName)
                 textView.text = incorrectSongs[x]
                 textView.gravity = Gravity.CENTER
-                textView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+                textView.layoutParams =
+                    LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
                 layout.addView(textView)
             }
         } else {
@@ -50,7 +52,8 @@ class IncorrectSongsActivity : AppCompatActivity() {
             textView.id = resources.getIdentifier("incorrect_song_1", "id", packageName)
             textView.text = resources.getString(R.string.inc_all_correct)
             textView.gravity = Gravity.CENTER
-            textView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+            textView.layoutParams =
+                LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
             layout.addView(textView)
         }
     }
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 955cdd0ce..8a6fc1bb3 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
@@ -2,7 +2,6 @@ package ch.sdp.vibester.activity
 
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.GenreTemporary
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 1bdeb8e2c..2205388a8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -1,13 +1,13 @@
 package ch.sdp.vibester.activity
 
 import android.content.DialogInterface
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.text.InputType
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.profile.UserProfile
 
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 74c09462d..fd75ad875 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -26,7 +26,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
-import java.lang.Exception
 import java.util.concurrent.CompletableFuture
 
 /**
diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index 67b38bae8..8e552047f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -1,10 +1,10 @@
 package ch.sdp.vibester.activity
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.view.Window.FEATURE_NO_TITLE
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.profile.ProfileDataProvider
diff --git a/app/src/main/java/ch/sdp/vibester/api/BitmapGetterApi.kt b/app/src/main/java/ch/sdp/vibester/api/BitmapGetterApi.kt
index d4074fe8a..8687b78b5 100644
--- a/app/src/main/java/ch/sdp/vibester/api/BitmapGetterApi.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/BitmapGetterApi.kt
@@ -1,19 +1,11 @@
 package ch.sdp.vibester.api
 
-import android.app.PendingIntent.getActivity
-import android.content.ContextWrapper
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import ch.sdp.vibester.R
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import java.io.IOException
-import java.security.AccessController
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Executors
 
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 32ae2dd73..d6e04b1aa 100644
--- a/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/ItunesMusicApi.kt
@@ -1,13 +1,6 @@
 package ch.sdp.vibester.api
 
-import android.media.AudioAttributes
-import android.media.MediaPlayer
-import android.util.Log
-import okhttp3.Call
-import okhttp3.Callback
 import okhttp3.OkHttpClient
-import okhttp3.Response
-import java.io.IOException
 import java.util.concurrent.CompletableFuture
 
 /**
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 23f061a7f..e339a0262 100644
--- a/app/src/main/java/ch/sdp/vibester/api/LastfmApi.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/LastfmApi.kt
@@ -1,8 +1,8 @@
 package ch.sdp.vibester.api
 
 import android.net.Uri
-import okhttp3.*
-import java.io.IOException
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import java.util.concurrent.CompletableFuture
 
 
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 11ad2b7f5..c9a0fcce9 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -1,13 +1,7 @@
 package ch.sdp.vibester.auth
 
-import android.content.ContentValues
 import android.content.Intent
-import android.util.Log
-import android.view.View
-import android.widget.TextView
-import android.widget.Toast
 import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
diff --git a/app/src/main/java/ch/sdp/vibester/helper/IntentSwitcher.kt b/app/src/main/java/ch/sdp/vibester/helper/IntentSwitcher.kt
index 18445f7f8..1ac1f164a 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/IntentSwitcher.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/IntentSwitcher.kt
@@ -2,7 +2,6 @@ package ch.sdp.vibester.helper
 
 import android.content.Context
 import android.content.Intent
-import androidx.core.content.ContextCompat.startActivity
 import ch.sdp.vibester.activity.WelcomeActivity
 
 class IntentSwitcher private constructor() {
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 b5af9734a..fb41c77bf 100644
--- a/app/src/main/java/ch/sdp/vibester/model/Song.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/Song.kt
@@ -1,9 +1,7 @@
 package ch.sdp.vibester.model
 
-import android.util.Log
 import org.json.JSONObject
 import java.io.Serializable
-import java.lang.IllegalArgumentException
 
 /**
  * A class representing a song
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 8e900771d..fd2183726 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongList.kt
@@ -2,7 +2,6 @@ package ch.sdp.vibester.model
 
 import org.json.JSONArray
 import org.json.JSONObject
-import java.lang.IllegalArgumentException
 
 /**
  * Process the fetched data from Lastfm query.