Kamila/refactor_game_choice_logic #146

kamilababayeva · 2022-04-02T12:47:45Z

This PR rewrites the logic of settings for any game and connects Typing Game to the welcome screen. Now every game has the following common settings: choosing genre and choosing difficulty. After the settings are set up, the individual game activities will start.

Major changes:

WelcomeActivity is now the main launcher activity
Previous MainActivity was deleted together with tests
Common setting (genre, difficulty) for all the games
GenreTemporaryActivity is merged with GameSetupActivity
Appropriate naming for Buzzer game
Set style for choosing genre

laurislopata · 2022-04-04T06:56:25Z

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

@@ -153,8 +153,8 @@ class LyricsBelongGameActivityTest {
        scn.onActivity { activity ->
            activity.testGetAndCheckLyrics("the best song in the world", "Mr.Mystery", "", gameManager)
        }
-        Thread.sleep(sleepTime)
-        onView(withId(R.id.lyricMatchResult)).check(matches(withText("No lyrics found, try another song")))
+//        Thread.sleep(10000)


Maybe delete these if they're unecessary

Sometime tests are not working because of the timing issue. I dont want to remove them so we remember to modify them

In this case, you can add a @fixme. I will try to mock the API call once the mock library is set up.

laurislopata · 2022-04-04T07:01:44Z

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

-     * @param
-     * n: number of players selected in the spinner
-     * id: the id of the field to update
+     * Fetch data from Lastfm and set song list in a GameManager


maybe add an explanation what the parameter uri is in the javadoc

laurislopata

Vey good job, just some very minor details but I'd even without them LGTM

jiabaow · 2022-04-04T07:32:03Z

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

+             switchToGame(TypingGameActivity())
+         }
+         else if(this.game == "local_lyrics"){
+            switchToGame(LyricsBelongGameActivity())


Is it normal that the lyrics game is not tested?

I have the tests for it:
fun localTypingOnClick(){
onView(withId(R.id.local_typing_game_button)).perform(scrollTo(), click())
onView(withId(R.id.btsButton)).perform(click())
onView(withId(R.id.difficulty_spinner)).perform(click())
intended(hasComponent(TypingGameActivity::class.java.name))
intended(hasExtra("Difficulty", "Hard"))
}

I have tested for random difficulty and genre. Do you think it is enough?

Ahh, this one I am not... I will test it!

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

jiabaow · 2022-04-04T10:28:53Z

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

@@ -153,8 +153,8 @@ class LyricsBelongGameActivityTest {
        scn.onActivity { activity ->
            activity.testGetAndCheckLyrics("the best song in the world", "Mr.Mystery", "", gameManager)
        }
-        Thread.sleep(sleepTime)
-        onView(withId(R.id.lyricMatchResult)).check(matches(withText("No lyrics found, try another song")))
+//        Thread.sleep(10000)


In this case, you can add a @fixme. I will try to mock the API call once the mock library is set up.

jiabaow · 2022-04-04T12:09:01Z

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

+
+    /**
+     * Converts the spinner text for the number of players into an Int
+     * @param


Suggested change

* @param

* @param text: the string to be converted

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

jiabaow · 2022-04-04T12:09:36Z

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

+            "Three" -> return 3
+            "Four" -> return 4
+        }
+        return 1


Is it possible to test the return value?

This was not my code, but I will try!

Co-authored-by: jiabaow <[email protected]>

zwierski · 2022-04-04T16:28:42Z

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

+
+        val statNames: ArrayList<String> = mockArray
+
+        val statVal: ArrayList<String> = mockArray


Good change, makes more sense to have all the tests values in variables.

zwierski · 2022-04-04T16:31:57Z

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

-        val updater = BuzzerScoreUpdater(buzIds, allPoints)
-
-        val buzToScoreMap = fetchBuzToScoreRowMap()
+        val updater = BuzzerScoreUpdater(buzIds, arrayListOf(*allPoints))



Maybe change the declaration of allPoints to an ArrayList if possible, it might be simpler than declaring an array and then casting it.

zwierski

Good job on refactoring so much code! Everything looks good to me, there is one change I commented on (the array declaration) but I can take care of it since it's part of the code I've written.

codeclimate · 2022-04-04T17:20:24Z

Code Climate has analyzed commit 103db5d and detected 0 issues on this pull request.

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

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

View more on Code Climate.

kamilababayeva added 30 commits April 1, 2022 16:01

remove MainActivity.kt

f869f6c

remove MainActivityTest.kt

b0dedd7

AndroidManifest.xml: make WelcomeActivity as a launch activity

e903d66

WelcomeActivity.kt: remove unnecessary buttons

a1ddbee

WelcomeActivityTest.kt: remove unnecessary tests

5bb6417

BuzzerScreenActivityTest: rename file form GamescreenActivityTest

5b657fe

BuzzerSetupActivityTest: move test for buzzer from GameSetupActivitytest

dccc78e

GamescreenActivity rename to BuzzerScreenActivity

4d7393c

LastfmUri: change val to var

e217b8e

Delete GenreTemporary.kt

601ae5f

delete activity_genre_remporary.xml

a6072c5

activity_buzzer_setup.xml: move buzzer layout form game_setup_screen

0d9bc85

AndroidManifest.xml: add new activity BuzzerScreenActivity

8f24587

Delete GenreTemporaryTest

da0cd04

rename gamescreen to buzzer_screen

d17b132

activity_game_setup_screen.xml: move genre layout

a492bd8

BuzzerSetupActivity: move buzzer activity to game setup activity

8fe93b2

Rename GamescreenActivityTest to BuzzerScreenActivityTest

ee1aceb

GameSetupActivity: connect genre choose and solo typing game

827ff65

GameSetupActivityTest: modify tests

c05f5bd

GameSetupActivity: fixx difficulty setup

7fd19b2

GameSetupActivityTest.kt: fix the tests

a081aa4

Delete activity_music_temporary.xml

9d82a21

rounded_button.xml: set shape for several buttons

f4e3f57

activity_genre_setup_screen.xml: set appropriate style to buttons

9e275c5

BuzzerSetupActivityTest: dix the test

9cb97c4

GameSetupActivity: add switch game to avoid duplicates

fdb5fba

GameSetupActivity: set uri only in the end of when

ca12f54

change function name from play to chooseGenre

90b9a8a

activity_game_setup.xml: add a function to choose a game

e051040

kamilababayeva added 4 commits April 3, 2022 19:29

BuzzerSetupActivityTest: put all tests back

c8e7ddc

GameSetupActivity: fix the space

4745f4d

add comments to classes

d7ce57c

GameSetupActivityTest: add extra check

57c0f3a

kamilababayeva marked this pull request as ready for review April 3, 2022 19:05

laurislopata reviewed Apr 4, 2022

View reviewed changes

laurislopata approved these changes Apr 4, 2022

View reviewed changes

jiabaow reviewed Apr 4, 2022

View reviewed changes

kamilababayeva and others added 2 commits April 4, 2022 15:40

Update app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt

b3c15ad

Co-authored-by: jiabaow <[email protected]>

Update app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt

2d80d1f

Co-authored-by: jiabaow <[email protected]>

zwierski reviewed Apr 4, 2022

View reviewed changes

zwierski approved these changes Apr 4, 2022

View reviewed changes

kamilababayeva added 13 commits April 4, 2022 18:45

GameManager: dix the return of setNextSong()

a09bda0

TypingGameActivityTest.kt: fix the space/comments

b149d83

GameManagerTest.kt: add wrong test to the setManager

72a35a3

Buzzer: change type of points from array to arraylist

4f427f8

GameManagerTest: check wrong fetched song

de40a45

GameSetupActivityTest: check the diffciulties for setMax in GameActivity

87265f2

BuzzerSetupActivity: check the return of test value

7024aa2

LyricBelongToGameActivity: add fixme documentation

1bd7bd4

strings.xml: add button for lyrics game

1b365a3

activity_game_setup_screen.xml: add button for local lyrics

568bf25

GameSetupActivity: add gameManager for lyricsGame

2c43b31

GameSetupActivity: add comment

f54bd21

GameSetupActivityTest: add test for LyricsGame

103db5d

kamilababayeva merged commit 37ce25a into main Apr 4, 2022

kamilababayeva deleted the kamila/refactor_game_choice_logic branch April 4, 2022 17:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kamila/refactor_game_choice_logic #146

Kamila/refactor_game_choice_logic #146

kamilababayeva commented Apr 2, 2022 •

edited

Loading

laurislopata Apr 4, 2022

kamilababayeva Apr 4, 2022

jiabaow Apr 4, 2022

kamilababayeva Apr 4, 2022

laurislopata Apr 4, 2022

laurislopata left a comment

jiabaow Apr 4, 2022

kamilababayeva Apr 4, 2022 •

edited

Loading

kamilababayeva Apr 4, 2022

kamilababayeva Apr 4, 2022

jiabaow Apr 4, 2022

jiabaow Apr 4, 2022

jiabaow Apr 4, 2022

kamilababayeva Apr 4, 2022

kamilababayeva Apr 4, 2022

zwierski Apr 4, 2022

zwierski Apr 4, 2022

kamilababayeva Apr 4, 2022

zwierski left a comment

codeclimate bot commented Apr 4, 2022


		val statNames: ArrayList<String> = mockArray

		val statVal: ArrayList<String> = mockArray

Kamila/refactor_game_choice_logic #146

Kamila/refactor_game_choice_logic #146

Conversation

kamilababayeva commented Apr 2, 2022 • edited Loading

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

Choose a reason for hiding this comment

kamilababayeva Apr 4, 2022 • edited Loading

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zwierski left a comment

Choose a reason for hiding this comment

codeclimate bot commented Apr 4, 2022

kamilababayeva commented Apr 2, 2022 •

edited

Loading

kamilababayeva Apr 4, 2022 •

edited

Loading