From 2ec1e7e92560b2c5f222ab77d479c3839ed79ed4 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 22 Nov 2017 09:39:11 -0500
Subject: [PATCH] Respond to CR.

---
 .../ConversationView/ConversationScrollButton.h  |  2 ++
 .../ConversationView/ConversationScrollButton.m  | 16 +++++++++-------
 .../ConversationViewController.m                 |  8 ++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.h b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.h
index dea8f43de..ba830bfa7 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.h
+++ b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.h
@@ -8,6 +8,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic) BOOL hasUnreadMessages;
 
++ (CGFloat)buttonSize;
+
 - (nullable instancetype)initWithIconText:(NSString *)iconText;
 
 @end
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
index 3a196d7e1..3570c4224 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (nullable instancetype)initWithIconText:(NSString *)iconText
 {
-    self = [super initWithFrame:CGRectMake(0, 0, self.buttonSize, self.buttonSize)];
+    self = [super initWithFrame:CGRectZero];
     if (!self) {
         return self;
     }
@@ -35,12 +35,12 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-- (CGFloat)circleSize
++ (CGFloat)circleSize
 {
     return ScaleFromIPhone5To7Plus(35.f, 40.f);
 }
 
-- (CGFloat)buttonSize
++ (CGFloat)buttonSize
 {
     return self.circleSize + 2 * 15.f;
 }
@@ -51,17 +51,18 @@ NS_ASSUME_NONNULL_BEGIN
     self.iconLabel = iconLabel;
     iconLabel.userInteractionEnabled = NO;
 
+    const CGFloat circleSize = self.class.circleSize;
     UIView *circleView = [UIView new];
     self.circleView = circleView;
     circleView.backgroundColor = [UIColor colorWithWhite:0.95f alpha:1.f];
     circleView.userInteractionEnabled = NO;
-    circleView.layer.cornerRadius = self.circleSize * 0.5f;
+    circleView.layer.cornerRadius = circleSize * 0.5f;
     circleView.layer.shadowColor = [UIColor colorWithWhite:0.5f alpha:1.f].CGColor;
     circleView.layer.shadowOffset = CGSizeMake(+1.f, +2.f);
     circleView.layer.shadowRadius = 1.5f;
     circleView.layer.shadowOpacity = 0.35f;
-    [circleView autoSetDimension:ALDimensionWidth toSize:self.circleSize];
-    [circleView autoSetDimension:ALDimensionHeight toSize:self.circleSize];
+    [circleView autoSetDimension:ALDimensionWidth toSize:circleSize];
+    [circleView autoSetDimension:ALDimensionHeight toSize:circleSize];
 
     [self addSubview:circleView];
     [self addSubview:iconLabel];
@@ -80,12 +81,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)updateColors
 {
+    const CGFloat circleSize = self.class.circleSize;
     self.circleView.backgroundColor
         = (self.hasUnreadMessages ? [UIColor ows_materialBlueColor] : [UIColor colorWithWhite:0.95f alpha:1.f]);
     self.iconLabel.attributedText = [[NSAttributedString alloc]
         initWithString:self.iconText
             attributes:@{
-                NSFontAttributeName : [UIFont ows_fontAwesomeFont:self.circleSize * 0.8f],
+                NSFontAttributeName : [UIFont ows_fontAwesomeFont:circleSize * 0.8f],
                 NSForegroundColorAttributeName :
                     (self.hasUnreadMessages ? [UIColor whiteColor] : [UIColor ows_materialBlueColor]),
                 NSBaselineOffsetAttributeName : @(-0.5f),
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index a93d6526a..9bf9b050d 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2232,8 +2232,8 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
                               action:@selector(scrollDownButtonTapped)
                     forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:self.scrollDownButton];
-    [self.scrollDownButton autoSetDimension:ALDimensionWidth toSize:self.scrollDownButton.width];
-    [self.scrollDownButton autoSetDimension:ALDimensionHeight toSize:self.scrollDownButton.width];
+    [self.scrollDownButton autoSetDimension:ALDimensionWidth toSize:ConversationScrollButton.buttonSize];
+    [self.scrollDownButton autoSetDimension:ALDimensionHeight toSize:ConversationScrollButton.buttonSize];
     [self.scrollDownButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:self.inputToolbar];
     [self.scrollDownButton autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
 
@@ -2243,8 +2243,8 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
                             action:@selector(scrollUpButtonTapped)
                   forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:self.scrollUpButton];
-    [self.scrollUpButton autoSetDimension:ALDimensionWidth toSize:self.scrollUpButton.width];
-    [self.scrollUpButton autoSetDimension:ALDimensionHeight toSize:self.scrollUpButton.width];
+    [self.scrollUpButton autoSetDimension:ALDimensionWidth toSize:ConversationScrollButton.buttonSize];
+    [self.scrollUpButton autoSetDimension:ALDimensionHeight toSize:ConversationScrollButton.buttonSize];
     [self.scrollUpButton autoPinToTopLayoutGuideOfViewController:self withInset:0];
     [self.scrollUpButton autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
 #endif