Jwen/single player lyrics game #148

jiabaow · 2022-04-02T19:31:26Z

turn lyricsBelongToActivity into a proper game:
- add a progress bar
- add genre menu
- add game ending screen
refactor common elements from the lyrics game and the typing game
- extract genre
- extract game activity
- extract game manager

Issues in the lyrics game need to be fixed (In another PR):
- progress bar doesn't decrease, need to manually click the next button
- the logic of next, playRound and checkAnswer need to be reconsidered:
currently, we can go to the end of the game by clicking the next button, but it won't save the wrong song which results crash on the game-ending screen
Walk-around: say anything and check the answer then click the next button

make GenreTemporary.kt a super class, let typing game and lyrics game inherit from it.

add progress bar use game manager

app/src/main/java/ch/sdp/vibester/GenreToLyrics.kt

app/src/main/java/ch/sdp/vibester/GenreToTyping.kt

app/src/main/java/ch/sdp/vibester/GenreTemporary.kt

jiabaow · 2022-04-03T07:15:00Z

Code Climate has analyzed commit 09cb8e9 and detected 2 issues on this pull request.

Here's the issue category breakdown:

Category Count
Duplication 2
The test coverage on the diff in this pull request is 86.8% (80% is the threshold).

This pull request will bring the total coverage in the repository to 91.0% (0.4% change).

View more on Code Climate.

It seems that the duplication is because of import statements...

laurislopata

Added some minor comments but overall good job!

app/src/androidTest/java/ch/sdp/vibester/GenreToLyricsTest.kt

app/src/androidTest/java/ch/sdp/vibester/GenreToTypingTest.kt

app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt

app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt

app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt

app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt

kamilababayeva · 2022-04-03T10:18:34Z

The separation of a game manager for all games I like! Thank you very much! And the lyrics game is coming soon! yayyy

As you said in your description, the app crashes in the end when displaying wrong songs. There is also a little weird behaviour:

if you dont say anything on the first song and the progress bar reaches 0, the app crashes.
But, if you say something on the first song, click next to the next song, say nothing, the progress bar reaches 0, the app does not crash.

Looking forward to working game!

kamilababayeva · 2022-04-03T09:15:32Z

app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt

+                    getAndCheckLyrics(songName, artistName, speechInput, gameManager)
+                }
+            }
+        }


Suggested change

}

}

h.post(runnable!!)

Now the progressbar should work!

kamilababayeva · 2022-04-03T09:37:49Z

app/src/main/java/ch/sdp/vibester/helper/GameManager.kt

@@ -70,6 +66,7 @@ class GameManager : Serializable {
    /**
     * Get a current playing song
     */
+    @JvmName("getCurrentSong1")


[Question] what is the reason to apply JvmName here?

It's Android Studio's suggestion, otherwise I got compile error saying "Platform declaration clash: The following declarations have the same JVM signature (getCurrentSong()Lch/sdp/vibester/model/Song;):
public open fun (): Song defined in ch.sdp.vibester.helper.GameManager
public final fun getCurrentSong(): Song defined in ch.sdp.vibester.helper.GameManage"

kamilababayeva · 2022-04-03T09:50:50Z

app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt

-                ignoreCase = true
-            )
-        ) "res: correct" else "res: too bad"
+    private fun checkLyrics(lyricToBeCheck: String, lyrics: String, gameManager: GameManager) {


What will happen if the speech input is null? Will the sonf be added to incorrect?

In general, if speech input is null, is there a need to fetch song, or we can just continue within the next sonf?

For now, I don't have the answer for your second question. If the speech input from SpeechRecognizer is null, the SpeechRecognizer itself will crash the app, if we call it without initialize, it will crash, and if the speech input is "" (empty) the check pass as correct.
This is something I need to fix in my next PR.

kamilababayeva · 2022-04-03T10:07:15Z

app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt

-                            speechInput,
-                            lyrics
-                        ) // be sure the lyrics is ready when checking
+                        checkLyrics( speechInput, lyrics, gameManager) // be sure the lyrics is ready when checking
                    } else {
                        findViewById<TextView>(R.id.lyricMatchResult).text =
                            "No lyrics found, try another song"


the progress bar should be stopped if lyrics are not found

Thanks for spotting this out, I will replace all the use of the next button to the progress bar and redesign the switch logic in my next PR.

kamilababayeva · 2022-04-03T10:12:07Z

app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt

+         } else {
+             gameManager.addWrongSong()
+             findViewById<TextView>(R.id.lyricMatchResult).text = "res: too bad"
+         }


