Merge branch 'task/gravatar-integration' into gravatar/etoledom/using…

…-fetch-profile-from-gravatar-sdk
wordpress-mobile · Feb 21, 2024 · 109e40d · 109e40d
2 parents d72bcfd + 4035beb
commit 109e40d
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog + Me/UIBarButtonItem+MeBarButton.swift b/WordPress/Classes/ViewRelated/Blog/Blog + Me/UIBarButtonItem+MeBarButton.swift
@@ -68,7 +68,7 @@ fileprivate extension UIBarButtonItem {
         gravatarImageView.contentMode = .scaleAspectFill
 
         if let email = email {
-            gravatarImageView.downloadGravatarWithEmail(email, placeholderImage: GravatarConfiguration.fallBackImage)
+            gravatarImageView.downloadGravatar(for: email, placeholderImage: GravatarConfiguration.fallBackImage)
         } else {
             gravatarImageView.image = GravatarConfiguration.fallBackImage
         }

diff --git a/WordPress/Classes/ViewRelated/Comments/CommentContentTableViewCell.swift b/WordPress/Classes/ViewRelated/Comments/CommentContentTableViewCell.swift
@@ -375,7 +375,7 @@ private extension CommentContentTableViewCell {
             return
         }
 
-        avatarImageView.downloadGravatarWithEmail(someEmail, placeholderImage: Style.placeholderImage)
+        avatarImageView.downloadGravatar(for: someEmail, placeholderImage: Style.placeholderImage)
     }
 
     func updateContainerLeadingConstraint() {

diff --git a/WordPress/Classes/ViewRelated/Me/My Profile/MyProfileHeaderView.swift b/WordPress/Classes/ViewRelated/Me/My Profile/MyProfileHeaderView.swift
@@ -25,7 +25,7 @@ class MyProfileHeaderView: UITableViewHeaderFooterView {
     var gravatarEmail: String? = nil {
         didSet {
             if let email = gravatarEmail {
-                gravatarImageView.downloadGravatarWithEmail(email, rating: GravatarRatings.x)
+                gravatarImageView.downloadGravatar(for: email, gravatarRating: .x)
             }
         }
     }

diff --git a/WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderView.m b/WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderView.m
@@ -1,6 +1,7 @@
 #import "MeHeaderView.h"
 #import "Blog.h"
 #import "WordPress-Swift.h"
+#import "Gravatar-Swift.h"
 
 const CGFloat MeHeaderViewHeight = 154;
 const CGFloat MeHeaderViewGravatarSize = 64.0;
@@ -67,7 +68,7 @@ - (NSString *)username
 - (void)setGravatarEmail:(NSString *)gravatarEmail
 {    
     // Since this view is only visible to the current user, we should show all ratings
-    [self.gravatarImageView downloadGravatarWithEmail:gravatarEmail rating:GravatarRatingsX];
+    [self.gravatarImageView downloadGravatarFor:gravatarEmail gravatarRating:GravatarRatingX];
     _gravatarEmail = gravatarEmail;
 }
 

diff --git a/WordPress/Classes/ViewRelated/NUX/EpilogueUserInfoCell.swift b/WordPress/Classes/ViewRelated/NUX/EpilogueUserInfoCell.swift
@@ -60,7 +60,7 @@ class EpilogueUserInfoCell: UITableViewCell {
                 gravatarView.downloadImage(from: url)
             } else {
                 let placeholder: UIImage = allowGravatarUploads ? .gravatarUploadablePlaceholderImage : .gravatarPlaceholderImage
-                gravatarView.downloadGravatarWithEmail(userInfo.email, rating: .x, placeholderImage: placeholder)
+                gravatarView.downloadGravatar(for: userInfo.email, gravatarRating: .x, placeholderImage: placeholder)
             }
         }
     }

diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockCommentTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockCommentTableViewCell.swift
@@ -111,7 +111,7 @@ class NoteBlockCommentTableViewCell: NoteBlockTextTableViewCell {
             return
         }
 
-        gravatarImageView.downloadGravatarWithEmail(unwrappedEmail, placeholderImage: placeholderImage)
+        gravatarImageView.downloadGravatar(for: unwrappedEmail, placeholderImage: placeholderImage)
     }
 
     // MARK: - View Methods

diff --git a/WordPress/Classes/ViewRelated/Post/AuthorFilterButton.swift b/WordPress/Classes/ViewRelated/Post/AuthorFilterButton.swift
@@ -39,7 +39,7 @@ final class AuthorFilterButton: UIControl {
             case .user(let email):
                 authorImageView.contentMode = .scaleAspectFill
                 if let email = email {
-                    authorImageView.downloadGravatarWithEmail(email, placeholderImage: gravatarPlaceholder)
+                    authorImageView.downloadGravatar(for: email, placeholderImage: gravatarPlaceholder)
                 } else {
                     authorImageView.image = gravatarPlaceholder
                 }

diff --git a/WordPress/Classes/ViewRelated/Post/AuthorFilterViewController.swift b/WordPress/Classes/ViewRelated/Post/AuthorFilterViewController.swift
@@ -253,7 +253,7 @@ private class AuthorFilterCell: UITableViewCell {
 
                 let placeholder = UIImage(named: "comment-author-gravatar")
                 if let email = email {
-                    gravatarImageView.downloadGravatarWithEmail(email, placeholderImage: placeholder ?? UIImage())
+                    gravatarImageView.downloadGravatar(for: email, placeholderImage: placeholder ?? UIImage())
                 } else {
                     gravatarImageView.image = placeholder
                 }

diff --git a/WordPress/Classes/ViewRelated/Views/List/ListTableViewCell.swift b/WordPress/Classes/ViewRelated/Views/List/ListTableViewCell.swift
@@ -102,7 +102,7 @@ class ListTableViewCell: UITableViewCell, NibReusable {
             return
         }
 
-        avatarView.downloadGravatarWithEmail(someEmail, placeholderImage: placeholderImage)
+        avatarView.downloadGravatar(for: someEmail, placeholderImage: placeholderImage)
     }
 
     // MARK: Overlay View Support
-Original file line number
+Diff line change
@@ Expand Up / @@ -375,7 +375,7 @@ private extension CommentContentTableViewCell { @@
                 return
             }
-            avatarImageView.downloadGravatarWithEmail(someEmail, placeholderImage: Style.placeholderImage)
+            avatarImageView.downloadGravatar(for: someEmail, placeholderImage: Style.placeholderImage)
         }
         func updateContainerLeadingConstraint() {
@@ Expand Down @@