Skip to content
This repository has been archived by the owner on Jan 31, 2024. It is now read-only.

Kamila/solo game next button #147

Merged
merged 44 commits into from
Apr 5, 2022
Merged

Kamila/solo game next button #147

merged 44 commits into from
Apr 5, 2022

Conversation

kamilababayeva
Copy link
Collaborator

@kamilababayeva kamilababayeva commented Apr 2, 2022 •
edited
Loading

This PR add "Next" button to the TypingGame. The round does not start automatically but by the click on the "Next" button.

Updates:

  • add button to the TypingGame Layout
  • add button functionality to the TypingGame
  • separate playRound into endRound/startRound
  • improve testing of TypingGameActivity/GameActivity

For future PR:

  • handle errors when it is impossible to fetch songs/song fragment
  • notify user about data fetching
  • think of more robust solution to fetch list of songs

image

@kamilababayeva
TypingGameActivity: remove complexity
9844303
@kamilababayeva
TypingGameActivity: remove complexity
8050c91
@kamilababayeva
TypingGameActivity: change from private
272aea9
@kamilababayeva
TypingGaameactivity: fix the tests
72f6acb
@kamilababayeva
TypingGameActivity: reduce complexity
9158f7a
@kamilababayeva
TypingGameActivity: set button listener
ef8f56c
@kamilababayeva
TypingGameActivityTest: fix the tests
f7fefda
@kamilababayeva
merge main
00c5ea3
@kamilababayeva
Merge my refactor branch
c0f23c7
@kamilababayeva
TypingGameActivity: change funciton name
7495ae1
@kamilababayeva
TypingGameActivity: simplify the funcitons in the class
2c93700
@kamilababayeva
TypingGameActivityTest.kt: fix the test
182b9bd
@kamilababayeva
merge main
a1cf9bb
@kamilababayeva
TypingGameActivityTest: remove unnecessary test
f5ff36d
@kamilababayeva
GameActivity: change wrong song list size calculation
ebc82e3
@kamilababayeva
TypingGameActivity: fix button visibility
e2f142e
@kamilababayeva
activity_typing_game: set button style
b5d634d
@kamilababayeva
GameManagaer: remove space
3c16eb7
@kamilababayeva
TypingGameActivity: add functions fore testing
d1110b9
@kamilababayeva
TypingGameActivity: change the startround order
4f233a7
@kamilababayeva
TypingGameActivity: change toggle visibility order
6a58259
@kamilababayeva
TypingGameActivity: fix
4274bb2
@kamilababayeva
TypingGameActivityTest: test progress bar when reches 0
67d8557
@kamilababayeva
TypingGameActivityTest: test next button click
135a2f9
@kamilababayeva
ProfileActivityTest: comment failing test
bafc2df
@kamilababayeva
TypingGameManager: check if media player is initialized before stopping
be47e16
@kamilababayeva
TypingGameActivity: add tests for progress bar colors
be3b1fd
@kamilababayeva
TypingGameActivity: check if media player is initialised before stopp…
cea66ed 
…ing it
@kamilababayeva
TypingGameActivity: add import for colors
50d2058
@kamilababayeva
TypingGameActivityTest: check when the first round fails
bc4b8bb
@kamilababayeva
TypingGameActivitytTest: check the colors of progress bar
df9f9d7
@kamilababayeva
TypingGameActivityTestL add invalid song otopion for testing
9bae1df
@kamilababayeva
TypingGameActivityTest: fix the library imports
846c878
@kamilababayeva
TypingGameActivityTest: remove unnecessary test
18b79d9
@kamilababayeva
TypingGameActivity: combine funciton for testing
2e23b74
@kamilababayeva
TypingGameActivity: fix the spaces
c9f82a0
@kamilababayeva kamilababayeva marked this pull request as ready for review April 5, 2022 13:08
MaximeZmt
MaximeZmt reviewed Apr 5, 2022
View reviewed changes
Copy link
Owner

@MaximeZmt MaximeZmt left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 LGTM, Just one comment below !

app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt Outdated Show resolved Hide resolved
Tsathogguaa
Tsathogguaa approved these changes Apr 5, 2022
View reviewed changes
Copy link
Collaborator

@Tsathogguaa Tsathogguaa left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! Maxime's comment is intriguing as well, but since he is gatekeeping it, I'll assume it is resolved once he approves.

@kamilababayeva kamilababayeva self-assigned this Apr 5, 2022
@kamilababayeva kamilababayeva linked an issue Apr 5, 2022 that may be closed by this pull request
Add a button to play next song only onclick #143
Closed
@codeclimate
Copy link

codeclimate bot commented Apr 5, 2022

Code Climate has analyzed commit 372cc28 and detected 0 issues on this pull request.

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

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

View more on Code Climate.

MaximeZmt
MaximeZmt approved these changes Apr 5, 2022
View reviewed changes
Copy link
Owner

@MaximeZmt MaximeZmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice Work 👍 !

@kamilababayeva kamilababayeva merged commit 0694769 into main Apr 5, 2022
@kamilababayeva kamilababayeva deleted the kamila/solo_game_nextButton branch April 5, 2022 19:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@codeclimate codeclimate[bot] codeclimate[bot] left review comments

@MaximeZmt MaximeZmt MaximeZmt approved these changes

@Tsathogguaa Tsathogguaa Tsathogguaa approved these changes

Assignees

@kamilababayeva kamilababayeva

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add a button to play next song only onclick
3 participants
@kamilababayeva @Tsathogguaa @MaximeZmt