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

Kamila/play game fragment #259

Merged
merged 88 commits into from
May 11, 2022
Merged

Kamila/play game fragment #259

merged 88 commits into from
May 11, 2022

Conversation

kamilababayeva
Copy link
Collaborator

@kamilababayeva kamilababayeva commented May 7, 2022 •
edited
Loading

This PR:

  • creates two fragment: welcome screen and playGame
  • new images for buttons
  • new HiltTestActivity class for testing fragments

image

kamilababayeva and others added 24 commits May 7, 2022 16:47
@kamilababayeva
bottom_navigation.xml: add two fragments into navigation
f1364d4
@kamilababayeva
bottom_menu.xml: add two buttons
cb7e78f
@kamilababayeva
game_setting.xml: remove onClick proceedGame
9f3e27d
@kamilababayeva
main_activity.xml: contains two fragments
e1ec295
@kamilababayeva
game_genre.xml: remove onlick functions
9a7d5e3
@kamilababayeva
fragment_game_setup_screen: rename game setup screen
a7b74da
@kamilababayeva
activity_welcome_screen: remove unused buttons
6595df2
@kamilababayeva
activity_game_setup_screen: delete
dd4c71e
@kamilababayeva
IntentSwitcher: change Welcome Activity to Main Activity
a76dff8
@kamilababayeva
WelcomActivity: delete
4287a46
@kamilababayeva
ProfileActivity: switch to main
688f773
@kamilababayeva
PlayGameFragment: move GameSetup to fragment
a1c9c50
@kamilababayeva
MainActivity: contains fragments
637421a
@kamilababayeva
change WelcomeActivity to MainActivity
e9cd19f
@kamilababayeva
GameSetupActivity: delete
49a11a7
@kamilababayeva
Move WelcomeActivity to Home Fragment
48d618b
@kamilababayeva
change welcomaActivity to Main Activity
5840e10
@kamilababayeva
temporal remove of tests
faacd6d
@kamilababayeva
fix gradle with new activities
5ebbe94
@kamilababayeva
build.gradle: add navigation
6e0aa83
@kamilababayeva
Merge branch 'main' into kamila/playGame_fragment
30ca243
@kamilababayeva
Fix the bug of failing tests
c034164
@kamilababayeva
LyricsBelongGameActivity: the test is not working
4b013b4
@kamilababayeva
Merge branch 'main' into kamila/playGame_fragment
2dd3837
kamilababayeva and others added 6 commits May 10, 2022 22:29
@MaximeZmt MaximeZmt self-requested a review May 10, 2022 20:35
MaximeZmt
MaximeZmt reviewed May 10, 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 👍
Good UI 😀!

I've left some small comments.

photo_2022-05-10_23-05-54

Also here on the first layout of setting of GameSetupActivity, why not hiding the return button as it does not lead to somewhere ?

app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/ch/sdp/vibester/fragment/WelcomeScreenFragment.kt Outdated Show resolved Hide resolved
kamilababayeva and others added 15 commits May 11, 2022 00:00
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/activity/MainActivity.kt
7ff010c 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
037e566 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
2a83db1 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
7e78ddd 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
1cd28bd 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
209541f 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
464b0ef 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/WelcomeScreenFragme…
087a295 
…nt.kt

Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
2336e44 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
de42a0d 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @MaximeZmt
Update app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
70d33df 
Co-authored-by: Maxime <[email protected]>
@kamilababayeva @jiabaow
Update app/src/androidTest/java/ch/sdp/vibester/fragment/GameSetupFra…
1a608c1 
…gmentTest.kt

Co-authored-by: jiabaow <[email protected]>
@kamilababayeva
GameSetupFragment: separate based on functionality
ccf7b5d
@kamilababayeva
fix suggestions
860fa22
@kamilababayeva
MainActivity: set the comment
02a73e4
@kamilababayeva
Copy link
Collaborator Author

Nice! Can't wait to see Fragment used in practice! I still have one general question: will there be more sections in the navigation bar in the future?

There will be more sections! This PR I have been learning how to do that and lets say, setting the ground.

@kamilababayeva
Copy link
Collaborator Author

Nice work 👍 Good UI 😀!

I've left some small comments.

photo_2022-05-10_23-05-54

Also here on the first layout of setting of GameSetupActivity, why not hiding the return button as it does not lead to somewhere ?

got you! I will fix the button visibility in the next pr

jiabaow
jiabaow approved these changes May 11, 2022
View reviewed changes
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

@codeclimate
Copy link

codeclimate bot commented May 11, 2022

Code Climate has analyzed commit 02a73e4 and detected 9 issues on this pull request.

Here's the issue category breakdown:

Category Count
Duplication 9

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

This pull request will bring the total coverage in the repository to 81.1%.

View more on Code Climate.

MaximeZmt
MaximeZmt approved these changes May 11, 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.

👍

@kamilababayeva kamilababayeva merged commit 00b4d3c into main May 11, 2022
@kamilababayeva kamilababayeva deleted the kamila/playGame_fragment branch May 11, 2022 09:39
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

@jiabaow jiabaow jiabaow 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.

Refactoring/fragmentation
3 participants
@kamilababayeva @jiabaow @MaximeZmt