example code bug fix

TinyCrayon · Mar 6, 2017 · 3619884 · 3619884
1 parent 320bb87
commit 3619884
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 39 deletions.
diff --git a/Examples/objective-c/TCMaskBlendExample/TCMaskBlendExample.xcodeproj/project.pbxproj b/Examples/objective-c/TCMaskBlendExample/TCMaskBlendExample.xcodeproj/project.pbxproj
@@ -269,6 +269,7 @@
 		750E14461E51B3860057E0D0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -285,6 +286,7 @@
 		750E14471E51B3860057E0D0 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -317,6 +319,7 @@
 				750E14471E51B3860057E0D0 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

diff --git a/Examples/objective-c/TCMaskCustomization/TCMaskCustomization.xcodeproj/project.pbxproj b/Examples/objective-c/TCMaskCustomization/TCMaskCustomization.xcodeproj/project.pbxproj
@@ -16,19 +16,6 @@
 		750E147E1E51DD410057E0D0 /* Balloon.JPEG in Resources */ = {isa = PBXBuildFile; fileRef = 750E147D1E51DD410057E0D0 /* Balloon.JPEG */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		75F7B2281E6D2D4500A8774F /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		750E145C1E51DB780057E0D0 /* TCMaskCustomization.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TCMaskCustomization.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		750E14601E51DB780057E0D0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -105,7 +92,6 @@
 				750E14581E51DB780057E0D0 /* Sources */,
 				750E14591E51DB780057E0D0 /* Frameworks */,
 				750E145A1E51DB780057E0D0 /* Resources */,
-				75F7B2281E6D2D4500A8774F /* Embed Frameworks */,
 			);
 			buildRules = (
 			);

diff --git a/Examples/objective-c/TCMaskNavigationView/TCMaskNavigationView.xcodeproj/project.pbxproj b/Examples/objective-c/TCMaskNavigationView/TCMaskNavigationView.xcodeproj/project.pbxproj
@@ -275,12 +275,13 @@
 		750E140A1E5184E20057E0D0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = TCMaskNavigationView/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.TinyCrayon.TCMaskNavigationView;
@@ -291,12 +292,13 @@
 		750E140B1E5184E20057E0D0 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = TCMaskNavigationView/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.TinyCrayon.TCMaskNavigationView;

diff --git a/Examples/objective-c/TCMaskNavigationView/TCMaskNavigationView/MainViewController.m b/Examples/objective-c/TCMaskNavigationView/TCMaskNavigationView/MainViewController.m
@@ -55,7 +55,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
 - (UIViewController *)tcMaskViewWillPushViewControllerWithMask:(TCMask *)mask image:(UIImage *)image {
     UIStoryboard *storyBoard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
     ConfirmViewController *controller = [storyBoard instantiateViewControllerWithIdentifier:@"confirmViewController"];
-    controller.image = image;
+    controller.image = [mask cutoutWithImage:image resize:true];
     return controller;
 }
 

diff --git a/Examples/objective-c/TCMaskPopView/Podfile b/Examples/objective-c/TCMaskPopView/Podfile
@@ -3,6 +3,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '10.0'
 use_frameworks!
 
-target 'TCMaskBlendExample' do
+target 'TCMaskPopView' do
   pod 'TinyCrayon'
 end
diff --git a/Examples/objective-c/TCMaskPopView/TCMaskPopView/ViewController.m b/Examples/objective-c/TCMaskPopView/TCMaskPopView/ViewController.m
@@ -44,8 +44,8 @@ - (void)presentTCMaskView {
     [maskView presentFromRootViewController:self animated:true];
 }
 
-- (void)tcMaskViewDidCompleteWithImage:(UIImage *)image mask:(TCMask *)mask {
-    _imageView.image = [mask cutoutImageWithImage:image resize:true];
+- (void)tcMaskViewDidCompleteWithMask:(TCMask *)mask image:(UIImage *)image {
+    _imageView.image = [mask cutoutWithImage:image resize:true];
 }
 
 @end
diff --git a/Examples/swift/TCMaskNavigationView/TCMaskNavigationView.xcodeproj/project.pbxproj b/Examples/swift/TCMaskNavigationView/TCMaskNavigationView.xcodeproj/project.pbxproj
@@ -7,8 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		751A7EEA1E6425DC00C449C5 /* TCMask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 751A7EE71E6425D400C449C5 /* TCMask.framework */; };
-		751A7EEB1E6425DC00C449C5 /* TCMask.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 751A7EE71E6425D400C449C5 /* TCMask.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		75A0A6E71E2463B5005B36B7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75A0A6E61E2463B5005B36B7 /* AppDelegate.swift */; };
 		75A0A6EC1E2463B5005B36B7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75A0A6EA1E2463B5005B36B7 /* Main.storyboard */; };
 		75A0A6EE1E2463B5005B36B7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 75A0A6ED1E2463B5005B36B7 /* Assets.xcassets */; };
@@ -17,22 +15,7 @@
 		75A0A6FC1E246852005B36B7 /* ConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75A0A6FB1E246852005B36B7 /* ConfirmViewController.swift */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		751A7EEC1E6425DC00C449C5 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				751A7EEB1E6425DC00C449C5 /* TCMask.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
-		751A7EE71E6425D400C449C5 /* TCMask.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TCMask.framework; path = "/Users/xinzeng/Desktop/TinyCrayon-iOS-SDK/Examples/swift/TCMaskNavigationView/TCMask.framework"; sourceTree = "<absolute>"; };
 		75A0A6E31E2463B5005B36B7 /* TCMaskNavigationView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TCMaskNavigationView.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		75A0A6E61E2463B5005B36B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		75A0A6EB1E2463B5005B36B7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -48,7 +31,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				751A7EEA1E6425DC00C449C5 /* TCMask.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -95,7 +77,6 @@
 				75A0A6DF1E2463B5005B36B7 /* Sources */,
 				75A0A6E01E2463B5005B36B7 /* Frameworks */,
 				75A0A6E11E2463B5005B36B7 /* Resources */,
-				751A7EEC1E6425DC00C449C5 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);