|
|
|
@ -44,37 +44,36 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private lazy var validImage: UIImage? = {
|
|
|
|
private lazy var validImage: UIImage? = {
|
|
|
|
switch attachment.fileType {
|
|
|
|
if attachment.isImage {
|
|
|
|
case .image:
|
|
|
|
guard
|
|
|
|
guard
|
|
|
|
attachment.isValidImage,
|
|
|
|
attachment.isValidImage,
|
|
|
|
let image: UIImage = attachment.image(),
|
|
|
|
let image: UIImage = attachment.image(),
|
|
|
|
image.size.width > 0,
|
|
|
|
image.size.width > 0,
|
|
|
|
image.size.height > 0
|
|
|
|
image.size.height > 0
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return image
|
|
|
|
return image
|
|
|
|
}
|
|
|
|
|
|
|
|
else if attachment.isVideo {
|
|
|
|
case .video:
|
|
|
|
guard
|
|
|
|
guard
|
|
|
|
attachment.isValidVideo,
|
|
|
|
attachment.isValidVideo,
|
|
|
|
let image: UIImage = attachment.videoPreview(),
|
|
|
|
let image: UIImage = attachment.videoPreview(),
|
|
|
|
image.size.width > 0,
|
|
|
|
image.size.width > 0,
|
|
|
|
image.size.height > 0
|
|
|
|
image.size.height > 0
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return image
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default: return nil
|
|
|
|
return image
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}()
|
|
|
|
}()
|
|
|
|
private lazy var validAnimatedImage: YYImage? = {
|
|
|
|
private lazy var validAnimatedImage: YYImage? = {
|
|
|
|
guard
|
|
|
|
guard
|
|
|
|
attachment.fileType == .animatedImage,
|
|
|
|
attachment.isAnimatedImage,
|
|
|
|
attachment.isValidImage,
|
|
|
|
attachment.isValidImage,
|
|
|
|
let dataUrl: URL = attachment.dataUrl,
|
|
|
|
let dataUrl: URL = attachment.dataUrl,
|
|
|
|
let image: YYImage = YYImage(contentsOfFile: dataUrl.path),
|
|
|
|
let image: YYImage = YYImage(contentsOfFile: dataUrl.path),
|
|
|
|
@ -153,22 +152,19 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
view.isHidden = true
|
|
|
|
view.isHidden = true
|
|
|
|
|
|
|
|
|
|
|
|
// Override the image to the correct one
|
|
|
|
// Override the image to the correct one
|
|
|
|
switch attachment.fileType {
|
|
|
|
if attachment.isImage || attachment.isVideo {
|
|
|
|
case .image, .video:
|
|
|
|
if let validImage: UIImage = validImage {
|
|
|
|
if let validImage: UIImage = validImage {
|
|
|
|
view.layer.minificationFilter = .trilinear
|
|
|
|
view.layer.minificationFilter = .trilinear
|
|
|
|
view.layer.magnificationFilter = .trilinear
|
|
|
|
view.layer.magnificationFilter = .trilinear
|
|
|
|
view.image = validImage
|
|
|
|
view.image = validImage
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else if attachment.isUrl {
|
|
|
|
case .url:
|
|
|
|
view.clipsToBounds = true
|
|
|
|
view.clipsToBounds = true
|
|
|
|
view.image = UIImage(named: "Link")?.withTint(Colors.text)
|
|
|
|
view.image = UIImage(named: "Link")?.withTint(Colors.text)
|
|
|
|
view.contentMode = .center
|
|
|
|
view.contentMode = .center
|
|
|
|
view.backgroundColor = (isDarkMode ? .black : UIColor.black.withAlphaComponent(0.06))
|
|
|
|
view.backgroundColor = (isDarkMode ? .black : UIColor.black.withAlphaComponent(0.06))
|
|
|
|
view.layer.cornerRadius = 8
|
|
|
|
view.layer.cornerRadius = 8
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default: break
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return view
|
|
|
|
return view
|
|
|
|
@ -225,7 +221,7 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
let stackView: UIStackView = UIStackView()
|
|
|
|
let stackView: UIStackView = UIStackView()
|
|
|
|
stackView.translatesAutoresizingMaskIntoConstraints = false
|
|
|
|
stackView.translatesAutoresizingMaskIntoConstraints = false
|
|
|
|
stackView.axis = .vertical
|
|
|
|
stackView.axis = .vertical
|
|
|
|
stackView.alignment = (attachment.fileType == .url ? .leading : .center)
|
|
|
|
stackView.alignment = (attachment.isUrl ? .leading : .center)
|
|
|
|
stackView.distribution = .fill
|
|
|
|
stackView.distribution = .fill
|
|
|
|
|
|
|
|
|
|
|
|
switch mode {
|
|
|
|
switch mode {
|
|
|
|
@ -257,35 +253,33 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Content
|
|
|
|
// Content
|
|
|
|
switch attachment.fileType {
|
|
|
|
if attachment.isUrl {
|
|
|
|
case .image, .animatedImage, .video: break // No title for these
|
|
|
|
// If we have no link preview info at this point then assume link previews are disabled
|
|
|
|
|
|
|
|
if let linkPreviewURL: String = linkPreviewInfo?.url {
|
|
|
|
case .url:
|
|
|
|
|
|
|
|
// If we have no link preview info at this point then assume link previews are disabled
|
|
|
|
|
|
|
|
guard let linkPreviewURL: String = linkPreviewInfo?.url else {
|
|
|
|
|
|
|
|
label.text = "vc_share_link_previews_disabled_title".localized()
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
label.font = .boldSystemFont(ofSize: Values.smallFontSize)
|
|
|
|
label.font = .boldSystemFont(ofSize: Values.smallFontSize)
|
|
|
|
label.text = linkPreviewURL
|
|
|
|
label.text = linkPreviewURL
|
|
|
|
label.textAlignment = .left
|
|
|
|
label.textAlignment = .left
|
|
|
|
label.lineBreakMode = .byTruncatingTail
|
|
|
|
label.lineBreakMode = .byTruncatingTail
|
|
|
|
label.numberOfLines = 2
|
|
|
|
label.numberOfLines = 2
|
|
|
|
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
else {
|
|
|
|
if let fileName: String = attachment.sourceFilename?.trimmingCharacters(in: .whitespacesAndNewlines), fileName.count > 0 {
|
|
|
|
label.text = "vc_share_link_previews_disabled_title".localized()
|
|
|
|
label.text = fileName
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if let fileExtension: String = attachment.fileExtension {
|
|
|
|
// Title for everything except these types
|
|
|
|
label.text = String(
|
|
|
|
else if !attachment.isImage && !attachment.isAnimatedImage && !attachment.isVideo {
|
|
|
|
format: "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT".localized(),
|
|
|
|
if let fileName: String = attachment.sourceFilename?.trimmingCharacters(in: .whitespacesAndNewlines), fileName.count > 0 {
|
|
|
|
fileExtension.uppercased()
|
|
|
|
label.text = fileName
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if let fileExtension: String = attachment.fileExtension {
|
|
|
|
|
|
|
|
label.text = String(
|
|
|
|
label.textAlignment = .center
|
|
|
|
format: "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT".localized(),
|
|
|
|
label.lineBreakMode = .byTruncatingMiddle
|
|
|
|
fileExtension.uppercased()
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
label.textAlignment = .center
|
|
|
|
|
|
|
|
label.lineBreakMode = .byTruncatingMiddle
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Hide the label if it has no content
|
|
|
|
// Hide the label if it has no content
|
|
|
|
@ -314,32 +308,30 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Content
|
|
|
|
// Content
|
|
|
|
switch attachment.fileType {
|
|
|
|
if attachment.isUrl {
|
|
|
|
case .image, .animatedImage, .video: break // No size for these
|
|
|
|
// We only load Link Previews for HTTPS urls so append an explanation for not
|
|
|
|
|
|
|
|
if let linkPreviewURL: String = linkPreviewInfo?.url {
|
|
|
|
case .url:
|
|
|
|
|
|
|
|
// If we have no link preview info at this point then assume link previews are disabled
|
|
|
|
|
|
|
|
guard let linkPreviewURL: String = linkPreviewInfo?.url else {
|
|
|
|
|
|
|
|
label.text = "vc_share_link_previews_disabled_explanation".localized()
|
|
|
|
|
|
|
|
label.textColor = Colors.text
|
|
|
|
|
|
|
|
label.textAlignment = .center
|
|
|
|
|
|
|
|
label.numberOfLines = 0
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// We only load Link Previews for HTTPS urls so append an explanation for not
|
|
|
|
|
|
|
|
if let targetUrl: URL = URL(string: linkPreviewURL), targetUrl.scheme?.lowercased() != "https" {
|
|
|
|
if let targetUrl: URL = URL(string: linkPreviewURL), targetUrl.scheme?.lowercased() != "https" {
|
|
|
|
label.font = UIFont.ows_regularFont(withSize: Values.verySmallFontSize)
|
|
|
|
label.font = UIFont.ows_regularFont(withSize: Values.verySmallFontSize)
|
|
|
|
label.text = "vc_share_link_previews_unsecure".localized()
|
|
|
|
label.text = "vc_share_link_previews_unsecure".localized()
|
|
|
|
label.textColor = (mode == .attachmentApproval ? Colors.pinIcon : Colors.accent)
|
|
|
|
label.textColor = (mode == .attachmentApproval ? Colors.pinIcon : Colors.accent)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
// If we have no link preview info at this point then assume link previews are disabled
|
|
|
|
// Format string for file size label in call interstitial view.
|
|
|
|
else {
|
|
|
|
// Embeds: {{file size as 'N mb' or 'N kb'}}.
|
|
|
|
label.text = "vc_share_link_previews_disabled_explanation".localized()
|
|
|
|
let fileSize: UInt = attachment.dataLength
|
|
|
|
label.textColor = Colors.text
|
|
|
|
label.text = String(format: "ATTACHMENT_APPROVAL_FILE_SIZE_FORMAT".localized(), OWSFormat.formatFileSize(UInt(fileSize)))
|
|
|
|
|
|
|
|
label.textAlignment = .center
|
|
|
|
label.textAlignment = .center
|
|
|
|
|
|
|
|
label.numberOfLines = 0
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// Subtitle for everything else except these types
|
|
|
|
|
|
|
|
else if !attachment.isImage && !attachment.isAnimatedImage && !attachment.isVideo {
|
|
|
|
|
|
|
|
// Format string for file size label in call interstitial view.
|
|
|
|
|
|
|
|
// Embeds: {{file size as 'N mb' or 'N kb'}}.
|
|
|
|
|
|
|
|
let fileSize: UInt = attachment.dataLength
|
|
|
|
|
|
|
|
label.text = String(format: "ATTACHMENT_APPROVAL_FILE_SIZE_FORMAT".localized(), OWSFormat.formatFileSize(UInt(fileSize)))
|
|
|
|
|
|
|
|
label.textAlignment = .center
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Hide the label if it has no content
|
|
|
|
// Hide the label if it has no content
|
|
|
|
@ -352,7 +344,7 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
|
|
|
|
|
|
|
|
private func setupViews() {
|
|
|
|
private func setupViews() {
|
|
|
|
// Plain text will just be put in the 'message' input so do nothing
|
|
|
|
// Plain text will just be put in the 'message' input so do nothing
|
|
|
|
guard attachment.fileType != .text && attachment.fileType != .oversizeText else { return }
|
|
|
|
guard !attachment.isText && !attachment.isOversizeText else { return }
|
|
|
|
|
|
|
|
|
|
|
|
// Setup the view hierarchy
|
|
|
|
// Setup the view hierarchy
|
|
|
|
addSubview(stackView)
|
|
|
|
addSubview(stackView)
|
|
|
|
@ -370,95 +362,90 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
imageView.addSubview(fileTypeImageView)
|
|
|
|
imageView.addSubview(fileTypeImageView)
|
|
|
|
|
|
|
|
|
|
|
|
// Type-specific configurations
|
|
|
|
// Type-specific configurations
|
|
|
|
switch attachment.fileType {
|
|
|
|
if attachment.isAnimatedImage {
|
|
|
|
case .animatedImage: animatedImageView.isHidden = false
|
|
|
|
animatedImageView.isHidden = false
|
|
|
|
case .image: imageView.isHidden = false
|
|
|
|
}
|
|
|
|
|
|
|
|
else if attachment.isImage {
|
|
|
|
case .video:
|
|
|
|
imageView.isHidden = false
|
|
|
|
// Note: The 'attachmentApproval' mode provides it's own play button to keep
|
|
|
|
}
|
|
|
|
// it at the proper scale when zooming
|
|
|
|
else if attachment.isVideo {
|
|
|
|
imageView.isHidden = false
|
|
|
|
// Note: The 'attachmentApproval' mode provides it's own play button to keep
|
|
|
|
videoPlayButton.isHidden = (mode == .attachmentApproval)
|
|
|
|
// it at the proper scale when zooming
|
|
|
|
|
|
|
|
imageView.isHidden = false
|
|
|
|
case .audio:
|
|
|
|
videoPlayButton.isHidden = (mode == .attachmentApproval)
|
|
|
|
// Hide the 'audioPlayPauseButton' if the 'audioPlayer' failed to get created
|
|
|
|
}
|
|
|
|
imageView.isHidden = false
|
|
|
|
else if attachment.isAudio {
|
|
|
|
audioPlayPauseButton.isHidden = (audioPlayer == nil)
|
|
|
|
// Hide the 'audioPlayPauseButton' if the 'audioPlayer' failed to get created
|
|
|
|
setAudioIconToPlay()
|
|
|
|
imageView.isHidden = false
|
|
|
|
setAudioProgress(0, duration: (audioPlayer?.duration ?? 0))
|
|
|
|
audioPlayPauseButton.isHidden = (audioPlayer == nil)
|
|
|
|
|
|
|
|
setAudioIconToPlay()
|
|
|
|
fileTypeImageView.image = UIImage(named: "table_ic_notification_sound")?
|
|
|
|
setAudioProgress(0, duration: (audioPlayer?.duration ?? 0))
|
|
|
|
.withRenderingMode(.alwaysTemplate)
|
|
|
|
|
|
|
|
fileTypeImageView.tintColor = Colors.text
|
|
|
|
fileTypeImageView.image = UIImage(named: "table_ic_notification_sound")?
|
|
|
|
fileTypeImageView.isHidden = false
|
|
|
|
.withRenderingMode(.alwaysTemplate)
|
|
|
|
|
|
|
|
fileTypeImageView.tintColor = Colors.text
|
|
|
|
// Note: There is an annoying bug where the MediaMessageView will fill the screen if the
|
|
|
|
fileTypeImageView.isHidden = false
|
|
|
|
// 'audioPlayPauseButton' is added anywhere within the view hierarchy causing issues with
|
|
|
|
|
|
|
|
// the min scale on 'image' and 'animatedImage' file types (assume it's actually any UIButton)
|
|
|
|
// Note: There is an annoying bug where the MediaMessageView will fill the screen if the
|
|
|
|
addSubview(audioPlayPauseButton)
|
|
|
|
// 'audioPlayPauseButton' is added anywhere within the view hierarchy causing issues with
|
|
|
|
|
|
|
|
// the min scale on 'image' and 'animatedImage' file types (assume it's actually any UIButton)
|
|
|
|
case .url:
|
|
|
|
addSubview(audioPlayPauseButton)
|
|
|
|
imageView.isHidden = false
|
|
|
|
}
|
|
|
|
imageView.alpha = 0 // Not 'isHidden' because we want it to take up space in the UIStackView
|
|
|
|
else if attachment.isUrl {
|
|
|
|
loadingView.isHidden = false
|
|
|
|
imageView.isHidden = false
|
|
|
|
|
|
|
|
imageView.alpha = 0 // Not 'isHidden' because we want it to take up space in the UIStackView
|
|
|
|
if let linkPreviewUrl: String = linkPreviewInfo?.url {
|
|
|
|
loadingView.isHidden = false
|
|
|
|
// Don't want to change the axis until we have a URL to start loading, otherwise the
|
|
|
|
|
|
|
|
// error message will be broken
|
|
|
|
if let linkPreviewUrl: String = linkPreviewInfo?.url {
|
|
|
|
stackView.axis = .horizontal
|
|
|
|
// Don't want to change the axis until we have a URL to start loading, otherwise the
|
|
|
|
|
|
|
|
// error message will be broken
|
|
|
|
loadLinkPreview(linkPreviewURL: linkPreviewUrl)
|
|
|
|
stackView.axis = .horizontal
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default: imageView.isHidden = false
|
|
|
|
loadLinkPreview(linkPreviewURL: linkPreviewUrl)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
imageView.isHidden = false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private func setupLayout() {
|
|
|
|
private func setupLayout() {
|
|
|
|
// Plain text will just be put in the 'message' input so do nothing
|
|
|
|
// Plain text will just be put in the 'message' input so do nothing
|
|
|
|
guard attachment.fileType != .text && attachment.fileType != .oversizeText else { return }
|
|
|
|
guard !attachment.isText && !attachment.isOversizeText else { return }
|
|
|
|
|
|
|
|
|
|
|
|
// Sizing calculations
|
|
|
|
// Sizing calculations
|
|
|
|
let clampedRatio: CGFloat = {
|
|
|
|
let clampedRatio: CGFloat = {
|
|
|
|
switch attachment.fileType {
|
|
|
|
if attachment.isUrl {
|
|
|
|
case .url: return 1
|
|
|
|
return 1
|
|
|
|
|
|
|
|
|
|
|
|
case .image, .video, .audio, .unknown:
|
|
|
|
|
|
|
|
let imageSize: CGSize = (imageView.image?.size ?? CGSize(width: 1, height: 1))
|
|
|
|
|
|
|
|
let aspectRatio: CGFloat = (imageSize.width / imageSize.height)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return CGFloatClamp(aspectRatio, 0.05, 95.0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case .animatedImage:
|
|
|
|
|
|
|
|
let imageSize: CGSize = (animatedImageView.image?.size ?? CGSize(width: 1, height: 1))
|
|
|
|
|
|
|
|
let aspectRatio: CGFloat = (imageSize.width / imageSize.height)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return CGFloatClamp(aspectRatio, 0.05, 95.0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default: return 0
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if attachment.isAnimatedImage {
|
|
|
|
|
|
|
|
let imageSize: CGSize = (animatedImageView.image?.size ?? CGSize(width: 1, height: 1))
|
|
|
|
|
|
|
|
let aspectRatio: CGFloat = (imageSize.width / imageSize.height)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return CGFloatClamp(aspectRatio, 0.05, 95.0)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// All other types should maintain the ratio of the image in the 'imageView'
|
|
|
|
|
|
|
|
let imageSize: CGSize = (imageView.image?.size ?? CGSize(width: 1, height: 1))
|
|
|
|
|
|
|
|
let aspectRatio: CGFloat = (imageSize.width / imageSize.height)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return CGFloatClamp(aspectRatio, 0.05, 95.0)
|
|
|
|
}()
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
|
|
let maybeImageSize: CGFloat? = {
|
|
|
|
let maybeImageSize: CGFloat? = {
|
|
|
|
switch attachment.fileType {
|
|
|
|
if attachment.isImage || attachment.isVideo {
|
|
|
|
case .image, .video:
|
|
|
|
if validImage != nil { return nil }
|
|
|
|
if validImage != nil { return nil }
|
|
|
|
|
|
|
|
|
|
|
|
// If we don't have a valid image then use the 'generic' case
|
|
|
|
// If we don't have a valid image then use the 'generic' case
|
|
|
|
}
|
|
|
|
break
|
|
|
|
else if attachment.isAnimatedImage {
|
|
|
|
|
|
|
|
if validAnimatedImage != nil { return nil }
|
|
|
|
case .animatedImage:
|
|
|
|
|
|
|
|
if validAnimatedImage != nil { return nil }
|
|
|
|
// If we don't have a valid image then use the 'generic' case
|
|
|
|
|
|
|
|
}
|
|
|
|
// If we don't have a valid image then use the 'generic' case
|
|
|
|
else if attachment.isUrl {
|
|
|
|
break
|
|
|
|
return 80
|
|
|
|
|
|
|
|
|
|
|
|
case .url: return 80
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Use the 'generic' case for these
|
|
|
|
|
|
|
|
case .audio, .unknown: break
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default: return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Generic file size
|
|
|
|
// Generic file size
|
|
|
|
@ -531,7 +518,7 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
// No inset for the text for URLs but there is for all other layouts
|
|
|
|
// No inset for the text for URLs but there is for all other layouts
|
|
|
|
if (attachment.fileType != .url) {
|
|
|
|
if !attachment.isUrl {
|
|
|
|
NSLayoutConstraint.activate([
|
|
|
|
NSLayoutConstraint.activate([
|
|
|
|
titleLabel.widthAnchor.constraint(equalTo: stackView.widthAnchor, constant: -(32 * 2)),
|
|
|
|
titleLabel.widthAnchor.constraint(equalTo: stackView.widthAnchor, constant: -(32 * 2)),
|
|
|
|
subtitleLabel.widthAnchor.constraint(equalTo: stackView.widthAnchor, constant: -(32 * 2))
|
|
|
|
subtitleLabel.widthAnchor.constraint(equalTo: stackView.widthAnchor, constant: -(32 * 2))
|
|
|
|
@ -541,7 +528,7 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
|
|
|
|
// Note: There is an annoying bug where the MediaMessageView will fill the screen if the
|
|
|
|
// Note: There is an annoying bug where the MediaMessageView will fill the screen if the
|
|
|
|
// 'audioPlayPauseButton' is added anywhere within the view hierarchy causing issues with
|
|
|
|
// 'audioPlayPauseButton' is added anywhere within the view hierarchy causing issues with
|
|
|
|
// the min scale on 'image' and 'animatedImage' file types (assume it's actually any UIButton)
|
|
|
|
// the min scale on 'image' and 'animatedImage' file types (assume it's actually any UIButton)
|
|
|
|
if attachment.fileType == .audio {
|
|
|
|
if attachment.isAudio {
|
|
|
|
NSLayoutConstraint.activate([
|
|
|
|
NSLayoutConstraint.activate([
|
|
|
|
audioPlayPauseButton.centerXAnchor.constraint(equalTo: imageView.centerXAnchor),
|
|
|
|
audioPlayPauseButton.centerXAnchor.constraint(equalTo: imageView.centerXAnchor),
|
|
|
|
audioPlayPauseButton.centerYAnchor.constraint(equalTo: imageView.centerYAnchor),
|
|
|
|
audioPlayPauseButton.centerYAnchor.constraint(equalTo: imageView.centerYAnchor),
|
|
|
|
|
Morgan Pretty
3 years ago