Merge branch 'dev' into improve-responsiveness-of-camera

This commit is contained in:
Anton Schukin 2016-07-12 15:13:46 +01:00 committed by GitHub
commit 45730f1696
1 changed files with 12 additions and 0 deletions

View File

@ -70,6 +70,18 @@ public class PhotoMessageCollectionViewCellDefaultStyle: PhotoMessageCollectionV
public let progressIndicatorColorIncoming: UIColor
public let progressIndicatorColorOutgoing: UIColor
public let overlayColor: UIColor
public init(
placeholderIconTintIncoming: UIColor,
placeholderIconTintOutgoing: UIColor,
progressIndicatorColorIncoming: UIColor,
progressIndicatorColorOutgoing: UIColor,
overlayColor: UIColor) {
self.placeholderIconTintIncoming = placeholderIconTintIncoming
self.placeholderIconTintOutgoing = placeholderIconTintOutgoing
self.progressIndicatorColorIncoming = progressIndicatorColorIncoming
self.progressIndicatorColorOutgoing = progressIndicatorColorOutgoing
self.overlayColor = overlayColor
}
}
let bubbleMasks: BubbleMasks