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

Feat/Finalize and improve the aesthetics of the progression UI #234

Merged
merged 4 commits into from
Dec 17, 2024

Conversation

alvaro1080
Copy link
Contributor

@alvaro1080 alvaro1080 commented Dec 17, 2024

Overview

The objective of this short Pull request is to finalize the last details of the progression UI.

Changes

  • Display a text when the user has not done any training yet
  • Change the medals icon (in particular we have now an icon for "platinum", that was missing in the last version)

Screenshot

image image

@alvaro1080 alvaro1080 added the Enhancement ✨ New feature or request label Dec 17, 2024
@alvaro1080 alvaro1080 added this to the Milestone M3 milestone Dec 17, 2024
@alvaro1080 alvaro1080 self-assigned this Dec 17, 2024
@alvaro1080 alvaro1080 linked an issue Dec 17, 2024 that may be closed by this pull request
@alvaro1080 alvaro1080 changed the title Feat/finalize and improve esthetic of progression UI Feat/Finalize and improve the aesthetics of the progression UI Dec 17, 2024
@alvaro1080 alvaro1080 marked this pull request as ready for review December 17, 2024 13:07
Copy link
Contributor

@kzepfl kzepfl left a comment

Choose a reason for hiding this comment

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

Good PR, the new icon is very good.
I made a little suggestion that you could make, but I approved the PR as it wasn't a big changes so you can merge.
Just a question, do you need to source the icon ?

@@ -170,6 +170,14 @@ fun ProgressScreen(
}
DashboardStateProgression.Training -> {

if (currentWorkout?.workoutSessions?.isEmpty() == true) {
Copy link
Contributor

Choose a reason for hiding this comment

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

You can put : currentWorkout?.workoutSessions.isNullOrEmpty() instead of a == true check,
Not really important, resolve if you think its fine like this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree that this is better, it is changed thank you!

Copy link
Contributor

@Alex720p Alex720p left a comment

Choose a reason for hiding this comment

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

The changes look good, the medals are much cleaner.

I approved but here's a few suggestions, I'll let you decide if you want to take them into account or not:

  • I find it hard to distinguish the gold and platinum medal. I think have a color similar to this would be better:
    images
  • The old icons for the friends are lacking colors compared to the new badges, would be great to update them to something more flashy

eventsJoined = 0,
achievements = emptyList())

coEvery { progressionRepository.getOrAddProgression(eq(mockedUser.uid)) } answers
Copy link
Contributor

Choose a reason for hiding this comment

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

I see that it has already been done in the file so no need to change, but you should not mix 2 mocking libraries in the same file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I apologize, I did not know that it was bad to do that. Thank you for letting me know!

@alvaro1080
Copy link
Contributor Author

  • I find it hard to distinguish the gold and platinum medal. I think have a color similar to this would be better:

I spend quite some time to generate the current set of medals, as a lot of generated images were really bad. In order to keep the coherence of the medals, I will keep theme like this and try to generate a new set in order to match the color you proposed!

  • The old icons for the friends are lacking colors compared to the new badges, would be great to update them to something more flashy

I agree, but as per my last comment, I also did not manage to generate something coherent (and beautiful enough) for the friends icons. If I manage to find better for the friends, I will do another PR but I really think that the medals needed to change quickly because the bronze and the platinum had the same logo.

@alvaro1080 alvaro1080 merged commit f60ea2e into main Dec 17, 2024
3 checks passed
@alvaro1080 alvaro1080 deleted the feat/finalize-progression-ui branch December 17, 2024 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement ✨ New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Finalize esthetic details in progression UI
3 participants