"add more" as rail cell

Signal/Images.xcassets/ic_plus_24.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "plus-24@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "plus-24@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "plus-24@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/src/ViewControllers/MediaPageViewController.swift

@@ -334,7 +334,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 
         galleryRailView.configureCellViews(itemProvider: currentItem.album,
                                            focusedItem: currentItem,
-                                           cellViewBuilder: { return GalleryRailCellView() })
+                                           cellViewBuilder: { _ in return GalleryRailCellView() })
     }
 
     // MARK: Actions
@@ -774,17 +774,23 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 }
 
 extension MediaGalleryItem: GalleryRailItem {
-    public var aspectRatio: CGFloat {
-        return self.imageSize.aspectRatio
+    public func buildRailItemView() -> UIView {
+        let imageView = UIImageView()
+        imageView.contentMode = .scaleAspectFill
+        getRailImage().map { [weak imageView] image in
+            guard let imageView = imageView else { return }
+            imageView.image = image
+        }.retainUntilComplete()
+
+        return imageView
     }
 
-    public func getRailImage() -> Promise<UIImage> {
-        let (guarantee, fulfill) = Guarantee<UIImage>.pending()
-        if let image = self.thumbnailImage(async: { fulfill($0) }) {
-            fulfill(image)
+    public func getRailImage() -> Guarantee<UIImage> {
+        return Guarantee<UIImage> { fulfill in
+            if let image = self.thumbnailImage(async: { fulfill($0) }) {
+                fulfill(image)
+            }
         }
-
-        return Promise(guarantee)
     }
 }
 

SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift

@@ -32,9 +32,8 @@ class AttachmentApprovalInputAccessoryView: UIView {
 
     let kGalleryRailViewHeight: CGFloat = 72
 
-    required init(isAddMoreVisible: Bool) {
-        attachmentTextToolbar = AttachmentTextToolbar(isAddMoreVisible: isAddMoreVisible)
-
+    required init() {
+        attachmentTextToolbar = AttachmentTextToolbar()
         attachmentCaptionToolbar = AttachmentCaptionToolbar()
 
         galleryRailView = GalleryRailView()

SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift

@@ -40,6 +40,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
     // MARK: - Properties
 
     private let mode: AttachmentApprovalViewControllerMode
+    private let isAddMoreVisible: Bool
 
     public weak var approvalDelegate: AttachmentApprovalViewControllerDelegate?
 
@@ -64,7 +65,9 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
         assert(attachments.count > 0)
         self.mode = mode
         let attachmentItems = attachments.map { SignalAttachmentItem(attachment: $0 )}
-        self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems)
+        self.isAddMoreVisible = mode == .sharedNavigation
+
+        self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems, isAddMoreVisible: isAddMoreVisible)
 
         let options: [UIPageViewController.OptionsKey: Any] = [.interPageSpacing: kSpacingBetweenItems]
         super.init(transitionStyle: .scroll,
@@ -118,8 +121,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
     }
 
     lazy var bottomToolView: AttachmentApprovalInputAccessoryView = {
-        let isAddMoreVisible = mode == .sharedNavigation
-        let bottomToolView = AttachmentApprovalInputAccessoryView(isAddMoreVisible: isAddMoreVisible)
+        let bottomToolView = AttachmentApprovalInputAccessoryView()
         bottomToolView.delegate = self
 
         return bottomToolView
@@ -536,17 +538,31 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
             return
         }
 
-        let cellViewBuilder: () -> ApprovalRailCellView = { [weak self] in
-            let cell = ApprovalRailCellView()
-            cell.approvalRailCellDelegate = self
-            return cell
+        let cellViewBuilder: (GalleryRailItem) -> GalleryRailCellView = { [weak self] railItem in
+            switch railItem {
+            case is AddMoreRailItem:
+                return GalleryRailCellView()
+            case is SignalAttachmentItem:
+                let cell = ApprovalRailCellView()
+                cell.approvalRailCellDelegate = self
+                return cell
+            default:
+                owsFailDebug("unexpted rail item type: \(railItem)")
+                return GalleryRailCellView()
+            }
         }
 
         galleryRailView.configureCellViews(itemProvider: attachmentItemCollection,
                                            focusedItem: currentItem,
                                            cellViewBuilder: cellViewBuilder)
 
-        galleryRailView.isHidden = attachmentItemCollection.attachmentItems.count < 2
+        if isAddMoreVisible {
+            galleryRailView.isHidden = false
+        } else if attachmentItemCollection.attachmentItems.count > 1 {
+            galleryRailView.isHidden = false
+        } else {
+            galleryRailView.isHidden = true
+        }
     }
 
     let attachmentItemCollection: AttachmentItemCollection
@@ -699,10 +715,6 @@ extension AttachmentApprovalViewController: AttachmentTextToolbarDelegate {
         approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments, messageText: attachmentTextToolbar.messageText)
     }
 
-    func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar) {
-        self.approvalDelegate?.attachmentApprovalDidTapAddMore?(self)
-    }
-
     func attachmentTextToolbarDidChange(_ attachmentTextToolbar: AttachmentTextToolbar) {
         approvalDelegate?.attachmentApproval(self, didChangeMessageText: attachmentTextToolbar.messageText)
     }
@@ -723,12 +735,15 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate
 // MARK: GalleryRail
 
 extension SignalAttachmentItem: GalleryRailItem {
-    var aspectRatio: CGFloat {
-        return self.imageSize.aspectRatio
-    }
+    func buildRailItemView() -> UIView {
+        let imageView = UIImageView()
+        imageView.contentMode = .scaleAspectFill
 
-    func getRailImage() -> Promise<UIImage> {
-        return self.getThumbnailImage()
+        getThumbnailImage().map { image in
+            imageView.image = image
+        }.retainUntilComplete()
+
+        return imageView
     }
 }
 
@@ -736,7 +751,11 @@ extension SignalAttachmentItem: GalleryRailItem {
 
 extension AttachmentItemCollection: GalleryRailItemProvider {
     var railItems: [GalleryRailItem] {
-        return self.attachmentItems
+        if isAddMoreVisible {
+            return self.attachmentItems + [AddMoreRailItem()]
+        } else {
+            return self.attachmentItems
+        }
     }
 }
 
@@ -744,6 +763,11 @@ extension AttachmentItemCollection: GalleryRailItemProvider {
 
 extension AttachmentApprovalViewController: GalleryRailViewDelegate {
     public func galleryRailView(_ galleryRailView: GalleryRailView, didTapItem imageRailItem: GalleryRailItem) {
+        if imageRailItem is AddMoreRailItem {
+            self.approvalDelegate?.attachmentApprovalDidTapAddMore?(self)
+            return
+        }
+
         guard let targetItem = imageRailItem as? SignalAttachmentItem else {
             owsFailDebug("unexpected imageRailItem: \(imageRailItem)")
             return

SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift

@@ -5,6 +5,22 @@
 import Foundation
 import PromiseKit
 
+class AddMoreRailItem: GalleryRailItem {
+    func buildRailItemView() -> UIView {
+        let view = UIView()
+        view.backgroundColor = UIColor.black.withAlphaComponent(0.33)
+
+        let iconView = UIImageView(image: #imageLiteral(resourceName: "ic_plus_24").withRenderingMode(.alwaysTemplate))
+        iconView.tintColor = .ows_white
+        view.addSubview(iconView)
+        iconView.setCompressionResistanceHigh()
+        iconView.setContentHuggingHigh()
+        iconView.autoCenterInSuperview()
+
+        return view
+    }
+}
+
 class SignalAttachmentItem: Hashable {
 
     enum SignalAttachmentItemError: Error {
@@ -75,8 +91,10 @@ class SignalAttachmentItem: Hashable {
 
 class AttachmentItemCollection {
     private (set) var attachmentItems: [SignalAttachmentItem]
-    init(attachmentItems: [SignalAttachmentItem]) {
+    let isAddMoreVisible: Bool
+    init(attachmentItems: [SignalAttachmentItem], isAddMoreVisible: Bool) {
         self.attachmentItems = attachmentItems
+        self.isAddMoreVisible = isAddMoreVisible
     }
 
     func itemAfter(item: SignalAttachmentItem) -> SignalAttachmentItem? {

SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift

@@ -12,7 +12,6 @@ protocol AttachmentTextToolbarDelegate: class {
     func attachmentTextToolbarDidTapSend(_ attachmentTextToolbar: AttachmentTextToolbar)
     func attachmentTextToolbarDidBeginEditing(_ attachmentTextToolbar: AttachmentTextToolbar)
     func attachmentTextToolbarDidEndEditing(_ attachmentTextToolbar: AttachmentTextToolbar)
-    func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar)
     func attachmentTextToolbarDidChange(_ attachmentTextToolbar: AttachmentTextToolbar)
 }
 
@@ -44,8 +43,7 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
 
     // MARK: - Initializers
 
-    init(isAddMoreVisible: Bool) {
-        self.addMoreButton = UIButton(type: .custom)
+    init() {
         self.sendButton = UIButton(type: .system)
         self.textViewHeight = kMinTextViewHeight
 
@@ -59,11 +57,6 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
 
         textView.delegate = self
 
-        let addMoreIcon = #imageLiteral(resourceName: "album_add_more").withRenderingMode(.alwaysTemplate)
-        addMoreButton.setImage(addMoreIcon, for: .normal)
-        addMoreButton.tintColor = Theme.darkThemePrimaryColor
-        addMoreButton.addTarget(self, action: #selector(didTapAddMore), for: .touchUpInside)
-
         let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.")
         sendButton.setTitle(sendTitle, for: .normal)
         sendButton.addTarget(self, action: #selector(didTapSend), for: .touchUpInside)
@@ -79,10 +72,6 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
         contentView.addSubview(sendButton)
         contentView.addSubview(textContainer)
         contentView.addSubview(lengthLimitLabel)
-        if isAddMoreVisible {
-            contentView.addSubview(addMoreButton)
-        }
-
         addSubview(contentView)
         contentView.autoPinEdgesToSuperviewEdges()
 
@@ -105,15 +94,7 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
         // I believe this is a bug in PureLayout. Filed here: https://github.com/PureLayout/PureLayout/issues/209
         textContainer.autoPinEdge(toSuperviewMargin: .top)
         textContainer.autoPinEdge(toSuperviewMargin: .bottom)
-        if isAddMoreVisible {
-            addMoreButton.autoPinEdge(toSuperviewMargin: .left)
-            textContainer.autoPinEdge(.left, to: .right, of: addMoreButton, withOffset: kToolbarMargin)
-            addMoreButton.autoAlignAxis(.horizontal, toSameAxisOf: sendButton)
-            addMoreButton.setContentHuggingHigh()
-            addMoreButton.setCompressionResistanceHigh()
-        } else {
-            textContainer.autoPinEdge(toSuperviewMargin: .left)
-        }
+        textContainer.autoPinEdge(toSuperviewMargin: .left)
 
         sendButton.autoPinEdge(.left, to: .right, of: textContainer, withOffset: kToolbarMargin)
         sendButton.autoPinEdge(.bottom, to: .bottom, of: textContainer, withOffset: -3)
@@ -145,7 +126,6 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
 
     // MARK: - Subviews
 
-    private let addMoreButton: UIButton
     private let sendButton: UIButton
 
     private lazy var lengthLimitLabel: UILabel = {
@@ -221,10 +201,6 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
         attachmentTextToolbarDelegate?.attachmentTextToolbarDidTapSend(self)
     }
 
-    @objc func didTapAddMore() {
-        attachmentTextToolbarDelegate?.attachmentTextToolbarDidAddMore(self)
-    }
-
     // MARK: - UITextViewDelegate
 
     public func textViewDidChange(_ textView: UITextView) {

SignalMessaging/Views/GalleryRailView.swift

@@ -9,8 +9,7 @@ public protocol GalleryRailItemProvider: class {
 }
 
 public protocol GalleryRailItem: class {
-    func getRailImage() -> Promise<UIImage>
-    var aspectRatio: CGFloat { get }
+    func buildRailItemView() -> UIView
 }
 
 protocol GalleryRailCellViewDelegate: class {
@@ -26,8 +25,8 @@ public class GalleryRailCellView: UIView {
 
         layoutMargins = .zero
         clipsToBounds = false
-        addSubview(imageView)
-        imageView.autoPinEdgesToSuperviewMargins()
+        addSubview(contentContainer)
+        contentContainer.autoPinEdgesToSuperviewMargins()
 
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTap(sender:)))
         addGestureRecognizer(tapGesture)
@@ -52,11 +51,13 @@ public class GalleryRailCellView: UIView {
         self.item = item
         self.delegate = delegate
 
-        item.getRailImage().done { image in
-            guard self.item === item else { return }
+        for view in contentContainer.subviews {
+            view.removeFromSuperview()
+        }
 
-            self.imageView.image = image
-        }.retainUntilComplete()
+        let itemView = item.buildRailItemView()
+        contentContainer.addSubview(itemView)
+        itemView.autoPinEdgesToSuperviewEdges()
     }
 
     // MARK: Selected
@@ -72,24 +73,23 @@ public class GalleryRailCellView: UIView {
         layoutMargins = UIEdgeInsets(top: 0, left: cellBorderWidth, bottom: 0, right: cellBorderWidth)
 
         if isSelected {
-            imageView.layer.borderColor = Theme.galleryHighlightColor.cgColor
-            imageView.layer.borderWidth = cellBorderWidth
-            imageView.layer.cornerRadius = cellBorderWidth
+            contentContainer.layer.borderColor = Theme.galleryHighlightColor.cgColor
+            contentContainer.layer.borderWidth = cellBorderWidth
+            contentContainer.layer.cornerRadius = cellBorderWidth
         } else {
-            imageView.layer.borderWidth = 0
-            imageView.layer.cornerRadius = 0
+            contentContainer.layer.borderWidth = 0
+            contentContainer.layer.cornerRadius = 0
         }
     }
 
     // MARK: Subview Helpers
 
-    let imageView: UIImageView = {
-        let imageView = UIImageView()
-        imageView.contentMode = .scaleAspectFill
-        imageView.autoPinToSquareAspectRatio()
-        imageView.clipsToBounds = true
+    let contentContainer: UIView = {
+        let view = UIView()
+        view.autoPinToSquareAspectRatio()
+        view.clipsToBounds = true
 
-        return imageView
+        return view
     }()
 }
 
@@ -124,7 +124,7 @@ public class GalleryRailView: UIView, GalleryRailCellViewDelegate {
 
     // MARK: Public
 
-    public func configureCellViews(itemProvider: GalleryRailItemProvider?, focusedItem: GalleryRailItem?, cellViewBuilder: () -> GalleryRailCellView) {
+    public func configureCellViews(itemProvider: GalleryRailItemProvider?, focusedItem: GalleryRailItem?, cellViewBuilder: (GalleryRailItem) -> GalleryRailCellView) {
         let animationDuration: TimeInterval = 0.2
 
         guard let itemProvider = itemProvider else {
@@ -210,9 +210,9 @@ public class GalleryRailView: UIView, GalleryRailCellViewDelegate {
         return scrollView
     }()
 
-    private func buildCellViews(items: [GalleryRailItem], cellViewBuilder: () -> GalleryRailCellView) -> [GalleryRailCellView] {
+    private func buildCellViews(items: [GalleryRailItem], cellViewBuilder: (GalleryRailItem) -> GalleryRailCellView) -> [GalleryRailCellView] {
         return items.map { item in
-            let cellView = cellViewBuilder()
+            let cellView = cellViewBuilder(item)
             cellView.configure(item: item, delegate: self)
             return cellView
         }