Leaving only location on QE profile card details (#653)

Sources/GravatarUI/ProfileFields/Model/PersonalInfoModel.swift

@@ -35,7 +35,7 @@ public enum PersonalInfoBuildingBlock {
 }
 
 extension String {
-    fileprivate func nilIfEmpty() -> String? {
+    func nilIfEmpty() -> String? {
         isEmpty ? nil : self
     }
 }

Sources/GravatarUI/Resources/en.lproj/Localizable.strings

@@ -118,8 +118,8 @@
 /* Placeholder text for the name field */
 "AvatarPickerProfile.Name.placeholder" = "Your Name";
 
-/* Placeholder text for some profile fields. */
-"AvatarPickerProfile.ProfileFields.placeholder" = "Job, location, pronouns etc.";
+/* Placeholder text for the profile card. Will show as subtitle bellow the name placeholder. */
+"AvatarPickerProfile.ProfileFields.placeholder" = "Location";
 
 /* This error message shows when the user attempts to change the alt text of an avatar and fails. */
 "AvatarPickerViewModel.AltText.Error" = "Oops, something didn't quite work out while trying to update the alt text.";

Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerProfileView.swift

@@ -11,14 +11,9 @@ struct AvatarPickerProfileView: View {
         var displayName: String
         var location: String
         var profileURL: URL?
-        var pronunciation: String
-        var pronouns: String
 
         var profileDetails: String? {
-            let joinedFields = [pronunciation, pronouns, location]
-                .filter { !$0.isEmpty }
-                .joined(separator: "・")
-            return joinedFields.isEmpty ? nil : joinedFields
+            location.nilIfEmpty()
         }
     }
 
@@ -147,8 +142,8 @@ extension AvatarPickerProfileView {
         )
         static let profileDetailsPlaceholder = SDKLocalizedString(
             "AvatarPickerProfile.ProfileFields.placeholder",
-            value: "Job, location, pronouns etc.",
-            comment: "Placeholder text for some profile fields."
+            value: "Location",
+            comment: "Placeholder text for the profile card. Will show as subtitle bellow the name placeholder."
         )
     }
 }
@@ -163,9 +158,7 @@ extension AvatarPickerProfileView {
             .init(
                 displayName: "Shelly Kimbrough",
                 location: "San Antonio, TX",
-                profileURL: URL(string: "https://gravatar.com"),
-                pronunciation: "SHEL-ee",
-                pronouns: "she/her"
+                profileURL: URL(string: "https://gravatar.com")
             )
         ),
         isLoading: .constant(false)

Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerViewModel.swift

@@ -37,9 +37,7 @@ class AvatarPickerViewModel: ObservableObject {
                 profileModel = .init(
                     displayName: value.displayName,
                     location: value.location,
-                    profileURL: value.profileURL,
-                    pronunciation: value.pronunciation,
-                    pronouns: value.pronouns
+                    profileURL: value.profileURL
                 )
             default:
                 profileModel = nil
@@ -100,9 +98,7 @@ class AvatarPickerViewModel: ObservableObject {
             self.profileModel = .init(
                 displayName: profileModel.displayName,
                 location: profileModel.location,
-                profileURL: profileModel.profileURL,
-                pronunciation: profileModel.pronunciation,
-                pronouns: profileModel.pronouns
+                profileURL: profileModel.profileURL
             )
             switch profileModel.avatarIdentifier {
             case .email(let email):

Tests/GravatarUITests/AvatarPickerProfileViewTests.swift

@@ -23,9 +23,36 @@ final class AvatarPickerProfileViewTests: XCTestCase {
                         .init(
                             displayName: "Shelly Kimbrough",
                             location: "San Antonio, TX",
-                            profileURL: URL(string: "https://gravatar.com"),
-                            pronunciation: "SHEL-ee",
-                            pronouns: "she/her"
+                            profileURL: URL(string: "https://gravatar.com")
+                        )
+                    ),
+                    isLoading: .constant(false)
+                )
+                .frame(maxWidth: .infinity, alignment: .leading)
+            })
+            .frame(minWidth: Self.width)
+
+        assertSnapshots(
+            of: testView,
+            as: [
+                .testStrategy(userInterfaceStyle: .light, layout: .sizeThatFits),
+                .testStrategy(userInterfaceStyle: .dark, layout: .sizeThatFits),
+            ]
+        )
+    }
+
+    @MainActor
+    func testAvatarPickerProfileViewWithoutLocation() throws {
+        let testView =
+            VStack(alignment: .leading, content: {
+                AvatarPickerProfileView(
+                    avatarID: .constant(.email("")),
+                    forceRefreshAvatar: .constant(false),
+                    model: .constant(
+                        .init(
+                            displayName: "Shelly Kimbrough",
+                            location: "",
+                            profileURL: URL(string: "https://gravatar.com")
                         )
                     ),
                     isLoading: .constant(false)