Avatar improvements

ChattoAdditions/Source/Chat Items/BaseMessage/BaseMessagePresenter.swift

@@ -35,6 +35,7 @@ public protocol ViewModelBuilderProtocol {
 public protocol BaseMessageInteractionHandlerProtocol {
     associatedtype ViewModelT
     func userDidTapOnFailIcon(viewModel viewModel: ViewModelT, failIconView: UIView)
+    func userDidTapOnAvatar(viewModel viewModel: ViewModelT)
     func userDidTapOnBubble(viewModel viewModel: ViewModelT)
     func userDidBeginLongPressOnBubble(viewModel viewModel: ViewModelT)
     func userDidEndLongPressOnBubble(viewModel viewModel: ViewModelT)
@@ -96,6 +97,9 @@ public class BaseMessagePresenter<BubbleViewT, ViewModelBuilderT, InteractionHan
     public func configureCell(cell: CellT, decorationAttributes: ChatItemDecorationAttributes, animated: Bool, additionalConfiguration: (() -> Void)?) {
         cell.performBatchUpdates({ () -> Void in
             self.messageViewModel.showsTail = decorationAttributes.showsTail
+            if !decorationAttributes.canShowAvatar {
+                self.messageViewModel.avatarImage.value = nil
+            }
             cell.bubbleView.userInteractionEnabled = true // just in case something went wrong while showing UIMenuController
             cell.baseStyle = self.cellStyle
             cell.messageViewModel = self.messageViewModel
@@ -111,6 +115,10 @@ public class BaseMessagePresenter<BubbleViewT, ViewModelBuilderT, InteractionHan
                 guard let sSelf = self else { return }
                 sSelf.onCellBubbleLongPressEnded()
             }
+            cell.onAvatarTapped = { [weak self] (cell) in
+                guard let sSelf = self else { return }
+                sSelf.onCellAvatarTapped()
+            }
             cell.onFailedButtonTapped = { [weak self] (cell) in
                 guard let sSelf = self else { return }
                 sSelf.onCellFailedButtonTapped(cell.failedButton)
@@ -172,6 +180,10 @@ public class BaseMessagePresenter<BubbleViewT, ViewModelBuilderT, InteractionHan
     public func onCellBubbleLongPressEnded() {
         self.interactionHandler?.userDidEndLongPressOnBubble(viewModel: self.messageViewModel)
     }
+
+    public func onCellAvatarTapped() {
+        self.interactionHandler?.userDidTapOnAvatar(viewModel: self.messageViewModel)
+    }
 
     public func onCellFailedButtonTapped(failedButtonView: UIView) {
         self.interactionHandler?.userDidTapOnFailIcon(viewModel: self.messageViewModel, failIconView: failedButtonView)

ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift

@@ -127,6 +127,7 @@ public class BaseMessageCollectionViewCell<BubbleViewType where BubbleViewType:U
     public private(set) var avatarView: UIImageView!
     func createAvatarView() -> UIImageView! {
         let avatarImageView = UIImageView(frame: CGRect.zero)
+        avatarImageView.userInteractionEnabled = true
         return avatarImageView
     }
 
@@ -150,9 +151,15 @@ public class BaseMessageCollectionViewCell<BubbleViewType where BubbleViewType:U
         longpressGestureRecognizer.delegate = self
         return longpressGestureRecognizer
     }()
+
+    public private(set) lazy var avatarTapGestureRecognizer: UITapGestureRecognizer = {
+        let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(BaseMessageCollectionViewCell.avatarTapped(_:)))
+        return tapGestureRecognizer
+    }()
 
     private func commonInit() {
         self.avatarView = self.createAvatarView()
+        self.avatarView.addGestureRecognizer(self.avatarTapGestureRecognizer)
         self.bubbleView = self.createBubbleView()
         self.bubbleView.addGestureRecognizer(self.tapGestureRecognizer)
         self.bubbleView.addGestureRecognizer(self.longPressGestureRecognizer)
@@ -310,6 +317,12 @@ public class BaseMessageCollectionViewCell<BubbleViewType where BubbleViewType:U
         self.onFailedButtonTapped?(cell: self)
     }
 
+    public var onAvatarTapped: ((cell: BaseMessageCollectionViewCell) -> Void)?
+    @objc
+    func avatarTapped(tapGestureRecognizer: UITapGestureRecognizer) {
+        self.onAvatarTapped?(cell: self)
+    }
+
     public var onBubbleTapped: ((cell: BaseMessageCollectionViewCell) -> Void)?
     @objc
     func bubbleTapped(tapGestureRecognizer: UITapGestureRecognizer) {

ChattoAdditions/Source/Chat Items/ChatItemDecorationAttributes.swift

@@ -28,8 +28,10 @@ import Chatto
 public struct ChatItemDecorationAttributes: ChatItemDecorationAttributesProtocol {
     public let bottomMargin: CGFloat
     public let showsTail: Bool
-    public init(bottomMargin: CGFloat, showsTail: Bool) {
+    public let canShowAvatar: Bool
+    public init(bottomMargin: CGFloat, showsTail: Bool, canShowAvatar: Bool) {
         self.bottomMargin = bottomMargin
         self.showsTail = showsTail
+        self.canShowAvatar = canShowAvatar
     }
 }

ChattoAdditions/Tests/Chat Items/BaseMessage/BaseMessagePresenterTests.swift

@@ -30,7 +30,7 @@ class BaseMessagePresenterTests: XCTestCase {
 
     // BaseMessagePresenter is generic, let's use the photo one for instance
     var presenter: PhotoMessagePresenter<PhotoMessageViewModelDefaultBuilder<PhotoMessageModel<MessageModel>>, PhotoMessageTestHandler>!
-    let decorationAttributes = ChatItemDecorationAttributes(bottomMargin: 0, showsTail: false)
+    let decorationAttributes = ChatItemDecorationAttributes(bottomMargin: 0, showsTail: false, canShowAvatar: false)
     var interactionHandler: PhotoMessageTestHandler!
     override func setUp() {
         let viewModelBuilder = PhotoMessageViewModelDefaultBuilder<PhotoMessageModel<MessageModel>>()

ChattoAdditions/Tests/Chat Items/PhotoMessages/PhotoMessagePresenterTests.swift

@@ -28,7 +28,7 @@ import XCTest
 class PhotoMessagePresenterTests: XCTestCase, UICollectionViewDataSource {
 
     var presenter: PhotoMessagePresenter<PhotoMessageViewModelDefaultBuilder<PhotoMessageModel<MessageModel>>, PhotoMessageTestHandler>!
-    let decorationAttributes = ChatItemDecorationAttributes(bottomMargin: 0, showsTail: false)
+    let decorationAttributes = ChatItemDecorationAttributes(bottomMargin: 0, showsTail: false, canShowAvatar: false)
     let testImage = UIImage()
     override func setUp() {
         let viewModelBuilder = PhotoMessageViewModelDefaultBuilder<PhotoMessageModel<MessageModel>>()
@@ -82,6 +82,11 @@ class PhotoMessageTestHandler: BaseMessageInteractionHandlerProtocol {
     func userDidTapOnFailIcon(viewModel viewModel: ViewModelT, failIconView: UIView) {
         self.didHandleTapOnFailIcon = true
     }
+
+    var didHandleTapOnAvatar = false
+    func userDidTapOnAvatar(viewModel viewModel: ViewModelT) {
+        self.didHandleTapOnAvatar = true
+    }
 
     var didHandleTapOnBubble = false
     func userDidTapOnBubble(viewModel viewModel: ViewModelT) {

ChattoAdditions/Tests/Chat Items/TextMessages/TextMessagePresenterTests.swift

@@ -29,7 +29,7 @@ import Chatto
 class TextMessagePresenterTests: XCTestCase, UICollectionViewDataSource {
 
     var presenter: TextMessagePresenter<TextMessageViewModelDefaultBuilder<TextMessageModel<MessageModel>>, TextMessageTestHandler>!
-    let decorationAttributes = ChatItemDecorationAttributes(bottomMargin: 0, showsTail: false)
+    let decorationAttributes = ChatItemDecorationAttributes(bottomMargin: 0, showsTail: false, canShowAvatar: false)
     override func setUp() {
         let viewModelBuilder = TextMessageViewModelDefaultBuilder<TextMessageModel<MessageModel>>()
         let sizingCell = TextMessageCollectionViewCell.sizingCell()
@@ -91,6 +91,10 @@ class TextMessageTestHandler: BaseMessageInteractionHandlerProtocol {
 
     func userDidTapOnFailIcon(viewModel viewModel: ViewModelT, failIconView: UIView) {
 
+    }
+
+    func userDidTapOnAvatar(viewModel viewModel: ViewModelT) {
+
     }
 
     func userDidTapOnBubble(viewModel viewModel: ViewModelT) {

ChattoApp/ChattoApp/Source/BaseMessageHandler.swift

@@ -41,9 +41,12 @@ class BaseMessageHandler {
         self.messageSender.sendMessage(viewModel.messageModel)
     }
 
+    func userDidTapOnAvatar(viewModel viewModel: MessageViewModelProtocol) {
+        print("userDidTapOnAvatar")
+    }
+
     func userDidTapOnBubble(viewModel viewModel: DemoMessageViewModelProtocol) {
         print("userDidTapOnBubble")
-
     }
 
     func userDidBeginLongPressOnBubble(viewModel viewModel: DemoMessageViewModelProtocol) {

ChattoApp/ChattoApp/Source/ChatItemsDemoDecorator.swift

@@ -75,7 +75,7 @@ final class ChatItemsDemoDecorator: ChatItemsDecoratorProtocol {
 
             decoratedChatItems.append(DecoratedChatItem(
                 chatItem: chatItem,
-                decorationAttributes: ChatItemDecorationAttributes(bottomMargin: bottomMargin, showsTail: showsTail))
+                decorationAttributes: ChatItemDecorationAttributes(bottomMargin: bottomMargin, showsTail: showsTail, canShowAvatar: showsTail))
             )
             decoratedChatItems.appendContentsOf(additionalItems)
         }

ChattoApp/ChattoApp/Source/DemoChatViewController.swift

@@ -65,20 +65,25 @@ class DemoChatViewController: BaseChatViewController {
     }
 
     override func createPresenterBuilders() -> [ChatItemType: [ChatItemPresenterBuilderProtocol]] {
+
         let textMessagePresenter = TextMessagePresenterBuilder(
             viewModelBuilder: DemoTextMessageViewModelBuilder(),
             interactionHandler: DemoTextMessageHandler(baseHandler: self.baseMessageHandler)
         )
         textMessagePresenter.baseMessageStyle = BaseMessageCollectionViewCellAvatarStyle()
+
+        let photoMessagePresenter = PhotoMessagePresenterBuilder(
+            viewModelBuilder: DemoPhotoMessageViewModelBuilder(),
+            interactionHandler: DemoPhotoMessageHandler(baseHandler: self.baseMessageHandler)
+        )
+        photoMessagePresenter.baseCellStyle = BaseMessageCollectionViewCellAvatarStyle()
+
         return [
             DemoTextMessageModel.chatItemType: [
                 textMessagePresenter
             ],
             DemoPhotoMessageModel.chatItemType: [
-                PhotoMessagePresenterBuilder(
-                    viewModelBuilder: DemoPhotoMessageViewModelBuilder(),
-                    interactionHandler: DemoPhotoMessageHandler(baseHandler: self.baseMessageHandler)
-                )
+                photoMessagePresenter
             ],
             SendingStatusModel.chatItemType: [SendingStatusPresenterBuilder()],
             TimeSeparatorModel.chatItemType: [TimeSeparatorPresenterBuilder()]

ChattoApp/ChattoApp/Source/Photo Messages/DemoPhotoMessageHandler.swift

@@ -34,6 +34,10 @@ class DemoPhotoMessageHandler: BaseMessageInteractionHandlerProtocol {
     func userDidTapOnFailIcon(viewModel viewModel: DemoPhotoMessageViewModel, failIconView: UIView) {
         self.baseHandler.userDidTapOnFailIcon(viewModel: viewModel)
     }
+
+    func userDidTapOnAvatar(viewModel viewModel: DemoPhotoMessageViewModel) {
+        self.baseHandler.userDidTapOnAvatar(viewModel: viewModel)
+    }
 
     func userDidTapOnBubble(viewModel viewModel: DemoPhotoMessageViewModel) {
         self.baseHandler.userDidTapOnBubble(viewModel: viewModel)

ChattoApp/ChattoApp/Source/Photo Messages/DemoPhotoMessageViewModel.swift

@@ -78,6 +78,7 @@ class DemoPhotoMessageViewModelBuilder: ViewModelBuilderProtocol {
     func createViewModel(model: DemoPhotoMessageModel) -> DemoPhotoMessageViewModel {
         let messageViewModel = self.messageViewModelBuilder.createMessageViewModel(model)
         let photoMessageViewModel = DemoPhotoMessageViewModel(photoMessage: model, messageViewModel: messageViewModel)
+        photoMessageViewModel.avatarImage.value = UIImage(named: "userAvatar")
         return photoMessageViewModel
     }
 

ChattoApp/ChattoApp/Source/Text Messages/DemoTextMessageHandler.swift

@@ -33,6 +33,10 @@ class DemoTextMessageHandler: BaseMessageInteractionHandlerProtocol {
     func userDidTapOnFailIcon(viewModel viewModel: DemoTextMessageViewModel, failIconView: UIView) {
         self.baseHandler.userDidTapOnFailIcon(viewModel: viewModel)
     }
+
+    func userDidTapOnAvatar(viewModel viewModel: DemoTextMessageViewModel) {
+        self.baseHandler.userDidTapOnAvatar(viewModel: viewModel)
+    }
 
     func userDidTapOnBubble(viewModel viewModel: DemoTextMessageViewModel) {
         self.baseHandler.userDidTapOnBubble(viewModel: viewModel)

ChattoApp/ChattoApp/Source/Text Messages/DemoTextMessageViewModel.swift

@@ -44,8 +44,6 @@ public class DemoTextMessageViewModelBuilder: ViewModelBuilderProtocol {
     public func createViewModel(textMessage: DemoTextMessageModel) -> DemoTextMessageViewModel {
         let messageViewModel = self.messageViewModelBuilder.createMessageViewModel(textMessage)
         let textMessageViewModel = DemoTextMessageViewModel(textMessage: textMessage, messageViewModel: messageViewModel)
-        // Best place to decide whether user having avart might be in the presenter. Here just for demo purpose
-        // Because we might only want to display avatar when showTail in the nessage bubble
         textMessageViewModel.avatarImage.value = UIImage(named: "userAvatar")
         return textMessageViewModel
     }