From 6dfd3f1bd4ce9157e6329eed49722c08bec44a33 Mon Sep 17 00:00:00 2001
From: Ryan Nystrom <rnystrom@instagram.com>
Date: Fri, 16 Mar 2018 18:28:40 -0400
Subject: [PATCH] fix left button positioning, refactor inset, and undo font
 changes

---
 .../attachment.imageset/Contents.json         |  22 ----
 .../attachment.imageset/attachment.png        | Bin 1662 -> 0 bytes
 .../attachment.imageset/attachment@2x.png     | Bin 3508 -> 0 bytes
 Examples/Examples/ViewController.swift        |  14 ++-
 MessageViewController/MessageTextView.swift   |   4 +-
 MessageViewController/MessageView.swift       | 113 +++++++++++-------
 6 files changed, 80 insertions(+), 73 deletions(-)
 delete mode 100644 Examples/Examples/Assets.xcassets/attachment.imageset/Contents.json
 delete mode 100644 Examples/Examples/Assets.xcassets/attachment.imageset/attachment.png
 delete mode 100644 Examples/Examples/Assets.xcassets/attachment.imageset/attachment@2x.png

diff --git a/Examples/Examples/Assets.xcassets/attachment.imageset/Contents.json b/Examples/Examples/Assets.xcassets/attachment.imageset/Contents.json
deleted file mode 100644
index 854865a..0000000
--- a/Examples/Examples/Assets.xcassets/attachment.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "attachment.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "attachment@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Examples/Examples/Assets.xcassets/attachment.imageset/attachment.png b/Examples/Examples/Assets.xcassets/attachment.imageset/attachment.png
deleted file mode 100644
index 451b4d73600b1fc2a4569d7cca3b24e6aac13096..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1662
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
IM6N<$f-=x1%m4rY

diff --git a/Examples/Examples/Assets.xcassets/attachment.imageset/attachment@2x.png b/Examples/Examples/Assets.xcassets/attachment.imageset/attachment@2x.png
deleted file mode 100644
index 753fd95080067ad5d943e659b6078ed104d0ee2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3508
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

diff --git a/Examples/Examples/ViewController.swift b/Examples/Examples/ViewController.swift
index 73347ba..1277be9 100644
--- a/Examples/Examples/ViewController.swift
+++ b/Examples/Examples/ViewController.swift
@@ -27,18 +27,20 @@ class ViewController: MessageViewController, UITableViewDataSource, UITableViewD
 
         messageView.inset = UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 16)
         messageView.font = UIFont.preferredFont(forTextStyle: .body)
-        messageView.leftButtonInset = 8
 
