From 6e55f5e05204ffd2fae6cf4aaf47fd38f9b795d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20S=C3=A1nchez?= Date: Fri, 27 May 2016 16:54:20 +0100 Subject: [PATCH] Make border images optional in BaseMessageCollectionViewCellDefaultStyle (#139) --- .../BaseMessageCollectionViewCellDefaultStyle.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift index f60aecb11..11e0be20c 100644 --- a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift +++ b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift @@ -88,14 +88,14 @@ public class BaseMessageCollectionViewCellDefaultStyle: BaseMessageCollectionVie } let colors: Colors - let bubbleBorderImages: BubbleBorderImages + 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(), + bubbleBorderImages: BubbleBorderImages? = Class.createDefaultBubbleBorderImages(), failedIconImages: FailedIconImages = Class.createDefaultFailedIconImages(), layoutConstants: BaseMessageCollectionViewCellLayoutConstants = Class.createDefaultLayoutConstants(), dateTextStyle: DateTextStyle = Class.createDefaultDateTextStyle(), @@ -111,10 +111,10 @@ public class BaseMessageCollectionViewCellDefaultStyle: BaseMessageCollectionVie public lazy var baseColorIncoming: UIColor = self.colors.incoming() public lazy var baseColorOutgoing: UIColor = self.colors.outgoing() - 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() + 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() public lazy var failedIcon: UIImage = self.failedIconImages.normal() public lazy var failedIconHighlighted: UIImage = self.failedIconImages.highlighted()