Merge pull request #122 from tumblr/bjtitus/editor-view-delegate

Editor View Delegate fix
tumblr · Sep 8, 2021 · 90f783b · 90f783b
2 parents 75acbd2 + 0dc70d4
commit 90f783b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Classes/Editor/EditorView.swift b/Classes/Editor/EditorView.swift
@@ -273,7 +273,6 @@ final class EditorView: UIView, MovableViewCanvasDelegate, MediaPlayerViewDelega
         self.movableViewCanvas = movableViewCanvas ?? MovableViewCanvas()
         super.init(frame: .zero)
         self.movableViewCanvas.delegate = self
-        setupViews()
     }
 
     func updateUI(forDraggingClip: Bool) {
@@ -288,7 +287,7 @@ final class EditorView: UIView, MovableViewCanvasDelegate, MediaPlayerViewDelega
         })
     }
 
-    private func setupViews() {
+    func setupViews() {
         setupPlayer()
         setupDrawingCanvas()
         setupMovableViewCanvas()

diff --git a/Classes/Editor/EditorViewController.swift b/Classes/Editor/EditorViewController.swift
@@ -407,6 +407,8 @@ public final class EditorViewController: UIViewController, MediaPlayerController
     override public func viewDidLoad() {
         super.viewDidLoad()
 
+        editorView.setupViews()
+
         view.backgroundColor = .black
         editorView.add(into: view)
         drawingController.drawingLayer = editorView.drawingCanvas.layer

diff --git a/Kanvas.podspec b/Kanvas.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "Kanvas"
-  spec.version      = "1.3.1"
+  spec.version      = "1.3.2"
   spec.summary      = "A custom camera built for iOS."
   spec.homepage     = "https://github.com/tumblr/kanvas-ios"
   spec.license      = "MPLv2"

diff --git a/KanvasExample/KanvasExampleTests/Editor/EditorViewTests.swift b/KanvasExample/KanvasExampleTests/Editor/EditorViewTests.swift
@@ -39,6 +39,7 @@ final class EditorViewTests: FBSnapshotTestCase {
                               mediaContentMode: .scaleAspectFit,
                               movableViewCanvas: nil)
         view.frame = CGRect(x: 0, y: 0, width: 320, height: 480)
+        view.setupViews()
         return view
     }
 

diff --git a/KanvasExample/Podfile.lock b/KanvasExample/Podfile.lock
@@ -4,7 +4,7 @@ PODS:
   - FBSnapshotTestCase/Core (2.1.4)
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
-  - Kanvas (1.3.1)
+  - Kanvas (1.3.2)
 
 DEPENDENCIES:
   - FBSnapshotTestCase (= 2.1.4)
@@ -20,7 +20,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  Kanvas: faba43c849ca46b304f760ebbf993f0b94bc6a32
+  Kanvas: ddc575e431d8fd397a5413adace5b608d3c6c043
 
 PODFILE CHECKSUM: 14b28dd726149c0d01dba9154d5bb095d9ba6a18