Commit graph

132 commits

Author SHA1 Message Date
gazz
addff327d6 Merge branch 'autoflash' into swifty_master
# Conflicts:
#	DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj
#	DemoSwiftyCam/DemoSwiftyCam/ViewController.swift
2018-12-06 11:30:51 +01:00
Jon Andersen
1a1fb3f9aa
Update CHANGELOG.md 2018-12-03 21:08:54 -05:00
Jon Andersen
566c7ea1a0
Merge pull request #192 from dadalar/master
didFinishRecordingVideo not getting called bug
2018-12-03 21:07:41 -05:00
Deniz Adalar
c55732d9e8 Expose outputFolder as a variable 2018-12-01 18:22:22 +00:00
Deniz Adalar
582efb4b5a Fix a bug where didFinishRecordingVideo delegate method wasn't being called if stopVideoRecording gets called before the actual recording starts 2018-12-01 18:21:28 +00:00
gazz
a9eda5fc0d Merge branch 'feature/swift4-auto-flash' into develop 2018-11-27 14:00:41 +01:00
Jon Andersen
9953182481
Update CHANGELOG.md 2018-11-23 14:04:36 -05:00
Jon Andersen
7d20e0dcde
Update CHANGELOG.md 2018-11-23 14:04:20 -05:00
Jon Andersen
42209e4b9f
Merge pull request #87 from petermarathas/master
Remove .changed case from long press recognizer
2018-11-23 14:03:23 -05:00
Peter Marathas
a672cd3da4 sync w/ upstream 2018-11-23 13:45:25 -05:00
Jon Andersen
99869553e0
Update CHANGELOG.md 2018-11-21 20:01:44 -05:00
Jon Andersen
8473079036 Release 3.0.0 with Swift 4.2 support 2018-11-21 19:50:36 -05:00
Jon Andersen
26d4a1ef53
Update SwiftyCam.podspec 2018-11-21 19:47:23 -05:00
Jon Andersen
7ef1b96edd
Update README.md 2018-11-21 10:31:33 -05:00
Jon Andersen
88779afb79
Merge pull request #190 from Awalz/Swift4.2
Swift 4.2 to master
2018-11-21 10:29:16 -05:00
Jon Andersen
ac02cc2e13
Merge pull request #189 from jonandersen/Swift4.2
Migrate swift from 4.0 to 4.2
2018-11-18 20:43:50 -05:00
Jon Andersen
5c5931e869 Migrate swift from 4.0 to 4.2 2018-11-18 20:40:56 -05:00
Andrew Walz
5684848953
Merge pull request #161 from michaelprummer/Swift4
Fixed optional checking for audio and video device
2018-05-28 15:59:47 -07:00
Michael Prummer
c88e8f3d03 Fixed optional checking for audio and video device (e.g. prevent crashing on the simulator) 2018-05-03 10:43:39 +02:00
gazz
8fd983de19 Merge branch 'master' into feature/swift4-auto-flash
# Conflicts:
#	DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj
#	DemoSwiftyCam/DemoSwiftyCam/ViewController.swift
#	Source/SwiftyCamViewController.swift
2018-04-12 12:40:41 +02:00
Andrea Maschio
52d8b1151c support for auto mode in flash 2018-04-11 19:43:14 +02:00
Andrew Walz
1551bfafd5
Merge pull request #157 from thebigkhaled/patch-1
Update previewLayer to scale to fullscreen on iphone x
2018-04-11 10:02:57 -07:00
Khaled AlSaadi
b0d6fd2ca4
Update SwiftyCamViewController.swift
adding previewLayer.center = view.center will enable full screen camera on iphone x
2018-04-09 21:38:26 +03:00
Andrew Walz
85d713d643
Merge pull request #127 from risingsunomi/Swift4
Fix for switching camera from front to back and back to front
2017-10-30 07:27:03 -10:00
Vincent Castro
afd121afa2 Fix for switching camera from front to back and back to front with addition for iOS 10 2017-10-28 19:56:51 -08:00
Jon Andersen
fedb6ef39e Ensure demo project can be compiled 2017-10-18 13:51:46 -04:00
Andrew Walz
153aa640c9 Merge pull request #109 from Awalz/feature/core-motion-orientation
Feature/core motion orientation
2017-09-18 16:26:09 -06:00
Jon Andersen
995071a574 Format code 2017-09-07 17:23:26 -04:00
Jon Andersen
a95a04a475 Use core motion to calculate orientation 2017-09-07 17:21:15 -04:00
Jon Andersen
0c4b65f8aa Remove protocol for orientation mode 2017-09-07 17:10:01 -04:00
Jon Andersen
a9746bf861 Ensure preview layer is accessed on main thread 2017-09-07 17:06:21 -04:00
Jon Andersen
04faa034e3 Move orientation logic to separate class 2017-09-07 17:00:18 -04:00
Andrew Walz
9df5997d18 Changed objc inference 2017-09-06 14:03:43 -06:00
Andrew Walz
9a2d279544 Continued work 2017-09-06 13:50:01 -06:00
Andrew Walz
c98cf8256d Fixed issue with audio going over bluetooth 2017-09-06 13:43:57 -06:00
Andrew Walz
6b8d19620c Fixed issue with Bluetooth audio being forced onto device 2017-09-06 13:24:22 -06:00
Andrew Walz
d837d4d71e Added optional delegate methods for running session and added enabled property to SwiftyCamButton 2017-09-06 12:33:59 -06:00
Andrew Walz
ad38933dca Added delegate to prompt to app settings 2017-08-30 21:41:03 -06:00
Andrew Walz
85d9bc917c Added delegate for failed configuration 2017-08-30 21:17:54 -06:00
Andrew Walz
2f4784ae39 Added check for start recording video 2017-08-30 20:59:38 -06:00
Andrew Walz
a7474d5bcc Hopefully fixing camera issue 2017-08-30 20:56:34 -06:00
Andrew Walz
a3a8c6e3c1 Continued work of phone call interruptions 2017-08-25 15:53:16 -06:00
Andrew Walz
a98f190828 Added new delegate function 2017-08-25 15:36:27 -06:00
Andrew Walz
a94043d5ac Updated README 2017-08-25 14:51:17 -06:00
Andrew Walz
fa6e301806 Updating project 2017-08-25 14:49:38 -06:00
Andrew Walz
4d98b5f3f7 Commit before reworking 2017-08-25 14:39:52 -06:00
Andrew Walz
e9ee6f0ebd Commit before trying to fix demo 2017-08-25 14:25:47 -06:00
Peter Marathas
f041dd7af0 Fixed a bug where moving your finger while recording a video would crash the app 2017-07-07 12:25:02 -04:00
Jack Chen
6b41e540dd Fixed Video Crashing Issue 2017-07-07 07:52:03 -04:00
Andrew Walz
7aee7f5f1b Updated PODSPEC 2017-05-29 22:06:33 -06:00