From 50f1a9a7de6a90a0e6590cee56f8667a6cb0f65d Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 23 Jun 2020 19:33:14 -0400 Subject: [PATCH] Change ComposeDrawingViewController to use drawingPolicy on iOS 14 --- Tusker/Screens/Compose/ComposeDrawingViewController.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tusker/Screens/Compose/ComposeDrawingViewController.swift b/Tusker/Screens/Compose/ComposeDrawingViewController.swift index a8aa166f..39251a40 100644 --- a/Tusker/Screens/Compose/ComposeDrawingViewController.swift +++ b/Tusker/Screens/Compose/ComposeDrawingViewController.swift @@ -58,7 +58,11 @@ class ComposeDrawingViewController: UIViewController { canvasView.drawing = initialDrawing } canvasView.delegate = self - canvasView.allowsFingerDrawing = true + if #available(iOS 14.0, *) { + canvasView.drawingPolicy = .anyInput + } else { + canvasView.allowsFingerDrawing = true + } canvasView.minimumZoomScale = 0.5 canvasView.maximumZoomScale = 2 canvasView.backgroundColor = .systemBackground @@ -75,6 +79,7 @@ class ComposeDrawingViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + // todo: should the PKToolPicker be owned by this VC or something else? if let window = parent?.view.window, let toolPicker = PKToolPicker.shared(for: window) { toolPicker.setVisible(true, forFirstResponder: canvasView) toolPicker.addObserver(canvasView)