-        messageView.set(buttonIcon: UIImage(named: "attachment"), for: .normal, type: .left)
-        messageView.addButton(target: self, action: #selector(onLeftButton), type: .left)
+        messageView.setButton(title: "Add", for: .normal, position: .left)
+        messageView.addButton(target: self, action: #selector(onLeftButton), position: .left)
+        messageView.leftButtonTint = .blue
         messageView.showLeftButton = true
 
+        messageView.setButton(inset: 10, position: .left)
+        messageView.setButton(inset: 15, position: .right)
+
         messageView.textView.placeholderText = "New message..."
         messageView.textView.placeholderTextColor = .lightGray
-        messageView.textView.backgroundColor = .white
 
-        messageView.set(buttonTitle: "Send", for: .normal, type: .right)
-        messageView.addButton(target: self, action: #selector(onRightButton), type: .right)
+        messageView.setButton(title: "Send", for: .normal, position: .right)
+        messageView.addButton(target: self, action: #selector(onRightButton), position: .right)
         messageView.rightButtonTint = .blue
 
         messageAutocompleteController.tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")
diff --git a/MessageViewController/MessageTextView.swift b/MessageViewController/MessageTextView.swift
index 8637dc2..3399d65 100644
--- a/MessageViewController/MessageTextView.swift
+++ b/MessageViewController/MessageTextView.swift
@@ -87,8 +87,8 @@ open class MessageTextView: UITextView, UITextViewDelegate {
 
         let placeholderSize = placeholderLabel.bounds.size
         placeholderLabel.frame = CGRect(
-            x: bounds.minX,
-            y: bounds.minY,
+            x: textContainerInset.left,
+            y: textContainerInset.top,
             width: placeholderSize.width,
             height: placeholderSize.height
         )
diff --git a/MessageViewController/MessageView.swift b/MessageViewController/MessageView.swift
index 6584002..b01beb5 100644
--- a/MessageViewController/MessageView.swift
+++ b/MessageViewController/MessageView.swift
@@ -20,9 +20,10 @@ public final class MessageView: UIView, MessageTextViewListener {
     internal var contentView: UIView?
     internal var leftButtonAction: Selector?
     internal var rightButtonAction: Selector?
-    public var showLeftButton: Bool = true
+    internal var leftButtonInset: CGFloat = 0
+    internal var rightButtonInset: CGFloat = 0
 
-    public enum buttonType {
+    public enum ButtonPosition {
         case left
         case right
     }
@@ -84,11 +85,15 @@ public final class MessageView: UIView, MessageTextViewListener {
 
     // MARK: Public API
 
+    public var showLeftButton: Bool = true {
+        didSet {
+            delegate?.wantsLayout(messageView: self)
+        }
+    }
+
     public var font: UIFont? {
         get { return textView.font }
         set {
-            leftButton.titleLabel?.font = newValue
-            rightButton.titleLabel?.font = newValue
             textView.font = newValue
             delegate?.wantsLayout(messageView: self)
         }
@@ -103,41 +108,37 @@ public final class MessageView: UIView, MessageTextViewListener {
         }
     }
 
-    public var inset: UIEdgeInsets = .zero {
-        didSet {
+    public var inset: UIEdgeInsets {
+        set {
+            textView.textContainerInset = newValue
             setNeedsLayout()
             delegate?.wantsLayout(messageView: self)
         }
+        get { return textView.textContainerInset }
     }
 
-    public var leftButtonInset: CGFloat = 0 {
-        didSet { setNeedsLayout() }
-    }
-
-    public func set(buttonIcon: UIImage?, for state: UIControlState, type: buttonType) {
+    public func setButton(icon: UIImage?, for state: UIControlState, position: ButtonPosition) {
         let button: UIButton
-        switch type {
+        switch position {
         case .left:
             button = leftButton
         case .right:
             button = rightButton
         }
-        
-        button.setImage(buttonIcon, for: state)
-        buttonLayoutDidChange()
+        button.setImage(icon, for: state)
+        buttonLayoutDidChange(button: button)
     }
 
-    public func set(buttonTitle: String, for state: UIControlState, type: buttonType) {
+    public func setButton(title: String, for state: UIControlState, position: ButtonPosition) {
         let button: UIButton
-        switch type {
+        switch position {
         case .left:
             button = leftButton
         case .right:
             button = rightButton
         }
-        
-        button.setTitle(buttonTitle, for: state)
-        buttonLayoutDidChange()
+        button.setTitle(title, for: state)
+        buttonLayoutDidChange(button: button)
     }
 
     public var leftButtonTint: UIColor {
@@ -177,9 +178,9 @@ public final class MessageView: UIView, MessageTextViewListener {
         set { textView.keyboardType = newValue }
     }
 
-    public func addButton(target: Any, action: Selector, type: buttonType) {
+    public func addButton(target: Any, action: Selector, position: ButtonPosition) {
         let button: UIButton
-        switch type {
+        switch position {
         case .left:
             button = leftButton
             leftButtonAction = action
@@ -196,6 +197,28 @@ public final class MessageView: UIView, MessageTextViewListener {
         return [UIKeyCommand(input: "\r", modifierFlags: .command, action: action)]
     }
 
+    public func setButton(inset: CGFloat, position: ButtonPosition) {
+        switch position {
+        case .left:
+            leftButtonInset = inset
+        case .right:
+            rightButtonInset = inset
+        }
+        setNeedsLayout()
+    }
+
+    public func setButton(font: UIFont, position: ButtonPosition) {
+        let button: UIButton
+        switch position {
+        case .left:
+            button = leftButton
+        case .right:
+            button = rightButton
+        }
+        button.titleLabel?.font = font
+        buttonLayoutDidChange(button: button)
+    }
+
     // MARK: Overrides
 
     public override func layoutSubviews() {
@@ -214,33 +237,35 @@ public final class MessageView: UIView, MessageTextViewListener {
             width: bounds.width - util_safeAreaInsets.left - util_safeAreaInsets.right,
             height: bounds.height
         )
-        let insetBounds = UIEdgeInsetsInsetRect(safeBounds, inset)
 
-        let size = textView.font?.lineHeight ?? 25 //Use textView line height
-        let leftButtonSize = CGSize(width: size, height: size)
+        let leftButtonSize = leftButton.bounds.size
         let rightButtonSize = rightButton.bounds.size
-        
+
+        let textViewY = safeBounds.minY
+        let textViewHeight = self.textViewHeight
+        let textViewMaxY = textViewY + textViewHeight
+
         // adjust by bottom offset so content is flush w/ text view
         let leftButtonFrame = CGRect(
-            x: insetBounds.minX,
-            y: (insetBounds.minY + textViewHeight) - leftButtonSize.height + leftButton.bottomHeightOffset,
+            x: safeBounds.minX + inset.left,
+            y: textViewMaxY - leftButtonSize.height + leftButton.bottomHeightOffset - inset.bottom,
             width: leftButtonSize.width,
             height: leftButtonSize.height
         )
-        leftButton.frame = (showLeftButton) ? leftButtonFrame : .zero
-        
+        leftButton.frame = showLeftButton ? leftButtonFrame : .zero
+
         let textViewFrame = CGRect(
-            x: ((showLeftButton) ? leftButtonFrame.maxX : 0) + leftButtonInset,
-            y: insetBounds.minY,
-            width: insetBounds.width - ((showLeftButton) ? leftButtonSize.width : 0) - leftButtonInset - rightButtonSize.width,
+            x: leftButtonFrame.maxX + leftButtonInset,
+            y: textViewY,
+            width: safeBounds.width - leftButtonFrame.maxX - rightButtonSize.width - rightButtonInset - inset.right,
             height: textViewHeight
         )
         textView.frame = textViewFrame
 
         // adjust by bottom offset so content is flush w/ text view
         let rightButtonFrame = CGRect(
-            x: textViewFrame.maxX + leftButtonInset,
-            y: textViewFrame.maxY - rightButtonSize.height + rightButton.bottomHeightOffset,
+            x: textViewFrame.maxX + rightButtonInset,
+            y: textViewMaxY - rightButtonSize.height + rightButton.bottomHeightOffset - inset.bottom,
             width: rightButtonSize.width,
             height: rightButtonSize.height
         )
@@ -268,14 +293,17 @@ public final class MessageView: UIView, MessageTextViewListener {
     // MARK: Private API
 
     internal var height: CGFloat {
-        return inset.top
-            + inset.bottom
-            + textViewHeight
-            + (contentView?.bounds.height ?? 0)
+        return textViewHeight + (contentView?.bounds.height ?? 0)
     }
 
     internal var textViewHeight: CGFloat {
-        return min(maxHeight, max(textView.font?.lineHeight ?? 0, textView.contentSize.height))
+        return ceil(min(
+            maxHeight,
+            max(
+                textView.font?.lineHeight ?? 0,
+                textView.contentSize.height
+            )
+        ))
     }
 
     internal var maxHeight: CGFloat {
@@ -288,9 +316,8 @@ public final class MessageView: UIView, MessageTextViewListener {
         rightButton.alpha = isEmpty ? 0.25 : 1
     }
 
-    internal func buttonLayoutDidChange() {
-        leftButton.sizeToFit()
-        rightButton.sizeToFit()
+    internal func buttonLayoutDidChange(button: UIButton) {
+        button.sizeToFit()
         setNeedsLayout()
     }