Merge branch 'main' into kamila/ui_fixes

MaximeZmt · May 4, 2022 · cabad35 · cabad35
2 parents 373178e + bba638a
commit cabad35
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 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
@@ -41,9 +41,6 @@ class TypingGameActivityTest {
     @get:Rule(order = 0)
     var hiltRule = HiltAndroidRule(this)
 
-    @get:Rule(order = 1)
-    val activityRule = ActivityScenarioRule(TypingGameActivity::class.java)
-
     @Before
     fun setUp() {
         hiltRule.inject()
@@ -64,10 +61,10 @@ class TypingGameActivityTest {
         every { mockUsersRepo.updateFieldInt(any(), any(), any(), any()) } answers {}
         every { mockUsersRepo.setFieldValue(any(), any(), any()) } answers {}
         every { mockUsersRepo.updateSubFieldInt(any(), any(), any(), any(), any()) } answers {}
-
     }
 
     private val expectedSize = 200
+
     private fun setGameManager(numSongs:Int = 1, valid: Boolean = true): TypingGameManager {
         val epilogue = "{\"tracks\":{\"track\":["
         val prologue =
@@ -103,8 +100,12 @@ class TypingGameActivityTest {
     @Test
     fun textGenTest() {
         val txtInput = "hello"
+        val intent =
+            Intent(ApplicationProvider.getApplicationContext(), TypingGameActivity::class.java)
+        val scn: ActivityScenario<TypingGameActivity> = ActivityScenario.launch(intent)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val myText = GameActivity.generateText(txtInput, ctx)
+
         assertEquals(txtInput, myText.text.toString())
         assertEquals(expectedSize, myText.minHeight)
         assertEquals(ContextCompat.getColor(ctx, R.color.black), myText.textColors.defaultColor)
@@ -122,6 +123,9 @@ class TypingGameActivityTest {
             """
 
         val mySong = Song.singleSong(inputTxt)
+        val intent =
+        Intent(ApplicationProvider.getApplicationContext(), TypingGameActivity::class.java)
+        val scn: ActivityScenario<TypingGameActivity> = ActivityScenario.launch(intent)
 
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val myTest = GameActivity.generateImage(mySong, ctx)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt
@@ -92,9 +92,10 @@ open class GameActivity : AppCompatActivity() {
     /**
      * Function called in the end of each round.
      */
-    open fun endRound(gameManager: GameManager) {
+    open fun endRound(gameManager: GameManager, callback: (()->Unit)?= null) {
         checkRunnable()
         if (isEndGame(gameManager)) {
+            callback?.invoke()
             switchToEnding(gameManager)
         }
     }

diff --git a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -96,8 +96,8 @@ class LyricsBelongGameActivity : GameActivity() {
         barTimer(ctx, findViewById(R.id.progressBarLyrics))
     }
 
-    override fun endRound(gameManager: GameManager) {
-        super.endRound(gameManager)
+    override fun endRound(gameManager: GameManager, callback: (() -> Unit)?) {
+        super.endRound(gameManager, null)
         toggleBtnVisibility(R.id.nextSongButton, true)
     }
 

diff --git a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -9,7 +9,6 @@ import android.widget.*
 import androidx.core.content.ContextCompat.getColor
 import androidx.core.widget.addTextChangedListener
 import ch.sdp.vibester.R
-import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.ItunesMusicApi
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
@@ -208,22 +207,12 @@ class TypingGameActivity : GameActivity() {
      * Function called in the end of each round. Displays the button "Next" and
      * sets the next songs to play.
      */
-    override fun endRound(gameManager: GameManager){
+    override fun endRound(gameManager: GameManager, callback: (() -> Unit)?) {
         gameIsOn = false
         findViewById<EditText>(R.id.yourGuessET).isEnabled = false
-        //checkRunnable()
-        super.endRound(gameManager)
+        super.endRound(gameManager,this::setScores)
         //TODO: is it ok for the last round to go to the end game directly without waiting for the next btn?
         toggleNextBtnVisibility(true)
-
-        // If currently not in test and has finished the game, update the scores
-        if (isEndGame(gameManager)) {
-            dataGetter.updateFieldInt(FireBaseAuthenticator.getCurrentUID(),  "totalGames", 1, method = "sum")
-            dataGetter.updateFieldInt(FireBaseAuthenticator.getCurrentUID(), "correctSongs", gameManager.getCorrectSongs().size, method = "sum")
-            dataGetter.updateFieldInt(FireBaseAuthenticator.getCurrentUID(),  "bestScore", gameManager.getScore(), method = "best")
-            dataGetter.updateSubFieldInt(FireBaseAuthenticator.getCurrentUID(), gameManager.getScore(), "scores", gameManager.gameMode, method = "best")
-        }
-
     }
 
     /**
@@ -241,6 +230,17 @@ class TypingGameActivity : GameActivity() {
         barTimer(findViewById(R.id.progressBarTyping), ctx, gameManager)
     }
 
+    /**
+     * Function to set scores in the end of the game
+     */
+    private fun setScores() {
+        if(::gameManager.isInitialized){
+            dataGetter.updateFieldInt(FireBaseAuthenticator.getCurrentUID(), "totalGames", 1, method = "sum")
+            dataGetter.updateFieldInt(FireBaseAuthenticator.getCurrentUID(), "correctSongs", gameManager.getCorrectSongs().size, method = "sum")
+            dataGetter.updateFieldInt(FireBaseAuthenticator.getCurrentUID(), "bestScore", gameManager.getScore(), method = "best")
+            dataGetter.updateSubFieldInt(FireBaseAuthenticator.getCurrentUID(), gameManager.getScore(), "scores", gameManager.gameMode, method = "best")
+        }
+    }
     /**
      * Functions for testing
      */

diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -101,10 +101,7 @@ class DataGetter @Inject constructor() {
      * @param uid id of the new user
      */
     fun createUser(email: String, username: String, callback: (String) -> Unit, uid: String) {
-        val newUser = User()
-        newUser.email = email
-        newUser.username = username
-        newUser.uid = uid
+        val newUser = User(email = email, username = username, uid = uid)
         dbUserRef.child(uid).setValue(newUser)
             .addOnSuccessListener {
                 callback(email)