From 4af9fa6789d831df0c3f6eb2dd3ef438ffbb72a6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 19 Apr 2019 16:21:00 -0600 Subject: [PATCH] "add more" as rail cell --- .../ic_plus_24.imageset/Contents.json | 23 +++++++ .../ic_plus_24.imageset/plus-24@1x.png | Bin 0 -> 168 bytes .../ic_plus_24.imageset/plus-24@2x.png | Bin 0 -> 248 bytes .../ic_plus_24.imageset/plus-24@3x.png | Bin 0 -> 348 bytes .../MediaPageViewController.swift | 24 ++++--- ...AttachmentApprovalInputAccessoryView.swift | 5 +- .../AttachmentApprovalViewController.swift | 60 ++++++++++++------ .../AttachmentItemCollection.swift | 20 +++++- .../AttachmentTextToolbar.swift | 28 +------- SignalMessaging/Views/GalleryRailView.swift | 44 ++++++------- 10 files changed, 125 insertions(+), 79 deletions(-) create mode 100644 Signal/Images.xcassets/ic_plus_24.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_plus_24.imageset/plus-24@1x.png create mode 100644 Signal/Images.xcassets/ic_plus_24.imageset/plus-24@2x.png create mode 100644 Signal/Images.xcassets/ic_plus_24.imageset/plus-24@3x.png diff --git a/Signal/Images.xcassets/ic_plus_24.imageset/Contents.json b/Signal/Images.xcassets/ic_plus_24.imageset/Contents.json new file mode 100644 index 000000000..72e7fa1e2 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/ic_plus_24.imageset/plus-24@1x.png b/Signal/Images.xcassets/ic_plus_24.imageset/plus-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..5a11ea9a1d129a1dbf19f106db44dd7ba5faebb8 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0pkS1z zi(`mKXY!x_|LvJ|8HIg))vq$SxgBFx=uvEB=h2hzi89Dy409;ve&EVFQSt*H$#5Cl>NYP zm`Q1oE6eY!mrb*O$OjZR%woPGv)~znDfRJJK8PFVEm@e~)3!%Pww@ zf427{4=ny3>2d61`A@-Fmn9#}J{M!0(lV*G#Z8Cd_nJ-X&0g8n^{xWz=R+8|_4`|| hkjH{St7RD;u*)zk3gf%b%LH^agQu&X%Q~loCICf4Ui$z5 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_plus_24.imageset/plus-24@3x.png b/Signal/Images.xcassets/ic_plus_24.imageset/plus-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d63c48c7145d591dab4fc313375b0df64da993ba GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KI&fq{|F z)5S5QV$R!J2YH(u1RO3(COb}PP>t-=jbxJT4b0bhY~Oh7&-8+usx37MmJVT|E6TId zza%LnfZ+$>Mx)|$XQFaHZ+I+T!OqA`Dr_t^ul=z6ex^j{45MO+JKmvpxAWcom-y|E zpB>M?jjL|$k+MrV;BdfULF^LcM@Btwp6~RyALhQ_?MTrB%bYCc($&A@W^KP(^u)5H r=14;$snFqf{e*janqk`PIy>0^d{X4{+hKPY7+egVu6{1-oD!M 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 { - let (guarantee, fulfill) = Guarantee.pending() - if let image = self.thumbnailImage(async: { fulfill($0) }) { - fulfill(image) + public func getRailImage() -> Guarantee { + return Guarantee { fulfill in + if let image = self.thumbnailImage(async: { fulfill($0) }) { + fulfill(image) + } } - - return Promise(guarantee) } } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index eadc0afda..95084efc3 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/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() diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 9480f2ecf..3cae70819 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/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 { - 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 diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift index deee60f3e..f03ff9472 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift +++ b/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? { diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift index d475d2a0b..4e3c1d387 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift +++ b/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) { diff --git a/SignalMessaging/Views/GalleryRailView.swift b/SignalMessaging/Views/GalleryRailView.swift index 4227c108c..c05097ad1 100644 --- a/SignalMessaging/Views/GalleryRailView.swift +++ b/SignalMessaging/Views/GalleryRailView.swift @@ -9,8 +9,7 @@ public protocol GalleryRailItemProvider: class { } public protocol GalleryRailItem: class { - func getRailImage() -> Promise - 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 }