[unstable] Optimized "to past" scrolling by reversing cells order

nMessenger/Source/MessageNodes/ContentNodes/CollectionViewContent/CollectionViewWithTextContentNode.swift

@@ -0,0 +1,86 @@
+//
+//  CollectionViewWithTextContentNode.swift
+//  nMessenger
+//
+//  Created by Alexander Dodatko on 7/18/17.
+//  Copyright © 2017 Ebay Inc. All rights reserved.
+//
+
+import Foundation
+import AsyncDisplayKit
+
+
+open class CollectionViewWithTextContentNode: CollectionViewContentNode
+{
+    public var textMessageNode: ASTextNode?
+    public var timestampNode  : ASTextNode?
+
+    override open func layoutSpecThatFits(
+        _ constrainedSize: ASSizeRange)
+    -> ASLayoutSpec
+    {
+        guard let textMessageNodeUnwrap = self.textMessageNode,
+              let timestampNodeUnwrap   = self.timestampNode
+        else
+        {
+            return super.layoutSpecThatFits(constrainedSize)
+        }
+
+
+        // ====
+        //
+        let cellsLayout = super.layoutSpecThatFits(constrainedSize)
+
+        let imagesPaddingInsets =
+            UIEdgeInsets(
+                top: 4,
+                left: 15,
+                bottom: 15,
+                right: 4)
+        let imagesPadding =
+            ASInsetLayoutSpec(
+                insets: imagesPaddingInsets,
+                child: cellsLayout)
+
+
+        // ==== timestampNode
+        //
+        let timespampPaddingInsets =
+            UIEdgeInsets(
+                top: 10,
+                left: 15,
+                bottom: 0,
+                right: 0)
+        let timestampPadding =
+            ASInsetLayoutSpec(
+                insets: timespampPaddingInsets,
+                child: timestampNodeUnwrap)
+
+        // ==== textMessageNode
+        //
+        let labelPaddingInsets =
+            UIEdgeInsets(
+                top: 5,
+                left: 15,
+                bottom: 0,
+                right: 0)
+        let labelPadding =
+            ASInsetLayoutSpec(
+                insets: labelPaddingInsets,
+                child: textMessageNodeUnwrap)
+
+
+        // ====
+        //
+        let result =
+            ASStackLayoutSpec(
+                direction: .vertical,
+                spacing: 5,
+                justifyContent: .start,
+                alignItems: .start,
+                children: [timestampPadding, labelPadding, imagesPadding])
+
+        return result
+    }
+}
+

nMessenger/Source/MessageNodes/ContentNodes/ContentNode.swift

