From ec408d5f36e5c38ecfc2d968280e466c41cd152d Mon Sep 17 00:00:00 2001 From: nixzhu Date: Sun, 6 Sep 2015 23:01:40 +0800 Subject: [PATCH] reduce cell.tapAvatarAction --- .../ConversationViewController.swift | 47 +++---------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift index 139d0b59..723aed6c 100644 --- a/Yep/ViewControllers/Conversation/ConversationViewController.swift +++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift @@ -2012,6 +2012,12 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi if let sender = message.fromFriend { + if let cell = cell as? ChatBaseCell { + cell.tapAvatarAction = { [weak self] user in + self?.performSegueWithIdentifier("showProfile", sender: user) + } + } + if sender.friendState != UserFriendState.Me.rawValue { // from Friend markMessageAsReaded(message) @@ -2032,10 +2038,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi } }, collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } case MessageMediaType.Audio.rawValue: @@ -2054,10 +2056,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi } }, collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } case MessageMediaType.Video.rawValue: @@ -2074,13 +2072,8 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi } }, collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } - case MessageMediaType.Location.rawValue: if let cell = cell as? ChatLeftLocationCell { @@ -2097,10 +2090,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi } }, collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } default: @@ -2108,10 +2097,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi if let cell = cell as? ChatLeftTextCell { cell.configureWithMessage(message, textContentLabelWidth: textContentLabelWidthOfMessage(message), collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } } @@ -2146,10 +2131,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi } }, collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } case MessageMediaType.Audio.rawValue: @@ -2182,10 +2163,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi self?.playMessageAudioWithMessage(message) }, collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } case MessageMediaType.Video.rawValue: @@ -2215,10 +2192,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi } }, collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } case MessageMediaType.Location.rawValue: @@ -2256,10 +2229,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi } }, collectionView: collectionView, indexPath: indexPath) - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } default: @@ -2359,10 +2328,6 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi } } } - - cell.tapAvatarAction = { [weak self] user in - self?.performSegueWithIdentifier("showProfile", sender: user) - } } } }