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

Feature/9 startpage #138

Merged
merged 29 commits into from
Jun 14, 2023
Merged

Feature/9 startpage #138

merged 29 commits into from
Jun 14, 2023

Conversation

Benjamin-Dippold
Copy link
Collaborator

@Benjamin-Dippold Benjamin-Dippold commented Jun 14, 2023

Overhauled main menu and post game stuff.

  • Added intro cinematic
  • Added fancy AI backgrounds to menus
  • Removed various ways to crash the app in the Menu, by clicking the buttons in a suboptimal order.
    • Fixed Crash when pressing "Join game" without a valid IP
    • Fixed Crash when pressing "Join game" before Host is ready
    • Fixed Crash when pressing "Start game" before Client is ready (by removing "Start game button")
  • Removed many unnececery button presses to get the game going.
  • Added loading screen to hide the game initializing.
  • Added the ability to return to the main menu after a game.
  • Added the ability to rematch your opponent after a game.
  • Removed Comic Sans from Victory/Defeat Images
  • Added the ability to choose a name in the Main Menu
  • Swapped position of Turnvalues and Player stats, to give Champions more space.
  • Added a new background track to the Main Menu
  • Updated the MusicPlayer to be more expandable.

sosaidi and others added 29 commits June 3, 2023 14:01
Now, instead of having all video-player controls, the user can skip the intro by pressing anywhere.
# Conflicts:
#	app/src/main/java/at/vunfer/openrealms/MainActivity.java
#	app/src/main/java/at/vunfer/openrealms/model/PlayArea.java
#	app/src/test/java/at/vunfer/openrealms/model/PlayAreaTest.java
- Clicking Join will no longer crash if no/the wrong IP is entered.
- After clicking Join, the user must no longer click Start afterwards.
- After starting, the user will see a loading screen until the host has joined as well and started the game.
- (internal) OverlayView is now added in the XML, instead of startGame()
- Updated view to be more in line with menu.xml and join.xml
- Replaced background image to avoid stretching
- After clicking Host, the user must no longer click 5 different buttons, before the client can join.
…re a client joined,

by removing the join game button.
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/at/vunfer/openrealms/MainActivity.java
#	app/src/main/java/at/vunfer/openrealms/model/PlayArea.java
#	app/src/main/java/at/vunfer/openrealms/network/DataKey.java
#	app/src/main/java/at/vunfer/openrealms/network/MessageType.java
#	app/src/main/java/at/vunfer/openrealms/network/server/ClientHandler.java
#	app/src/main/java/at/vunfer/openrealms/network/server/MessageHandler.java
#	app/src/main/java/at/vunfer/openrealms/view/OverlayView.java
#	app/src/test/java/at/vunfer/openrealms/model/PlayAreaTest.java
- Use already-defined constant 'logTag' instead of duplicating its value here.
- Make the enclosing method "static" or remove this set.
- End this switch case with an unconditional break,
- Define and throw a dedicated exception instead of using a generic one.
- Make this anonymous inner class a lambda
@sonarcloud
Copy link

sonarcloud bot commented Jun 14, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

59.0% 59.0% Coverage
0.0% 0.0% Duplication

@Benjamin-Dippold Benjamin-Dippold marked this pull request as ready for review June 14, 2023 18:50
@Benjamin-Dippold
Copy link
Collaborator Author

Benjamin-Dippold commented Jun 14, 2023

Though coverage may seem low, this PR will still result in an increased total coverage of the main branch.

Copy link
Collaborator

@sosaidi sosaidi left a comment

Choose a reason for hiding this comment

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

I'm really impressed with the design changes made in this pull request. The overhaul of the main menu and post-game elements brings a fresh and polished look to the application. I also appreciate the improvements like allowing players to choose a name in the main menu. Overall, these changes have been executed exceptionally well, and I'm really impressed with the outcome.

Copy link
Collaborator

@Kranosos Kranosos left a comment

Choose a reason for hiding this comment

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

Dear Ben,

I am writing to express my appreciation and approval of the comprehensive changes made to our application's main menu and post-game experiences.

The enhancements brought to the game, including the introduction of a cinematic, AI backgrounds for the menus, and a new background track, significantly elevate the user experience. Moreover, I am particularly impressed by the improved connection process which simplifies the game setup by reducing unnecessary interactions and eliminating potential crashes.

Adding the option for players to select their own names directly from the main menu is a thoughtful feature that will personalize and enhance the user experience. The ability to rematch an opponent or return to the main menu after a game adds to the continuity of the game, providing users with a smoother gaming experience.

The refactoring of the loading screen elegantly masks the game initialization, further contributing to a seamless user journey.

Overall, the update successfully balances functional improvements and aesthetic upgrades. I commend the dedication and attention to detail reflected in this work. Even if the coverage could be a little higher.

I hereby approve this pull request and look forward to its positive impact on our user experience.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants