From 2c5b065d5cb62bf792443ae244aaaa07b163194e Mon Sep 17 00:00:00 2001
From: Diego Sanchez <diego.sanchez@corp.badoo.com>
Date: Mon, 21 Mar 2016 13:08:07 +0000
Subject: [PATCH 1/4] Improvements for custom styling  - Allows reusing default
 styles by injecting parameters  - Insets and fonts for input component

---
 .../Views/BaseMessageCollectionViewCell.swift |   2 +-
 ...essageCollectionViewCellDefaultStyle.swift | 157 ++++++++++++++----
 ...essageCollectionViewCellDefaultStyle.swift |  72 +++++---
 ...essageCollectionViewCellDefaultStyle.swift |  92 ++++++++--
 .../Source/Input/ChatInputBar.swift           |   5 +
 ChattoAdditions/Source/Input/ChatInputBar.xib |  19 ++-
 .../Source/Input/ChatInputBarAppearance.swift |   6 +-
 .../Source/Input/ChatInputBarPresenter.swift  |   5 +-
 .../Source/Input/ExpandableTextView.swift     |   4 +-
 .../Input/Photos/PhotosChatInputItem.swift    |  37 ++++-
 .../Source/Input/Text/TextChatInputItem.swift |  24 ++-
 11 files changed, 332 insertions(+), 91 deletions(-)

diff --git a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift
index e5b993c07..cd9de1962 100644
--- a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift	
+++ b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift	
@@ -26,7 +26,7 @@ import UIKit
 import Chatto
 
 public protocol BaseMessageCollectionViewCellStyleProtocol {
-    func avatarSize(viewModel viewModel: MessageViewModelProtocol) -> CGSize
+    func avatarSize(viewModel viewModel: MessageViewModelProtocol) -> CGSize // .zero => no avatar
     func avatarVerticalAlignment(viewModel viewModel: MessageViewModelProtocol) -> VerticalAlignment
     var failedIcon: UIImage { get }
     var failedIconHighlighted: UIImage { get }
diff --git a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift
index cf26e2026..d43b54f90 100644
--- a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift	
+++ b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift	
@@ -26,45 +26,110 @@ import UIKit
 
 public class BaseMessageCollectionViewCellDefaultStyle: BaseMessageCollectionViewCellStyleProtocol {
 
-    public init () {}
+    typealias Class = BaseMessageCollectionViewCellDefaultStyle
+
+    public struct Colors {
+        let incoming: () -> UIColor
+        let outgoing: () -> UIColor
+        public init(
+            @autoclosure(escaping) incoming: () -> UIColor,
+            @autoclosure(escaping) outgoing: () -> UIColor) {
+                self.incoming = incoming
+                self.outgoing = outgoing
+        }
+    }
 
-    lazy var baseColorIncoming = UIColor.bma_color(rgb: 0xE6ECF2)
-    lazy var baseColorOutgoing = UIColor.bma_color(rgb: 0x3D68F5)
+    public struct BubbleBorderImages {
+        let borderIncomingTail: () -> UIImage
+        let borderIncomingNoTail: () -> UIImage
+        let borderOutgoingTail: () -> UIImage
+        let borderOutgoingNoTail: () -> UIImage
+        public init(
+            @autoclosure(escaping) borderIncomingTail: () -> UIImage,
+            @autoclosure(escaping) borderIncomingNoTail: () -> UIImage,
+            @autoclosure(escaping) borderOutgoingTail: () -> UIImage,
+            @autoclosure(escaping) borderOutgoingNoTail: () -> UIImage) {
+                self.borderIncomingTail = borderIncomingTail
+                self.borderIncomingNoTail = borderIncomingNoTail
+                self.borderOutgoingTail = borderOutgoingTail
+                self.borderOutgoingNoTail = borderOutgoingNoTail
+        }
+    }
 
-    lazy var borderIncomingTail: UIImage = {
-        return UIImage(named: "bubble-incoming-border-tail", inBundle: NSBundle(forClass: BaseMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
+    public struct FailedIconImages {
+        let normal: () -> UIImage
+        let highlighted: () -> UIImage
+        public init(
+            @autoclosure(escaping) normal: () -> UIImage,
+            @autoclosure(escaping) highlighted: () -> UIImage) {
+                self.normal = normal
+                self.highlighted = highlighted
+        }
+    }
 
-    lazy var borderIncomingNoTail: UIImage = {
-        return UIImage(named: "bubble-incoming-border", inBundle: NSBundle(forClass: BaseMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
+    public struct DateTextStyle {
+        let font: () -> UIFont
+        let color: () -> UIColor
+        public init(
+            @autoclosure(escaping) font: () -> UIFont,
+            @autoclosure(escaping) color: () -> UIColor) {
+                self.font = font
+                self.color = color
+        }
+    }
 
-    lazy var borderOutgoingTail: UIImage = {
-        return UIImage(named: "bubble-outgoing-border-tail", inBundle: NSBundle(forClass: BaseMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
+    public struct AvatarStyle {
+        let size: CGSize
+        let alignment: VerticalAlignment
+        public init(size: CGSize = .zero, alignment: VerticalAlignment = .Bottom) {
+            self.size = size
+            self.alignment = alignment
+        }
+    }
 
-    lazy var borderOutgoingNoTail: UIImage = {
-        return UIImage(named: "bubble-outgoing-border", inBundle: NSBundle(forClass: BaseMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
+    let colors: Colors
+    let bubbleBorderImages: BubbleBorderImages
+    let failedIconImages: FailedIconImages
+    let layoutConstants: BaseMessageCollectionViewCellLayoutConstants
+    let dateTextStyle: DateTextStyle
+    let avatarStyle: AvatarStyle
+    public init (
+        colors: Colors = Class.createDefaultColors(),
+        bubbleBorderImages: BubbleBorderImages = Class.createDefaultBubbleBorderImages(),
+        failedIconImages: FailedIconImages = Class.createDefaultFailedIconImages(),
+        layoutConstants: BaseMessageCollectionViewCellLayoutConstants = Class.createDefaultLayoutConstants(),
+        dateTextStyle: DateTextStyle = Class.createDefaultDateTextStyle(),
+        avatarStyle: AvatarStyle = AvatarStyle()) {
+            self.colors = colors
+            self.bubbleBorderImages = bubbleBorderImages
+            self.failedIconImages = failedIconImages
+            self.layoutConstants = layoutConstants
+            self.dateTextStyle = dateTextStyle
+            self.avatarStyle = avatarStyle
+    }
 
-    public lazy var failedIcon: UIImage = {
-        return UIImage(named: "base-message-failed-icon", inBundle: NSBundle(forClass: BaseMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
+    public lazy var baseColorIncoming: UIColor = self.colors.incoming()
+    public lazy var baseColorOutgoing: UIColor = self.colors.outgoing()
 
-    public lazy var failedIconHighlighted: UIImage = {
-        return self.failedIcon.bma_blendWithColor(UIColor.blackColor().colorWithAlphaComponent(0.10))
-    }()
+    public lazy var borderIncomingTail: UIImage = self.bubbleBorderImages.borderIncomingTail()
+    public lazy var borderIncomingNoTail: UIImage = self.bubbleBorderImages.borderIncomingNoTail()
+    public lazy var borderOutgoingTail: UIImage = self.bubbleBorderImages.borderOutgoingTail()
+    public lazy var borderOutgoingNoTail: UIImage = self.bubbleBorderImages.borderOutgoingNoTail()
 
-    private lazy var dateFont = {
-        return UIFont.systemFontOfSize(12.0)
-    }()
+    public lazy var failedIcon: UIImage = self.failedIconImages.normal()
+    public lazy var failedIconHighlighted: UIImage = self.failedIconImages.highlighted()
+    private lazy var dateFont: UIFont = self.dateTextStyle.font()
+    private lazy var dateFontColor: UIColor = self.dateTextStyle.color()
 
     public func attributedStringForDate(date: String) -> NSAttributedString {
-        let attributes = [NSFontAttributeName : self.dateFont]
+        let attributes = [
+            NSFontAttributeName : self.dateFont,
+            NSForegroundColorAttributeName: self.dateFontColor
+        ]
         return NSAttributedString(string: date, attributes: attributes)
     }
 
-    func borderImage(viewModel viewModel: MessageViewModelProtocol) -> UIImage? {
+    public func borderImage(viewModel viewModel: MessageViewModelProtocol) -> UIImage? {
         switch (viewModel.isIncoming, viewModel.showsTail) {
         case (true, true):
             return self.borderIncomingTail
@@ -77,18 +142,48 @@ public class BaseMessageCollectionViewCellDefaultStyle: BaseMessageCollectionVie
         }
     }
 
-    // Override this method to provide a size of avatarImage, so avatar image will be displayed if there is any in the viewModel
-    // if no image, then no avatar will be displayed, and a blank space will placehold at the position
     public func avatarSize(viewModel viewModel: MessageViewModelProtocol) -> CGSize {
-        return CGSize.zero
+        return self.avatarStyle.size
     }
 
-    // Specify the vertical alignment of the avatar image in the cell. By Default it is Botton, can go Top or Center
     public func avatarVerticalAlignment(viewModel viewModel: MessageViewModelProtocol) -> VerticalAlignment {
-        return VerticalAlignment.Bottom
+        return self.avatarStyle.alignment
     }
 
     public func layoutConstants(viewModel viewModel: MessageViewModelProtocol) -> BaseMessageCollectionViewCellLayoutConstants {
+        return self.layoutConstants
+    }
+}
+
+public extension BaseMessageCollectionViewCellDefaultStyle { // Default values
+    static public func createDefaultColors() -> Colors {
+        return Colors(incoming: UIColor.bma_color(rgb: 0xE6ECF2), outgoing: UIColor.bma_color(rgb: 0x3D68F5))
+    }
+
+    static public func createDefaultBubbleBorderImages() -> BubbleBorderImages {
+        return BubbleBorderImages(
+            borderIncomingTail: UIImage(named: "bubble-incoming-border-tail", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            borderIncomingNoTail: UIImage(named: "bubble-incoming-border", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            borderOutgoingTail: UIImage(named: "bubble-outgoing-border-tail", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            borderOutgoingNoTail: UIImage(named: "bubble-outgoing-border", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!
+        )
+    }
+
+    static public func createDefaultFailedIconImages() -> FailedIconImages {
+        let normal = {
+            return UIImage(named: "base-message-failed-icon", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!
+        }
+        return FailedIconImages(
+            normal: normal(),
+            highlighted: normal().bma_blendWithColor(UIColor.blackColor().colorWithAlphaComponent(0.10))
+        )
+    }
+
+    static public func createDefaultDateTextStyle() -> DateTextStyle {
+        return DateTextStyle(font: UIFont.systemFontOfSize(12), color: UIColor.bma_color(rgb: 0x9aa3ab))
+    }
+
+    static public func createDefaultLayoutConstants() -> BaseMessageCollectionViewCellLayoutConstants {
         return BaseMessageCollectionViewCellLayoutConstants(horizontalMargin: 11, horizontalInterspacing: 4, maxContainerWidthPercentageForBubbleView: 0.68)
     }
 }
diff --git a/ChattoAdditions/Source/Chat Items/PhotoMessages/Views/PhotoMessageCollectionViewCellDefaultStyle.swift b/ChattoAdditions/Source/Chat Items/PhotoMessages/Views/PhotoMessageCollectionViewCellDefaultStyle.swift
index 30a3057e7..35bed9a07 100644
--- a/ChattoAdditions/Source/Chat Items/PhotoMessages/Views/PhotoMessageCollectionViewCellDefaultStyle.swift	
+++ b/ChattoAdditions/Source/Chat Items/PhotoMessages/Views/PhotoMessageCollectionViewCellDefaultStyle.swift	
@@ -25,40 +25,53 @@
 import UIKit
 
 public class PhotoMessageCollectionViewCellDefaultStyle: PhotoMessageCollectionViewCellStyleProtocol {
+    typealias Class = PhotoMessageCollectionViewCellDefaultStyle
+
+    public struct BubbleMasks {
+        let incomingTail: () -> UIImage
+        let incomingNoTail: () -> UIImage
+        let outgoingTail: () -> UIImage
+        let outgoingNoTail: () -> UIImage
+        let tailWidth: CGFloat
+        public init(
+            @autoclosure(escaping) incomingTail: () -> UIImage,
+            @autoclosure(escaping) incomingNoTail: () -> UIImage,
+            @autoclosure(escaping) outgoingTail: () -> UIImage,
+            @autoclosure(escaping) outgoingNoTail: () -> UIImage,
+            tailWidth: CGFloat) {
+                self.incomingTail = incomingTail
+                self.incomingNoTail = incomingNoTail
+                self.outgoingTail = outgoingTail
+                self.outgoingNoTail = outgoingNoTail
+                self.tailWidth = tailWidth
+        }
+    }
+
+    let bubbleMasks: BubbleMasks
+    let baseStyle: BaseMessageCollectionViewCellDefaultStyle
+    public init(bubbleMasks: BubbleMasks = Class.createDefaultBubbleMasks(), baseStyle: BaseMessageCollectionViewCellDefaultStyle = BaseMessageCollectionViewCellDefaultStyle()) {
+        self.bubbleMasks = bubbleMasks
+        self.baseStyle = baseStyle
+    }
 
-    public init() { }
-    
     private struct Constants {
-        let tailWidth: CGFloat = 6.0
         let aspectRatioIntervalForSquaredSize: ClosedInterval<CGFloat> = 0.90...1.10
         let photoSizeLandscape = CGSize(width: 210, height: 136)
         let photoSizePortratit = CGSize(width: 136, height: 210)
         let photoSizeSquare = CGSize(width: 210, height: 210)
         let placeholderIconTintIncoming = UIColor.bma_color(rgb: 0xced6dc)
-        let placeholderIconTintOugoing = UIColor.bma_color(rgb: 0x508dfc)
+        let placeholderIconTintOutgoing = UIColor.bma_color(rgb: 0x508dfc)
         let progressIndicatorColorIncoming = UIColor.bma_color(rgb: 0x98a3ab)
         let progressIndicatorColorOutgoing = UIColor.whiteColor()
         let overlayColor = UIColor.blackColor().colorWithAlphaComponent(0.70)
     }
 
     lazy private var styleConstants = Constants()
-    lazy private var baseStyle = BaseMessageCollectionViewCellDefaultStyle()
 
-    lazy private var maskImageIncomingTail: UIImage = {
-        return UIImage(named: "bubble-incoming-tail", inBundle: NSBundle(forClass: PhotoMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
-
-    lazy private var maskImageIncomingNoTail: UIImage = {
-        return UIImage(named: "bubble-incoming", inBundle: NSBundle(forClass: PhotoMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
-
-    lazy private var maskImageOutgoingTail: UIImage = {
-        return UIImage(named: "bubble-outgoing-tail", inBundle: NSBundle(forClass: PhotoMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
-
-    lazy private var maskImageOutgoingNoTail: UIImage = {
-        return UIImage(named: "bubble-outgoing", inBundle: NSBundle(forClass: PhotoMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
-    }()
+    lazy private var maskImageIncomingTail: UIImage = self.bubbleMasks.incomingTail()
+    lazy private var maskImageIncomingNoTail: UIImage = self.bubbleMasks.incomingNoTail()
+    lazy private var maskImageOutgoingTail: UIImage = self.bubbleMasks.outgoingTail()
+    lazy private var maskImageOutgoingNoTail: UIImage = self.bubbleMasks.outgoingNoTail()
 
     lazy private var placeholderBackgroundIncoming: UIImage = {
         return UIImage.bma_imageWithColor(self.baseStyle.baseColorIncoming, size: CGSize(width: 1, height: 1))
@@ -69,7 +82,7 @@ public class PhotoMessageCollectionViewCellDefaultStyle: PhotoMessageCollectionV
     }()
 
     lazy private var placeholderIcon: UIImage = {
-        return UIImage(named: "photo-bubble-placeholder-icon", inBundle: NSBundle(forClass: PhotoMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!
+        return UIImage(named: "photo-bubble-placeholder-icon", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!
     }()
 
     public func maskingImage(viewModel viewModel: PhotoMessageViewModelProtocol) -> UIImage {
@@ -95,14 +108,14 @@ public class PhotoMessageCollectionViewCellDefaultStyle: PhotoMessageCollectionV
 
     public func placeholderIconImage(viewModel viewModel: PhotoMessageViewModelProtocol) -> (icon: UIImage?, tintColor: UIColor?) {
         if viewModel.image.value == nil && viewModel.transferStatus.value == .Failed {
-            let tintColor = viewModel.isIncoming ? self.styleConstants.placeholderIconTintIncoming : self.styleConstants.placeholderIconTintOugoing
+            let tintColor = viewModel.isIncoming ? self.styleConstants.placeholderIconTintIncoming : self.styleConstants.placeholderIconTintOutgoing
             return (self.placeholderIcon, tintColor)
         }
         return (nil, nil)
     }
 
     public func tailWidth(viewModel viewModel: PhotoMessageViewModelProtocol) -> CGFloat {
-        return self.styleConstants.tailWidth
+        return self.bubbleMasks.tailWidth
     }
 
     public func bubbleSize(viewModel viewModel: PhotoMessageViewModelProtocol) -> CGSize {
@@ -127,3 +140,16 @@ public class PhotoMessageCollectionViewCellDefaultStyle: PhotoMessageCollectionV
     }
 
 }
+
+public extension PhotoMessageCollectionViewCellDefaultStyle { // Default values
+
+    static public func createDefaultBubbleMasks() -> BubbleMasks {
+        return BubbleMasks(
+            incomingTail: UIImage(named: "bubble-incoming-tail", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            incomingNoTail: UIImage(named: "bubble-incoming", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            outgoingTail: UIImage(named: "bubble-outgoing-tail", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            outgoingNoTail: UIImage(named: "bubble-outgoing", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            tailWidth: 6
+        )
+    }
+}
diff --git a/ChattoAdditions/Source/Chat Items/TextMessages/Views/TextMessageCollectionViewCellDefaultStyle.swift b/ChattoAdditions/Source/Chat Items/TextMessages/Views/TextMessageCollectionViewCellDefaultStyle.swift
index 2ee1046a9..d89705dbe 100644
--- a/ChattoAdditions/Source/Chat Items/TextMessages/Views/TextMessageCollectionViewCellDefaultStyle.swift	
+++ b/ChattoAdditions/Source/Chat Items/TextMessages/Views/TextMessageCollectionViewCellDefaultStyle.swift	
@@ -25,33 +25,81 @@
 import UIKit
 
 public class TextMessageCollectionViewCellDefaultStyle: TextMessageCollectionViewCellStyleProtocol {
+    typealias Class = TextMessageCollectionViewCellDefaultStyle
+
+    public struct BubbleImages {
+        let incomingTail: () -> UIImage
+        let incomingNoTail: () -> UIImage
+        let outgoingTail: () -> UIImage
+        let outgoingNoTail: () -> UIImage
+        public init(
+            @autoclosure(escaping) incomingTail: () -> UIImage,
+            @autoclosure(escaping) incomingNoTail: () -> UIImage,
+            @autoclosure(escaping) outgoingTail: () -> UIImage,
+            @autoclosure(escaping) outgoingNoTail: () -> UIImage) {
+                self.incomingTail = incomingTail
+                self.incomingNoTail = incomingNoTail
+                self.outgoingTail = outgoingTail
+                self.outgoingNoTail = outgoingNoTail
+        }
+    }
 
-    public init () {}
+    public struct TextStyle {
+        let font: () -> UIFont
+        let incomingColor: () -> UIColor
+        let outgoingColor: () -> UIColor
+        let incomingInsets: UIEdgeInsets
+        let outgoingInsets: UIEdgeInsets
+        public init(
+            @autoclosure(escaping) font: () -> UIFont,
+            @autoclosure(escaping) incomingColor: () -> UIColor,
+            @autoclosure(escaping) outgoingColor: () -> UIColor,
+            incomingInsets: UIEdgeInsets,
+            outgoingInsets: UIEdgeInsets) {
+                self.font = font
+                self.incomingColor = incomingColor
+                self.outgoingColor = outgoingColor
+                self.incomingInsets = incomingInsets
+                self.outgoingInsets = outgoingInsets
+        }
+    }
+
+    let bubbleImages: BubbleImages
+    let textStyle: TextStyle
+    let baseStyle: BaseMessageCollectionViewCellDefaultStyle
+
+    public init (
+        bubbleImages: BubbleImages = Class.createDefaultBubbleImages(),
+        textStyle: TextStyle = Class.createDefaultTextStyle(),
+        baseStyle: BaseMessageCollectionViewCellDefaultStyle = BaseMessageCollectionViewCellDefaultStyle()) {
+            self.bubbleImages = bubbleImages
+            self.textStyle = textStyle
+            self.baseStyle = baseStyle
+    }
 
-    lazy var baseStyle = BaseMessageCollectionViewCellDefaultStyle()
     lazy var images: [String: UIImage] = {
         return [
-            "incoming_tail" : UIImage(named: "bubble-incoming-tail", inBundle: NSBundle(forClass: TextMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!,
-            "incoming_notail" : UIImage(named: "bubble-incoming", inBundle: NSBundle(forClass: TextMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!,
-            "outgoing_tail" : UIImage(named: "bubble-outgoing-tail", inBundle: NSBundle(forClass: TextMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!,
-            "outgoing_notail" : UIImage(named: "bubble-outgoing", inBundle: NSBundle(forClass: TextMessageCollectionViewCellDefaultStyle.self), compatibleWithTraitCollection: nil)!,
+            "incoming_tail" : self.bubbleImages.incomingTail(),
+            "incoming_notail" : self.bubbleImages.incomingNoTail(),
+            "outgoing_tail" : self.bubbleImages.outgoingTail(),
+            "outgoing_notail" : self.bubbleImages.outgoingNoTail()
         ]
     }()
 
-    lazy var font = {
-        return UIFont.systemFontOfSize(16)
-    }()
+    lazy var font: UIFont = self.textStyle.font()
+    lazy var incomingColor: UIColor = self.textStyle.incomingColor()
+    lazy var outgoingColor: UIColor = self.textStyle.outgoingColor()
 
     public func textFont(viewModel viewModel: TextMessageViewModelProtocol, isSelected: Bool) -> UIFont {
         return self.font
     }
 
     public func textColor(viewModel viewModel: TextMessageViewModelProtocol, isSelected: Bool) -> UIColor {
-        return viewModel.isIncoming ? UIColor.blackColor() : UIColor.whiteColor()
+        return viewModel.isIncoming ? self.incomingColor : self.outgoingColor
     }
 
     public func textInsets(viewModel viewModel: TextMessageViewModelProtocol, isSelected: Bool) -> UIEdgeInsets {
-        return viewModel.isIncoming ? UIEdgeInsets(top: 10, left: 19, bottom: 10, right: 15) : UIEdgeInsets(top: 10, left: 15, bottom: 10, right: 19)
+        return viewModel.isIncoming ? self.textStyle.incomingInsets : self.textStyle.outgoingInsets
     }
 
     public func bubbleImageBorder(viewModel viewModel: TextMessageViewModelProtocol, isSelected: Bool) -> UIImage? {
@@ -119,3 +167,25 @@ public class TextMessageCollectionViewCellDefaultStyle: TextMessageCollectionVie
         }
     }
 }
+
+public extension TextMessageCollectionViewCellDefaultStyle { // Default values
+
+    static public func createDefaultBubbleImages() -> BubbleImages {
+        return BubbleImages(
+            incomingTail: UIImage(named: "bubble-incoming-tail", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            incomingNoTail: UIImage(named: "bubble-incoming", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            outgoingTail: UIImage(named: "bubble-outgoing-tail", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            outgoingNoTail: UIImage(named: "bubble-outgoing", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!
+        )
+    }
+
+    static public func createDefaultTextStyle() -> TextStyle {
+        return TextStyle(
+            font: UIFont.systemFontOfSize(16),
+            incomingColor: UIColor.blackColor(),
+            outgoingColor: UIColor.whiteColor(),
+            incomingInsets: UIEdgeInsets(top: 10, left: 19, bottom: 10, right: 15),
+            outgoingInsets: UIEdgeInsets(top: 10, left: 15, bottom: 10, right: 19)
+        )
+    }
+}
diff --git a/ChattoAdditions/Source/Input/ChatInputBar.swift b/ChattoAdditions/Source/Input/ChatInputBar.swift
index 76e1f6d02..68b20adc9 100644
--- a/ChattoAdditions/Source/Input/ChatInputBar.swift
+++ b/ChattoAdditions/Source/Input/ChatInputBar.swift
@@ -168,10 +168,15 @@ extension ChatInputBar {
     public func setAppearance(appearance: ChatInputBarAppearance) {
         self.textView.font = appearance.textFont
         self.textView.textColor = appearance.textColor
+        self.textView.textContainerInset = appearance.textInsets
         self.textView.setTextPlaceholderFont(appearance.textPlaceholderFont)
         self.textView.setTextPlaceholderColor(appearance.textPlaceholderColor)
         self.textView.setTextPlaceholder(appearance.textPlaceholder)
+        self.tabBarInterItemSpacing = appearance.tabBarInterItemSpacing
+        self.tabBarContentInsets = appearance.tabBarInsets
+        self.sendButton.contentEdgeInsets = appearance.sendButtonInsets
         self.sendButton.setTitle(appearance.sendButtonTitle, forState: .Normal)
+        self.sendButton.titleLabel?.font = appearance.sendButtonFont
     }
 }
 
diff --git a/ChattoAdditions/Source/Input/ChatInputBar.xib b/ChattoAdditions/Source/Input/ChatInputBar.xib
index 6877956da..de17f85d6 100644
--- a/ChattoAdditions/Source/Input/ChatInputBar.xib
+++ b/ChattoAdditions/Source/Input/ChatInputBar.xib
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C47a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10115" systemVersion="15E64a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10084"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ChatInputBar" customModule="BMAChatFrameworkAdditions" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ChatInputBar" customModule="ChattoAdditions" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="600" height="123"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalHuggingPriority="249" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="fsh-hH-hKG" userLabel="TextView" customClass="ExpandableTextView" customModule="BMAChatFrameworkAdditions" customModuleProvider="target">
+                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalHuggingPriority="249" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="fsh-hH-hKG" userLabel="TextView" customClass="ExpandableTextView" customModule="ChattoAdditions" customModuleProvider="target">
                     <rect key="frame" x="0.0" y="0.0" width="600" height="79"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -20,12 +20,13 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hkz-tq-X6j" userLabel="Tab selector container">
                     <rect key="frame" x="0.0" y="79" width="600" height="44"/>
                     <subviews>
-                        <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WNX-pj-5AB" customClass="HorizontalStackScrollView" customModule="BMAChatFrameworkAdditions" customModuleProvider="target">
+                        <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WNX-pj-5AB" customClass="HorizontalStackScrollView" customModule="ChattoAdditions" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="514" height="44"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         </scrollView>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hE9-hU-Ci1">
-                            <rect key="frame" x="534" y="0.0" width="46" height="44"/>
+                        <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hE9-hU-Ci1">
+                            <rect key="frame" x="514" y="0.0" width="86" height="44"/>
+                            <inset key="contentEdgeInsets" minX="20" minY="0.0" maxX="20" maxY="0.0"/>
                             <state key="normal" title="Button"/>
                             <connections>
                                 <action selector="buttonTapped:" destination="iN0-l3-epB" eventType="touchUpInside" id="9hi-0N-Y5F"/>
@@ -34,10 +35,10 @@
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="trailing" secondItem="hE9-hU-Ci1" secondAttribute="trailing" constant="20" id="ABn-ah-JYL"/>
+                        <constraint firstAttribute="trailing" secondItem="hE9-hU-Ci1" secondAttribute="trailing" id="ABn-ah-JYL"/>
                         <constraint firstItem="WNX-pj-5AB" firstAttribute="leading" secondItem="hkz-tq-X6j" secondAttribute="leading" id="Jk5-7M-Mh8"/>
                         <constraint firstItem="hE9-hU-Ci1" firstAttribute="top" secondItem="hkz-tq-X6j" secondAttribute="top" id="KsA-Bb-G4V"/>
-                        <constraint firstItem="hE9-hU-Ci1" firstAttribute="leading" secondItem="WNX-pj-5AB" secondAttribute="trailing" constant="20" id="M1Q-jh-zRz"/>
+                        <constraint firstItem="hE9-hU-Ci1" firstAttribute="leading" secondItem="WNX-pj-5AB" secondAttribute="trailing" id="M1Q-jh-zRz"/>
                         <constraint firstItem="WNX-pj-5AB" firstAttribute="top" secondItem="hkz-tq-X6j" secondAttribute="top" id="QdZ-iC-yJd"/>
                         <constraint firstAttribute="trailing" secondItem="WNX-pj-5AB" secondAttribute="trailing" id="ciR-Nt-1tI"/>
                         <constraint firstAttribute="bottom" secondItem="WNX-pj-5AB" secondAttribute="bottom" id="i7l-t6-4IG"/>
diff --git a/ChattoAdditions/Source/Input/ChatInputBarAppearance.swift b/ChattoAdditions/Source/Input/ChatInputBarAppearance.swift
index b7832db4b..89a2332b1 100644
--- a/ChattoAdditions/Source/Input/ChatInputBarAppearance.swift
+++ b/ChattoAdditions/Source/Input/ChatInputBarAppearance.swift
@@ -28,7 +28,11 @@ public struct ChatInputBarAppearance {
     public var textPlaceholderFont = UIFont.systemFontOfSize(12)
     public var textPlaceholderColor = UIColor.grayColor()
     public var textPlaceholder = ""
+    public var textInsets = UIEdgeInsets(top: 8, left: 0, bottom: 8, right: 0)
+    public var sendButtonFont = UIFont.systemFontOfSize(16)
+    public var sendButtonInsets = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20)
     public var sendButtonTitle = ""
-
+    public var tabBarInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 5)
+    public var tabBarInterItemSpacing: CGFloat = 10
     public init() {}
 }
diff --git a/ChattoAdditions/Source/Input/ChatInputBarPresenter.swift b/ChattoAdditions/Source/Input/ChatInputBarPresenter.swift
index e2350930a..b5d5d6ac1 100644
--- a/ChattoAdditions/Source/Input/ChatInputBarPresenter.swift
+++ b/ChattoAdditions/Source/Input/ChatInputBarPresenter.swift
@@ -36,11 +36,10 @@ protocol ChatInputBarPresenter: class {
     let chatInputBar: ChatInputBar
     let chatInputItems: [ChatInputItemProtocol]
 
-    public init(chatInputBar: ChatInputBar, chatInputItems: [ChatInputItemProtocol]) {
+    public init(chatInputBar: ChatInputBar, chatInputItems: [ChatInputItemProtocol], chatInputBarAppearance: ChatInputBarAppearance = ChatInputBarAppearance()) {
         self.chatInputBar = chatInputBar
         self.chatInputItems = chatInputItems
-        self.chatInputBar.tabBarInterItemSpacing = 10
-        self.chatInputBar.tabBarContentInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 5)
+        self.chatInputBar.setAppearance(chatInputBarAppearance)
         super.init()
 
         self.chatInputBar.presenter = self
diff --git a/ChattoAdditions/Source/Input/ExpandableTextView.swift b/ChattoAdditions/Source/Input/ExpandableTextView.swift
index a03b86de1..1bb6fbecd 100644
--- a/ChattoAdditions/Source/Input/ExpandableTextView.swift
+++ b/ChattoAdditions/Source/Input/ExpandableTextView.swift
@@ -125,8 +125,8 @@ public class ExpandableTextView: UITextView {
         self.placeholder.editable = false
         self.placeholder.selectable = false
         self.placeholder.userInteractionEnabled = false
-        self.placeholder.textAlignment = textAlignment
-        self.placeholder.textContainerInset = textContainerInset
+        self.placeholder.textAlignment = self.textAlignment
+        self.placeholder.textContainerInset = self.textContainerInset
         self.placeholder.backgroundColor = UIColor.clearColor()
     }
 }
diff --git a/ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift b/ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift
index 72fb1fbc6..e1bf16f90 100644
--- a/ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift
+++ b/ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift
@@ -24,21 +24,48 @@
 
 import Foundation
 
-@objc public class PhotosChatInputItem: NSObject {
+public struct ButtonImages {
+    public let normal: () -> UIImage
+    public let selected: () -> UIImage
+    public let highlighted: () -> UIImage
+    public init(
+        @autoclosure(escaping) normal: () -> UIImage,
+        @autoclosure(escaping) selected: () -> UIImage,
+        @autoclosure(escaping) highlighted: () -> UIImage) {
+            self.normal = normal
+            self.selected = selected
+            self.highlighted = highlighted
+    }
+}
+
+public class PhotosChatInputItem {
+    typealias Class = PhotosChatInputItem
+
     public var photoInputHandler: ((UIImage) -> Void)?
     public var cameraPermissionHandler: (() -> Void)?
     public var photosPermissionHandler: (() -> Void)?
     public weak var presentingController: UIViewController?
-    public init(presentingController: UIViewController?) {
+
+    let buttonImages: ButtonImages
+    public init(presentingController: UIViewController?, buttonImages: ButtonImages = Class.createDefaultButtonStyle()) {
         self.presentingController = presentingController
+        self.buttonImages = buttonImages
+    }
+
+    public class func createDefaultButtonStyle() -> ButtonImages {
+        return ButtonImages(
+            normal: UIImage(named: "camera-icon-unselected", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            selected: UIImage(named: "camera-icon-selected", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!,
+            highlighted: UIImage(named: "camera-icon-selected", inBundle: NSBundle(forClass: Class.self), compatibleWithTraitCollection: nil)!
+        )
     }
 
     lazy private var internalTabView: UIButton = {
         var button = UIButton(type: .Custom)
         button.exclusiveTouch = true
-        button.setImage(UIImage(named: "camera-icon-unselected", inBundle: NSBundle(forClass: PhotosChatInputItem.self), compatibleWithTraitCollection: nil), forState: .Normal)
-        button.setImage(UIImage(named: "camera-icon-selected", inBundle: NSBundle(forClass: PhotosChatInputItem.self), compatibleWithTraitCollection: nil), forState: .Highlighted)
-        button.setImage(UIImage(named: "camera-icon-selected", inBundle: NSBundle(forClass: PhotosChatInputItem.self), compatibleWithTraitCollection: nil), forState: .Selected)
+        button.setImage(self.buttonImages.normal(), forState: .Normal)
+        button.setImage(self.buttonImages.highlighted(), forState: .Highlighted)
+        button.setImage(self.buttonImages.selected(), forState: .Selected)
         return button
     }()
 
diff --git a/ChattoAdditions/Source/Input/Text/TextChatInputItem.swift b/ChattoAdditions/Source/Input/Text/TextChatInputItem.swift
index 18b00f138..d6eb9c72e 100644
--- a/ChattoAdditions/Source/Input/Text/TextChatInputItem.swift
+++ b/ChattoAdditions/Source/Input/Text/TextChatInputItem.swift
@@ -24,17 +24,31 @@
 
 import Foundation
 
-@objc public class TextChatInputItem: NSObject {
+public class TextChatInputItem {
+    typealias Class = TextChatInputItem
     public var textInputHandler: ((String) -> Void)?
 
+    let buttonImages: ButtonImages
+    public init(buttonImages: ButtonImages = Class.createDefaultButtonStyle()) {
+        self.buttonImages = buttonImages
+    }
+
+    public class func createDefaultButtonStyle() -> ButtonImages {
+        return ButtonImages(
+            normal: UIImage(named: "text-icon-unselected", inBundle: NSBundle(forClass: TextChatInputItem.self), compatibleWithTraitCollection: nil)!,
+            selected: UIImage(named: "text-icon-selected", inBundle: NSBundle(forClass: TextChatInputItem.self), compatibleWithTraitCollection: nil)!,
+            highlighted: UIImage(named: "text-icon-selected", inBundle: NSBundle(forClass: TextChatInputItem.self), compatibleWithTraitCollection: nil)!
+        )
+    }
+
     lazy private var internalTabView: UIButton = {
         var button = UIButton(type: .Custom)
         button.exclusiveTouch = true
-        button.setImage(UIImage(named: "text-icon-unselected", inBundle: NSBundle(forClass: TextChatInputItem.self), compatibleWithTraitCollection: nil), forState: .Normal)
-        button.setImage(UIImage(named: "text-icon-selected", inBundle: NSBundle(forClass: TextChatInputItem.self), compatibleWithTraitCollection: nil), forState: .Highlighted)
-        button.setImage(UIImage(named: "text-icon-selected", inBundle: NSBundle(forClass: TextChatInputItem.self), compatibleWithTraitCollection: nil), forState: .Selected)
+        button.setImage(self.buttonImages.normal(), forState: .Normal)
+        button.setImage(self.buttonImages.highlighted(), forState: .Highlighted)
+        button.setImage(self.buttonImages.selected(), forState: .Selected)
         return button
-        }()
+    }()
 
     public var selected = false {
         didSet {

From eaa4142e1714d3599f822f1b8c18dfeb77353f1a Mon Sep 17 00:00:00 2001
From: Diego Sanchez <diego.sanchez@corp.badoo.com>
Date: Mon, 21 Mar 2016 20:24:22 +0000
Subject: [PATCH 2/4] Fixes misalignment when revealing timestamps due to
 different sizes (3.00 am 17.37 pm)

---
 .../AccessoryViewRevealer.swift               | 11 +++-
 .../Views/BaseMessageCollectionViewCell.swift | 54 +++++++++----------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/Chatto/Source/ChatController/AccessoryViewRevealer.swift b/Chatto/Source/ChatController/AccessoryViewRevealer.swift
index 4c41dead6..560182cea 100644
--- a/Chatto/Source/ChatController/AccessoryViewRevealer.swift
+++ b/Chatto/Source/ChatController/AccessoryViewRevealer.swift
@@ -25,7 +25,8 @@
 import Foundation
 
 public protocol AccessoryViewRevealable {
-    func revealAccessoryView(maximumOffset offset: CGFloat, animated: Bool)
+    func revealAccessoryView(withOffset offset: CGFloat, animated: Bool)
+    func preferredOffsetToRevealAccessoryView() -> CGFloat? // This allows to sync size in case cells have different sizes for the accessory view. Nil -> no restriction
 }
 
 class AccessoryViewRevealer: NSObject, UIGestureRecognizerDelegate {
@@ -73,9 +74,15 @@ class AccessoryViewRevealer: NSObject, UIGestureRecognizerDelegate {
     }
 
     private func revealAccessoryView(atOffset offset: CGFloat) {
+        // Find max offset (cells can have slighlty different timestamp size ( 3.00 am vs 11.37 pm )
+        let cells: [AccessoryViewRevealable] = self.collectionView.visibleCells().filter({$0 is AccessoryViewRevealable}).map({$0 as! AccessoryViewRevealable})
+        let offset = min(offset, cells.reduce(0) { (current, cell) -> CGFloat in
+            return max(current, cell.preferredOffsetToRevealAccessoryView() ?? 0)
+        })
+
         for cell in self.collectionView.visibleCells() {
             if let cell = cell as? AccessoryViewRevealable {
-                cell.revealAccessoryView(maximumOffset: offset, animated: offset == 0)
+                cell.revealAccessoryView(withOffset: offset, animated: offset == 0)
             }
         }
     }
diff --git a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift
index cd9de1962..70e14ec01 100644
--- a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift	
+++ b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift	
@@ -191,7 +191,7 @@ public class BaseMessageCollectionViewCell<BubbleViewType where BubbleViewType:U
         } else {
             self.failedButton.alpha = 0
         }
-        self.accessoryTimestamp?.attributedText = style.attributedStringForDate(viewModel.date)
+        self.accessoryTimestampView.attributedText = style.attributedStringForDate(viewModel.date)
         let avatarImageSize = baseStyle.avatarSize(viewModel: messageViewModel)
         if avatarImageSize != CGSize.zero {
             self.avatarView.image = self.messageViewModel.avatarImage.value
@@ -211,21 +211,20 @@ public class BaseMessageCollectionViewCell<BubbleViewType where BubbleViewType:U
 
         self.avatarView.bma_rect = layoutModel.avatarViewFrame
 
-        // TODO: refactor accessorView?
-
-        if let accessoryView = self.accessoryTimestamp {
-            accessoryView.bounds = CGRect(origin: CGPoint.zero, size: accessoryView.intrinsicContentSize())
-            let accessoryViewWidth = CGRectGetWidth(accessoryView.bounds)
-            let accessoryViewMargin: CGFloat = 10
-            let leftDisplacement = max(0, min(self.timestampMaxVisibleOffset, accessoryViewWidth + accessoryViewMargin))
+        if self.accessoryTimestampView.superview != nil {
+            let layoutConstants = baseStyle.layoutConstants(viewModel: messageViewModel)
+            self.accessoryTimestampView.bounds = CGRect(origin: CGPoint.zero, size: self.accessoryTimestampView.intrinsicContentSize())
+            let accessoryViewWidth = CGRectGetWidth(self.accessoryTimestampView.bounds)
+            let leftOffsetForContentView = max(0, offsetToRevealAccessoryView)
+            let leftOffsetForAccessoryView = min(leftOffsetForContentView, accessoryViewWidth + layoutConstants.horizontalMargin)
             var contentViewframe = self.contentView.frame
             if self.messageViewModel.isIncoming {
                 contentViewframe.origin = CGPoint.zero
             } else {
-                contentViewframe.origin.x = -leftDisplacement
+                contentViewframe.origin.x = -leftOffsetForContentView
             }
             self.contentView.frame = contentViewframe
-            accessoryView.center = CGPoint(x: CGRectGetWidth(self.bounds) - leftDisplacement + accessoryViewWidth / 2, y: self.contentView.center.y)
+            self.accessoryTimestampView.center = CGPoint(x: CGRectGetWidth(self.bounds) - leftOffsetForAccessoryView + accessoryViewWidth / 2, y: self.contentView.center.y)
         }
     }
 
@@ -254,53 +253,52 @@ public class BaseMessageCollectionViewCell<BubbleViewType where BubbleViewType:U
 
 
     // MARK: timestamp revealing
-    var timestampMaxVisibleOffset: CGFloat = 0 {
+
+    lazy var accessoryTimestampView = UILabel()
+
+    var offsetToRevealAccessoryView: CGFloat = 0 {
         didSet {
             self.setNeedsLayout()
         }
     }
-    var accessoryTimestamp: UILabel?
-    public func revealAccessoryView(maximumOffset offset: CGFloat, animated: Bool) {
-        if self.accessoryTimestamp == nil {
+
+
+    public func preferredOffsetToRevealAccessoryView() -> CGFloat? {
+        let layoutConstants = baseStyle.layoutConstants(viewModel: messageViewModel)
+        return self.accessoryTimestampView.intrinsicContentSize().width + layoutConstants.horizontalMargin
+    }
+
+
+    public func revealAccessoryView(withOffset offset: CGFloat, animated: Bool) {
+        self.offsetToRevealAccessoryView = offset
+        if self.accessoryTimestampView.superview == nil {
             if offset > 0 {
-                let accessoryTimestamp = UILabel()
-                accessoryTimestamp.attributedText = self.baseStyle?.attributedStringForDate(self.messageViewModel.date)
-                self.addSubview(accessoryTimestamp)
-                self.accessoryTimestamp = accessoryTimestamp
+                self.addSubview(self.accessoryTimestampView)
                 self.layoutIfNeeded()
             }
 
             if animated {
                 UIView.animateWithDuration(self.animationDuration, animations: { () -> Void in
-                    self.timestampMaxVisibleOffset = offset
                     self.layoutIfNeeded()
                 })
-            } else {
-                self.timestampMaxVisibleOffset = offset
             }
         } else {
             if animated {
                 UIView.animateWithDuration(self.animationDuration, animations: { () -> Void in
-                    self.timestampMaxVisibleOffset = offset
                     self.layoutIfNeeded()
                     }, completion: { (finished) -> Void in
                         if offset == 0 {
                             self.removeAccessoryView()
                         }
                 })
-
-            } else {
-                self.timestampMaxVisibleOffset = offset
             }
         }
     }
 
     func removeAccessoryView() {
-        self.accessoryTimestamp?.removeFromSuperview()
-        self.accessoryTimestamp = nil
+        self.accessoryTimestampView.removeFromSuperview()
     }
 
-
     // MARK: User interaction
     public var onFailedButtonTapped: ((cell: BaseMessageCollectionViewCell) -> Void)?
     @objc

From 4cca18783ac02707962944c57d5e250b1ace10e7 Mon Sep 17 00:00:00 2001
From: Diego Sanchez <diego.sanchez@corp.badoo.com>
Date: Mon, 21 Mar 2016 20:25:45 +0000
Subject: [PATCH 3/4] Fixes swiftlint warnings

---
 .swiftlint.yml                                                | 1 +
 .../Chat Items/PhotoMessages/PhotoMessagePresenter.swift      | 2 +-
 ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift | 4 ++--
 ChattoAdditions/Source/Input/Photos/PhotosInputView.swift     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index f97b4fac3..13a37fc99 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -7,3 +7,4 @@ disabled_rules: # rule identifiers to exclude from running
   - type_body_length
   - variable_name
   - type_name
+  - function_parameter_count
diff --git a/ChattoAdditions/Source/Chat Items/PhotoMessages/PhotoMessagePresenter.swift b/ChattoAdditions/Source/Chat Items/PhotoMessages/PhotoMessagePresenter.swift
index 2fae8ad6e..4487bff89 100644
--- a/ChattoAdditions/Source/Chat Items/PhotoMessages/PhotoMessagePresenter.swift	
+++ b/ChattoAdditions/Source/Chat Items/PhotoMessages/PhotoMessagePresenter.swift	
@@ -34,7 +34,7 @@ public class PhotoMessagePresenter<ViewModelBuilderT, InteractionHandlerT where
     public typealias ViewModelT = ViewModelBuilderT.ViewModelT
 
     public let photoCellStyle: PhotoMessageCollectionViewCellStyleProtocol
-    
+
     public init (
         messageModel: ModelT,
         viewModelBuilder: ViewModelBuilderT,
diff --git a/ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift b/ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift
index e1bf16f90..4654dbe09 100644
--- a/ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift
+++ b/ChattoAdditions/Source/Input/Photos/PhotosChatInputItem.swift
@@ -115,11 +115,11 @@ extension PhotosChatInputItem: PhotosInputViewDelegate {
     func inputView(inputView: PhotosInputViewProtocol, didSelectImage image: UIImage) {
         self.photoInputHandler?(image)
     }
-    
+
     func inputViewDidRequestCameraPermission(inputView: PhotosInputViewProtocol) {
         self.cameraPermissionHandler?()
     }
-    
+
     func inputViewDidRequestPhotoLibraryPermission(inputView: PhotosInputViewProtocol) {
         self.photosPermissionHandler?()
     }
diff --git a/ChattoAdditions/Source/Input/Photos/PhotosInputView.swift b/ChattoAdditions/Source/Input/Photos/PhotosInputView.swift
index 11819e721..976513b46 100644
--- a/ChattoAdditions/Source/Input/Photos/PhotosInputView.swift
+++ b/ChattoAdditions/Source/Input/Photos/PhotosInputView.swift
@@ -48,7 +48,7 @@ class PhotosInputView: UIView, PhotosInputViewProtocol {
     private var dataProvider: PhotosInputDataProviderProtocol!
     private var cellProvider: PhotosInputCellProviderProtocol!
     private var itemSizeCalculator: PhotosInputViewItemSizeCalculator!
-    
+
     var cameraAuthorizationStatus: AVAuthorizationStatus {
         return AVCaptureDevice.authorizationStatusForMediaType(AVMediaTypeVideo)
     }

From c1b7cb755334cae4321f2dcb0f1d7cc05aafe28b Mon Sep 17 00:00:00 2001
From: Diego Sanchez <diego.sanchez@corp.badoo.com>
Date: Mon, 21 Mar 2016 23:53:58 +0000
Subject: [PATCH 4/4] Adopts changes in appearance on ChattoApp. The default
 values in appearance don't work for any app (unlocalized texts) so it's
 better to remove the default value and make existing apps get a compiler
 error.

---
 ChattoAdditions/Source/Input/ChatInputBarPresenter.swift | 2 +-
 ChattoApp/ChattoApp/Source/DemoChatViewController.swift  | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ChattoAdditions/Source/Input/ChatInputBarPresenter.swift b/ChattoAdditions/Source/Input/ChatInputBarPresenter.swift
index b5d5d6ac1..dee41331b 100644
--- a/ChattoAdditions/Source/Input/ChatInputBarPresenter.swift
+++ b/ChattoAdditions/Source/Input/ChatInputBarPresenter.swift
@@ -36,7 +36,7 @@ protocol ChatInputBarPresenter: class {
     let chatInputBar: ChatInputBar
     let chatInputItems: [ChatInputItemProtocol]
 
-    public init(chatInputBar: ChatInputBar, chatInputItems: [ChatInputItemProtocol], chatInputBarAppearance: ChatInputBarAppearance = ChatInputBarAppearance()) {
+    public init(chatInputBar: ChatInputBar, chatInputItems: [ChatInputItemProtocol], chatInputBarAppearance: ChatInputBarAppearance) {
         self.chatInputBar = chatInputBar
         self.chatInputItems = chatInputItems
         self.chatInputBar.setAppearance(chatInputBarAppearance)
diff --git a/ChattoApp/ChattoApp/Source/DemoChatViewController.swift b/ChattoApp/ChattoApp/Source/DemoChatViewController.swift
index 39b42e1b2..be86d773d 100644
--- a/ChattoApp/ChattoApp/Source/DemoChatViewController.swift
+++ b/ChattoApp/ChattoApp/Source/DemoChatViewController.swift
@@ -55,16 +55,11 @@ class DemoChatViewController: BaseChatViewController {
     var chatInputPresenter: BasicChatInputBarPresenter!
     override func createChatInputView() -> UIView {
         let chatInputView = ChatInputBar.loadNib()
-        self.configureChatInputBar(chatInputView)
-        self.chatInputPresenter = BasicChatInputBarPresenter(chatInputBar: chatInputView, chatInputItems: self.createChatInputItems())
-        return chatInputView
-    }
-
-    func configureChatInputBar(chatInputBar: ChatInputBar) {
         var appearance = ChatInputBarAppearance()
         appearance.sendButtonTitle = NSLocalizedString("Send", comment: "")
         appearance.textPlaceholder = NSLocalizedString("Type a message", comment: "")
-        chatInputBar.setAppearance(appearance)
+        self.chatInputPresenter = BasicChatInputBarPresenter(chatInputBar: chatInputView, chatInputItems: self.createChatInputItems(), chatInputBarAppearance: appearance)
+        return chatInputView
     }
 
     override func createPresenterBuilders() -> [ChatItemType: [ChatItemPresenterBuilderProtocol]] {