From f501ef6543ecd0832708c9a35897b2effd723e69 Mon Sep 17 00:00:00 2001 From: Andrew Walz Date: Thu, 12 Jan 2017 21:39:55 -0700 Subject: [PATCH] Updated Demo project --- .../DemoSwiftyCam.xcodeproj/project.pbxproj | 8 ++ .../cancel.imageset/Contents.json | 22 +++++ .../cancel.imageset/cancel@2x.png | Bin 0 -> 701 bytes .../cancel.imageset/cancel@3x.png | Bin 0 -> 1139 bytes .../DemoSwiftyCam/PhotoViewController.swift | 50 +++++++++++ .../DemoSwiftyCam/SwiftyRecordButton.swift | 51 +++++------- .../DemoSwiftyCam/VideoViewController.swift | 78 ++++++++++++++++++ .../DemoSwiftyCam/ViewController.swift | 6 +- 8 files changed, 182 insertions(+), 33 deletions(-) create mode 100644 DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/Contents.json create mode 100644 DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/cancel@2x.png create mode 100644 DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/cancel@3x.png create mode 100644 DemoSwiftyCam/DemoSwiftyCam/PhotoViewController.swift create mode 100644 DemoSwiftyCam/DemoSwiftyCam/VideoViewController.swift diff --git a/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj b/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj index 2a84cf7..84aa9b0 100644 --- a/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj +++ b/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj @@ -17,6 +17,8 @@ 1675A98E1E00A74A00B80903 /* SwiftyCamButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1675A98A1E00A74A00B80903 /* SwiftyCamButton.swift */; }; 1675A98F1E00A74A00B80903 /* SwiftyCamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1675A98B1E00A74A00B80903 /* SwiftyCamViewController.swift */; }; 1675A9901E00A74A00B80903 /* SwiftyCamViewControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1675A98C1E00A74A00B80903 /* SwiftyCamViewControllerDelegate.swift */; }; + 168505E81E288B4C005B4537 /* VideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 168505E71E288B4C005B4537 /* VideoViewController.swift */; }; + 168505EA1E288D80005B4537 /* PhotoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 168505E91E288D80005B4537 /* PhotoViewController.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -32,6 +34,8 @@ 1675A98A1E00A74A00B80903 /* SwiftyCamButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftyCamButton.swift; path = ../../Source/SwiftyCamButton.swift; sourceTree = ""; }; 1675A98B1E00A74A00B80903 /* SwiftyCamViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftyCamViewController.swift; path = ../../Source/SwiftyCamViewController.swift; sourceTree = ""; }; 1675A98C1E00A74A00B80903 /* SwiftyCamViewControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftyCamViewControllerDelegate.swift; path = ../../Source/SwiftyCamViewControllerDelegate.swift; sourceTree = ""; }; + 168505E71E288B4C005B4537 /* VideoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoViewController.swift; sourceTree = ""; }; + 168505E91E288D80005B4537 /* PhotoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -68,6 +72,8 @@ 1675A9751E00A68300B80903 /* AppDelegate.swift */, 1675A9771E00A68300B80903 /* ViewController.swift */, 16298B551E2703DC0056D413 /* SwiftyRecordButton.swift */, + 168505E71E288B4C005B4537 /* VideoViewController.swift */, + 168505E91E288D80005B4537 /* PhotoViewController.swift */, 1675A9791E00A68300B80903 /* Main.storyboard */, 1675A97C1E00A68300B80903 /* Assets.xcassets */, 1675A97E1E00A68300B80903 /* LaunchScreen.storyboard */, @@ -162,8 +168,10 @@ files = ( 1675A9781E00A68300B80903 /* ViewController.swift in Sources */, 1675A9901E00A74A00B80903 /* SwiftyCamViewControllerDelegate.swift in Sources */, + 168505E81E288B4C005B4537 /* VideoViewController.swift in Sources */, 1675A9761E00A68300B80903 /* AppDelegate.swift in Sources */, 1675A98F1E00A74A00B80903 /* SwiftyCamViewController.swift in Sources */, + 168505EA1E288D80005B4537 /* PhotoViewController.swift in Sources */, 16298B561E2703DC0056D413 /* SwiftyRecordButton.swift in Sources */, 1675A98D1E00A74A00B80903 /* PreviewView.swift in Sources */, 1675A98E1E00A74A00B80903 /* SwiftyCamButton.swift in Sources */, diff --git a/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/Contents.json b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/Contents.json new file mode 100644 index 0000000..9fd9a73 --- /dev/null +++ b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "cancel@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "cancel@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/cancel@2x.png b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/cancel@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3af97375264f83ac56bd4a9b8e7db8cb43a16bb1 GIT binary patch literal 701 zcmV;u0z&Px%cS%G+RA>e5n^8^zF%X7XuRy{v^u<%?iy`q6cnA~kz>5i2ki-PfU;;kqF;?$@ z|G%-YkX`AvGt-(n$=G&jXZ{aL%bIO9YT0(XouYXKzkt{94SZfz73^iLr24t@z| z{T==S{ZAGa?XSS z<3xu1;oX;X4>B4C{WBLRWU0n2$X4X~v=diY6JZUGPQP_wyXY0Y^Ejk(LZC-5qe z)*RMxM?gOlxTFWfUkO~&5r9VmmvqSErukX`x`bmq`@>oQF6N+CG`i=|00000NkvXXu0mjfKng+F literal 0 HcmV?d00001 diff --git a/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/cancel@3x.png b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/cancel.imageset/cancel@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..41fa8915abdc582673cacfaeaaf804b5876b168b GIT binary patch literal 1139 zcmV-(1dRKMP)Px(ElET{RCodHoxN_8$$cTaPX1u!sun2Y4Qho`^AID`e;RC7=80gs zXE7Us0~Tgs2ZBs=4@U^Tf`>3ucOw8W_3omJ;rnW!;)t#(WmkYh`%J)wh>(!)w%-Qm zi1YWpQ_Dke_xDS~MzSFxlWF~~4h@{g6G{k^gbkq~Ayaen?}H+Ae6{@;C0r$JEL4ptJTluH}0N$m;(6>^vavG2(#g{JJgFCVYR zr4XE=Pp{C%28$^?W?y4@1U)YXfEaxQh2$%E1Q4@&egl?R7KWS;Yy*((!!`uj zF6_XNIq{%}FguePs1Nz%y8;oTk0jIOzMaMd5VNno`lB3|LU@WkqrhzIB&Fb#eYf!l z(yky>A%`GvT~H-~O1U^bUY3f&6myycTUn5DZiAp(5Mm+6PUw~dSjx2q-D2YAayFOn z&JZz^yO~6H;O?)=YmiTHpJ>OntQOhCI$$2!C8tR)p+f`*?3d9dlgI#gLk~@^F?j+* ziA^{@nO1aMUIGgU9*s|f>MwysLwT*SN5VUy>aR7%j`E`Ja1VUHRo`%cTwXm765tT> zq4GQa#Xn2M`L<^SyhgdXkG=zkinq!28u6LCZ@VC9)-LpE<{&%q0b#!(=wsKBhoxD_ zPJ1BO#{|vFl0M8lWCtMt>_>uT`Oc}94P*zxGwgf*v@K=!9NmVchr1D$*?V1u#!4w1 z*#Ox!O@#f)#o?$frBJstnpZ}`{(