From e884300f851ccb67403fc75d1f6e5f60f5e8fc66 Mon Sep 17 00:00:00 2001 From: Andrew Walz Date: Mon, 24 Apr 2017 14:36:51 -0600 Subject: [PATCH] Tip keyboard now works --- .../xcshareddata/xcschemes/SwiftyCam-iOS.xcscheme | 6 +++--- .../DARKPR0.xcuserdatad/xcschemes/xcschememanagement.plist | 5 +++++ Source/SwiftyCamViewController.swift | 5 ++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcshareddata/xcschemes/SwiftyCam-iOS.xcscheme b/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcshareddata/xcschemes/SwiftyCam-iOS.xcscheme index 4d18705..95275f3 100644 --- a/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcshareddata/xcschemes/SwiftyCam-iOS.xcscheme +++ b/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcshareddata/xcschemes/SwiftyCam-iOS.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@ diff --git a/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcuserdata/DARKPR0.xcuserdatad/xcschemes/xcschememanagement.plist b/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcuserdata/DARKPR0.xcuserdatad/xcschemes/xcschememanagement.plist index 7aa4b12..0e7c74d 100644 --- a/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcuserdata/DARKPR0.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcuserdata/DARKPR0.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,6 +12,11 @@ SuppressBuildableAutocreation + 05D2A9B31E80BE9700B479E9 + + primary + + 1675A9711E00A68300B80903 primary diff --git a/Source/SwiftyCamViewController.swift b/Source/SwiftyCamViewController.swift index 845b7ce..73cadfd 100644 --- a/Source/SwiftyCamViewController.swift +++ b/Source/SwiftyCamViewController.swift @@ -12,8 +12,7 @@ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE A BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - +*/ import UIKit import AVFoundation @@ -992,7 +991,7 @@ extension SwiftyCamViewController { @objc fileprivate func zoomGesture(pinch: UIPinchGestureRecognizer) { guard pinchToZoom == true && self.currentCamera == .rear else { - //ignore pinch if pinchToZoom is set to false + //ignore pinch return } do {