Clean up ahead of PR.

pull/2/head
Matthew Chen 6 years ago
parent dc4e174e86
commit 63637af240

@ -135,7 +135,7 @@ public class ConversationMediaView: UIView {
} else if attachmentStream.isVideo { } else if attachmentStream.isVideo {
configureForVideo(attachmentStream: attachmentStream) configureForVideo(attachmentStream: attachmentStream)
} else { } else {
// owsFailDebug("Attachment has unexpected type.") owsFailDebug("Attachment has unexpected type.")
configure(forError: .invalid) configure(forError: .invalid)
} }
} }

@ -229,8 +229,8 @@ class AttachmentCaptionViewController: OWSViewController {
let contentSize = textView.sizeThatFits(CGSize(width: textView.width(), height: CGFloat.greatestFiniteMagnitude)) let contentSize = textView.sizeThatFits(CGSize(width: textView.width(), height: CGFloat.greatestFiniteMagnitude))
// `textView.contentSize` isn't accurate when restoring a multiline draft, so we compute it here. // `textView.contentSize` isn't accurate when restoring a multiline draft, so we compute it here.
textView.contentSize = contentSize textView.contentSize = contentSize
let minHeight: CGFloat = textView.font?.lineHeight ?? 0 let minHeight: CGFloat = textView.font?.lineHeight ?? 0
let maxHeight = minHeight * 4 let maxHeight = minHeight * 4

@ -11,7 +11,6 @@ public protocol ImageEditorBrushViewControllerDelegate: class {
// MARK: - // MARK: -
// A view for editing text item in image editor.
public class ImageEditorBrushViewController: OWSViewController { public class ImageEditorBrushViewController: OWSViewController {
private weak var delegate: ImageEditorBrushViewControllerDelegate? private weak var delegate: ImageEditorBrushViewControllerDelegate?

Loading…
Cancel
Save