-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22 from wordpress-mobile/release/1.1
Release/1.1
- Loading branch information
Showing
14 changed files
with
650 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 2.6.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| github "Quick/Nimble" "v8.0.5" | ||
| github "Quick/Nimble" "v8.0.7" | ||
| github "TimOliver/TOCropViewController" "2.5.2" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,7 @@ | ||
| 1.1.0 | ||
| ----- | ||
| * Add Drawing capability using PencilKit | ||
|
|
||
| 1.0.1 | ||
| ----- | ||
| * Expose the Hub | ||
|
|
||
230 changes: 230 additions & 0 deletions
230
Sources/Capabilities/Drawing/MediaEditorAnnotationView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,230 @@ | ||
| import UIKit | ||
| import AVFoundation | ||
| import PencilKit | ||
|
|
||
| @available(iOS 13.0, *) | ||
| protocol MediaEditorAnnotationViewUndoObserver: NSObject { | ||
| func mediaEditorAnnotationView(_ annotationView: MediaEditorAnnotationView, isHidingUndoControls: Bool) | ||
| func mediaEditorAnnotationViewUndoStatusDidChange(_ view: MediaEditorAnnotationView) | ||
| } | ||
|
|
||
| /// Wrapper view that contains an image view and a PencilKit canvas to allow | ||
| /// drawing on top of the image. | ||
| /// | ||
| @available(iOS 13.0, *) | ||
| class MediaEditorAnnotationView: UIView { | ||
|
|
||
| private let imageView = UIImageView() | ||
| private let canvasView = PKCanvasView() | ||
|
|
||
| private var bottomConstraint: NSLayoutConstraint! | ||
|
|
||
| weak var undoObserver: MediaEditorAnnotationViewUndoObserver? | ||
|
|
||
| var canUndo: Bool { | ||
| return canvasView.undoManager?.canUndo ?? false | ||
| } | ||
|
|
||
| var canRedo: Bool { | ||
| return canvasView.undoManager?.canRedo ?? false | ||
| } | ||
|
|
||
| var image: UIImage? { | ||
| set { | ||
| imageView.image = newValue | ||
| } | ||
| get { | ||
| return renderedImage | ||
| } | ||
| } | ||
|
|
||
| // Primarily for testing purposes | ||
| var drawingData: Data { | ||
| set { | ||
| do { | ||
| canvasView.drawing = try PKDrawing(data: newValue) | ||
| } catch { | ||
| print("Error setting annotation view drawing data.") | ||
| } | ||
| } | ||
| get { | ||
| return canvasView.drawing.dataRepresentation() | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Initialization | ||
|
|
||
| override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
| commonInit() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| super.init(coder: coder) | ||
| commonInit() | ||
| } | ||
|
|
||
| deinit { | ||
| undoObserver = nil | ||
|
|
||
| NotificationCenter.default.removeObserver(self, | ||
| name: NSNotification.Name.NSUndoManagerCheckpoint, | ||
| object: canvasView.undoManager) | ||
| } | ||
|
|
||
| private func commonInit() { | ||
| configureImageView() | ||
| configureCanvasView() | ||
| } | ||
|
|
||
| private func configureImageView() { | ||
| addSubview(imageView) | ||
| imageView.translatesAutoresizingMaskIntoConstraints = false | ||
|
|
||
| imageView.contentMode = .scaleAspectFit | ||
|
|
||
| bottomConstraint = imageView.bottomAnchor.constraint(equalTo: bottomAnchor) | ||
|
|
||
| NSLayoutConstraint.activate([ | ||
| imageView.leadingAnchor.constraint(equalTo: leadingAnchor), | ||
| imageView.trailingAnchor.constraint(equalTo: trailingAnchor), | ||
| imageView.topAnchor.constraint(equalTo: topAnchor), | ||
| bottomConstraint | ||
| ]) | ||
| } | ||
|
|
||
| private func configureCanvasView() { | ||
| addSubview(canvasView) | ||
|
|
||
| canvasView.backgroundColor = .clear | ||
| canvasView.isOpaque = false | ||
|
|
||
| // Ensure ink remains the same color regardless of light / dark mode | ||
| canvasView.overrideUserInterfaceStyle = .light | ||
|
|
||
| NotificationCenter.default.addObserver(forName: NSNotification.Name.NSUndoManagerCheckpoint, object: canvasView.undoManager, queue: nil) { [weak self] _ in | ||
| self?.notifyUndoObserver() | ||
| } | ||
| } | ||
|
|
||
| fileprivate func notifyUndoObserver() { | ||
| undoObserver?.mediaEditorAnnotationViewUndoStatusDidChange(self) | ||
| } | ||
|
|
||
| // MARK: - View Layout | ||
|
|
||
| override func layoutSubviews() { | ||
| super.layoutSubviews() | ||
|
|
||
| let currentFrame = canvasView.frame | ||
| let newFrame = calculateCanvasFrame() | ||
| canvasView.frame = newFrame | ||
|
|
||
| // If the canvas has changed size (e.g. due to device rotation) apply a transform | ||
| // to the drawing so that it still fits the scaled imageview | ||
| let transform = CGAffineTransform(scaleX: newFrame.width / currentFrame.width, y: newFrame.height / currentFrame.height) | ||
| self.canvasView.drawing.transform(using: transform) | ||
| } | ||
|
|
||
| private func calculateCanvasFrame() -> CGRect { | ||
| guard let image = imageView.image, | ||
| imageView.contentMode == .scaleAspectFit, | ||
| image.size.width > 0 && image.size.height > 0 else { | ||
| return imageView.bounds | ||
| } | ||
|
|
||
| let size = AVMakeRect(aspectRatio: image.size, insideRect: imageView.bounds) | ||
|
|
||
| let x = (imageView.bounds.width - size.width) * 0.5 | ||
| let y = (imageView.bounds.height - size.height) * 0.5 | ||
|
|
||
| return CGRect(x: x, y: y, width: size.width, height: size.height) | ||
| } | ||
|
|
||
| // MARK: - Public methods | ||
|
|
||
| /// Displays the system tool picker in the specified window | ||
| /// | ||
| func showTools(in window: UIWindow) { | ||
| if let toolPicker = PKToolPicker.shared(for: window) { | ||
| toolPicker.setVisible(true, forFirstResponder: canvasView) | ||
| toolPicker.addObserver(canvasView) | ||
| toolPicker.addObserver(self) | ||
|
|
||
| canvasView.becomeFirstResponder() | ||
| updateLayout(for: toolPicker) | ||
| } | ||
| } | ||
|
|
||
| /// Renders the initial image with the canvas's image overlaid on top | ||
| /// into a single UIImage instance. | ||
| /// | ||
| private var renderedImage: UIImage? { | ||
| guard let imageViewImage = imageView.image else { | ||
| return nil | ||
| } | ||
|
|
||
| guard canvasView.bounds != .zero else { | ||
| return imageViewImage | ||
| } | ||
|
|
||
| // Check we actually have some changes | ||
| if let undoManager = canvasView.undoManager, | ||
| undoManager.canUndo == false { | ||
| return imageViewImage | ||
| } | ||
|
|
||
| let targetSize = imageViewImage.size | ||
|
|
||
| let canvasViewImage = canvasView.drawing.image(from: canvasView.bounds, scale: UIScreen.main.scale) | ||
|
|
||
| let renderer = UIGraphicsImageRenderer(size: targetSize, format: .default()) | ||
| let renderedImage = renderer.image { context in | ||
| imageViewImage.draw(at: .zero) | ||
| canvasViewImage.draw(in: CGRect(origin: .zero, size: targetSize)) | ||
| } | ||
|
|
||
| return renderedImage | ||
| } | ||
| } | ||
|
|
||
| // Note: Code in this extension reused from WWDC 2019 PencilKit example | ||
| // | ||
| @available(iOS 13.0, *) | ||
| extension MediaEditorAnnotationView: PKToolPickerObserver { | ||
| // MARK: Tool Picker Observer | ||
|
|
||
| /// Delegate method: Note that the tool picker has changed which part of the canvas view | ||
| /// it obscures, if any. | ||
| internal func toolPickerFramesObscuredDidChange(_ toolPicker: PKToolPicker) { | ||
| updateLayout(for: toolPicker) | ||
| } | ||
|
|
||
| /// Delegate method: Note that the tool picker has become visible or hidden. | ||
| internal func toolPickerVisibilityDidChange(_ toolPicker: PKToolPicker) { | ||
| updateLayout(for: toolPicker) | ||
| } | ||
|
|
||
| /// Helper method to adjust the canvas view size when the tool picker changes which part | ||
| /// of the canvas view it obscures, if any. | ||
| /// | ||
| /// Note that the tool picker floats over the canvas in regular size classes, but docks to | ||
| /// the canvas in compact size classes, occupying a part of the screen that the canvas | ||
| /// could otherwise use. | ||
| fileprivate func updateLayout(for toolPicker: PKToolPicker) { | ||
| let obscuredFrame = toolPicker.frameObscured(in: self) | ||
|
|
||
| if obscuredFrame.isNull { | ||
| bottomConstraint.constant = 0 | ||
| undoObserver?.mediaEditorAnnotationView(self, isHidingUndoControls: false) | ||
| } else { | ||
| bottomConstraint.constant = -obscuredFrame.height | ||
| undoObserver?.mediaEditorAnnotationView(self, isHidingUndoControls: true) | ||
| } | ||
|
|
||
| setNeedsLayout() | ||
| layoutIfNeeded() | ||
|
|
||
| canvasView.scrollIndicatorInsets = canvasView.contentInset | ||
| } | ||
| } |
Oops, something went wrong.