From 2244830633ad8b8439f6e85b4f8d84ad27a4e4fb Mon Sep 17 00:00:00 2001
From: David Sinclair <dev@dejal.com>
Date: Wed, 26 Sep 2018 11:20:51 -0700
Subject: [PATCH] iOS: done #1122 (stretched user icon)

Fixed the social feed detail icon being stretched, and the avatar on the feeds list being missing.
---
 clients/ios/Classes/FeedDetailViewController.m |  3 +--
 clients/ios/Classes/NewsBlurViewController.m   |  4 ++--
 clients/ios/Classes/Utilities.h                |  1 +
 clients/ios/Classes/Utilities.m                | 12 ++++++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/clients/ios/Classes/FeedDetailViewController.m b/clients/ios/Classes/FeedDetailViewController.m
index ef4d34bd8..229091c2b 100644
--- a/clients/ios/Classes/FeedDetailViewController.m
+++ b/clients/ios/Classes/FeedDetailViewController.m
@@ -328,12 +328,11 @@
         spacerBarButton.width = -6;
         NSString *feedIdStr = [NSString stringWithFormat:@"%@", [storiesCollection.activeFeed objectForKey:@"id"]];
         UIImage *titleImage  = [appDelegate getFavicon:feedIdStr isSocial:YES];
-        titleImage = [Utilities roundCorneredImage:titleImage radius:6];
+        titleImage = [Utilities roundCorneredImage:titleImage radius:6 convertToSize:CGSizeMake(32, 32)];
         [((UIButton *)titleImageBarButton.customView).imageView removeFromSuperview];
         titleImageBarButton = [UIBarButtonItem barItemWithImage:titleImage
                                                          target:self
                                                          action:@selector(showUserProfile)];
-        titleImageBarButton.customView.frame = CGRectMake(0, 0, 32, 32);
         self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects:
                                                    spacerBarButton,
                                                    titleImageBarButton,
diff --git a/clients/ios/Classes/NewsBlurViewController.m b/clients/ios/Classes/NewsBlurViewController.m
index 8e966cad0..7261fa2ce 100644
--- a/clients/ios/Classes/NewsBlurViewController.m
+++ b/clients/ios/Classes/NewsBlurViewController.m
@@ -2131,6 +2131,7 @@ heightForHeaderInSection:(NSInteger)section {
                                                   target:self
                                                   action:@selector(showUserProfile)];
     userAvatarButton.customView.frame = CGRectMake(0, yOffset + 1, 32, 32);
+    userAvatarButton.width = 32;
     userAvatarButton.accessibilityLabel = @"User info";
     userAvatarButton.accessibilityHint = @"Double-tap for information about your account.";
 
@@ -2141,8 +2142,7 @@ heightForHeaderInSection:(NSInteger)section {
     typeof(self) __weak weakSelf = self;
     [avatarImageView setImageWithURLRequest:avatarRequest placeholderImage:nil success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
         typeof(weakSelf) __strong strongSelf = weakSelf;
-        image = [Utilities imageWithImage:image convertToSize:CGSizeMake(32, 32)];
-        image = [Utilities roundCorneredImage:image radius:6];
+        image = [Utilities roundCorneredImage:image radius:6 convertToSize:CGSizeMake(32, 32)];
         [(UIButton *)strongSelf.userAvatarButton.customView setImage:image forState:UIControlStateNormal];
         
     } failure:^(NSURLRequest * _Nonnull request, NSHTTPURLResponse * _Nonnull response, NSError * _Nonnull error) {
diff --git a/clients/ios/Classes/Utilities.h b/clients/ios/Classes/Utilities.h
index 9ded127c9..a190dc5fc 100644
--- a/clients/ios/Classes/Utilities.h
+++ b/clients/ios/Classes/Utilities.h
@@ -17,6 +17,7 @@ void drawLinearGradient(CGContextRef context, CGRect rect, CGColorRef startColor
 
 + (void)drawLinearGradientWithRect:(CGRect)rect startColor:(CGColorRef)startColor endColor:(CGColorRef)endColor;
 + (UIImage *)roundCorneredImage:(UIImage *)orig radius:(CGFloat)r;
++ (UIImage *)roundCorneredImage: (UIImage*)orig radius:(CGFloat)r convertToSize:(CGSize)size;
 + (UIImage *)imageWithImage:(UIImage *)image convertToSize:(CGSize)size;
 + (NSString *)md5:(NSString *)string;
 + (NSString *)formatLongDateFromTimestamp:(NSInteger)timestamp;
diff --git a/clients/ios/Classes/Utilities.m b/clients/ios/Classes/Utilities.m
index 3fcd472ba..e98e90cd4 100644
--- a/clients/ios/Classes/Utilities.m
+++ b/clients/ios/Classes/Utilities.m
@@ -58,12 +58,16 @@ void drawLinearGradient(CGContextRef context, CGRect rect, CGColorRef startColor
     CGColorSpaceRelease(colorSpace);
 }
 
-+ (UIImage *)roundCorneredImage: (UIImage*) orig radius:(CGFloat) r {
++ (UIImage *)roundCorneredImage:(UIImage*)orig radius:(CGFloat)r {
+    return [self roundCorneredImage:orig radius:r convertToSize:orig.size];
+}
+
++ (UIImage *)roundCorneredImage:(UIImage*)orig radius:(CGFloat)r convertToSize:(CGSize)size {
     if (!orig) return nil;
-    UIGraphicsBeginImageContextWithOptions(orig.size, NO, 0);
-    [[UIBezierPath bezierPathWithRoundedRect:(CGRect){CGPointZero, orig.size} 
+    UIGraphicsBeginImageContextWithOptions(size, NO, 0);
+    [[UIBezierPath bezierPathWithRoundedRect:(CGRect){CGPointZero, size}
                                 cornerRadius:r] addClip];
-    [orig drawInRect:(CGRect){CGPointZero, orig.size}];
+    [orig drawInRect:(CGRect){CGPointZero, size}];
     UIImage* result = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
     return result;