QE: Avatar Rating

Sources/Gravatar/Network/Services/ProfileService.swift

@@ -3,8 +3,12 @@ import Foundation
 private let baseURL = URL(string: "https://api.gravatar.com/v3/profiles/")!
 private let avatarsBaseURLComponents = URLComponents(string: "https://api.gravatar.com/v3/me/avatars")!
 
+private func avatarBaseURL(with avatarID: String) -> URL? {
+    URL(string: "https://api.gravatar.com/v3/me/avatars/\(avatarID)")
+}
+
 private func selectAvatarBaseURL(with avatarID: String) -> URL? {
-    URL(string: "https://api.gravatar.com/v3/me/avatars/\(avatarID)/email")
+    avatarBaseURL(with: avatarID)?.appendingPathComponent("email")
 }
 
 /// A service to perform Profile related tasks.
@@ -59,6 +63,32 @@ public struct ProfileService: ProfileFetching, Sendable {
             throw error.apiError()
         }
     }
+
+    @discardableResult
+    package func setRating(
+        _ rating: AvatarRating,
+        for avatar: AvatarIdentifier,
+        token: String
+    ) async throws -> Avatar {
+        guard let url = avatarsBaseURLComponents
+            .settingQueryItems([.init(name: "raiting", value: rating.rawValue)]).url?
+            .appendingPathComponent(avatar.id)
+        else {
+            throw APIError.requestError(reason: .urlInitializationFailed)
+        }
+
+        do {
+            var request = URLRequest(url: url).settingAuthorizationHeaderField(with: token)
+            request.httpMethod = "PATCH"
+
+            let requestBody = try JSONEncoder().encode(UpdateAvatarRequest(rating: rating))
+            request.httpBody = requestBody
+            let (data, _) = try await client.data(with: request)
+            return try data.decode()
+        } catch {
+            throw error.apiError()
+        }
+    }
 }
 
 extension ProfileService {

Sources/Gravatar/OpenApi/Generated/Avatar.swift

@@ -3,27 +3,19 @@ import Foundation
 /// An avatar that the user has already uploaded to their Gravatar account.
 ///
 package struct Avatar: Codable, Hashable, Sendable {
-    package enum Rating: String, Codable, CaseIterable, Sendable {
-        case g = "G"
-        case pg = "PG"
-        case r = "R"
-        case x = "X"
-    }
-
     /// Unique identifier for the image.
     package private(set) var imageId: String
     /// Image URL
     package private(set) var imageUrl: String
-    /// Rating associated with the image.
-    package private(set) var rating: Rating
+    package private(set) var rating: AvatarRating
     /// Alternative text description of the image.
     package private(set) var altText: String
     /// Whether the image is currently selected as the provided selected email's avatar.
     package private(set) var selected: Bool?
     /// Date and time when the image was last updated.
     package private(set) var updatedDate: Date
 
-    package init(imageId: String, imageUrl: String, rating: Rating, altText: String, selected: Bool? = nil, updatedDate: Date) {
+    package init(imageId: String, imageUrl: String, rating: AvatarRating, altText: String, selected: Bool? = nil, updatedDate: Date) {
         self.imageId = imageId
         self.imageUrl = imageUrl
         self.rating = rating

Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarAction.swift

@@ -1,24 +1,21 @@
 import Foundation
 import SwiftUI
 
-enum AvatarAction: String, CaseIterable, Identifiable {
+enum AvatarAction: Identifiable {
     case share
     case delete
+    case rating(AvatarRating)
     case playground
 
-    static var allCases: [AvatarAction] {
-        var cases: [AvatarAction] = []
-        if #available(iOS 18.2, *) {
-            if EnvironmentValues().supportsImagePlayground {
-                cases.append(.playground)
-            }
+    var id: String {
+        switch self {
+        case .share: "share"
+        case .delete: "delete"
+        case .rating(let rating): rating.rawValue
+        case .playground: "playground"
         }
-        cases.append(contentsOf: [.share, .delete])
-        return cases
     }
 
-    var id: String { rawValue }
-
     var icon: Image {
         switch self {
         case .delete:
@@ -27,6 +24,8 @@ enum AvatarAction: String, CaseIterable, Identifiable {
             Image(systemName: "square.and.arrow.up")
         case .playground:
             Image(systemName: "apple.image.playground")
+        case .rating:
+            Image(systemName: "eye")
         }
     }
 
@@ -50,14 +49,23 @@ enum AvatarAction: String, CaseIterable, Identifiable {
                 value: "Playground",
                 comment: "An option to show the image playground"
             )
+        case .rating(let rating):
+            String(
+                format: SDKLocalizedString(
+                    "AvatarPicker.AvatarAction.rate",
+                    value: "Rating: %@",
+                    comment: "An option in the avatar menu that shows the current rating, and allows the user to change that rating. The rating is used to indicate the appropriateness of an avatar for different audiences, and follows the US system of Motion Picture ratings: G, PG, R, and X."
+                ),
+                rating.rawValue
+            )
         }
     }
 
     var role: ButtonRole? {
         switch self {
         case .delete:
             .destructive
-        case .share, .playground:
+        case .share, .rating, .playground:
             nil
         }
     }

Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarImageModel.swift

@@ -17,6 +17,7 @@ struct AvatarImageModel: Hashable, Identifiable, Sendable {
     let source: Source
     let isSelected: Bool
     let state: State
+    let rating: AvatarRating
 
     var url: URL? {
         guard case .remote(let url) = source else {
@@ -46,14 +47,15 @@ struct AvatarImageModel: Hashable, Identifiable, Sendable {
         return image
     }
 
-    init(id: String, source: Source, state: State = .loaded, isSelected: Bool = false) {
+    init(id: String, source: Source, state: State = .loaded, isSelected: Bool = false, rating: AvatarRating = .g) {
         self.id = id
         self.source = source
         self.state = state
         self.isSelected = isSelected
+        self.rating = rating
     }
 
     func settingStatus(to newStatus: State) -> AvatarImageModel {
-        AvatarImageModel(id: id, source: source, state: newStatus, isSelected: isSelected)
+        AvatarImageModel(id: id, source: source, state: newStatus, isSelected: isSelected, rating: rating)
     }
 }

Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerView.swift

@@ -383,6 +383,10 @@ struct AvatarPickerView<ImageEditor: ImageEditorView>: View {
                     playgroundInputItem = PlaygroundInputItem(id: avatar.id, image: Image(uiImage: image))
                 }
             }
+        case .rating(let rating):
+            Task {
+                await model.setRating(rating, for: avatar)
+            }
         }
     }
 

Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerViewModel.swift

@@ -207,7 +207,7 @@ class AvatarPickerViewModel: ObservableObject {
 
         let localID = UUID().uuidString
 
-        let localImageModel = AvatarImageModel(id: localID, source: .local(image: image), state: .loading)
+        let localImageModel = AvatarImageModel(id: localID, source: .local(image: image), state: .loading, rating: .g)
         grid.append(localImageModel)
 
         await doUpload(squareImage: image, localID: localID, accessToken: authToken)
@@ -290,7 +290,8 @@ class AvatarPickerViewModel: ObservableObject {
         let newModel = AvatarImageModel(
             id: imageID,
             source: .local(image: squareImage),
-            state: .error(supportsRetry: supportsRetry, errorMessage: errorMessage)
+            state: .error(supportsRetry: supportsRetry, errorMessage: errorMessage),
+            rating: grid.model(with: imageID)?.rating ?? .g
         )
         grid.replaceModel(withID: imageID, with: newModel)
     }
@@ -337,6 +338,21 @@ class AvatarPickerViewModel: ObservableObject {
         await profile
     }
 
+    func setRating(_ rating: AvatarRating, for avatar: AvatarImageModel) async {
+        guard let authToken else { return }
+
+        do {
+            let updatedAvatar = try await profileService.setRating(
+                rating,
+                for: .hashID(avatar.id),
+                token: authToken
+            )
+            grid.replaceModel(withID: avatar.id, with: .init(with: updatedAvatar))
+        } catch {
+            // TODO: Handle error
+        }
+    }
+
     func delete(_ avatar: AvatarImageModel) async -> Bool {
         guard let token = self.authToken else { return false }
         defer {
@@ -440,5 +456,6 @@ extension AvatarImageModel {
         source = .remote(url: avatar.url(withSize: String(avatarGridItemSize)))
         state = .loaded
         isSelected = avatar.isSelected
+        rating = avatar.rating
     }
 }

Sources/GravatarUI/SwiftUI/AvatarPicker/Views/AvatarPickerAvatarView.swift

@@ -80,25 +80,101 @@ struct AvatarPickerAvatarView: View {
 
     func actionsMenu() -> some View {
         Menu {
-            ForEach(AvatarAction.allCases) { action in
+            Section {
+                button(for: .share)
+                if #available(iOS 18.2, *) {
+                    if EnvironmentValues().supportsImagePlayground {
+                        button(for: .playground)
+                    }
+                }
+            }
+            Section {
+                Menu {
+                    ForEach(AvatarRating.allCases, id: \.self) { rating in
+                        button(for: .rating(rating))
+                    }
+                } label: {
+                    label(forAction: AvatarAction.rating(avatar.rating))
+                }
+            }
+            Section {
+                button(for: .delete)
+            }
+        } label: {
+            ellipsisView()
+        }
+    }
+
+    func button(for action: AvatarAction) -> some View {
+        Group {
+            switch action {
+            case .rating(let rating):
                 Button(role: action.role) {
                     onActionTap(action)
                 } label: {
-                    Label {
-                        Text(action.localizedTitle)
-                    } icon: {
-                        action.icon
+                    let buttonTitle = "\(rating.rawValue) (\(rating.localizedSubtitle))"
+                    if rating == avatar.rating {
+                        Label(buttonTitle, systemImage: "checkmark")
+                    } else {
+                        Text(buttonTitle)
                     }
                 }
+            case .delete, .playground, .share:
+                Button(role: action.role) {
+                    onActionTap(action)
+                } label: {
+                    label(forAction: action)
+                }
             }
-        } label: {
-            ellipsisView()
+        }
+    }
+
+    func label(forAction action: AvatarAction) -> Label<Text, Image> {
+        Label {
+            Text(action.localizedTitle)
+        } icon: {
+            action.icon
+        }
+    }
+}
+
+extension AvatarRating {
+    fileprivate var localizedSubtitle: String {
+        switch self {
+        case .g:
+            SDKLocalizedString(
+                "Avatar.Rating.G.subtitle",
+                value: "General",
+                comment: "Rating that indicates that the avatar is suitable for everyone"
+            )
+        case .pg:
+            SDKLocalizedString(
+                "Avatar.Rating.PG.subtitle",
+                value: "Parental Guidance",
+                comment: "Rating that indicates that the avatar may not be suitable for children"
+            )
+        case .r:
+            SDKLocalizedString(
+                "Avatar.Rating.R.subtitle",
+                value: "Restricted",
+                comment: "Rating that indicates that the avatar may not be suitable for children"
+            )
+        case .x:
+            SDKLocalizedString(
+                "Avatar.Rating.X.subtitle",
+                value: "Extreme",
+                comment: "Rating that indicates that the avatar is obviously and extremely suitable for children"
+            )
         }
     }
 }
 
 #Preview {
-    let avatar = AvatarImageModel(id: "1", source: .remote(url: "https://gravatar.com/userimage/110207384/aa5f129a2ec75162cee9a1f0c472356a.jpeg?size=256"))
+    let avatar = AvatarImageModel(
+        id: "1",
+        source: .remote(url: "https://gravatar.com/userimage/110207384/aa5f129a2ec75162cee9a1f0c472356a.jpeg?size=256"),
+        rating: .pg
+    )
     return AvatarPickerAvatarView(avatar: avatar, maxLength: AvatarGridConstants.maxAvatarWidth, minLength: AvatarGridConstants.minAvatarWidth) {
         false
     } onAvatarTap: { _ in