From 52d8b1151ce4974620e527a94dafba9ec55821e8 Mon Sep 17 00:00:00 2001 From: Andrea Maschio Date: Wed, 11 Apr 2018 19:43:14 +0200 Subject: [PATCH] support for auto mode in flash --- .../DemoSwiftyCam.xcodeproj/project.pbxproj | 6 +- .../AppIcon.appiconset/Contents.json | 5 ++ .../flashauto.imageset/Contents.json | 22 +++++ .../flashauto.imageset/flashauto@2x.png | Bin 0 -> 2290 bytes .../flashauto.imageset/flashauto@3x.png | Bin 0 -> 2829 bytes .../DemoSwiftyCam/ViewController.swift | 14 ++- Source/SwiftyCamViewController.swift | 82 ++++++++++++------ 7 files changed, 94 insertions(+), 35 deletions(-) create mode 100644 DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/Contents.json create mode 100644 DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/flashauto@2x.png create mode 100644 DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/flashauto@3x.png diff --git a/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj b/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj index 6af0d11..e9ffb0c 100644 --- a/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj +++ b/DemoSwiftyCam/DemoSwiftyCam.xcodeproj/project.pbxproj @@ -184,7 +184,7 @@ }; 1675A9711E00A68300B80903 = { CreatedOnToolsVersion = 8.1; - DevelopmentTeam = DGV5BLXSF9; + DevelopmentTeam = R3EWTF6KML; ProvisioningStyle = Automatic; }; }; @@ -421,7 +421,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = DGV5BLXSF9; + DEVELOPMENT_TEAM = R3EWTF6KML; INFOPLIST_FILE = DemoSwiftyCam/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -436,7 +436,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = DGV5BLXSF9; + DEVELOPMENT_TEAM = R3EWTF6KML; INFOPLIST_FILE = DemoSwiftyCam/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/AppIcon.appiconset/Contents.json b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/AppIcon.appiconset/Contents.json index b8236c6..19882d5 100644 --- a/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -39,6 +39,11 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "3x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/Contents.json b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/Contents.json new file mode 100644 index 0000000..6cd836f --- /dev/null +++ b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "flashauto@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "flashauto@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/flashauto@2x.png b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/flashauto@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8d15610699039407da7534f0193554e65d18ffff GIT binary patch literal 2290 zcmeAS@N?(olHy`uVBq!ia0vp^%0O(x!3HGXL^6v5DVB6cUq=Rpjs4tz5?O(K&H|6f zVg?3oVGw3ym^DWNs75I>B%&n3*T*V3KUXg?B|j-uuOhbqs2XTkg%yyQn_7~nP?4LH zS8P>bs{~eI1!RMS^_3LBN=mYAl_Got6rA&mQWZ?~O!N$t?6?#Z6l{u8(yW49+@RWl zJX@uVl9B=|ef{$Ca=mh6z5JqdeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wr!g#b6ir3 zlZ!G7N;32F6hP)CCgqow*eWT3EP?}wJ4-Ut5H{r%L%jv`pgu@O-%!s$ADgz+icB2Z zKr%SBr6j|BRZv=#1NKu&vVLk#YHn&?Nik5LAy(^vVGGxY;>e1`0*GbcK!o_s2IO+9 zpw#00oKjE_gyvGs1{@~boCJkYwXNnb|4F) zYw$111o|`)a6f62ImN1K z855+`zN0|7J;;l5ZSl2d6U?6G$lC8uKbumvZ)W+unLqdayuSJUng2g(j6ch54_+?h zWjFsl-z&%P*+z47=LG%GQQT%X{q$e2iORJa{>c^(|l9V!WLq zFoW5yvg6N_s-E1Mi+?n%IBY%%Tue275xqsptW)ELqzqeK;PrQTlMjE@JjQM_KgIiQ z%e-%P%J2El*JkSfe7g96@qgvQchjeC+of*Jdiuam0j1m*%Pa4AS9@;Us_3#LkMX7t zv&bxtJAuX6e@Kx!=sA7Mo+Fa+^tQ_N1iU(uw~0 z&sLsc`em`$|NUM2<53);HLd;^VO{@SDa4!CvdBOI0>EG40Qt@t~OR$U9FZ z`JarFcZltOYqsx)$E-IxJzgt3D`T8SV9mHS|hdnk`FO)T9ZskBRL)r*&(N z$h1rEq@^4VX{zjE`4yoy<#zrDt}Trh?%epZ$b5-;fQGjp2I&>xW)W>g}2=0INs`0mG?}6@v3?Eb`lwT6{r>WHyXB0q;;-r_GA?wU2`S(a`PTN~fUm$!;XJ>LhweJvKeO~7+s-8abX;bC!R@RY-$Rjfw*I58 z%qhATX2wprbJ)@LoR`pEHKXf|E8>6i&UcIJzh)jbX^PKY*Kd0TcIG^sey-JheO}h2 z)e@&Khi>dx*1uyfVUm<*?TTp{Ir9(ofrnWs0#^DQ#?XYj`SfawAm`GY&3_;jc^ z+J6wLa6PWV?Ay7KpP|aM_tRoq&V5aB%Pbc6KCpTat6u-WuIP7n|L!{y4<|%+_!*s# zxR9b!5m?>zzrJk7pIGU4=?81i*XF<5s$u``Rnm5r-H%zO|I}6}nsRix`VS_%<~05- zjh7j29#s`8<$CyQ=i1woqXJiauPNkhE3-1Im41C7yMO+)wb=(m3eGO>-}glP3*#)d zEhQNpeLtQzz872|xcjiq`C8ElFC@(834}102(10Sernv32g^4*ygkmxYPtCO!>^YW zW(T@Y=!^Yozcg!cGS}k51)rW?{jhiP`z1G*pZ_*(`9;y5(CAaA>KQ*3)hOPXv+gjc O72@gY=d#Wzp$PzioOdYz literal 0 HcmV?d00001 diff --git a/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/flashauto@3x.png b/DemoSwiftyCam/DemoSwiftyCam/Assets.xcassets/flashauto.imageset/flashauto@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..cc7666e225c64578e29d76b1ad1dda93df9efe75 GIT binary patch literal 2829 zcmZ`*3p|s38=lj!$l2QoGkT+TFheZ1b`m)+$PyKn`5Mj42ir^N-5`hOR0E^ zrh`5z3Kd29d|oLL!b&ZNZ==ILzuxEfdk+8mzOMguU-$Fe`z_7ebCV`$1qc8DXu7%( z$$UFiqeU^n05b!*NzsCvU z@8Jz5u(@=wE!+lf1;K#8V6Y=Mgn=d#oxjngDYnT)PVckA88@MKU{GlxvY6lA;Abbiylso;Pa$By=xX%DlqfgzE;NC&i)4cb;(`yz~7 z1+ol*OQ-VLTwgYug_(B|E?a_8@bwE!`TRGkBSJPsa#OW1vhz{t%wj-N=J)x>fZSeZ zOMhd40#_o=H%6hOAdqE9(r*gXuO7GwOo-q(KF- z+ukwfEbwDBq9>rUE^JM0sZP<1k9Nua8Ra;Fa^h8|%-fE~OWzG*!=TSqf$d9|LOlt$ zvbwxy%kAnc1Qf!q8#tGaQv%$z14@D$>UeZ~FMMe;j)gzaiMk@Ajw)WL`(4w3VxleW`wa{0qKY+gH zKZf?4s;LKcKd!b{cx0>cSy}vCQSrg(&Y)s`&Gg3e{$poC1Csdl;({Yd_i5ta-SF1Y zp63-0_Q6}ozXjMOtU1=3&|ucN=bY0PFiZ6==o(An30cZ616M<1hhT@bsC#KS143h^ zLC+8IvZ;^&;V-(TJd2-6fE2D94dl2g?}dB%@-*(bd(-y zUj8nvua;Zp=U2D+NK#vD@(j=@)S&)Lqmo7}uW#Z&w(wTUK~FUy%q<`=aD7G2y6iY* zC*u%3u$ONBtAW&ZeU_yC5BjRh(<(J^1~b))0mrIUw_iHB=B%D>RtnP8C?uzdt&Vne z7BufxgQ1XRa4h3p)S=Gf2L+vpiqAt_Mo{CLW-6vVT|N>_vyH~(N^!!vT)TynR(Tk7pcb68qm@)5$OYQ2zThQ zrS*ljOSd8`jbqm)L=)~edF4(#v!@LEY@3Mxa>Oa%E+fm#IZ%k2SiW4l-$)1TQqUaU zn$Td7a*=mfwC~FGY|{JU@EQUB_i97@rEcAvgo+X|zp5N`HrutQ6*_Wm^TQh^E9*2n zRzkN9klvmd0wzDO-P-lvzYIDe!(ii8<>wjo1grd}D_baTc*sYKs^Za&;!_?;S-pjo0_p} zxM;s5goZzT@fZepN>9Ne@Mex`GFWo7HU9RL_vwUJZ_z$4LNME(!qNpHM|-Ym{l_Fr z5*qsA%bqtED%U!Y;u2|G9bJ|mar~2WDdS@C{Z=Mc=|rI>$)22%ngMLwV^fQr*bzp| z4}3j*p%7O+Tb-XlTzSiCn1(`uO1j#k{l+sSV+Mk#8|Bvu(r*u)o{A@59d*!my_tw< znAJLj6|Sl^J^t1Bs2iD{L(~F9ZmT#nxcutthGJ6l`HJ@?1v(uwh6SRc-!6%LxR$1! zzP?2R7qIoPqqUROD|3A%{)JIUo~b`sx{6)zHvRN`KVi%0S*wx|5LH~o!v(~yQ$`!XnH#EC%(YM}HU zyl4GDe5T!fvh{cZqo-p@GR5_8J>W1(73!0vm+Za`Z~jgUc5)tqUYILex#>yZNI)mJ3h!}W6=9EPj(C*r|mENluc|sg-V%K zIpDWxEFkld&4q5J@7Gs0c1tMu_t f+mZP|vuESjxtK0Ja8=