QE: Avatar Rating #589
Merged
QE: Avatar Rating #589
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
 |
App Name |  Gravatar Prototype Build |
| Build Number | 1848 | |
| Version | 1.0 | |
| Bundle ID | com.automattic.gravatar-sdk-demo-uikit.prototype-build | |
| Commit | b535bac | |
| App Center Build | Gravatar SDK Demo - UIKit #457 |
| /// Transforms `Avatar.Rating` into `AvatarRating` | ||
| /// This is only necessary while we maintain both enums. For our next major realease, `Avatar` will use the `AvatarRating` enum | ||
| /// rather than defining its own. | ||
| var avatarRating: AvatarRating { |
There was a problem hiding this comment.
We only need this in one place, currently, and only until we release a new major release. But I wonder if it still makes sense to move it to Gravatar and use package, to match the access of Avatar.Rating.
| @@ -1,24 +1,21 @@ | |||
| import Foundation | |||
| import SwiftUI | |||
|
|
|||
| enum AvatarAction: String, CaseIterable, Identifiable { | |||
There was a problem hiding this comment.
Since we are laying out the menu manually, the CaseIterable is no longer needed.
I'm using an enum with an associated value (rating(AvatarRating)) in order to pass values back up the chain when a rating is tapped. So conforming to String is no longer possible.
pinarol
reviewed
Dec 10, 2024
Sources/GravatarUI/SwiftUI/AvatarPicker/Views/AvatarPickerAvatarView.swift
Outdated
Show resolved
Hide resolved
pinarol
reviewed
Dec 10, 2024
Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerViewModel.swift
Outdated
Show resolved
Hide resolved
pinarol
reviewed
Dec 10, 2024
Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerViewModel.swift
Outdated
Show resolved
Hide resolved
pinarol
reviewed
Dec 10, 2024
Comment on lines
-229
to
294
| if request.httpMethod == "POST" { | ||
| if request.url?.absoluteString.contains(RequestType.avatars.rawValue) == true { | ||
| return (Bundle.postAvatarSelectedJsonData, HTTPURLResponse.successResponse()) // Avatars data | ||
| if request.isSetAvatarForEmailRequest { | ||
| return (Bundle.postAvatarSelectedJsonData, HTTPURLResponse.successResponse()) // Avatars data | ||
| } | ||
|
|
||
| if request.isSetAvatarRatingRequest { | ||
| if let returnErrorCode { | ||
| return (Data("".utf8), HTTPURLResponse.errorResponse(code: returnErrorCode)) | ||
| } else { | ||
| return (Bundle.setRatingJsonData, HTTPURLResponse.successResponse()) // Avatar data | ||
| } | ||
| } | ||
| if request.url?.absoluteString.contains(RequestType.profiles.rawValue) == true { | ||
|
|
||
| if request.isProfilesRequest { | ||
| return (Bundle.fullProfileJsonData, HTTPURLResponse.successResponse()) // Profile data | ||
| } else if request.url?.absoluteString.contains(RequestType.avatars.rawValue) == true { | ||
| } else if request.isAvatarsRequest == true { | ||
| return (Bundle.getAvatarsJsonData, HTTPURLResponse.successResponse()) // Avatars data | ||
| } |
There was a problem hiding this comment.
I broke this into helpers. Now that we're adding more capabilities, I think this will be easy to read and extend.
Comment on lines
+241
to
+242
| "Handle avatar rating change: Failure", | ||
| arguments: [HTTPStatus.unauthorized, .forbidden] |
There was a problem hiding this comment.
I have been adding titles to tests as I write them.
And parameterized tests in Swift Testing are 🎉
andrewdmontgomery
force-pushed
the
andrewdmontgomery/qe-avatar-rating
branch
from
81ddcf3 to
a840f86
Compare
pinarol
reviewed
Dec 11, 2024
| @@ -419,6 +444,16 @@ extension AvatarPickerViewModel { | |||
| value: "Oops, something didn't quite work out while trying to share your avatar.", | |||
| comment: "This error message shows when the user attempts to share an avatar and fails." | |||
| ) | |||
| static let avatarRatingUpdateSuccess = SDKLocalizedString( | |||
| "AvatarPickerViewModel.RatingUpdate.Success", | |||
| value: "Avatar rating was changed successfully", | |||
There was a problem hiding this comment.
let's put a . at the end for consistency, wdyt?
There was a problem hiding this comment.
Definitely, thanks for catching.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #546 #548
Description
Adds support for viewing and changing the rating of an avatar in the Quick Editor.
Testing Steps
Open Profile Editor with OAuth flow...Ratingmenu appears in the menuRatingmenu shows the current rating for the image:Rating: PGRatingmenu has a icon of a half-filled star ⭐Ratingmenu to show the sub-menuG (General))Try: