mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Decompose attachment approval into multiple source files.
This commit is contained in:
Matthew Chen
parent
fdf3da8b0a
commit
0826864525
8 changed files with 1813 additions and 1746 deletions
|
|
@ -12,11 +12,16 @@
|
|||
34074F61203D0CBE004596AE /* OWSSounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 34074F5F203D0CBD004596AE /* OWSSounds.m */; };
|
||||
34074F62203D0CBE004596AE /* OWSSounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 34074F60203D0CBE004596AE /* OWSSounds.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
34080EFE2225F96D0087E99F /* ImageEditorPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */; };
|
||||
34080F0022282C880087E99F /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */; };
|
||||
34080F02222853E30087E99F /* ImageEditorBrushViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */; };
|
||||
34080F04222858DC0087E99F /* OWSViewController+ImageEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */; };
|
||||
340872BF22393CFA00CB25B0 /* UIGestureRecognizer+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */; };
|
||||
340872C122394CAA00CB25B0 /* ImageEditorTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C022394CAA00CB25B0 /* ImageEditorTransform.swift */; };
|
||||
340872C82239563500CB25B0 /* ApprovalRailCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C32239563500CB25B0 /* ApprovalRailCellView.swift */; };
|
||||
340872C92239563500CB25B0 /* AttachmentItemCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C42239563500CB25B0 /* AttachmentItemCollection.swift */; };
|
||||
340872CA2239563500CB25B0 /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */; };
|
||||
340872CB2239563500CB25B0 /* AttachmentPrepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */; };
|
||||
340872CC2239563500CB25B0 /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */; };
|
||||
340872CE2239596100CB25B0 /* AttachmentApprovalInputAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */; };
|
||||
340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; };
|
||||
340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; };
|
||||
340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; };
|
||||
|
|
@ -197,7 +202,6 @@
|
|||
34AC09ED211B39B100997B47 /* ContactFieldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09CF211B39B000997B47 /* ContactFieldView.swift */; };
|
||||
34AC09EE211B39B100997B47 /* EditContactShareNameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09D0211B39B000997B47 /* EditContactShareNameViewController.swift */; };
|
||||
34AC09EF211B39B100997B47 /* ViewControllerUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09D1211B39B000997B47 /* ViewControllerUtils.m */; };
|
||||
34AC09F0211B39B100997B47 /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09D2211B39B000997B47 /* AttachmentApprovalViewController.swift */; };
|
||||
34AC09F2211B39B100997B47 /* OWSViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AC09D4211B39B000997B47 /* OWSViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
34AC09F3211B39B100997B47 /* NewNonContactConversationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09D5211B39B100997B47 /* NewNonContactConversationViewController.m */; };
|
||||
34AC09F4211B39B100997B47 /* SelectThreadViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AC09D6211B39B100997B47 /* SelectThreadViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
|
|
@ -643,11 +647,16 @@
|
|||
34074F5F203D0CBD004596AE /* OWSSounds.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSSounds.m; sourceTree = "<group>"; };
|
||||
34074F60203D0CBE004596AE /* OWSSounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSSounds.h; sourceTree = "<group>"; };
|
||||
34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorPaletteView.swift; sourceTree = "<group>"; };
|
||||
34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = "<group>"; };
|
||||
34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorBrushViewController.swift; sourceTree = "<group>"; };
|
||||
34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OWSViewController+ImageEditor.swift"; sourceTree = "<group>"; };
|
||||
340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIGestureRecognizer+OWS.swift"; sourceTree = "<group>"; };
|
||||
340872C022394CAA00CB25B0 /* ImageEditorTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorTransform.swift; sourceTree = "<group>"; };
|
||||
340872C32239563500CB25B0 /* ApprovalRailCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApprovalRailCellView.swift; sourceTree = "<group>"; };
|
||||
340872C42239563500CB25B0 /* AttachmentItemCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentItemCollection.swift; sourceTree = "<group>"; };
|
||||
340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalViewController.swift; sourceTree = "<group>"; };
|
||||
340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentPrepViewController.swift; sourceTree = "<group>"; };
|
||||
340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = "<group>"; };
|
||||
340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalInputAccessoryView.swift; sourceTree = "<group>"; };
|
||||
340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = "<group>"; };
|
||||
340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = "<group>"; };
|
||||
|
|
@ -884,7 +893,6 @@
|
|||
34AC09CF211B39B000997B47 /* ContactFieldView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactFieldView.swift; sourceTree = "<group>"; };
|
||||
34AC09D0211B39B000997B47 /* EditContactShareNameViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditContactShareNameViewController.swift; sourceTree = "<group>"; };
|
||||
34AC09D1211B39B000997B47 /* ViewControllerUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewControllerUtils.m; sourceTree = "<group>"; };
|
||||
34AC09D2211B39B000997B47 /* AttachmentApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalViewController.swift; sourceTree = "<group>"; };
|
||||
34AC09D4211B39B000997B47 /* OWSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSViewController.h; sourceTree = "<group>"; };
|
||||
34AC09D5211B39B100997B47 /* NewNonContactConversationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewNonContactConversationViewController.m; sourceTree = "<group>"; };
|
||||
34AC09D6211B39B100997B47 /* SelectThreadViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectThreadViewController.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1474,6 +1482,19 @@
|
|||
path = Signal/AudioFiles/messageReceivedSounds;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
340872C22239563500CB25B0 /* AttachmentApproval */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
340872C32239563500CB25B0 /* ApprovalRailCellView.swift */,
|
||||
340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */,
|
||||
340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */,
|
||||
340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */,
|
||||
340872C42239563500CB25B0 /* AttachmentItemCollection.swift */,
|
||||
340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */,
|
||||
);
|
||||
path = AttachmentApproval;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
340FC875204DAC8C007AEB0F /* Registration */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -2119,8 +2140,7 @@
|
|||
451F8A361FD7115D005CB9DA /* ViewControllers */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
34AC09D2211B39B000997B47 /* AttachmentApprovalViewController.swift */,
|
||||
34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */,
|
||||
340872C22239563500CB25B0 /* AttachmentApproval */,
|
||||
34AC09CF211B39B000997B47 /* ContactFieldView.swift */,
|
||||
34AC09CD211B39B000997B47 /* ContactShareApprovalViewController.swift */,
|
||||
34AC09DB211B39B100997B47 /* CountryCodeViewController.h */,
|
||||
|
|
@ -3338,12 +3358,12 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
45F59A0A2029140500E8D2B0 /* OWSVideoPlayer.swift in Sources */,
|
||||
340872C82239563500CB25B0 /* ApprovalRailCellView.swift in Sources */,
|
||||
45194F951FD7216600333B2C /* TSUnreadIndicatorInteraction.m in Sources */,
|
||||
4CB93DC22180FF07004B9764 /* ProximityMonitoringManager.swift in Sources */,
|
||||
34AC09E1211B39B100997B47 /* SelectThreadViewController.m in Sources */,
|
||||
34AC09EF211B39B100997B47 /* ViewControllerUtils.m in Sources */,
|
||||
346941A2215D2EE400B5BFAD /* OWSConversationColor.m in Sources */,
|
||||
34080F0022282C880087E99F /* AttachmentCaptionViewController.swift in Sources */,
|
||||
34AC0A17211B39EA00997B47 /* VideoPlayerView.swift in Sources */,
|
||||
34BEDB1321C43F6A007B0EAE /* ImageEditorView.swift in Sources */,
|
||||
34AC09EE211B39B100997B47 /* EditContactShareNameViewController.swift in Sources */,
|
||||
|
|
@ -3355,6 +3375,7 @@
|
|||
34AC09DF211B39B100997B47 /* OWSNavigationController.m in Sources */,
|
||||
34074F61203D0CBE004596AE /* OWSSounds.m in Sources */,
|
||||
34BEDB1721C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m in Sources */,
|
||||
340872C92239563500CB25B0 /* AttachmentItemCollection.swift in Sources */,
|
||||
34080EFE2225F96D0087E99F /* ImageEditorPaletteView.swift in Sources */,
|
||||
34B6A909218B8824007C4606 /* OWS112TypingIndicatorsMigration.swift in Sources */,
|
||||
4C3E245D21F2B395000AE092 /* DirectionalPanGestureRecognizer.swift in Sources */,
|
||||
|
|
@ -3379,6 +3400,7 @@
|
|||
3461293A1FD1B47300532771 /* OWSPreferences.m in Sources */,
|
||||
34AC09E6211B39B100997B47 /* SelectRecipientViewController.m in Sources */,
|
||||
4C858A52212DC5E1001B45D3 /* UIImage+OWS.swift in Sources */,
|
||||
340872CC2239563500CB25B0 /* AttachmentCaptionViewController.swift in Sources */,
|
||||
34480B671FD0AA9400BC14EF /* UIFont+OWS.m in Sources */,
|
||||
346129E61FD5C0C600532771 /* OWSDatabaseMigrationRunner.m in Sources */,
|
||||
34AC0A11211B39EA00997B47 /* OWSLayerView.swift in Sources */,
|
||||
|
|
@ -3397,6 +3419,7 @@
|
|||
34AC0A1F211B39EA00997B47 /* AvatarImageView.swift in Sources */,
|
||||
3466087220E550F400AFFE73 /* ConversationStyle.swift in Sources */,
|
||||
3478506B1FD9B78A007B8332 /* NoopCallMessageHandler.swift in Sources */,
|
||||
340872CA2239563500CB25B0 /* AttachmentApprovalViewController.swift in Sources */,
|
||||
346129AD1FD1F34E00532771 /* ImageCache.swift in Sources */,
|
||||
452C7CA72037628B003D51A5 /* Weak.swift in Sources */,
|
||||
34D5872F208E2C4200D2255A /* OWS109OutgoingMessageState.m in Sources */,
|
||||
|
|
@ -3408,6 +3431,7 @@
|
|||
346129F91FD5F31400532771 /* OWS104CreateRecipientIdentities.m in Sources */,
|
||||
346129B61FD1F7E800532771 /* ProfileFetcherJob.swift in Sources */,
|
||||
34AC09E9211B39B100997B47 /* OWSTableViewController.m in Sources */,
|
||||
340872CE2239596100CB25B0 /* AttachmentApprovalInputAccessoryView.swift in Sources */,
|
||||
346129F51FD5F31400532771 /* OWS102MoveLoggingPreferenceToUserDefaults.m in Sources */,
|
||||
45194F8F1FD71FF500333B2C /* ThreadUtil.m in Sources */,
|
||||
34BEDB0E21C405B0007B0EAE /* ImageEditorModel.swift in Sources */,
|
||||
|
|
@ -3430,6 +3454,7 @@
|
|||
346129FF1FD5F31400532771 /* OWS103EnableVideoCalling.m in Sources */,
|
||||
346129E31FD5C0BE00532771 /* VersionMigrations.m in Sources */,
|
||||
4C7537892193779700DF5E37 /* OWS113MultiAttachmentMediaMessages.swift in Sources */,
|
||||
340872CB2239563500CB25B0 /* AttachmentPrepViewController.swift in Sources */,
|
||||
34AC0A16211B39EA00997B47 /* OWSNavigationBar.swift in Sources */,
|
||||
34BEDB0B21C2FA3D007B0EAE /* OWS114RemoveDynamicInteractions.swift in Sources */,
|
||||
34AC0A1A211B39EA00997B47 /* CommonStrings.swift in Sources */,
|
||||
|
|
@ -3456,7 +3481,6 @@
|
|||
349ED992221EE80D008045B0 /* AppPreferences.swift in Sources */,
|
||||
34AC09E7211B39B100997B47 /* MessageApprovalViewController.swift in Sources */,
|
||||
34480B591FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m in Sources */,
|
||||
34AC09F0211B39B100997B47 /* AttachmentApprovalViewController.swift in Sources */,
|
||||
451F8A441FD7156B005CB9DA /* BlockListUIUtils.m in Sources */,
|
||||
34AC0A1E211B39EA00997B47 /* ThreadViewHelper.m in Sources */,
|
||||
34BBC85A220C7ADA00857249 /* ImageEditorTextItem.swift in Sources */,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,88 @@
|
|||
//
|
||||
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
|
||||
protocol ApprovalRailCellViewDelegate: class {
|
||||
func approvalRailCellView(_ approvalRailCellView: ApprovalRailCellView, didRemoveItem attachmentItem: SignalAttachmentItem)
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
public class ApprovalRailCellView: GalleryRailCellView {
|
||||
|
||||
weak var approvalRailCellDelegate: ApprovalRailCellViewDelegate?
|
||||
|
||||
lazy var deleteButton: UIButton = {
|
||||
let button = OWSButton { [weak self] in
|
||||
guard let strongSelf = self else { return }
|
||||
|
||||
guard let attachmentItem = strongSelf.item as? SignalAttachmentItem else {
|
||||
owsFailDebug("attachmentItem was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
strongSelf.approvalRailCellDelegate?.approvalRailCellView(strongSelf, didRemoveItem: attachmentItem)
|
||||
}
|
||||
|
||||
button.setImage(UIImage(named: "x-24")?.withRenderingMode(.alwaysTemplate), for: .normal)
|
||||
button.tintColor = .white
|
||||
button.layer.shadowColor = UIColor.black.cgColor
|
||||
button.layer.shadowRadius = 2
|
||||
button.layer.shadowOpacity = 0.66
|
||||
button.layer.shadowOffset = .zero
|
||||
|
||||
let kButtonWidth: CGFloat = 24
|
||||
button.autoSetDimensions(to: CGSize(width: kButtonWidth, height: kButtonWidth))
|
||||
|
||||
return button
|
||||
}()
|
||||
|
||||
lazy var captionIndicator: UIView = {
|
||||
let image = UIImage(named: "image_editor_caption")?.withRenderingMode(.alwaysTemplate)
|
||||
let imageView = UIImageView(image: image)
|
||||
imageView.tintColor = .white
|
||||
imageView.layer.shadowColor = UIColor.black.cgColor
|
||||
imageView.layer.shadowRadius = 2
|
||||
imageView.layer.shadowOpacity = 0.66
|
||||
imageView.layer.shadowOffset = .zero
|
||||
return imageView
|
||||
}()
|
||||
|
||||
override func setIsSelected(_ isSelected: Bool) {
|
||||
super.setIsSelected(isSelected)
|
||||
|
||||
if isSelected {
|
||||
addSubview(deleteButton)
|
||||
|
||||
deleteButton.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth)
|
||||
deleteButton.autoPinEdge(toSuperviewEdge: .trailing, withInset: cellBorderWidth + 4)
|
||||
} else {
|
||||
deleteButton.removeFromSuperview()
|
||||
}
|
||||
}
|
||||
|
||||
override func configure(item: GalleryRailItem, delegate: GalleryRailCellViewDelegate) {
|
||||
super.configure(item: item, delegate: delegate)
|
||||
|
||||
var hasCaption = false
|
||||
if let attachmentItem = item as? SignalAttachmentItem {
|
||||
if let captionText = attachmentItem.captionText {
|
||||
hasCaption = captionText.count > 0
|
||||
}
|
||||
} else {
|
||||
owsFailDebug("Invalid item.")
|
||||
}
|
||||
|
||||
if hasCaption {
|
||||
addSubview(captionIndicator)
|
||||
|
||||
captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth)
|
||||
captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: cellBorderWidth + 4)
|
||||
} else {
|
||||
captionIndicator.removeFromSuperview()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,400 @@
|
|||
//
|
||||
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
|
||||
class AttachmentApprovalInputAccessoryView: UIView {
|
||||
let mediaMessageTextToolbar: MediaMessageTextToolbar
|
||||
let galleryRailView: GalleryRailView
|
||||
|
||||
var isEditingMediaMessage: Bool {
|
||||
return mediaMessageTextToolbar.textView.isFirstResponder
|
||||
}
|
||||
|
||||
let kGalleryRailViewHeight: CGFloat = 72
|
||||
|
||||
required init(isAddMoreVisible: Bool) {
|
||||
mediaMessageTextToolbar = MediaMessageTextToolbar(isAddMoreVisible: isAddMoreVisible)
|
||||
|
||||
galleryRailView = GalleryRailView()
|
||||
galleryRailView.scrollFocusMode = .keepWithinBounds
|
||||
galleryRailView.autoSetDimension(.height, toSize: kGalleryRailViewHeight)
|
||||
|
||||
super.init(frame: .zero)
|
||||
|
||||
// Specifying auto-resizing mask and an intrinsic content size allows proper
|
||||
// sizing when used as an input accessory view.
|
||||
self.autoresizingMask = .flexibleHeight
|
||||
self.translatesAutoresizingMaskIntoConstraints = false
|
||||
|
||||
backgroundColor = UIColor.black.withAlphaComponent(0.6)
|
||||
preservesSuperviewLayoutMargins = true
|
||||
|
||||
let stackView = UIStackView(arrangedSubviews: [self.galleryRailView, self.mediaMessageTextToolbar])
|
||||
stackView.axis = .vertical
|
||||
|
||||
addSubview(stackView)
|
||||
stackView.autoPinEdgesToSuperviewEdges()
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK:
|
||||
|
||||
override var intrinsicContentSize: CGSize {
|
||||
get {
|
||||
// Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify
|
||||
// an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout.
|
||||
return CGSize.zero
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
// Coincides with Android's max text message length
|
||||
let kMaxMessageBodyCharacterCount = 2000
|
||||
|
||||
protocol MediaMessageTextToolbarDelegate: class {
|
||||
func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar)
|
||||
func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar)
|
||||
func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar)
|
||||
func mediaMessageTextToolbarDidAddMore(_ mediaMessageTextToolbar: MediaMessageTextToolbar)
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
class MediaMessageTextToolbar: UIView, UITextViewDelegate {
|
||||
|
||||
weak var mediaMessageTextToolbarDelegate: MediaMessageTextToolbarDelegate?
|
||||
|
||||
var messageText: String? {
|
||||
get { return textView.text }
|
||||
|
||||
set {
|
||||
textView.text = newValue
|
||||
updatePlaceholderTextViewVisibility()
|
||||
}
|
||||
}
|
||||
|
||||
// Layout Constants
|
||||
|
||||
let kMinTextViewHeight: CGFloat = 38
|
||||
var maxTextViewHeight: CGFloat {
|
||||
// About ~4 lines in portrait and ~3 lines in landscape.
|
||||
// Otherwise we risk obscuring too much of the content.
|
||||
return UIDevice.current.orientation.isPortrait ? 160 : 100
|
||||
}
|
||||
var textViewHeightConstraint: NSLayoutConstraint!
|
||||
var textViewHeight: CGFloat
|
||||
|
||||
// MARK: - Initializers
|
||||
|
||||
init(isAddMoreVisible: Bool) {
|
||||
self.addMoreButton = UIButton(type: .custom)
|
||||
self.sendButton = UIButton(type: .system)
|
||||
self.textViewHeight = kMinTextViewHeight
|
||||
|
||||
super.init(frame: CGRect.zero)
|
||||
|
||||
// Specifying autorsizing mask and an intrinsic content size allows proper
|
||||
// sizing when used as an input accessory view.
|
||||
self.autoresizingMask = .flexibleHeight
|
||||
self.translatesAutoresizingMaskIntoConstraints = false
|
||||
self.backgroundColor = UIColor.clear
|
||||
|
||||
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)
|
||||
|
||||
sendButton.titleLabel?.font = UIFont.ows_mediumFont(withSize: 16)
|
||||
sendButton.titleLabel?.textAlignment = .center
|
||||
sendButton.tintColor = Theme.galleryHighlightColor
|
||||
|
||||
// Increase hit area of send button
|
||||
sendButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 8, bottom: 6, right: 8)
|
||||
|
||||
let contentView = UIView()
|
||||
contentView.addSubview(sendButton)
|
||||
contentView.addSubview(textContainer)
|
||||
contentView.addSubview(lengthLimitLabel)
|
||||
if isAddMoreVisible {
|
||||
contentView.addSubview(addMoreButton)
|
||||
}
|
||||
|
||||
addSubview(contentView)
|
||||
contentView.autoPinEdgesToSuperviewEdges()
|
||||
|
||||
// Layout
|
||||
let kToolbarMargin: CGFloat = 8
|
||||
|
||||
// We have to wrap the toolbar items in a content view because iOS (at least on iOS10.3) assigns the inputAccessoryView.layoutMargins
|
||||
// when resigning first responder (verified by auditing with `layoutMarginsDidChange`).
|
||||
// The effect of this is that if we were to assign these margins to self.layoutMargins, they'd be blown away if the
|
||||
// user dismisses the keyboard, giving the input accessory view a wonky layout.
|
||||
contentView.layoutMargins = UIEdgeInsets(top: kToolbarMargin, left: kToolbarMargin, bottom: kToolbarMargin, right: kToolbarMargin)
|
||||
|
||||
self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight)
|
||||
|
||||
// We pin all three edges explicitly rather than doing something like:
|
||||
// textView.autoPinEdges(toSuperviewMarginsExcludingEdge: .right)
|
||||
// because that method uses `leading` / `trailing` rather than `left` vs. `right`.
|
||||
// So it doesn't work as expected with RTL layouts when we explicitly want something
|
||||
// to be on the right side for both RTL and LTR layouts, like with the send button.
|
||||
// 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)
|
||||
}
|
||||
|
||||
sendButton.autoPinEdge(.left, to: .right, of: textContainer, withOffset: kToolbarMargin)
|
||||
sendButton.autoPinEdge(.bottom, to: .bottom, of: textContainer, withOffset: -3)
|
||||
|
||||
sendButton.autoPinEdge(toSuperviewMargin: .right)
|
||||
sendButton.setContentHuggingHigh()
|
||||
sendButton.setCompressionResistanceHigh()
|
||||
|
||||
lengthLimitLabel.autoPinEdge(toSuperviewMargin: .left)
|
||||
lengthLimitLabel.autoPinEdge(toSuperviewMargin: .right)
|
||||
lengthLimitLabel.autoPinEdge(.bottom, to: .top, of: textContainer, withOffset: -6)
|
||||
lengthLimitLabel.setContentHuggingHigh()
|
||||
lengthLimitLabel.setCompressionResistanceHigh()
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
notImplemented()
|
||||
}
|
||||
|
||||
// MARK: - UIView Overrides
|
||||
|
||||
override var intrinsicContentSize: CGSize {
|
||||
get {
|
||||
// Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify
|
||||
// an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout.
|
||||
return CGSize.zero
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Subviews
|
||||
|
||||
private let addMoreButton: UIButton
|
||||
private let sendButton: UIButton
|
||||
|
||||
private lazy var lengthLimitLabel: UILabel = {
|
||||
let lengthLimitLabel = UILabel()
|
||||
|
||||
// Length Limit Label shown when the user inputs too long of a message
|
||||
lengthLimitLabel.textColor = .white
|
||||
lengthLimitLabel.text = NSLocalizedString("ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED", comment: "One-line label indicating the user can add no more text to the media message field.")
|
||||
lengthLimitLabel.textAlignment = .center
|
||||
|
||||
// Add shadow in case overlayed on white content
|
||||
lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor
|
||||
lengthLimitLabel.layer.shadowOffset = .zero
|
||||
lengthLimitLabel.layer.shadowOpacity = 0.8
|
||||
lengthLimitLabel.layer.shadowRadius = 2.0
|
||||
lengthLimitLabel.isHidden = true
|
||||
|
||||
return lengthLimitLabel
|
||||
}()
|
||||
|
||||
lazy var textView: UITextView = {
|
||||
let textView = buildTextView()
|
||||
|
||||
textView.returnKeyType = .done
|
||||
textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3)
|
||||
|
||||
return textView
|
||||
}()
|
||||
|
||||
private lazy var placeholderTextView: UITextView = {
|
||||
let placeholderTextView = buildTextView()
|
||||
|
||||
placeholderTextView.text = NSLocalizedString("MESSAGE_TEXT_FIELD_PLACEHOLDER", comment: "placeholder text for the editable message field")
|
||||
placeholderTextView.isEditable = false
|
||||
|
||||
return placeholderTextView
|
||||
}()
|
||||
|
||||
private lazy var textContainer: UIView = {
|
||||
let textContainer = UIView()
|
||||
|
||||
textContainer.layer.borderColor = Theme.darkThemePrimaryColor.cgColor
|
||||
textContainer.layer.borderWidth = 0.5
|
||||
textContainer.layer.cornerRadius = kMinTextViewHeight / 2
|
||||
textContainer.clipsToBounds = true
|
||||
|
||||
textContainer.addSubview(placeholderTextView)
|
||||
placeholderTextView.autoPinEdgesToSuperviewEdges()
|
||||
|
||||
textContainer.addSubview(textView)
|
||||
textView.autoPinEdgesToSuperviewEdges()
|
||||
|
||||
return textContainer
|
||||
}()
|
||||
|
||||
private func buildTextView() -> UITextView {
|
||||
let textView = MessageTextView()
|
||||
|
||||
textView.keyboardAppearance = Theme.darkThemeKeyboardAppearance
|
||||
textView.backgroundColor = .clear
|
||||
textView.tintColor = Theme.darkThemePrimaryColor
|
||||
|
||||
textView.font = UIFont.ows_dynamicTypeBody
|
||||
textView.textColor = Theme.darkThemePrimaryColor
|
||||
textView.textContainerInset = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7)
|
||||
|
||||
return textView
|
||||
}
|
||||
|
||||
class MessageTextView: UITextView {
|
||||
// When creating new lines, contentOffset is animated, but because
|
||||
// we are simultaneously resizing the text view, this can cause the
|
||||
// text in the textview to be "too high" in the text view.
|
||||
// Solution is to disable animation for setting content offset.
|
||||
override func setContentOffset(_ contentOffset: CGPoint, animated: Bool) {
|
||||
super.setContentOffset(contentOffset, animated: false)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Actions
|
||||
|
||||
@objc func didTapSend() {
|
||||
mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidTapSend(self)
|
||||
}
|
||||
|
||||
@objc func didTapAddMore() {
|
||||
mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidAddMore(self)
|
||||
}
|
||||
|
||||
// MARK: - UITextViewDelegate
|
||||
|
||||
public func textViewDidChange(_ textView: UITextView) {
|
||||
updateHeight(textView: textView)
|
||||
}
|
||||
|
||||
public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
|
||||
|
||||
if !FeatureFlags.sendingMediaWithOversizeText {
|
||||
let existingText: String = textView.text ?? ""
|
||||
let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text)
|
||||
|
||||
// Don't complicate things by mixing media attachments with oversize text attachments
|
||||
guard proposedText.utf8.count < kOversizeTextMessageSizeThreshold else {
|
||||
Logger.debug("long text was truncated")
|
||||
self.lengthLimitLabel.isHidden = false
|
||||
|
||||
// `range` represents the section of the existing text we will replace. We can re-use that space.
|
||||
// Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be
|
||||
// represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is
|
||||
// to just measure the utf8 encoded bytes of the replaced substring.
|
||||
let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count
|
||||
|
||||
// Accept as much of the input as we can
|
||||
let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete
|
||||
if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) {
|
||||
textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText)
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
self.lengthLimitLabel.isHidden = true
|
||||
|
||||
// After verifying the byte-length is sufficiently small, verify the character count is within bounds.
|
||||
guard proposedText.count < kMaxMessageBodyCharacterCount else {
|
||||
Logger.debug("hit attachment message body character count limit")
|
||||
|
||||
self.lengthLimitLabel.isHidden = false
|
||||
|
||||
// `range` represents the section of the existing text we will replace. We can re-use that space.
|
||||
let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count
|
||||
|
||||
// Accept as much of the input as we can
|
||||
let charBudget: Int = Int(kMaxMessageBodyCharacterCount) - charsAfterDelete
|
||||
if charBudget >= 0 {
|
||||
let acceptableNewText = String(text.prefix(charBudget))
|
||||
textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText)
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button
|
||||
// allows the user to get the keyboard out of the way while in the attachment approval view.
|
||||
if text == "\n" {
|
||||
textView.resignFirstResponder()
|
||||
return false
|
||||
} else {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
public func textViewDidBeginEditing(_ textView: UITextView) {
|
||||
mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidBeginEditing(self)
|
||||
updatePlaceholderTextViewVisibility()
|
||||
}
|
||||
|
||||
public func textViewDidEndEditing(_ textView: UITextView) {
|
||||
mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidEndEditing(self)
|
||||
updatePlaceholderTextViewVisibility()
|
||||
}
|
||||
|
||||
// MARK: - Helpers
|
||||
|
||||
func updatePlaceholderTextViewVisibility() {
|
||||
let isHidden: Bool = {
|
||||
guard !self.textView.isFirstResponder else {
|
||||
return true
|
||||
}
|
||||
|
||||
guard let text = self.textView.text else {
|
||||
return false
|
||||
}
|
||||
|
||||
guard text.count > 0 else {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}()
|
||||
|
||||
placeholderTextView.isHidden = isHidden
|
||||
}
|
||||
|
||||
private func updateHeight(textView: UITextView) {
|
||||
// compute new height assuming width is unchanged
|
||||
let currentSize = textView.frame.size
|
||||
let newHeight = clampedTextViewHeight(fixedWidth: currentSize.width)
|
||||
|
||||
if newHeight != textViewHeight {
|
||||
Logger.debug("TextView height changed: \(textViewHeight) -> \(newHeight)")
|
||||
textViewHeight = newHeight
|
||||
textViewHeightConstraint?.constant = textViewHeight
|
||||
invalidateIntrinsicContentSize()
|
||||
}
|
||||
}
|
||||
|
||||
private func clampedTextViewHeight(fixedWidth: CGFloat) -> CGFloat {
|
||||
let contentSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude))
|
||||
return CGFloatClamp(contentSize.height, kMinTextViewHeight, maxTextViewHeight)
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,619 @@
|
|||
//
|
||||
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import AVFoundation
|
||||
import MediaPlayer
|
||||
import PromiseKit
|
||||
|
||||
@objc
|
||||
public protocol AttachmentApprovalViewControllerDelegate: class {
|
||||
func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?)
|
||||
func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didCancelAttachments attachments: [SignalAttachment])
|
||||
@objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, addMoreToAttachments attachments: [SignalAttachment])
|
||||
@objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, changedCaptionOfAttachment attachment: SignalAttachment)
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
@objc
|
||||
public enum AttachmentApprovalViewControllerMode: UInt {
|
||||
case modal
|
||||
case sharedNavigation
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
@objc
|
||||
public class AttachmentApprovalViewController: UIPageViewController, UIPageViewControllerDataSource, UIPageViewControllerDelegate {
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
private let mode: AttachmentApprovalViewControllerMode
|
||||
|
||||
public weak var approvalDelegate: AttachmentApprovalViewControllerDelegate?
|
||||
|
||||
// MARK: - Initializers
|
||||
|
||||
@available(*, unavailable, message:"use attachment: constructor instead.")
|
||||
required public init?(coder aDecoder: NSCoder) {
|
||||
notImplemented()
|
||||
}
|
||||
|
||||
let kSpacingBetweenItems: CGFloat = 20
|
||||
|
||||
@objc
|
||||
required public init(mode: AttachmentApprovalViewControllerMode,
|
||||
attachments: [SignalAttachment]) {
|
||||
assert(attachments.count > 0)
|
||||
self.mode = mode
|
||||
let attachmentItems = attachments.map { SignalAttachmentItem(attachment: $0 )}
|
||||
self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems)
|
||||
super.init(transitionStyle: .scroll,
|
||||
navigationOrientation: .horizontal,
|
||||
options: [UIPageViewControllerOptionInterPageSpacingKey: kSpacingBetweenItems])
|
||||
self.dataSource = self
|
||||
self.delegate = self
|
||||
}
|
||||
|
||||
@objc
|
||||
public class func wrappedInNavController(attachments: [SignalAttachment], approvalDelegate: AttachmentApprovalViewControllerDelegate) -> OWSNavigationController {
|
||||
let vc = AttachmentApprovalViewController(mode: .modal, attachments: attachments)
|
||||
vc.approvalDelegate = approvalDelegate
|
||||
let navController = OWSNavigationController(rootViewController: vc)
|
||||
navController.ows_prefersStatusBarHidden = true
|
||||
|
||||
guard let navigationBar = navController.navigationBar as? OWSNavigationBar else {
|
||||
owsFailDebug("navigationBar was nil or unexpected class")
|
||||
return navController
|
||||
}
|
||||
navigationBar.overrideTheme(type: .clear)
|
||||
|
||||
return navController
|
||||
}
|
||||
|
||||
// MARK: - Subviews
|
||||
|
||||
var galleryRailView: GalleryRailView {
|
||||
return bottomToolView.galleryRailView
|
||||
}
|
||||
|
||||
var mediaMessageTextToolbar: MediaMessageTextToolbar {
|
||||
return bottomToolView.mediaMessageTextToolbar
|
||||
}
|
||||
|
||||
lazy var bottomToolView: AttachmentApprovalInputAccessoryView = {
|
||||
let isAddMoreVisible = mode == .sharedNavigation
|
||||
let bottomToolView = AttachmentApprovalInputAccessoryView(isAddMoreVisible: isAddMoreVisible)
|
||||
|
||||
return bottomToolView
|
||||
}()
|
||||
|
||||
// MARK: - View Lifecycle
|
||||
|
||||
public override var prefersStatusBarHidden: Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
override public func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
self.view.backgroundColor = .black
|
||||
|
||||
// avoid an unpleasant "bounce" which doesn't make sense in the context of a single item.
|
||||
pagerScrollView?.isScrollEnabled = attachmentItems.count > 1
|
||||
|
||||
// Bottom Toolbar
|
||||
galleryRailView.delegate = self
|
||||
mediaMessageTextToolbar.mediaMessageTextToolbarDelegate = self
|
||||
|
||||
// Navigation
|
||||
|
||||
self.navigationItem.title = nil
|
||||
|
||||
guard let firstItem = attachmentItems.first else {
|
||||
owsFailDebug("firstItem was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
self.setCurrentItem(firstItem, direction: .forward, animated: false)
|
||||
|
||||
// layout immediately to avoid animating the layout process during the transition
|
||||
self.currentPageViewController.view.layoutIfNeeded()
|
||||
}
|
||||
|
||||
override public func viewWillAppear(_ animated: Bool) {
|
||||
Logger.debug("")
|
||||
super.viewWillAppear(animated)
|
||||
|
||||
guard let navigationBar = navigationController?.navigationBar as? OWSNavigationBar else {
|
||||
owsFailDebug("navigationBar was nil or unexpected class")
|
||||
return
|
||||
}
|
||||
navigationBar.overrideTheme(type: .clear)
|
||||
|
||||
updateNavigationBar()
|
||||
updateControlVisibility()
|
||||
}
|
||||
|
||||
override public func viewDidAppear(_ animated: Bool) {
|
||||
Logger.debug("")
|
||||
|
||||
super.viewDidAppear(animated)
|
||||
|
||||
updateNavigationBar()
|
||||
updateControlVisibility()
|
||||
}
|
||||
|
||||
override public func viewWillDisappear(_ animated: Bool) {
|
||||
Logger.debug("")
|
||||
super.viewWillDisappear(animated)
|
||||
}
|
||||
|
||||
override public var inputAccessoryView: UIView? {
|
||||
bottomToolView.layoutIfNeeded()
|
||||
return bottomToolView
|
||||
}
|
||||
|
||||
override public var canBecomeFirstResponder: Bool {
|
||||
return !shouldHideControls
|
||||
}
|
||||
|
||||
// MARK: - Navigation Bar
|
||||
|
||||
public func updateNavigationBar() {
|
||||
guard !shouldHideControls else {
|
||||
self.navigationItem.leftBarButtonItem = nil
|
||||
self.navigationItem.rightBarButtonItem = nil
|
||||
return
|
||||
}
|
||||
|
||||
var navigationBarItems = [UIView]()
|
||||
var isShowingCaptionView = false
|
||||
|
||||
if let viewControllers = viewControllers,
|
||||
viewControllers.count == 1,
|
||||
let firstViewController = viewControllers.first as? AttachmentPrepViewController {
|
||||
navigationBarItems = firstViewController.navigationBarItems()
|
||||
isShowingCaptionView = firstViewController.isShowingCaptionView
|
||||
}
|
||||
|
||||
guard !isShowingCaptionView else {
|
||||
// Hide all navigation bar items while the caption view is open.
|
||||
self.navigationItem.leftBarButtonItem = nil
|
||||
self.navigationItem.rightBarButtonItem = nil
|
||||
return
|
||||
}
|
||||
|
||||
updateNavigationBar(navigationBarItems: navigationBarItems)
|
||||
|
||||
let hasCancel = (mode != .sharedNavigation)
|
||||
if hasCancel {
|
||||
let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel,
|
||||
target: self, action: #selector(cancelPressed))
|
||||
cancelButton.tintColor = .white
|
||||
self.navigationItem.leftBarButtonItem = cancelButton
|
||||
} else {
|
||||
// Note: using a custom leftBarButtonItem breaks the interactive pop gesture.
|
||||
self.navigationItem.leftBarButtonItem = self.createOWSBackButton()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Control Visibility
|
||||
|
||||
public var shouldHideControls: Bool {
|
||||
guard let pageViewController = pageViewControllers.first else {
|
||||
return false
|
||||
}
|
||||
return pageViewController.shouldHideControls
|
||||
}
|
||||
|
||||
private func updateControlVisibility() {
|
||||
if shouldHideControls {
|
||||
if isFirstResponder {
|
||||
resignFirstResponder()
|
||||
}
|
||||
} else {
|
||||
if !isFirstResponder {
|
||||
becomeFirstResponder()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - View Helpers
|
||||
|
||||
func remove(attachmentItem: SignalAttachmentItem) {
|
||||
if attachmentItem == currentItem {
|
||||
if let nextItem = attachmentItemCollection.itemAfter(item: attachmentItem) {
|
||||
setCurrentItem(nextItem, direction: .forward, animated: true)
|
||||
} else if let prevItem = attachmentItemCollection.itemBefore(item: attachmentItem) {
|
||||
setCurrentItem(prevItem, direction: .reverse, animated: true)
|
||||
} else {
|
||||
owsFailDebug("removing last item shouldn't be possible because rail should not be visible")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
guard let cell = galleryRailView.cellViews.first(where: { $0.item === attachmentItem }) else {
|
||||
owsFailDebug("cell was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
UIView.animate(withDuration: 0.2,
|
||||
animations: {
|
||||
// shrink stack view item until it disappears
|
||||
cell.isHidden = true
|
||||
|
||||
// simultaneously fade out
|
||||
cell.alpha = 0
|
||||
},
|
||||
completion: { _ in
|
||||
self.attachmentItemCollection.remove(item: attachmentItem)
|
||||
self.updateMediaRail()
|
||||
})
|
||||
}
|
||||
|
||||
lazy var pagerScrollView: UIScrollView? = {
|
||||
// This is kind of a hack. Since we don't have first class access to the superview's `scrollView`
|
||||
// we traverse the view hierarchy until we find it.
|
||||
let pagerScrollView = view.subviews.first { $0 is UIScrollView } as? UIScrollView
|
||||
assert(pagerScrollView != nil)
|
||||
|
||||
return pagerScrollView
|
||||
}()
|
||||
|
||||
// MARK: - UIPageViewControllerDelegate
|
||||
|
||||
public func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) {
|
||||
Logger.debug("")
|
||||
|
||||
assert(pendingViewControllers.count == 1)
|
||||
pendingViewControllers.forEach { viewController in
|
||||
guard let pendingPage = viewController as? AttachmentPrepViewController else {
|
||||
owsFailDebug("unexpected viewController: \(viewController)")
|
||||
return
|
||||
}
|
||||
|
||||
// use compact scale when keyboard is popped.
|
||||
let scale: AttachmentPrepViewController.AttachmentViewScale = self.isFirstResponder ? .fullsize : .compact
|
||||
pendingPage.setAttachmentViewScale(scale, animated: false)
|
||||
}
|
||||
}
|
||||
|
||||
public func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted: Bool) {
|
||||
Logger.debug("")
|
||||
|
||||
assert(previousViewControllers.count == 1)
|
||||
previousViewControllers.forEach { viewController in
|
||||
guard let previousPage = viewController as? AttachmentPrepViewController else {
|
||||
owsFailDebug("unexpected viewController: \(viewController)")
|
||||
return
|
||||
}
|
||||
|
||||
if transitionCompleted {
|
||||
previousPage.zoomOut(animated: false)
|
||||
updateMediaRail()
|
||||
}
|
||||
}
|
||||
|
||||
updateNavigationBar()
|
||||
updateControlVisibility()
|
||||
}
|
||||
|
||||
// MARK: - UIPageViewControllerDataSource
|
||||
|
||||
public func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
|
||||
guard let currentViewController = viewController as? AttachmentPrepViewController else {
|
||||
owsFailDebug("unexpected viewController: \(viewController)")
|
||||
return nil
|
||||
}
|
||||
|
||||
let currentItem = currentViewController.attachmentItem
|
||||
guard let previousItem = attachmentItem(before: currentItem) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
guard let previousPage: AttachmentPrepViewController = buildPage(item: previousItem) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
return previousPage
|
||||
}
|
||||
|
||||
public func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
|
||||
Logger.debug("")
|
||||
|
||||
guard let currentViewController = viewController as? AttachmentPrepViewController else {
|
||||
owsFailDebug("unexpected viewController: \(viewController)")
|
||||
return nil
|
||||
}
|
||||
|
||||
let currentItem = currentViewController.attachmentItem
|
||||
guard let nextItem = attachmentItem(after: currentItem) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
guard let nextPage: AttachmentPrepViewController = buildPage(item: nextItem) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
return nextPage
|
||||
}
|
||||
|
||||
public var currentPageViewController: AttachmentPrepViewController {
|
||||
return pageViewControllers.first!
|
||||
}
|
||||
|
||||
public var pageViewControllers: [AttachmentPrepViewController] {
|
||||
return super.viewControllers!.map { $0 as! AttachmentPrepViewController }
|
||||
}
|
||||
|
||||
var currentItem: SignalAttachmentItem! {
|
||||
get {
|
||||
return currentPageViewController.attachmentItem
|
||||
}
|
||||
set {
|
||||
setCurrentItem(newValue, direction: .forward, animated: false)
|
||||
}
|
||||
}
|
||||
|
||||
private var cachedPages: [SignalAttachmentItem: AttachmentPrepViewController] = [:]
|
||||
private func buildPage(item: SignalAttachmentItem) -> AttachmentPrepViewController? {
|
||||
|
||||
if let cachedPage = cachedPages[item] {
|
||||
Logger.debug("cache hit.")
|
||||
return cachedPage
|
||||
}
|
||||
|
||||
Logger.debug("cache miss.")
|
||||
let viewController = AttachmentPrepViewController(attachmentItem: item)
|
||||
viewController.prepDelegate = self
|
||||
cachedPages[item] = viewController
|
||||
|
||||
return viewController
|
||||
}
|
||||
|
||||
private func setCurrentItem(_ item: SignalAttachmentItem, direction: UIPageViewControllerNavigationDirection, animated isAnimated: Bool) {
|
||||
guard let page = self.buildPage(item: item) else {
|
||||
owsFailDebug("unexpectedly unable to build new page")
|
||||
return
|
||||
}
|
||||
|
||||
page.loadViewIfNeeded()
|
||||
|
||||
self.setViewControllers([page], direction: direction, animated: isAnimated, completion: nil)
|
||||
updateMediaRail()
|
||||
}
|
||||
|
||||
func updateMediaRail() {
|
||||
guard let currentItem = self.currentItem else {
|
||||
owsFailDebug("currentItem was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
let cellViewBuilder: () -> ApprovalRailCellView = { [weak self] in
|
||||
let cell = ApprovalRailCellView()
|
||||
cell.approvalRailCellDelegate = self
|
||||
return cell
|
||||
}
|
||||
|
||||
galleryRailView.configureCellViews(itemProvider: attachmentItemCollection,
|
||||
focusedItem: currentItem,
|
||||
cellViewBuilder: cellViewBuilder)
|
||||
|
||||
galleryRailView.isHidden = attachmentItemCollection.attachmentItems.count < 2
|
||||
}
|
||||
|
||||
let attachmentItemCollection: AttachmentItemCollection
|
||||
|
||||
var attachmentItems: [SignalAttachmentItem] {
|
||||
return attachmentItemCollection.attachmentItems
|
||||
}
|
||||
|
||||
var attachments: [SignalAttachment] {
|
||||
return attachmentItems.map { (attachmentItem) in
|
||||
autoreleasepool {
|
||||
return self.processedAttachment(forAttachmentItem: attachmentItem)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// For any attachments edited with the image editor, returns a
|
||||
// new SignalAttachment that reflects those changes. Otherwise,
|
||||
// returns the original attachment.
|
||||
//
|
||||
// If any errors occurs in the export process, we fail over to
|
||||
// sending the original attachment. This seems better than trying
|
||||
// to involve the user in resolving the issue.
|
||||
func processedAttachment(forAttachmentItem attachmentItem: SignalAttachmentItem) -> SignalAttachment {
|
||||
guard let imageEditorModel = attachmentItem.imageEditorModel else {
|
||||
// Image was not edited.
|
||||
return attachmentItem.attachment
|
||||
}
|
||||
guard imageEditorModel.isDirty() else {
|
||||
// Image editor has no changes.
|
||||
return attachmentItem.attachment
|
||||
}
|
||||
guard let dstImage = ImageEditorCanvasView.renderForOutput(model: imageEditorModel, transform: imageEditorModel.currentTransform()) else {
|
||||
owsFailDebug("Could not render for output.")
|
||||
return attachmentItem.attachment
|
||||
}
|
||||
var dataUTI = kUTTypeImage as String
|
||||
guard let dstData: Data = {
|
||||
let isLossy: Bool = attachmentItem.attachment.mimeType.caseInsensitiveCompare(OWSMimeTypeImageJpeg) == .orderedSame
|
||||
if isLossy {
|
||||
dataUTI = kUTTypeJPEG as String
|
||||
return UIImageJPEGRepresentation(dstImage, 0.9)
|
||||
} else {
|
||||
dataUTI = kUTTypePNG as String
|
||||
return UIImagePNGRepresentation(dstImage)
|
||||
}
|
||||
}() else {
|
||||
owsFailDebug("Could not export for output.")
|
||||
return attachmentItem.attachment
|
||||
}
|
||||
guard let dataSource = DataSourceValue.dataSource(with: dstData, utiType: dataUTI) else {
|
||||
owsFailDebug("Could not prepare data source for output.")
|
||||
return attachmentItem.attachment
|
||||
}
|
||||
|
||||
// Rewrite the filename's extension to reflect the output file format.
|
||||
var filename: String? = attachmentItem.attachment.sourceFilename
|
||||
if let sourceFilename = attachmentItem.attachment.sourceFilename {
|
||||
if let fileExtension: String = MIMETypeUtil.fileExtension(forUTIType: dataUTI) {
|
||||
filename = (sourceFilename as NSString).deletingPathExtension.appendingFileExtension(fileExtension)
|
||||
}
|
||||
}
|
||||
dataSource.sourceFilename = filename
|
||||
|
||||
let dstAttachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI, imageQuality: .original)
|
||||
if let attachmentError = dstAttachment.error {
|
||||
owsFailDebug("Could not prepare attachment for output: \(attachmentError).")
|
||||
return attachmentItem.attachment
|
||||
}
|
||||
return dstAttachment
|
||||
}
|
||||
|
||||
func attachmentItem(before currentItem: SignalAttachmentItem) -> SignalAttachmentItem? {
|
||||
guard let currentIndex = attachmentItems.index(of: currentItem) else {
|
||||
owsFailDebug("currentIndex was unexpectedly nil")
|
||||
return nil
|
||||
}
|
||||
|
||||
let index: Int = attachmentItems.index(before: currentIndex)
|
||||
guard let previousItem = attachmentItems[safe: index] else {
|
||||
// already at first item
|
||||
return nil
|
||||
}
|
||||
|
||||
return previousItem
|
||||
}
|
||||
|
||||
func attachmentItem(after currentItem: SignalAttachmentItem) -> SignalAttachmentItem? {
|
||||
guard let currentIndex = attachmentItems.index(of: currentItem) else {
|
||||
owsFailDebug("currentIndex was unexpectedly nil")
|
||||
return nil
|
||||
}
|
||||
|
||||
let index: Int = attachmentItems.index(after: currentIndex)
|
||||
guard let nextItem = attachmentItems[safe: index] else {
|
||||
// already at last item
|
||||
return nil
|
||||
}
|
||||
|
||||
return nextItem
|
||||
}
|
||||
|
||||
// MARK: - Event Handlers
|
||||
|
||||
@objc func cancelPressed(sender: UIButton) {
|
||||
self.approvalDelegate?.attachmentApproval(self, didCancelAttachments: attachments)
|
||||
}
|
||||
}
|
||||
|
||||
extension AttachmentApprovalViewController: MediaMessageTextToolbarDelegate {
|
||||
func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) {
|
||||
currentPageViewController.setAttachmentViewScale(.compact, animated: true)
|
||||
}
|
||||
|
||||
func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) {
|
||||
currentPageViewController.setAttachmentViewScale(.fullsize, animated: true)
|
||||
}
|
||||
|
||||
func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) {
|
||||
// Toolbar flickers in and out if there are errors
|
||||
// and remains visible momentarily after share extension is dismissed.
|
||||
// It's easiest to just hide it at this point since we're done with it.
|
||||
currentPageViewController.shouldAllowAttachmentViewResizing = false
|
||||
mediaMessageTextToolbar.isUserInteractionEnabled = false
|
||||
mediaMessageTextToolbar.isHidden = true
|
||||
|
||||
approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments, messageText: mediaMessageTextToolbar.messageText)
|
||||
}
|
||||
|
||||
func mediaMessageTextToolbarDidAddMore(_ mediaMessageTextToolbar: MediaMessageTextToolbar) {
|
||||
self.approvalDelegate?.attachmentApproval?(self, addMoreToAttachments: attachments)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate {
|
||||
func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) {
|
||||
self.approvalDelegate?.attachmentApproval?(self, changedCaptionOfAttachment: attachmentItem.attachment)
|
||||
|
||||
updateMediaRail()
|
||||
}
|
||||
|
||||
func prepViewControllerUpdateNavigationBar() {
|
||||
updateNavigationBar()
|
||||
}
|
||||
|
||||
func prepViewControllerUpdateControls() {
|
||||
updateControlVisibility()
|
||||
}
|
||||
|
||||
func prepViewControllerAttachmentCount() -> Int {
|
||||
return attachmentItemCollection.count
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: GalleryRail
|
||||
|
||||
extension SignalAttachmentItem: GalleryRailItem {
|
||||
var aspectRatio: CGFloat {
|
||||
return self.imageSize.aspectRatio
|
||||
}
|
||||
|
||||
func getRailImage() -> Promise<UIImage> {
|
||||
return self.getThumbnailImage()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension AttachmentItemCollection: GalleryRailItemProvider {
|
||||
var railItems: [GalleryRailItem] {
|
||||
return self.attachmentItems
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension AttachmentApprovalViewController: GalleryRailViewDelegate {
|
||||
public func galleryRailView(_ galleryRailView: GalleryRailView, didTapItem imageRailItem: GalleryRailItem) {
|
||||
guard let targetItem = imageRailItem as? SignalAttachmentItem else {
|
||||
owsFailDebug("unexpected imageRailItem: \(imageRailItem)")
|
||||
return
|
||||
}
|
||||
|
||||
guard let currentIndex = attachmentItems.index(of: currentItem) else {
|
||||
owsFailDebug("currentIndex was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
guard let targetIndex = attachmentItems.index(of: targetItem) else {
|
||||
owsFailDebug("targetIndex was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
let direction: UIPageViewControllerNavigationDirection = currentIndex < targetIndex ? .forward : .reverse
|
||||
|
||||
self.setCurrentItem(targetItem, direction: direction, animated: true)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
enum KeyboardScenario {
|
||||
case hidden, editingMessage, editingCaption
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension AttachmentApprovalViewController: ApprovalRailCellViewDelegate {
|
||||
func approvalRailCellView(_ approvalRailCellView: ApprovalRailCellView, didRemoveItem attachmentItem: SignalAttachmentItem) {
|
||||
remove(attachmentItem: attachmentItem)
|
||||
}
|
||||
}
|
||||
|
|
@ -9,6 +9,8 @@ protocol AttachmentCaptionDelegate: class {
|
|||
func captionViewDidCancel()
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
class AttachmentCaptionViewController: OWSViewController {
|
||||
|
||||
weak var delegate: AttachmentCaptionDelegate?
|
||||
|
|
@ -0,0 +1,111 @@
|
|||
//
|
||||
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import PromiseKit
|
||||
|
||||
class SignalAttachmentItem: Hashable {
|
||||
|
||||
enum SignalAttachmentItemError: Error {
|
||||
case noThumbnail
|
||||
}
|
||||
|
||||
let attachment: SignalAttachment
|
||||
|
||||
// This might be nil if the attachment is not a valid image.
|
||||
var imageEditorModel: ImageEditorModel?
|
||||
|
||||
init(attachment: SignalAttachment) {
|
||||
self.attachment = attachment
|
||||
|
||||
// Try and make a ImageEditorModel.
|
||||
// This will only apply for valid images.
|
||||
if ImageEditorModel.isFeatureEnabled,
|
||||
let dataUrl: URL = attachment.dataUrl,
|
||||
dataUrl.isFileURL {
|
||||
let path = dataUrl.path
|
||||
do {
|
||||
imageEditorModel = try ImageEditorModel(srcImagePath: path)
|
||||
} catch {
|
||||
// Usually not an error; this usually indicates invalid input.
|
||||
Logger.warn("Could not create image editor: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK:
|
||||
|
||||
var captionText: String? {
|
||||
return attachment.captionText
|
||||
}
|
||||
|
||||
var imageSize: CGSize = .zero
|
||||
|
||||
func getThumbnailImage() -> Promise<UIImage> {
|
||||
return DispatchQueue.global().async(.promise) { () -> UIImage in
|
||||
guard let image = self.attachment.staticThumbnail() else {
|
||||
throw SignalAttachmentItemError.noThumbnail
|
||||
}
|
||||
return image
|
||||
}.tap { result in
|
||||
switch result {
|
||||
case .fulfilled(let image):
|
||||
self.imageSize = image.size
|
||||
case .rejected(let error):
|
||||
owsFailDebug("failed with error: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: Hashable
|
||||
|
||||
public var hashValue: Int {
|
||||
return attachment.hashValue
|
||||
}
|
||||
|
||||
// MARK: Equatable
|
||||
|
||||
static func == (lhs: SignalAttachmentItem, rhs: SignalAttachmentItem) -> Bool {
|
||||
return lhs.attachment == rhs.attachment
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
class AttachmentItemCollection {
|
||||
private (set) var attachmentItems: [SignalAttachmentItem]
|
||||
init(attachmentItems: [SignalAttachmentItem]) {
|
||||
self.attachmentItems = attachmentItems
|
||||
}
|
||||
|
||||
func itemAfter(item: SignalAttachmentItem) -> SignalAttachmentItem? {
|
||||
guard let currentIndex = attachmentItems.index(of: item) else {
|
||||
owsFailDebug("currentIndex was unexpectedly nil")
|
||||
return nil
|
||||
}
|
||||
|
||||
let nextIndex = attachmentItems.index(after: currentIndex)
|
||||
|
||||
return attachmentItems[safe: nextIndex]
|
||||
}
|
||||
|
||||
func itemBefore(item: SignalAttachmentItem) -> SignalAttachmentItem? {
|
||||
guard let currentIndex = attachmentItems.index(of: item) else {
|
||||
owsFailDebug("currentIndex was unexpectedly nil")
|
||||
return nil
|
||||
}
|
||||
|
||||
let prevIndex = attachmentItems.index(before: currentIndex)
|
||||
|
||||
return attachmentItems[safe: prevIndex]
|
||||
}
|
||||
|
||||
func remove(item: SignalAttachmentItem) {
|
||||
attachmentItems = attachmentItems.filter { $0 != item }
|
||||
}
|
||||
|
||||
var count: Int {
|
||||
return attachmentItems.count
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,561 @@
|
|||
//
|
||||
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
import AVFoundation
|
||||
|
||||
protocol AttachmentPrepViewControllerDelegate: class {
|
||||
func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem)
|
||||
|
||||
func prepViewControllerUpdateNavigationBar()
|
||||
|
||||
func prepViewControllerUpdateControls()
|
||||
|
||||
func prepViewControllerAttachmentCount() -> Int
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarDelegate, OWSVideoPlayerDelegate {
|
||||
// We sometimes shrink the attachment view so that it remains somewhat visible
|
||||
// when the keyboard is presented.
|
||||
public enum AttachmentViewScale {
|
||||
case fullsize, compact
|
||||
}
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
weak var prepDelegate: AttachmentPrepViewControllerDelegate?
|
||||
|
||||
let attachmentItem: SignalAttachmentItem
|
||||
var attachment: SignalAttachment {
|
||||
return attachmentItem.attachment
|
||||
}
|
||||
|
||||
private var videoPlayer: OWSVideoPlayer?
|
||||
|
||||
private(set) var mediaMessageView: MediaMessageView!
|
||||
private(set) var scrollView: UIScrollView!
|
||||
private(set) var contentContainer: UIView!
|
||||
private(set) var playVideoButton: UIView?
|
||||
private var imageEditorView: ImageEditorView?
|
||||
|
||||
public var isShowingCaptionView = false {
|
||||
didSet {
|
||||
prepDelegate?.prepViewControllerUpdateNavigationBar()
|
||||
prepDelegate?.prepViewControllerUpdateControls()
|
||||
}
|
||||
}
|
||||
|
||||
public var shouldHideControls: Bool {
|
||||
guard let imageEditorView = imageEditorView else {
|
||||
return false
|
||||
}
|
||||
return imageEditorView.shouldHideControls
|
||||
}
|
||||
|
||||
// MARK: - Initializers
|
||||
|
||||
init(attachmentItem: SignalAttachmentItem) {
|
||||
self.attachmentItem = attachmentItem
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
assert(!attachment.hasError)
|
||||
}
|
||||
|
||||
public required init?(coder aDecoder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK: - Subviews
|
||||
|
||||
// TODO: Do we still need this?
|
||||
lazy var touchInterceptorView: UIView = {
|
||||
let touchInterceptorView = UIView()
|
||||
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapTouchInterceptorView(gesture:)))
|
||||
touchInterceptorView.addGestureRecognizer(tapGesture)
|
||||
|
||||
return touchInterceptorView
|
||||
}()
|
||||
|
||||
// MARK: - View Lifecycle
|
||||
|
||||
override public func loadView() {
|
||||
self.view = UIView()
|
||||
|
||||
self.mediaMessageView = MediaMessageView(attachment: attachment, mode: .attachmentApproval)
|
||||
|
||||
// Anything that should be shrunk when user pops keyboard lives in the contentContainer.
|
||||
let contentContainer = UIView()
|
||||
self.contentContainer = contentContainer
|
||||
view.addSubview(contentContainer)
|
||||
contentContainer.autoPinEdgesToSuperviewEdges()
|
||||
|
||||
// Scroll View - used to zoom/pan on images and video
|
||||
scrollView = UIScrollView()
|
||||
contentContainer.addSubview(scrollView)
|
||||
scrollView.delegate = self
|
||||
scrollView.showsHorizontalScrollIndicator = false
|
||||
scrollView.showsVerticalScrollIndicator = false
|
||||
|
||||
// Panning should stop pretty soon after the user stops scrolling
|
||||
scrollView.decelerationRate = UIScrollViewDecelerationRateFast
|
||||
|
||||
// We want scroll view content up and behind the system status bar content
|
||||
// but we want other content (e.g. bar buttons) to respect the top layout guide.
|
||||
self.automaticallyAdjustsScrollViewInsets = false
|
||||
|
||||
scrollView.autoPinEdgesToSuperviewEdges()
|
||||
|
||||
let backgroundColor = UIColor.black
|
||||
self.view.backgroundColor = backgroundColor
|
||||
|
||||
// Create full screen container view so the scrollView
|
||||
// can compute an appropriate content size in which to center
|
||||
// our media view.
|
||||
let containerView = UIView.container()
|
||||
scrollView.addSubview(containerView)
|
||||
containerView.autoPinEdgesToSuperviewEdges()
|
||||
containerView.autoMatch(.height, to: .height, of: self.view)
|
||||
containerView.autoMatch(.width, to: .width, of: self.view)
|
||||
|
||||
containerView.addSubview(mediaMessageView)
|
||||
mediaMessageView.autoPinEdgesToSuperviewEdges()
|
||||
|
||||
#if DEBUG
|
||||
if let imageEditorModel = attachmentItem.imageEditorModel {
|
||||
|
||||
let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self)
|
||||
if imageEditorView.configureSubviews() {
|
||||
self.imageEditorView = imageEditorView
|
||||
|
||||
mediaMessageView.isHidden = true
|
||||
|
||||
view.addSubview(imageEditorView)
|
||||
imageEditorView.autoPinEdgesToSuperviewEdges()
|
||||
|
||||
imageEditorUpdateNavigationBar()
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if isZoomable {
|
||||
// Add top and bottom gradients to ensure toolbar controls are legible
|
||||
// when placed over image/video preview which may be a clashing color.
|
||||
let topGradient = GradientView(from: backgroundColor, to: UIColor.clear)
|
||||
self.view.addSubview(topGradient)
|
||||
topGradient.autoPinWidthToSuperview()
|
||||
topGradient.autoPinEdge(toSuperviewEdge: .top)
|
||||
topGradient.autoSetDimension(.height, toSize: ScaleFromIPhone5(60))
|
||||
}
|
||||
|
||||
// Hide the play button embedded in the MediaView and replace it with our own.
|
||||
// This allows us to zoom in on the media view without zooming in on the button
|
||||
if attachment.isVideo {
|
||||
|
||||
guard let videoURL = attachment.dataUrl else {
|
||||
owsFailDebug("Missing videoURL")
|
||||
return
|
||||
}
|
||||
|
||||
let player = OWSVideoPlayer(url: videoURL)
|
||||
self.videoPlayer = player
|
||||
player.delegate = self
|
||||
|
||||
let playerView = VideoPlayerView()
|
||||
playerView.player = player.avPlayer
|
||||
self.mediaMessageView.addSubview(playerView)
|
||||
playerView.autoPinEdgesToSuperviewEdges()
|
||||
|
||||
let pauseGesture = UITapGestureRecognizer(target: self, action: #selector(didTapPlayerView(_:)))
|
||||
playerView.addGestureRecognizer(pauseGesture)
|
||||
|
||||
let progressBar = PlayerProgressBar()
|
||||
progressBar.player = player.avPlayer
|
||||
progressBar.delegate = self
|
||||
|
||||
// we don't want the progress bar to zoom during "pinch-to-zoom"
|
||||
// but we do want it to shrink with the media content when the user
|
||||
// pops the keyboard.
|
||||
contentContainer.addSubview(progressBar)
|
||||
|
||||
progressBar.autoPin(toTopLayoutGuideOf: self, withInset: 0)
|
||||
progressBar.autoPinWidthToSuperview()
|
||||
progressBar.autoSetDimension(.height, toSize: 44)
|
||||
|
||||
self.mediaMessageView.videoPlayButton?.isHidden = true
|
||||
let playButton = UIButton()
|
||||
self.playVideoButton = playButton
|
||||
playButton.accessibilityLabel = NSLocalizedString("PLAY_BUTTON_ACCESSABILITY_LABEL", comment: "Accessibility label for button to start media playback")
|
||||
playButton.setBackgroundImage(#imageLiteral(resourceName: "play_button"), for: .normal)
|
||||
playButton.contentMode = .scaleAspectFit
|
||||
|
||||
let playButtonWidth = ScaleFromIPhone5(70)
|
||||
playButton.autoSetDimensions(to: CGSize(width: playButtonWidth, height: playButtonWidth))
|
||||
self.contentContainer.addSubview(playButton)
|
||||
|
||||
playButton.addTarget(self, action: #selector(playButtonTapped), for: .touchUpInside)
|
||||
playButton.autoCenterInSuperview()
|
||||
}
|
||||
|
||||
// Caption
|
||||
|
||||
view.addSubview(touchInterceptorView)
|
||||
touchInterceptorView.autoPinEdgesToSuperviewEdges()
|
||||
touchInterceptorView.isHidden = true
|
||||
}
|
||||
|
||||
override public func viewWillAppear(_ animated: Bool) {
|
||||
Logger.debug("")
|
||||
|
||||
super.viewWillAppear(animated)
|
||||
|
||||
prepDelegate?.prepViewControllerUpdateNavigationBar()
|
||||
prepDelegate?.prepViewControllerUpdateControls()
|
||||
}
|
||||
|
||||
override public func viewDidAppear(_ animated: Bool) {
|
||||
Logger.debug("")
|
||||
|
||||
super.viewDidAppear(animated)
|
||||
|
||||
prepDelegate?.prepViewControllerUpdateNavigationBar()
|
||||
prepDelegate?.prepViewControllerUpdateControls()
|
||||
}
|
||||
|
||||
override public func viewWillLayoutSubviews() {
|
||||
Logger.debug("")
|
||||
super.viewWillLayoutSubviews()
|
||||
|
||||
// e.g. if flipping to/from landscape
|
||||
updateMinZoomScaleForSize(view.bounds.size)
|
||||
|
||||
ensureAttachmentViewScale(animated: false)
|
||||
}
|
||||
|
||||
// MARK: - Navigation Bar
|
||||
|
||||
public func navigationBarItems() -> [UIView] {
|
||||
let captionButton = navigationBarButton(imageName: "image_editor_caption",
|
||||
selector: #selector(didTapCaption(sender:)))
|
||||
|
||||
guard let imageEditorView = imageEditorView else {
|
||||
// Show the "add caption" button for non-image attachments if
|
||||
// there is more than one attachment.
|
||||
if let prepDelegate = prepDelegate,
|
||||
prepDelegate.prepViewControllerAttachmentCount() > 1 {
|
||||
return [captionButton]
|
||||
}
|
||||
return []
|
||||
}
|
||||
var navigationBarItems = imageEditorView.navigationBarItems()
|
||||
|
||||
// Show the caption UI if there's more than one attachment
|
||||
// OR if the attachment already has a caption.
|
||||
var shouldShowCaptionUI = attachmentCount() > 0
|
||||
if let captionText = attachmentItem.captionText, captionText.count > 0 {
|
||||
shouldShowCaptionUI = true
|
||||
}
|
||||
if shouldShowCaptionUI {
|
||||
navigationBarItems.append(captionButton)
|
||||
}
|
||||
|
||||
return navigationBarItems
|
||||
}
|
||||
|
||||
private func attachmentCount() -> Int {
|
||||
guard let prepDelegate = prepDelegate else {
|
||||
owsFailDebug("Missing prepDelegate.")
|
||||
return 0
|
||||
}
|
||||
return prepDelegate.prepViewControllerAttachmentCount()
|
||||
}
|
||||
|
||||
@objc func didTapCaption(sender: UIButton) {
|
||||
Logger.verbose("")
|
||||
|
||||
presentCaptionView()
|
||||
}
|
||||
|
||||
private func presentCaptionView() {
|
||||
let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem)
|
||||
self.imageEditor(presentFullScreenView: view, isTransparent: true)
|
||||
|
||||
isShowingCaptionView = true
|
||||
}
|
||||
|
||||
// MARK: - Event Handlers
|
||||
|
||||
@objc
|
||||
func didTapTouchInterceptorView(gesture: UITapGestureRecognizer) {
|
||||
Logger.info("")
|
||||
touchInterceptorView.isHidden = true
|
||||
}
|
||||
|
||||
@objc
|
||||
public func didTapPlayerView(_ gestureRecognizer: UIGestureRecognizer) {
|
||||
assert(self.videoPlayer != nil)
|
||||
self.pauseVideo()
|
||||
}
|
||||
|
||||
@objc
|
||||
public func playButtonTapped() {
|
||||
self.playVideo()
|
||||
}
|
||||
|
||||
// MARK: - Video
|
||||
|
||||
private func playVideo() {
|
||||
Logger.info("")
|
||||
|
||||
guard let videoPlayer = self.videoPlayer else {
|
||||
owsFailDebug("video player was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
guard let playVideoButton = self.playVideoButton else {
|
||||
owsFailDebug("playVideoButton was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
UIView.animate(withDuration: 0.1) {
|
||||
playVideoButton.alpha = 0.0
|
||||
}
|
||||
videoPlayer.play()
|
||||
}
|
||||
|
||||
private func pauseVideo() {
|
||||
guard let videoPlayer = self.videoPlayer else {
|
||||
owsFailDebug("video player was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
videoPlayer.pause()
|
||||
guard let playVideoButton = self.playVideoButton else {
|
||||
owsFailDebug("playVideoButton was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
UIView.animate(withDuration: 0.1) {
|
||||
playVideoButton.alpha = 1.0
|
||||
}
|
||||
}
|
||||
|
||||
@objc
|
||||
public func videoPlayerDidPlayToCompletion(_ videoPlayer: OWSVideoPlayer) {
|
||||
guard let playVideoButton = self.playVideoButton else {
|
||||
owsFailDebug("playVideoButton was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
UIView.animate(withDuration: 0.1) {
|
||||
playVideoButton.alpha = 1.0
|
||||
}
|
||||
}
|
||||
|
||||
public func playerProgressBarDidStartScrubbing(_ playerProgressBar: PlayerProgressBar) {
|
||||
guard let videoPlayer = self.videoPlayer else {
|
||||
owsFailDebug("video player was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
videoPlayer.pause()
|
||||
}
|
||||
|
||||
public func playerProgressBar(_ playerProgressBar: PlayerProgressBar, scrubbedToTime time: CMTime) {
|
||||
guard let videoPlayer = self.videoPlayer else {
|
||||
owsFailDebug("video player was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
videoPlayer.seek(to: time)
|
||||
}
|
||||
|
||||
public func playerProgressBar(_ playerProgressBar: PlayerProgressBar, didFinishScrubbingAtTime time: CMTime, shouldResumePlayback: Bool) {
|
||||
guard let videoPlayer = self.videoPlayer else {
|
||||
owsFailDebug("video player was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
videoPlayer.seek(to: time)
|
||||
if (shouldResumePlayback) {
|
||||
videoPlayer.play()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Helpers
|
||||
|
||||
var isZoomable: Bool {
|
||||
return attachment.isImage || attachment.isVideo
|
||||
}
|
||||
|
||||
func zoomOut(animated: Bool) {
|
||||
if self.scrollView.zoomScale != self.scrollView.minimumZoomScale {
|
||||
self.scrollView.setZoomScale(self.scrollView.minimumZoomScale, animated: animated)
|
||||
}
|
||||
}
|
||||
|
||||
// When the keyboard is popped, it can obscure the attachment view.
|
||||
// so we sometimes allow resizing the attachment.
|
||||
var shouldAllowAttachmentViewResizing: Bool = true
|
||||
|
||||
var attachmentViewScale: AttachmentViewScale = .fullsize
|
||||
public func setAttachmentViewScale(_ attachmentViewScale: AttachmentViewScale, animated: Bool) {
|
||||
self.attachmentViewScale = attachmentViewScale
|
||||
ensureAttachmentViewScale(animated: animated)
|
||||
}
|
||||
|
||||
func ensureAttachmentViewScale(animated: Bool) {
|
||||
let animationDuration = animated ? 0.2 : 0
|
||||
guard shouldAllowAttachmentViewResizing else {
|
||||
if self.contentContainer.transform != CGAffineTransform.identity {
|
||||
UIView.animate(withDuration: animationDuration) {
|
||||
self.contentContainer.transform = CGAffineTransform.identity
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
switch attachmentViewScale {
|
||||
case .fullsize:
|
||||
guard self.contentContainer.transform != .identity else {
|
||||
return
|
||||
}
|
||||
UIView.animate(withDuration: animationDuration) {
|
||||
self.contentContainer.transform = CGAffineTransform.identity
|
||||
}
|
||||
case .compact:
|
||||
guard self.contentContainer.transform == .identity else {
|
||||
return
|
||||
}
|
||||
UIView.animate(withDuration: animationDuration) {
|
||||
let kScaleFactor: CGFloat = 0.7
|
||||
let scale = CGAffineTransform(scaleX: kScaleFactor, y: kScaleFactor)
|
||||
|
||||
let originalHeight = self.scrollView.bounds.size.height
|
||||
|
||||
// Position the new scaled item to be centered with respect
|
||||
// to it's new size.
|
||||
let heightDelta = originalHeight * (1 - kScaleFactor)
|
||||
let translate = CGAffineTransform(translationX: 0, y: -heightDelta / 2)
|
||||
|
||||
self.contentContainer.transform = scale.concatenating(translate)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension AttachmentPrepViewController: AttachmentCaptionDelegate {
|
||||
func captionView(_ captionView: AttachmentCaptionViewController, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) {
|
||||
let attachment = attachmentItem.attachment
|
||||
attachment.captionText = captionText
|
||||
prepDelegate?.prepViewController(self, didUpdateCaptionForAttachmentItem: attachmentItem)
|
||||
|
||||
isShowingCaptionView = false
|
||||
}
|
||||
|
||||
func captionViewDidCancel() {
|
||||
isShowingCaptionView = false
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension AttachmentPrepViewController: UIScrollViewDelegate {
|
||||
|
||||
public func viewForZooming(in scrollView: UIScrollView) -> UIView? {
|
||||
if isZoomable {
|
||||
return mediaMessageView
|
||||
} else {
|
||||
// don't zoom for audio or generic attachments.
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
fileprivate func updateMinZoomScaleForSize(_ size: CGSize) {
|
||||
Logger.debug("")
|
||||
|
||||
// Ensure bounds have been computed
|
||||
mediaMessageView.layoutIfNeeded()
|
||||
guard mediaMessageView.bounds.width > 0, mediaMessageView.bounds.height > 0 else {
|
||||
Logger.warn("bad bounds")
|
||||
return
|
||||
}
|
||||
|
||||
let widthScale = size.width / mediaMessageView.bounds.width
|
||||
let heightScale = size.height / mediaMessageView.bounds.height
|
||||
let minScale = min(widthScale, heightScale)
|
||||
scrollView.maximumZoomScale = minScale * 5.0
|
||||
scrollView.minimumZoomScale = minScale
|
||||
scrollView.zoomScale = minScale
|
||||
}
|
||||
|
||||
// Keep the media view centered within the scroll view as you zoom
|
||||
public func scrollViewDidZoom(_ scrollView: UIScrollView) {
|
||||
// The scroll view has zoomed, so you need to re-center the contents
|
||||
let scrollViewSize = self.scrollViewVisibleSize
|
||||
|
||||
// First assume that mediaMessageView center coincides with the contents center
|
||||
// This is correct when the mediaMessageView is bigger than scrollView due to zoom
|
||||
var contentCenter = CGPoint(x: (scrollView.contentSize.width / 2), y: (scrollView.contentSize.height / 2))
|
||||
|
||||
let scrollViewCenter = self.scrollViewCenter
|
||||
|
||||
// if mediaMessageView is smaller than the scrollView visible size - fix the content center accordingly
|
||||
if self.scrollView.contentSize.width < scrollViewSize.width {
|
||||
contentCenter.x = scrollViewCenter.x
|
||||
}
|
||||
|
||||
if self.scrollView.contentSize.height < scrollViewSize.height {
|
||||
contentCenter.y = scrollViewCenter.y
|
||||
}
|
||||
|
||||
self.mediaMessageView.center = contentCenter
|
||||
}
|
||||
|
||||
// return the scroll view center
|
||||
private var scrollViewCenter: CGPoint {
|
||||
let size = scrollViewVisibleSize
|
||||
return CGPoint(x: (size.width / 2), y: (size.height / 2))
|
||||
}
|
||||
|
||||
// Return scrollview size without the area overlapping with tab and nav bar.
|
||||
private var scrollViewVisibleSize: CGSize {
|
||||
let contentInset = scrollView.contentInset
|
||||
let scrollViewSize = scrollView.bounds.standardized.size
|
||||
let width = scrollViewSize.width - (contentInset.left + contentInset.right)
|
||||
let height = scrollViewSize.height - (contentInset.top + contentInset.bottom)
|
||||
return CGSize(width: width, height: height)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension AttachmentPrepViewController: ImageEditorViewDelegate {
|
||||
public func imageEditor(presentFullScreenView viewController: UIViewController,
|
||||
isTransparent: Bool) {
|
||||
|
||||
let navigationController = OWSNavigationController(rootViewController: viewController)
|
||||
navigationController.modalPresentationStyle = (isTransparent
|
||||
? .overFullScreen
|
||||
: .fullScreen)
|
||||
|
||||
if let navigationBar = navigationController.navigationBar as? OWSNavigationBar {
|
||||
navigationBar.overrideTheme(type: .clear)
|
||||
} else {
|
||||
owsFailDebug("navigationBar was nil or unexpected class")
|
||||
}
|
||||
|
||||
self.present(navigationController, animated: false) {
|
||||
// Do nothing.
|
||||
}
|
||||
}
|
||||
|
||||
public func imageEditorUpdateNavigationBar() {
|
||||
prepDelegate?.prepViewControllerUpdateNavigationBar()
|
||||
}
|
||||
|
||||
public func imageEditorUpdateControls() {
|
||||
prepDelegate?.prepViewControllerUpdateControls()
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue