From 669991a4a0226d493d700303353d0bf69dea379f Mon Sep 17 00:00:00 2001 From: Stephen Radford Date: Tue, 3 Jul 2018 09:23:10 +0100 Subject: [PATCH] Add video cell and ensure and is set for all cell types. Needs testing. --- ...MessengerViewController + DataSource.swift | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/MessengerKit/Messenger View/MSGMessengerViewController + DataSource.swift b/MessengerKit/Messenger View/MSGMessengerViewController + DataSource.swift index 7856ad1a..d60691a8 100644 --- a/MessengerKit/Messenger View/MSGMessengerViewController + DataSource.swift +++ b/MessengerKit/Messenger View/MSGMessengerViewController + DataSource.swift @@ -34,9 +34,7 @@ extension MSGMessengerViewController: UICollectionViewDataSource, UICollectionVi let identifier = message.user.isSender ? "outgoingText" : "incomingText" let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath) as! MSGMessageCell - // TODO: set the delegate here cell.delegate = self - cell.message = message cell.style = style cell.isLastInSection = isLast @@ -56,8 +54,9 @@ extension MSGMessengerViewController: UICollectionViewDataSource, UICollectionVi let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath) as! MSGMessageCell cell.delegate = self - cell.message = message + cell.style = style + cell.isLastInSection = isLast return cell @@ -68,15 +67,24 @@ extension MSGMessengerViewController: UICollectionViewDataSource, UICollectionVi let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath) as! MSGMessageCell cell.delegate = self - cell.message = message + cell.style = style + cell.isLastInSection = isLast return cell case .video: - fatalError("video cell not defined") - break + + let identifier = message.user.isSender ? "outgoingVideo" : "incomingVideo" + let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath) as! MSGMessageCell + + cell.delegate = self + cell.message = message + cell.style = style + cell.isLastInSection = isLast + + return cell case .custom: let identifier = message.user.isSender ? "outgoingCustom" : "incomingCustom" @@ -84,6 +92,8 @@ extension MSGMessengerViewController: UICollectionViewDataSource, UICollectionVi cell.delegate = self cell.message = message + cell.style = style + cell.isLastInSection = isLast return cell }