Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

How to play Instructions and button Animation #88

Merged
merged 27 commits into from
May 28, 2022
Merged

Conversation

faisal1201
Copy link
Contributor

@faisal1201 faisal1201 commented May 26, 2022

This pull request has commits related to instructions of the game. A user will be able to go through this and become familiar with what the game offers and how the controls work. So, that the player isn't lost while playing the game.
Animations for buttons also added
Recommended device to test : Pixel 3 XL API 31

Related Issue: closes #40 #89

☑️ Definition of Done checklist

  • Meaningful title and valuable description in pull request
  • Code change tested manually if not covered by automated tests
  • Pull request linked to one or more issues/stories
  • Acceptance criteria of the linked stories satisfied
  • Code change comprehended by those who approved it
  • State of target branch maintained or improved after the code change
  • Go to MainActivityTest in the Android App and uncommit @test
    Run test manually. Add a picture of the test result in the comments.
    Comment @test again to avoid future problems with the CI

faisal1201 and others added 8 commits May 22, 2022 23:09
Your changes needs to be commited if you want to change branch and avoid losing the changes
# Conflicts:
#	Android/islandRush/app/src/androidTest/java/com/quinstedt/islandRush/LeaderboardTest.kt
#	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/BrokerConnection.java
#	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/ControlPad.java
#	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/Joystick.java
#	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/MainActivity.java
…HOW_TO_PLAY_SCREEN

� Conflicts:
�	Android/islandRush/app/src/androidTest/java/com/quinstedt/islandRush/LeaderboardTest.kt
�	Android/islandRush/app/src/main/AndroidManifest.xml
�	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/BrokerConnection.java
�	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/ControlPad.java
�	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/MainActivity.java
�	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/instructionScreens/controlsInstruction.java
�	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/instructionScreens/gettingStarted.java
�	Android/islandRush/app/src/main/res/layout-land/activity_controls_instruction.xml
�	Android/islandRush/app/src/main/res/layout-land/activity_game_modes.xml
�	Android/islandRush/app/src/main/res/layout-land/activity_getting_started.xml
�	Android/islandRush/app/src/main/res/layout-land/activity_intro_splash_animation.xml
�	Android/islandRush/app/src/main/res/layout-land/activity_main.xml
�	Android/islandRush/app/src/main/res/layout/activity_controls_instruction.xml
�	Android/islandRush/app/src/main/res/layout/activity_game_modes.xml
�	Android/islandRush/app/src/main/res/layout/activity_getting_started.xml
�	Android/islandRush/app/src/main/res/layout/activity_main.xml
�	Android/islandRush/app/src/main/res/layout/activity_scoreboard.xml
The user of the app will now be able to get a Beginner's Guide on how to play the game,which includes the controls,what the game offers, and how to check the leaderboard.

Related Issue : #40
@faisal1201 faisal1201 self-assigned this May 26, 2022
@faisal1201 faisal1201 added #Sprint4 Issues to be worked on during Sprint 4 #Sprint3 User stories for 3 labels May 26, 2022
Animation of buttonsUpon clicking buttons the buttons scale up .Other functionalities remains the same.

Related Issue : #89
@faisal1201 faisal1201 changed the title How to play Instructions How to play Instructions and button Animation May 26, 2022
Copy link
Contributor

@Quinstedt Quinstedt 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, But Could maybe change the color to white.
image

Black is a bit hard to read sometimes.

@faisal1201
Copy link
Contributor Author

Yes , I can change the color to white. Besides, what emulator are you using ? Seems like the whole layout can't be seen

text made white so that it's more visible to the player
@faisal1201
Copy link
Contributor Author

The text layout has been changed to white so that it appears more visible to the user.

@faisal1201
Copy link
Contributor Author

image

@faisal1201 faisal1201 requested a review from Quinstedt May 27, 2022 12:04
@Quinstedt
Copy link
Contributor

I fixing the constraint in all the activities. So wait until my next message to merge

@Dreia
Copy link
Contributor

Dreia commented May 27, 2022

IslandRush can be played in two modes...
That's what I would put. Otherwise it's user is incorrect, should be its user

@faisal1201
Copy link
Contributor Author

The title can be changed np.

@Quinstedt
Copy link
Contributor

The test are not passing because the title are not visible in the layout. Any particular reason why the recycle view is on top of the titles?

Quinstedt
Quinstedt previously approved these changes May 27, 2022
Copy link
Contributor

@Quinstedt Quinstedt left a comment

Choose a reason for hiding this comment

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

The required changes have been made.

@faisal1201
Copy link
Contributor Author

What I have noticed is that the layout I made was for Pixel 3 XL API 31 and using another device which has a larger or smaller screen size changes the layout . Like the example you gave before, the recycle view is over the title.

@Quinstedt
Copy link
Contributor

What I have noticed is that the layout I made was for Pixel 3 XL API 31 and using another device which has a larger or smaller screen size changes the layout . Like the example you gave before, the recycle view is over the title.

ok, I fixed the constrait so everything is passing now.

Quinstedt and others added 3 commits May 28, 2022 11:11
# Conflicts:
#	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/ControlChoice.java
#	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/ControlPad.java
#	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/Joystick.java
Quinstedt added 3 commits May 28, 2022 11:50
…PLAY_SCREEN

# Conflicts:
#	Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/ControlChoice.java
@Quinstedt
Copy link
Contributor

Quinstedt commented May 28, 2022

all test passing manually

image
image

@Quinstedt Quinstedt self-requested a review May 28, 2022 10:10
Copy link
Contributor

@Quinstedt Quinstedt left a comment

Choose a reason for hiding this comment

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

Everything in this branch is ready to be merge, test are passing, contrainsts have been improve for most of the layouts.

@Quinstedt Quinstedt merged commit f104389 into master May 28, 2022
@Quinstedt Quinstedt deleted the HOW_TO_PLAY_SCREEN branch May 28, 2022 10:11
@faisal1201 faisal1201 linked an issue May 28, 2022 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
#Sprint3 User stories for 3 #Sprint4 Issues to be worked on during Sprint 4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Button Enhancements Instruction Screen
3 participants