Margaux/buzzer timer and music backend #206

zwierski · 2022-04-28T20:38:34Z

This PR contains the implementation of a game Manager for the buzzer game, as well as an added progress bar in the buzzer screen's layout. The game can now play songs and display their titles (not yet their album artwork) in the answer card, and switches song after each answer.

codeclimate · 2022-04-28T20:53:14Z

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

-        if (players != null) {
-            buildScores(players, allPoints)
-            buildBuzzers(players, answer)
+    /**


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2022-04-28T20:53:14Z

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

+        super.onDestroy()
+    }
+*/
+    /**


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2022-04-28T20:53:14Z

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

+    fun checkAnswer(ctx: Context, chosenSong: Song?, gameManager: BuzzerGameManager) {
+        val playedSong = gameManager.getCurrentSong()
+
+        if (chosenSong != null && chosenSong.getTrackName() == playedSong.getTrackName() && chosenSong.getArtistName() == playedSong.getArtistName()) {


Identical blocks of code found in 2 locations. Consider refactoring.

Maybe we should create some util file and store some functions that all games use to avoid this duplication of code?

codeclimate · 2022-04-28T21:46:56Z

Code Climate has analyzed commit 2c739b4 and detected 6 issues on this pull request.

Here's the issue category breakdown:

Category	Count
Duplication	6

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

This pull request will bring the total coverage in the repository to 84.2% (-2.2% change).

View more on Code Climate.

laurislopata · 2022-04-28T23:14:13Z

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

+            override fun run() {
+                if (myBar.progress > 0) {
+                    decreaseBarTimer(myBar)
+                    handler.postDelayed(this, 999) //just a bit shorter than a second for safety


maybe create a variable instead of hardcoding it?

laurislopata

Added some comments, coverage is an issue but as you said you'll focus on that next week

laurislopata

Since you said you will work on fixing the codeclimeate issues next week. I think we can merge this. I'll approve it when te test pass

kamilababayeva

thank for your update! it is great! I have left some comments to resolve.

Also, a bug for us:
when the game reaches the maximum of fetched songs (100 in our case), it is stuck repeating the same song. If we have time in the end of the semester, we can solve it.

kamilababayeva · 2022-05-05T21:22:41Z

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

        val getIntent = intent.extras
-        val nPlayers = getIntent?.getInt("Number of players")
+        if (getIntent != null) {


rename getIntent to intentExtras or something like that

I am not sure whether it is okay to keep all code under if statement. In other activities we just check if the extra exists.

kamilababayeva · 2022-05-05T21:23:43Z

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

+            val answer = findViewById<LinearLayout>(R.id.answer)
+            answer.visibility=View.INVISIBLE
+            //val answerText = findViewById<TextView>(R.id.answerText)
+            //answerText.text = "The song was Demo by The Placeholders"


remove if not used

kamilababayeva · 2022-05-05T21:26:43Z

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

+
+        // fetch song and initialise answerText. We'll see later for the image
+        val title = gameManager.getCurrentSong().getTrackName()
+        findViewById<TextView>(R.id.answerText).text=title


Suggested change

findViewById<TextView>(R.id.answerText).text=title

findViewById<TextView>(R.id.answerText).text = title

kamilababayeva · 2022-05-05T21:32:29Z

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

+        findViewById<LinearLayout>(R.id.answer).visibility=View.INVISIBLE
+
+        // fetch song and initialise answerText. We'll see later for the image
+        val title = gameManager.getCurrentSong().getTrackName()


I suggest to set both title and artistname in the answer

kamilababayeva · 2022-05-05T21:33:56Z

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

    }


    /**
     * Fires an intent from the Gamescreen to the Ending Screen
     */
    fun switchToEnding(view: View) {
+        if (gameManager.playingMediaPlayer()) {


I had a bug that the game suddenly switched to end without stopping the media player. I am not sure how to reproduce the error, i have been playing a lot.

Maybe it happened when the super.enRound is used and it goes to super.switvhToEnding

kamilababayeva · 2022-05-05T21:34:24Z

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

+import ch.sdp.vibester.api.AudioPlayer
+import java.util.concurrent.CompletableFuture
+
+class BuzzerGameManager: GameManager() {


It is vrey similar to typinggameManager, we should create something common

kamilababayeva · 2022-05-05T21:35:33Z

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

-        if (players != null) {
-            buildScores(players, allPoints)
-            buildBuzzers(players, answer)
+            if (players != null) {


In general, you always have default values for players, so mayber ther is no need to check for that

kamilababayeva · 2022-05-05T21:41:39Z

app/src/main/res/layout/activity_buzzer_screen.xml

        android:gravity="center"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="1.0"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scoresTable">
+        app:layout_constraintTop_toBottomOf="@+id/go_to_end">


    </LinearLayout>

    <TableLayout
        android:id="@+id/scoresTable"


we should make the font bigger for name and score

kamilababayeva · 2022-05-05T21:49:39Z

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

@@ -94,7 +140,7 @@ class BuzzerScreenActivityTest {
            onView(withId(R.id.answer)).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
        }
    }
-
+/*
    /*
     * Currently testing with the *static* values. Change to *dynamic* once the game is correctly


it fails because gameManager was not initialized:
Caused by: kotlin.UninitializedPropertyAccessException: lateinit property gameManager has not been initialized

MaximeZmt

Some comments, nice work in overall 👍

MaximeZmt · 2022-05-05T21:42:31Z

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

+
+class BuzzerScreenActivity : GameActivity() {


Suggested change

class BuzzerScreenActivity : GameActivity() {

/**

* docs ?

*/

class BuzzerScreenActivity : GameActivity() {

MaximeZmt · 2022-05-05T21:43:24Z

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

        val getIntent = intent.extras
-        val nPlayers = getIntent?.getInt("Number of players")
+        if (getIntent != null) {
+


Suggested change

MaximeZmt · 2022-05-05T21:44:21Z

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

+            //val answerText = findViewById<TextView>(R.id.answerText)
+            //answerText.text = "The song was Demo by The Placeholders"


Are these comments useful ?

MaximeZmt · 2022-05-05T21:44:52Z

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

+            setAnswerButton(ctx, answer, findViewById(R.id.buttonCorrect), updater, buzzersToRows)
+            setAnswerButton(ctx, answer, findViewById(R.id.buttonWrong), updater, buzzersToRows)
+
+            // null pointer?


same ? Maybe either make it clearer if we keep it or remove it

MaximeZmt · 2022-05-05T21:45:42Z

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

+
+        // fetch song and initialise answerText. We'll see later for the image
+        val title = gameManager.getCurrentSong().getTrackName()
+        findViewById<TextView>(R.id.answerText).text=title


Suggested change

findViewById<TextView>(R.id.answerText).text=title

findViewById<TextView>(R.id.answerText).text = title

MaximeZmt · 2022-05-05T21:45:53Z

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

+     */
+    private fun startRound(ctx: Context, gameManager: BuzzerGameManager) {
+        gameIsOn = true
+        findViewById<LinearLayout>(R.id.answer).visibility=View.INVISIBLE


Suggested change

findViewById<LinearLayout>(R.id.answer).visibility=View.INVISIBLE

findViewById<LinearLayout>(R.id.answer).visibility = View.INVISIBLE

MaximeZmt · 2022-05-05T21:46:56Z

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

+            //TODO: replace with score handler stuff here
+            //hasWon(ctx, gameManager.getScore(), true, playedSong)
+        } else {
+            gameManager.addWrongSong()
+            //hasWon(ctx, gameManager.getScore(), false, playedSong)


Are the comments useful to keep ?

MaximeZmt · 2022-05-05T21:48:27Z

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

+        //findViewById<EditText>(R.id.yourGuessET).isEnabled = false
+        //checkRunnable()


Useful to keep ?

MaximeZmt · 2022-05-05T21:49:57Z

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

@@ -143,7 +144,7 @@ class GameSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListene
     */
    fun chooseGame(view: View){
        when (view.id) {
-            R.id.local_buzzer_game_button -> {game  = "local_buzzer"; gameManager = GameManager()}
+            R.id.local_buzzer_game_button -> {game  = "local_buzzer"; gameManager = BuzzerGameManager() }


Suggested change

R.id.local_buzzer_game_button -> {game = "local_buzzer"; gameManager = BuzzerGameManager() }

R.id.local_buzzer_game_button -> {game = "local_buzzer"; gameManager = BuzzerGameManager()}

codeclimate · 2022-05-05T22:02:57Z

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

+        }
+    }
+
+    /**


Identical blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2022-05-05T22:02:57Z

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

@@ -140,7 +255,7 @@ class BuzzerScreenActivity : AppCompatActivity() {
     * @param updater: the updater for the scores
     * @param map: a map from the buzzers' IDs to the IDs of each score's position in the score table layout
     */
-    private fun setAnswerButton(answer: LinearLayout, button: Button, updater: BuzzerScoreUpdater, map: Map<Int, Int>) {
+    private fun setAnswerButton(ctx: Context, answer: LinearLayout, button: Button, updater: BuzzerScoreUpdater, map: Map<Int, Int>) {


Method setAnswerButton has 5 arguments (exceeds 4 allowed). Consider refactoring.

MaximeZmt

As it is late, I approved !!exceptionally!! whereas you didn't address all the issues. Try to have a pr a bit earlier next week. 😅

Please address the issues in comment this weekend !!

zwierski added 2 commits April 27, 2022 16:21

buzzer with manager v1 (not functioning)

1d02d51

manager added in backend

9910672

codeclimate bot reviewed Apr 28, 2022

View reviewed changes

Merge branch 'main' into margaux/timer-buzzer

2c739b4

laurislopata reviewed Apr 28, 2022

View reviewed changes

zwierski linked an issue Apr 29, 2022 that may be closed by this pull request

Link the song fetching API to the buzzer game (play a new song after each guess, connect title and artist to the answer popup). BACKEND ONLY #168

Closed

zwierski added 16 commits May 1, 2022 22:19

Merge branch 'main' into margaux/timer-buzzer

b16276c

fix buzzer screen xml

c874c85

screen and unique timer works

3dc19c5

change init order for CI fix

ffe0905

fix CI 2

7fe841c

Merge branch 'main' into margaux/timer-buzzer

25dba2d

fix build gradle for CI

b79e4e6

rerun ci

24ef9c4

try test update

e61f86e

add game manager init to tests

59dc90d

fix tests

e3a65ae

remove problematic button tests

634b40a

remove weird unclickable button test

d223220

fix gameManager init in tests

d3c2564

remove missing name test because button

7c5caee

add song shuffle

0df7c70

zwierski linked an issue May 5, 2022 that may be closed by this pull request

Connect the buzzer game manager to the buzzer game activity (+tests) (#57) #219

Closed

Merge branch 'main' into margaux/timer-buzzer

4ffb694

laurislopata reviewed May 5, 2022

View reviewed changes

remove that one tests that fails everytime no idea why

5c26ae0

kamilababayeva reviewed May 5, 2022

View reviewed changes

MaximeZmt reviewed May 5, 2022

View reviewed changes

codeclimate bot reviewed May 5, 2022

View reviewed changes

zwierski and others added 4 commits May 6, 2022 00:05

Merge branch 'main' into margaux/timer-buzzer

fd31daa

remove comments + restart CI

17b2e19

remove test?

dc10c6b

retry CI without removing test

c06980e

laurislopata approved these changes May 6, 2022

View reviewed changes

MaximeZmt approved these changes May 6, 2022

View reviewed changes

MaximeZmt merged commit 017ead4 into main May 6, 2022

MaximeZmt deleted the margaux/timer-buzzer branch May 6, 2022 07:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Margaux/buzzer timer and music backend #206

Margaux/buzzer timer and music backend #206

zwierski commented Apr 28, 2022 •

edited

Loading

codeclimate bot Apr 28, 2022

codeclimate bot Apr 28, 2022

codeclimate bot Apr 28, 2022

laurislopata Apr 28, 2022 •

edited

Loading

codeclimate bot commented Apr 28, 2022

laurislopata Apr 28, 2022

laurislopata left a comment

laurislopata left a comment

kamilababayeva left a comment

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

kamilababayeva May 5, 2022

MaximeZmt left a comment

MaximeZmt May 5, 2022

MaximeZmt May 5, 2022

MaximeZmt May 5, 2022

MaximeZmt May 5, 2022

MaximeZmt May 5, 2022

MaximeZmt May 5, 2022

MaximeZmt May 5, 2022

MaximeZmt May 5, 2022

MaximeZmt May 5, 2022

codeclimate bot May 5, 2022

codeclimate bot May 5, 2022

MaximeZmt left a comment

	findViewById<TextView>(R.id.answerText).text=title
	findViewById<TextView>(R.id.answerText).text = title

		//val answerText = findViewById<TextView>(R.id.answerText)
		//answerText.text = "The song was Demo by The Placeholders"

	findViewById<LinearLayout>(R.id.answer).visibility=View.INVISIBLE
	findViewById<LinearLayout>(R.id.answer).visibility = View.INVISIBLE

		//findViewById<EditText>(R.id.yourGuessET).isEnabled = false
		//checkRunnable()

	R.id.local_buzzer_game_button -> {game = "local_buzzer"; gameManager = BuzzerGameManager() }
	R.id.local_buzzer_game_button -> {game = "local_buzzer"; gameManager = BuzzerGameManager()}

+                      }
+                  }
+                  /**

Margaux/buzzer timer and music backend #206

Margaux/buzzer timer and music backend #206

Conversation

zwierski commented Apr 28, 2022 • edited Loading

codeclimate bot Apr 28, 2022

Choose a reason for hiding this comment

codeclimate bot Apr 28, 2022

Choose a reason for hiding this comment

codeclimate bot Apr 28, 2022

Choose a reason for hiding this comment

laurislopata Apr 28, 2022 • edited Loading

Choose a reason for hiding this comment

codeclimate bot commented Apr 28, 2022

Choose a reason for hiding this comment

laurislopata left a comment

Choose a reason for hiding this comment

laurislopata left a comment

Choose a reason for hiding this comment

kamilababayeva left a 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MaximeZmt left a 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

codeclimate bot May 5, 2022

Choose a reason for hiding this comment

codeclimate bot May 5, 2022

Choose a reason for hiding this comment

MaximeZmt left a comment

Choose a reason for hiding this comment

zwierski commented Apr 28, 2022 •

edited

Loading

laurislopata Apr 28, 2022 •

edited

Loading