Added support for custom camera button

GottaYotta · Apr 7, 2022 · cbe04a0 · cbe04a0
1 parent 30c4d0a
commit cbe04a0
Show file tree

Hide file tree

Showing 56 changed files with 209 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### 11.2.0 - 4/6/22
+
+&bull; Added support for custom camera button<br>
+&bull; If content is watermarked, use a generic watermark when app is published on App Store
+
 ### 11.1.4 - 3/18/22
 
 &bull; General bug fixes and stability improvements

diff --git a/Example/PixelSDKExample.xcodeproj/project.pbxproj b/Example/PixelSDKExample.xcodeproj/project.pbxproj
@@ -358,7 +358,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1120;
-				LastUpgradeCheck = 9999;
+				LastUpgradeCheck = 1330;
 				ORGANIZATIONNAME = "GottaYotta, Inc.";
 				TargetAttributes = {
 					1FCA58BA23B6BDEB0087B542 = {

diff --git a/Example/PixelSDKExample.xcodeproj/xcshareddata/xcschemes/PixelSDKExample.xcscheme b/Example/PixelSDKExample.xcodeproj/xcshareddata/xcschemes/PixelSDKExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "9999"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...SDKExample.xcworkspace/xcuserdata/joshbernfeld.xcuserdatad/UserInterfaceState.xcuserstate b/...SDKExample.xcworkspace/xcuserdata/joshbernfeld.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - PixelSDK (11.1.4):
+  - PixelSDK (11.2.0):
     - PixelSDK-GPUImage3 (~> 3.0)
   - PixelSDK-GPUImage3 (3.1.1)
 
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :podspec: "../PixelSDK.podspec"
 
 SPEC CHECKSUMS:
-  PixelSDK: 7dc1d241e92103e77c074c610f95103d0e90096b
+  PixelSDK: 6f439e163e3e303a33657f8d82d9c2d9155676da
   PixelSDK-GPUImage3: 6a66cfca487b57219e557a6a31b21d5bd6480bea
 
 PODFILE CHECKSUM: 79b82a0f7e6f394eddc31f60b1ddd0470bc90801

diff --git a/Example/Pods/Local Podspecs/PixelSDK.podspec.json b/Example/Pods/Local Podspecs/PixelSDK.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/PixelSDK/PixelSDK.xcframework/Info.plist b/Example/Pods/PixelSDK/PixelSDK.xcframework/Info.plist
diff --git a/Example/Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/Assets.car b/Example/Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/Assets.car
diff --git a/Example/Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/EditController.nib b/Example/Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/EditController.nib
diff --git a/.../Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/Headers/PixelSDK-Swift.h b/.../Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/Headers/PixelSDK-Swift.h
diff --git a/Example/Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/Info.plist b/Example/Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/Info.plist
diff --git a/...mework/ios-arm64/PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios.swiftdoc b/...mework/ios-arm64/PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios.swiftdoc
diff --git a/.../ios-arm64/PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios.swiftinterface b/.../ios-arm64/PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios.swiftinterface
diff --git a/...os-arm64/PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios.swiftinterface-e b/...os-arm64/PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios.swiftinterface-e
diff --git a/Example/Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/PixelSDK b/Example/Pods/PixelSDK/PixelSDK.xcframework/ios-arm64/PixelSDK.framework/PixelSDK
diff --git a/...ds/PixelSDK/PixelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/Assets.car b/...ds/PixelSDK/PixelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/Assets.car
diff --git a/...SDK/PixelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/EditController.nib b/...SDK/PixelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/EditController.nib
diff --git a/...xelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/Headers/PixelSDK-Swift.h b/...xelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/Headers/PixelSDK-Swift.h
diff --git a/...ds/PixelSDK/PixelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/Info.plist b/...ds/PixelSDK/PixelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/Info.plist
diff --git a/...ulator/PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/...ulator/PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc
diff --git a/.../PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/.../PixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface
diff --git a/...ixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface-e b/...ixelSDK.framework/Modules/PixelSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface-e
diff --git a/...lator/PixelSDK.framework/Modules/PixelSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/...lator/PixelSDK.framework/Modules/PixelSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc
diff --git a/...PixelSDK.framework/Modules/PixelSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/...PixelSDK.framework/Modules/PixelSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
diff --git a/...xelSDK.framework/Modules/PixelSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface-e b/...xelSDK.framework/Modules/PixelSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface-e
diff --git a/...Pods/PixelSDK/PixelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/PixelSDK b/...Pods/PixelSDK/PixelSDK.xcframework/ios-arm64_x86_64-simulator/PixelSDK.framework/PixelSDK