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.

Sign up for GitHub

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

Jump to bottom

Rework & redesign settings menu #352

Merged
merged 22 commits into from
May 12, 2024
Merged

Rework & redesign settings menu #352

merged 22 commits into from
May 12, 2024

Conversation

Reco1I
Copy link
Contributor

@Reco1I Reco1I commented May 1, 2024 •
edited
Loading

In this PR I reworked and reorganized the entire settings menu UI following a section and categories pattern.

Preview

image

Sections

They're defined into the followings:

  • General: General usage and online/account options.
  • Gameplay: Options that strictly affect user experience visually while gameplay or HUD options.
  • Graphics: More technical than Gameplay section.
  • Sound: Audio related options and volume controlls.
  • Library: Beatmap library and storage related options, same as before.
  • Input: Playfield size and synchronization options.
  • Advanced: Same as before but some options where moved to the proper sections.

Additional changes

There's some functionality changes that may need to be discussed (or maybe not):

  • Background quality option was removed, this shouldn't be needed nowadays yet I don't think it was used at all.
  • Dither option was removed, same reason as the above.
  • Complex animations option was split in two: Animate follow circle and Animate combo text. Originally this option was covering those two features and I think that it's better to have those by separate.
  • Player name for offline was removed and the value will be always "Guest", cuz more space.
  • Enable video and Enable storyboard were added to Gameplay section.

What's left

  • Apply the rework to the multiplayer settings menu (I guess is currently broken with this state)

@Reco1I Reco1I mentioned this pull request May 1, 2024
Closed
@Rian8337
Copy link
Member

Rian8337 commented May 1, 2024

I'm not sure about removing any of the features mentioned. It definitely needs discussion.

@Reco1I
Copy link
Contributor Author

Reco1I commented May 1, 2024

I'm not sure about removing any of the features mentioned. It definitely needs discussion.

Bet

@Reco1I Reco1I mentioned this pull request May 11, 2024
Merged
1 task
Rian8337
Rian8337 reviewed May 12, 2024
View reviewed changes
Copy link
Member

@Rian8337 Rian8337 left a comment

Choose a reason for hiding this comment

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

I have yet to test multiplayer, but I have some things to discuss with regards to the code and wording. I will not go deep into wording as even though this is a rework, there are many confusing wordings in the settings that fixing them warrants another PR, so as to not overcomplicate this PR more than it currently is.

src/ru/nsu/ccfit/zuev/osu/Config.java Outdated Show resolved Hide resolved
res/xml/multiplayer_player_settings.xml
android:title="Show leaderboard"
android:summary="Show live leaderboard while playing"
/>
<PreferenceCategory android:title="In-game">
Copy link
Member

Choose a reason for hiding this comment

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

Maybe this should be "Gameplay" instead?

res/xml/multiplayer_room_settings.xml Outdated Show resolved Hide resolved
res/xml/multiplayer_room_settings.xml Outdated Show resolved Hide resolved
res/xml/multiplayer_room_settings.xml Outdated Show resolved Hide resolved
res/xml/settings_advanced.xml Outdated Show resolved Hide resolved
src/com/reco1l/osu/ui/MainMenu.kt Outdated Show resolved Hide resolved
src/com/reco1l/osu/ui/SettingsFragment.kt Outdated Show resolved Hide resolved
src/com/reco1l/osu/ui/SettingsFragment.kt Outdated Show resolved Hide resolved
src/com/reco1l/osu/ui/SettingsFragment.kt Show resolved Hide resolved
Reco1I and others added 9 commits May 11, 2024 22:42
@Reco1I @Rian8337
Fix wording
2a4f2e1 
Co-authored-by: Rian (Reza Mouna Hendrian) <[email protected]>
@Reco1I @Rian8337
Fix wording
313016e 
Co-authored-by: Rian (Reza Mouna Hendrian) <[email protected]>
@Reco1I @Rian8337
Fix wording
43eb4c4 
Co-authored-by: Rian (Reza Mouna Hendrian) <[email protected]>
@Reco1I @Rian8337
Use mainThread {} instead
1d9bd7f 
Co-authored-by: Rian (Reza Mouna Hendrian) <[email protected]>
@Rian8337
Add missing import
2a263c9
@Reco1I @Rian8337
Rename settings section
791f20a 
Co-authored-by: Rian (Reza Mouna Hendrian) <[email protected]>
@Reco1I @Rian8337
Rename settings section
24e1b5f 
Co-authored-by: Rian (Reza Mouna Hendrian) <[email protected]>
@Rian8337
Complete setting rename
022f13a
@Rian8337
Replace local username usages with online username
653b92c
@Rian8337
Copy link
Member

I have tested multiplayer and it works properly.

@Rian8337
Copy link
Member

I have moved the display FPS setting to "Gameplay" in line with other display settings.

Removing the setting's dependency should come in another PR.

Rian8337
Rian8337 approved these changes May 12, 2024
View reviewed changes
Copy link
Member

@Rian8337 Rian8337 left a comment

Choose a reason for hiding this comment

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

Big thank you for the work!

@Rian8337 Rian8337 merged commit 7d696e6 into osudroid:master May 12, 2024
2 of 3 checks passed
@Reco1I Reco1I deleted the new-settings branch May 13, 2024 12:09
@Reco1I Reco1I mentioned this pull request May 14, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rian8337 Rian8337 Rian8337 approved these changes

Assignees
No one assigned
Labels
size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Reco1I @Rian8337