also, then the result arrives the progress bar is not stopped

laurislopata

LGTM now!

jiabaow · 2022-04-03T12:25:22Z

The separation of a game manager for all games I like! Thank you very much! And the lyrics game is coming soon! yayyy

As you said in your description, the app crashes in the end when displaying wrong songs. There is also a little weird behaviour:

if you dont say anything on the first song and the progress bar reaches 0, the app crashes.

But, if you say something on the first song, click next to the next song, say nothing, the progress bar reaches 0, the app does not crash.

Looking forward to working game!

Thanks for your feedback, I will take them into account in a separate PR. (The reason is to make my time estimation more accurate, familiarize myself with the progress bar, and come up with a better solution)

codeclimate · 2022-04-03T13:31:20Z

Code Climate has analyzed commit 4b24ba5 and detected 2 issues on this pull request.

Here's the issue category breakdown:

Category	Count
Duplication	2

The test coverage on the diff in this pull request is 87.0% (80% is the threshold).

This pull request will bring the total coverage in the repository to 91.2% (0.6% change).

View more on Code Climate.

jiabaow added 6 commits April 2, 2022 10:28

add genre page to lyrics game

22cdf6e

make GenreTemporary.kt a super class, let typing game and lyrics game inherit from it.

extract TypingGameActivity.kt

2e43bd9

make LyricsBelongGameActivity similar to TypingGameActivity.kt

7978a48

add progress bar use game manager

fix TypingGame tests

764b781

test GenreToLyrics

bdd4899

fix tests in LyricsBelongGameActivityTest.kt

779f5df

jiabaow self-assigned this Apr 2, 2022

fix MainActivityTest.kt and code climate

442e549

codeclimate bot reviewed Apr 2, 2022

View reviewed changes

jiabaow added 5 commits April 2, 2022 22:20

fix duplicate

e64ebd8

test intent on ending

7f1b68c

add tests

59a091a

clean up

2cd9092

add test

09cb8e9

jiabaow marked this pull request as ready for review April 3, 2022 06:54

laurislopata reviewed Apr 3, 2022

View reviewed changes

jiabaow added 3 commits April 3, 2022 11:47

space consistency

fbddc82

use size const

97dc85d

rename handler

309e0fa

kamilababayeva approved these changes Apr 3, 2022

View reviewed changes

jiabaow added 2 commits April 3, 2022 13:55

fix progress bar

45a90de

delete LyricTemporary.kt

3cca15a

laurislopata approved these changes Apr 3, 2022

View reviewed changes

temporary disable progress bar

62f5cd9

update AndroidManifest.xml

4b24ba5

jiabaow merged commit 72e57ff into main Apr 3, 2022

jiabaow deleted the jwen/single-player-lyrics-game branch April 3, 2022 13:34

jiabaow linked an issue Apr 4, 2022 that may be closed by this pull request

Integrate the lyrics game into a single-player game (#136) #139

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Jwen/single player lyrics game #148

Jwen/single player lyrics game #148

jiabaow commented Apr 2, 2022 •

edited

Loading

jiabaow commented Apr 3, 2022

laurislopata left a comment

kamilababayeva commented Apr 3, 2022

kamilababayeva Apr 3, 2022

kamilababayeva Apr 3, 2022

jiabaow Apr 3, 2022

kamilababayeva Apr 3, 2022

jiabaow Apr 3, 2022

kamilababayeva Apr 3, 2022

jiabaow Apr 3, 2022

kamilababayeva Apr 3, 2022

laurislopata left a comment

jiabaow commented Apr 3, 2022

codeclimate bot commented Apr 3, 2022

Jwen/single player lyrics game #148

Jwen/single player lyrics game #148

Conversation

jiabaow commented Apr 2, 2022 • edited Loading

jiabaow commented Apr 3, 2022

laurislopata left a comment

Choose a reason for hiding this comment

kamilababayeva commented Apr 3, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laurislopata left a comment

Choose a reason for hiding this comment

jiabaow commented Apr 3, 2022

codeclimate bot commented Apr 3, 2022

jiabaow commented Apr 2, 2022 •

edited

Loading