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

Tsathogguaa/welcome #48

Merged
merged 15 commits into from
Mar 10, 2022
Merged

Tsathogguaa/welcome #48

merged 15 commits into from
Mar 10, 2022

Conversation

Tsathogguaa
Copy link
Collaborator

@Tsathogguaa Tsathogguaa commented Mar 10, 2022

Added the welcome screen and game setup screen which allows anywhere from one to four people to play together.
image
image

@@ -31,4 +32,9 @@ class MainActivity : AppCompatActivity() {
startActivity(scoreboardIntent)
}
}

fun switchToWelcome(view: View) {
Copy link

Choose a reason for hiding this comment

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

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

setContentView(R.layout.activity_welcome_screen)
}

fun switchToPlay(view: View) {
Copy link

Choose a reason for hiding this comment

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

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

startActivity(intent)
}

fun switchToProfile(view: View) { //FILLER INTENT
Copy link

Choose a reason for hiding this comment

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

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

startActivity(intent)
}

fun switchToScoreboard(view: View) {
Copy link

Choose a reason for hiding this comment

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

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

startActivity(intent)
}

fun switchToListen(view: View) { //FILLER INTENT
Copy link

Choose a reason for hiding this comment

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

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

startActivity(intent)
}

fun switchToSettings(view: View) { //FILLER INTENT
Copy link

Choose a reason for hiding this comment

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

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

Copy link
Collaborator

@kamilababayeva kamilababayeva left a comment

Choose a reason for hiding this comment

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

Both UI and backend code seems clear to me, and I have checked the functionality. We should work on the colors and style though.

Copy link
Collaborator

@jiabaow jiabaow left a comment

Choose a reason for hiding this comment

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

Good job on the welcome screen and game setup screen!

Maybe try to reduce the code duplications indicated by the CI, use @string for the strings instead of hardcode them and remove the commented code blocks (or add some documentation explaining why they are in comment)

You can also put a Screenshot of the UI in the PR description. I might be too curious but it will be nice to see them ;)

intended(hasComponent(GameSetupScreen::class.java.name))
}

/*@Test
Copy link
Collaborator

Choose a reason for hiding this comment

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

why this test is in the comments?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I removed a button that was causing problems, as it wasn't fitting in whatever emulator they are using for the CI tests. It all passed locally until then. This test is for that button, since it doesn't exist for now, I removed it, however am thinking of readding it in some form.

@codeclimate
Copy link

codeclimate bot commented Mar 10, 2022

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

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

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

View more on Code Climate.

Copy link
Collaborator

@jiabaow jiabaow left a comment

Choose a reason for hiding this comment

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

LGTM!

@Tsathogguaa Tsathogguaa merged commit a5c1fb2 into main Mar 10, 2022
@Tsathogguaa Tsathogguaa deleted the tsathogguaa/welcome branch March 10, 2022 21:40
@jiabaow jiabaow linked an issue Mar 11, 2022 that may be closed by this pull request
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UI: welcome screen with settings (#14)
3 participants