sjs/SwiftyCam
1
0
Fork 0
mirror of https://github.com/samsonjs/SwiftyCam.git synced 2026-04-27 15:07:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tip keyboard now works

Browse source
This commit is contained in:
Andrew Walz 2017-04-24 14:36:51 -06:00
parent 9efa062dab
commit e884300f85
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcshareddata/xcschemes/SwiftyCam-iOS.xcscheme
View file

@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "05D2A9B31E80BE9700B479E9" BlueprintIdentifier = "05D2A9B31E80BE9700B479E9"
BuildableName = "SwiftyCam-iOS.framework" BuildableName = "SwiftyCam.framework"
BlueprintName = "SwiftyCam-iOS" BlueprintName = "SwiftyCam-iOS"
ReferencedContainer = "container:DemoSwiftyCam.xcodeproj"> ReferencedContainer = "container:DemoSwiftyCam.xcodeproj">
</BuildableReference> </BuildableReference>
@ -46,7 +46,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "05D2A9B31E80BE9700B479E9" BlueprintIdentifier = "05D2A9B31E80BE9700B479E9"
BuildableName = "SwiftyCam-iOS.framework" BuildableName = "SwiftyCam.framework"
BlueprintName = "SwiftyCam-iOS" BlueprintName = "SwiftyCam-iOS"
ReferencedContainer = "container:DemoSwiftyCam.xcodeproj"> ReferencedContainer = "container:DemoSwiftyCam.xcodeproj">
</BuildableReference> </BuildableReference>
@ -64,7 +64,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "05D2A9B31E80BE9700B479E9" BlueprintIdentifier = "05D2A9B31E80BE9700B479E9"
BuildableName = "SwiftyCam-iOS.framework" BuildableName = "SwiftyCam.framework"
BlueprintName = "SwiftyCam-iOS" BlueprintName = "SwiftyCam-iOS"
ReferencedContainer = "container:DemoSwiftyCam.xcodeproj"> ReferencedContainer = "container:DemoSwiftyCam.xcodeproj">
</BuildableReference> </BuildableReference>

5
DemoSwiftyCam/DemoSwiftyCam.xcodeproj/xcuserdata/DARKPR0.xcuserdatad/xcschemes/xcschememanagement.plist
View file

@ -12,6 +12,11 @@
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>
<dict> <dict>
<key>05D2A9B31E80BE9700B479E9</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>1675A9711E00A68300B80903</key> <key>1675A9711E00A68300B80903</key>
<dict> <dict>
<key>primary</key> <key>primary</key>

5
Source/SwiftyCamViewController.swift
View file

@ -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 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 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. 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 UIKit
import AVFoundation import AVFoundation
@ -992,7 +991,7 @@ extension SwiftyCamViewController {
@objc fileprivate func zoomGesture(pinch: UIPinchGestureRecognizer) { @objc fileprivate func zoomGesture(pinch: UIPinchGestureRecognizer) {
guard pinchToZoom == true && self.currentCamera == .rear else { guard pinchToZoom == true && self.currentCamera == .rear else {
//ignore pinch if pinchToZoom is set to false //ignore pinch
return return
} }
do { do {