@@ -21,21 +21,28 @@ open class ContentNode: ASDisplayNode {
     // MARK: Public Parameters
     /** Bubble that defines the background for the message*/
     open var backgroundBubble: Bubble?
+
+
     /** UIViewController that holds the cell. Allows the cell the present View Controllers. Generally used for UIMenu or UIAlert Options*/
     open weak var currentViewController: UIViewController?
+
+
     /** MessageConfigurationProtocol hold common definition for all messages. Defaults to **StandardMessageConfiguration***/
-    open var bubbleConfiguration : BubbleConfigurationProtocol = StandardBubbleConfiguration() {
-        didSet {
+    open var bubbleConfiguration : BubbleConfigurationProtocol = StandardBubbleConfiguration()
+    {
+        didSet
+        {
             self.updateBubbleConfig(self.bubbleConfiguration)
         }
     }
     /** Bool if the cell is an incoming or out going message.
      Set backgroundBubble.bubbleColor when value is changed
      */
-    open var isIncomingMessage = true {
-        didSet {
-             self.backgroundBubble?.bubbleColor = isIncomingMessage ? bubbleConfiguration.getIncomingColor() : bubbleConfiguration.getOutgoingColor()
-
+    open var isIncomingMessage = true
+    {
+        didSet
+        {
+            self.updateBackgroundBubbleColor()
             self.setNeedsLayout()
         }
     }
@@ -67,14 +74,23 @@ open class ContentNode: ASDisplayNode {
     /** Updates the bubble config by setting all necessary properties (background bubble, bubble color, layout)
      - parameter newValue: the new BubbleConfigurationProtocol
      */
-    open func updateBubbleConfig(_ newValue: BubbleConfigurationProtocol) {
+    open func updateBubbleConfig(_ newValue: BubbleConfigurationProtocol)
+    {
         self.backgroundBubble = self.bubbleConfiguration.getBubble()
 
-        self.backgroundBubble?.bubbleColor = isIncomingMessage ? bubbleConfiguration.getIncomingColor() : bubbleConfiguration.getOutgoingColor()
+        self.updateBackgroundBubbleColor()
 
         self.setNeedsLayout()
     }
 
+    public func updateBackgroundBubbleColor()
+    {
+        self.backgroundBubble?.bubbleColor =
+            self.isIncomingMessage
+                ? self.bubbleConfiguration.getIncomingColor()
+                : self.bubbleConfiguration.getOutgoingColor()
+    }
+
     /**
      Called during the initializer and makes sure layers are added on the main thread
      */
@@ -100,14 +116,21 @@ open class ContentNode: ASDisplayNode {
     /**
      Draws the content in the bubble. This is called on a background thread.
      */
-    open func drawRect(_ bounds: CGRect, withParameters parameters: NSObjectProtocol!,
-                  isCancelled isCancelledBlock: asdisplaynode_iscancelled_block_t, isRasterizing: Bool) {
+    @objc open func drawRect(_ bounds: CGRect,
+                             withParameters parameters: NSObjectProtocol!,
+                             isCancelled isCancelledBlock: asdisplaynode_iscancelled_block_t,
+                             isRasterizing: Bool)
+    {
+        // print("[NMessenger] ContentNode.drawRect | isRasterizing=\(isRasterizing)")
         self.isOpaque = false
-        if !isRasterizing {
+
+        if !isRasterizing
+        {
             self.calculateLayerPropertiesThatFit(bounds)
 
             //call the main queue
-            DispatchQueue.main.async {
+            DispatchQueue.main.async
+            {
                 self.layoutLayers()
             }
         }
@@ -150,10 +173,15 @@ open class ContentNode: ASDisplayNode {
      - parameter closure: Must be an ()->()
      */
     open func delay(_ delay: Double, closure: @escaping ()->()) {
+
+        let timeIncrement =
+            Double(Int64(delay * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
+        let absoluteTimeIncremented =
+            DispatchTime.now() + timeIncrement
+
         DispatchQueue.main.asyncAfter(
-            deadline: DispatchTime.now() + Double(Int64(delay * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC),
-            execute: closure
-        )
+            deadline: absoluteTimeIncremented,
+            execute: closure)
     }
 
 

nMessenger/Source/MessageNodes/ContentNodes/ImageContent/ImageContentNode.swift

@@ -18,6 +18,8 @@ import AsyncDisplayKit
  */
 open class ImageContentNode: ContentNode {
 
+    open var imageAspectRatio: CGFloat = 4.0 / 3.0
+
     // MARK: Public Variables
     /** UIImage as the image of the cell*/
     open var image: UIImage? {
@@ -77,7 +79,7 @@ open class ImageContentNode: ContentNode {
 
         let width = constrainedSize.max.width
         self.imageMessageNode.style.width = ASDimension(unit: .points, value: width)
-        self.imageMessageNode.style.height = ASDimension(unit: .points, value: width/4*3)
+        self.imageMessageNode.style.height = ASDimension(unit: .points, value: width/self.imageAspectRatio)
         let absLayout = ASAbsoluteLayoutSpec()
         absLayout.sizing = .sizeToFit
         absLayout.children = [self.imageMessageNode]
@@ -99,14 +101,29 @@ open class ImageContentNode: ContentNode {
     open override func messageNodeLongPressSelector(_ recognizer: UITapGestureRecognizer) {
         if recognizer.state == UIGestureRecognizerState.began {
 
-            let touchLocation = recognizer.location(in: view)
+            let touchLocation = recognizer.location(in: self.view)
             if self.imageMessageNode.frame.contains(touchLocation) {
 
-                view.becomeFirstResponder()
+                self.view.becomeFirstResponder()
 
-                delay(0.1, closure: {
+                self.delay(0.1, closure: {
                     let menuController = UIMenuController.shared
-                    menuController.menuItems = [UIMenuItem(title: "Copy", action: #selector(ImageContentNode.copySelector))]
+
+                    let localizedCopyTitle = NSLocalizedString(
+                        "NMessenger.ImageContentNode.Menu.Copy",
+                        comment: "Copy")
+                    let copyTitle =
+                        (localizedCopyTitle.isEmpty)
+                            ? "Copy"
+                            : localizedCopyTitle
+
+                    menuController.menuItems =
+                    [
+                        UIMenuItem(
+                            title: copyTitle,
+                            action: #selector(ImageContentNode.copySelector))
+                    ]
+
                     menuController.setTargetRect(self.imageMessageNode.frame, in: self.view)
                     menuController.setMenuVisible(true, animated:true)
                 })
@@ -118,7 +135,7 @@ open class ImageContentNode: ContentNode {
      Copy Selector for UIMenuController
      Puts the node's image on UIPasteboard
      */
-    open func copySelector() {
+    @objc open func copySelector() {
         if let image = self.image {
             UIPasteboard.general.image = image
         }

nMessenger/Source/MessageNodes/ContentNodes/MixedContentNode/MixedContentNodeWithTimestamp.swift

@@ -0,0 +1,45 @@
+//
+//  MixedContentNodeWithTimestamp.swift
+//  nMessenger-iOS
+//
+//  Created by Alexander Dodatko on 12/12/17.
+//  Copyright © 2017 Ebay Inc. All rights reserved.
+//
+
+import Foundation
+
+
+open class MixedContentNodeWithTimestamp: ContentNode {
+
+    open var textNode: ASTextNode?
+    open var timestampNode: ASTextNode?
+    open var attachmentsNode: CollectionViewContentNode?
+
+    open override func layoutSpecThatFits(_ constrainedSize: ASSizeRange) -> ASLayoutSpec {
+
+        let children: [ASLayoutElement?] = [self.timestampNode,
+                                            self.textNode,
+                                            self.attachmentsNode]
+
+        let stackSpec = ASStackLayoutSpec(direction: .vertical,
+                                          spacing: 5,
+                                          justifyContent: .start,
+                                          alignItems: .start,
+                                          children: children.flatMap { $0 })
+
+        let insets = UIEdgeInsets(top: 10, left: 15, bottom: 10, right: 15)
+
+        let insetSpec = ASInsetLayoutSpec(insets: insets,
+                                          child: stackSpec)
+        return insetSpec
+    }
+
+    open override func messageNodeLongPressSelector(
+        _ recognizer: UITapGestureRecognizer)
+    {
+        // TODO: rewrite if specific menu is required for each cell
+        //
+        // fatalError("handled in MessageNode")
+    }
+
+}

nMessenger/Source/MessageNodes/ContentNodes/NetworkImageContent/NetworkImageContentNode.swift

@@ -107,11 +107,26 @@ open class NetworkImageContentNode: ContentNode,ASNetworkImageNodeDelegate {
             let touchLocation = recognizer.location(in: view)
             if self.networkImageMessageNode.frame.contains(touchLocation) {
 
-                view.becomeFirstResponder()
+                self.view.becomeFirstResponder()
 
-                delay(0.1, closure: {
+                self.delay(0.1, closure: {
                     let menuController = UIMenuController.shared
-                    menuController.menuItems = [UIMenuItem(title: "Copy", action: #selector(NetworkImageContentNode.copySelector))]
+
+                    let localizedCopyTitle = NSLocalizedString(
+                        "NMessenger.NetworkImageContentNode.Menu.Copy",
+                        comment: "Copy")
+                    let copyTitle =
+                        (localizedCopyTitle.isEmpty)
+                            ? "Copy"
+                            : localizedCopyTitle
+
+                    menuController.menuItems =
+                    [
+                        UIMenuItem(
+                            title: copyTitle,
+                            action: #selector(NetworkImageContentNode.copySelector))
+                    ]
+
                     menuController.setTargetRect(self.networkImageMessageNode.frame, in: self.view)
                     menuController.setMenuVisible(true, animated:true)
                 })
@@ -123,7 +138,7 @@ open class NetworkImageContentNode: ContentNode,ASNetworkImageNodeDelegate {
      Copy Selector for UIMenuController
      Puts the node's image on UIPasteboard
      */
-    open func copySelector() {
+    @objc open func copySelector() {
         if let image = self.networkImageMessageNode.image {
             UIPasteboard.general.image = image
         }