Merge pull request #9 from Yoonit-Labs/feature/min-version

Feature/min version
Yoonit-Labs · May 3, 2021 · 1e9deca · 1e9deca
2 parents 8c7ee60 + 0f1ff60
commit 1e9deca
Show file tree

Hide file tree

Showing 10 changed files with 323 additions and 292 deletions.
diff --git a/Example/YoonitFacefyDemo/Podfile b/Example/YoonitFacefyDemo/Podfile
@@ -8,5 +8,5 @@ target 'YoonitFacefyDemo' do
   # Pods for YoonitFacefyDemo
   pod 'YoonitFacefy', :path => '../../'
 
-  pod 'YoonitCamera', :git => 'https://github.com/Yoonit-Labs/ios-yoonit-camera.git', :tag => '2.3.0'
+  pod 'YoonitCamera', :git => 'https://github.com/Yoonit-Labs/ios-yoonit-camera.git', :tag => '2.7.0'
 end
diff --git a/Example/YoonitFacefyDemo/Podfile.lock b/Example/YoonitFacefyDemo/Podfile.lock
@@ -52,12 +52,13 @@ PODS:
   - nanopb/encode (2.30907.0)
   - PromisesObjC (1.2.12)
   - Protobuf (3.14.0)
-  - YoonitCamera (2.2.1)
-  - YoonitFacefy (1.0.4):
+  - YoonitCamera (2.7.0):
+    - YoonitFacefy
+  - YoonitFacefy (1.0.5):
     - GoogleMLKit/FaceDetection
 
 DEPENDENCIES:
-  - YoonitCamera (from `https://github.com/Yoonit-Labs/ios-yoonit-camera.git`, tag `2.3.0`)
+  - YoonitCamera (from `https://github.com/Yoonit-Labs/ios-yoonit-camera.git`, tag `2.7.0`)
   - YoonitFacefy (from `../../`)
 
 SPEC REPOS:
@@ -78,14 +79,14 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   YoonitCamera:
     :git: https://github.com/Yoonit-Labs/ios-yoonit-camera.git
-    :tag: 2.3.0
+    :tag: 2.7.0
   YoonitFacefy:
     :path: "../../"
 
 CHECKOUT OPTIONS:
   YoonitCamera:
     :git: https://github.com/Yoonit-Labs/ios-yoonit-camera.git
-    :tag: 2.3.0
+    :tag: 2.7.0
 
 SPEC CHECKSUMS:
   GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4
@@ -100,9 +101,9 @@ SPEC CHECKSUMS:
   nanopb: 59221d7f958fb711001e6a449489542d92ae113e
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
   Protobuf: 0cde852566359049847168e51bd1c690e0f70056
-  YoonitCamera: 0428ca55617a7752cd8a0298963c5d5144ddad6d
-  YoonitFacefy: 7d4eba6167bb23fdc27777c4e9f0c2da2f8e1b32
+  YoonitCamera: b42e7405363e882952dc5575e74cc40ec088d989
+  YoonitFacefy: cbdceda2336933a5028d2c7a87f4d8fccb78c263
 
-PODFILE CHECKSUM: c04e6cdfb6d85eee0ddca6d6f799401b3228e4a3
+PODFILE CHECKSUM: 0ad6d47bd9c877339e4d96bd2640e87e4f518132
 
 COCOAPODS: 1.10.1
diff --git a/Example/YoonitFacefyDemo/Pods/Local Podspecs/YoonitFacefy.podspec.json b/Example/YoonitFacefyDemo/Pods/Local Podspecs/YoonitFacefy.podspec.json
diff --git a/Example/YoonitFacefyDemo/Pods/Manifest.lock b/Example/YoonitFacefyDemo/Pods/Manifest.lock
diff --git a/Example/YoonitFacefyDemo/Pods/Pods.xcodeproj/project.pbxproj b/Example/YoonitFacefyDemo/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/YoonitFacefyDemo/YoonitFacefyDemo.xcodeproj/project.pbxproj b/Example/YoonitFacefyDemo/YoonitFacefyDemo.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		2956B7E45E91BDC648F136A1 /* Pods_YoonitFacefyDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8DF3F2403B49B11CE5FC600 /* Pods_YoonitFacefyDemo.framework */; };
 		5C06E54825D1F09A00E6770F /* Podfile in Resources */ = {isa = PBXBuildFile; fileRef = 5C06E54725D1F09A00E6770F /* Podfile */; };
 		5C6580CC25D5ACA3001171F8 /* GraphicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6580CB25D5ACA3001171F8 /* GraphicView.swift */; };
 		6176EFC2252E496D00F4D4DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6176EFC1252E496D00F4D4DD /* AppDelegate.swift */; };
@@ -16,12 +15,11 @@
 		6176EFCB252E496F00F4D4DD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6176EFCA252E496F00F4D4DD /* Assets.xcassets */; };
 		6176EFCE252E496F00F4D4DD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6176EFCC252E496F00F4D4DD /* LaunchScreen.storyboard */; };
 		6176EFDE252E4A9100F4D4DD /* FacefyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6176EFDB252E4A9100F4D4DD /* FacefyViewController.swift */; };
+		8621C5DFA57CB8C4DFB7E5A1 /* Pods_YoonitFacefyDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5981043E881821C48EE21E5 /* Pods_YoonitFacefyDemo.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		2B06598B5965589526FED76E /* Pods-YoonitFacefyDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YoonitFacefyDemo.release.xcconfig"; path = "Target Support Files/Pods-YoonitFacefyDemo/Pods-YoonitFacefyDemo.release.xcconfig"; sourceTree = "<group>"; };
-		51782800D00239D214AC409C /* Pods-YoonitFacefyDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YoonitFacefyDemo.debug.xcconfig"; path = "Target Support Files/Pods-YoonitFacefyDemo/Pods-YoonitFacefyDemo.debug.xcconfig"; sourceTree = "<group>"; };
-		5C06E54725D1F09A00E6770F /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		5C06E54725D1F09A00E6770F /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; };
 		5C06E5A925D1FBC500E6770F /* YoonitFacefy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = YoonitFacefy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5C6580CB25D5ACA3001171F8 /* GraphicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphicView.swift; sourceTree = "<group>"; };
 		6176EFBE252E496D00F4D4DD /* YoonitFacefyDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YoonitFacefyDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -32,15 +30,17 @@
 		6176EFCD252E496F00F4D4DD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		6176EFCF252E496F00F4D4DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6176EFDB252E4A9100F4D4DD /* FacefyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FacefyViewController.swift; sourceTree = "<group>"; };
-		F8DF3F2403B49B11CE5FC600 /* Pods_YoonitFacefyDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YoonitFacefyDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		77670929FD4341019EEE7FB6 /* Pods-YoonitFacefyDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YoonitFacefyDemo.release.xcconfig"; path = "Target Support Files/Pods-YoonitFacefyDemo/Pods-YoonitFacefyDemo.release.xcconfig"; sourceTree = "<group>"; };
+		A5981043E881821C48EE21E5 /* Pods_YoonitFacefyDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YoonitFacefyDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B44241CE2ED25CA4B121E976 /* Pods-YoonitFacefyDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YoonitFacefyDemo.debug.xcconfig"; path = "Target Support Files/Pods-YoonitFacefyDemo/Pods-YoonitFacefyDemo.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		6176EFBB252E496D00F4D4DD /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2956B7E45E91BDC648F136A1 /* Pods_YoonitFacefyDemo.framework in Frameworks */,
+				8621C5DFA57CB8C4DFB7E5A1 /* Pods_YoonitFacefyDemo.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -84,8 +84,8 @@
 		E43515AC47E0279330A1606A /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				51782800D00239D214AC409C /* Pods-YoonitFacefyDemo.debug.xcconfig */,
-				2B06598B5965589526FED76E /* Pods-YoonitFacefyDemo.release.xcconfig */,
+				B44241CE2ED25CA4B121E976 /* Pods-YoonitFacefyDemo.debug.xcconfig */,
+				77670929FD4341019EEE7FB6 /* Pods-YoonitFacefyDemo.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -94,7 +94,7 @@
 			isa = PBXGroup;
 			children = (
 				5C06E5A925D1FBC500E6770F /* YoonitFacefy.framework */,
-				F8DF3F2403B49B11CE5FC600 /* Pods_YoonitFacefyDemo.framework */,
+				A5981043E881821C48EE21E5 /* Pods_YoonitFacefyDemo.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -106,12 +106,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6176EFD2252E496F00F4D4DD /* Build configuration list for PBXNativeTarget "YoonitFacefyDemo" */;
 			buildPhases = (
-				E5185F88A35F0D8BFFC5A5D4 /* [CP] Check Pods Manifest.lock */,
+				65156EFED71DDAF1F2C4E34E /* [CP] Check Pods Manifest.lock */,
 				6176EFBA252E496D00F4D4DD /* Sources */,
 				6176EFBB252E496D00F4D4DD /* Frameworks */,
 				6176EFBC252E496D00F4D4DD /* Resources */,
-				D2A421A5473A8C965226611E /* [CP] Embed Pods Frameworks */,
-				0663E8C00BC3805DB2F99BD9 /* [CP] Copy Pods Resources */,
+				38B93D990B7EF2BECF3998DF /* [CP] Embed Pods Frameworks */,
+				31CCFF387D85F5E5281F9313 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -169,7 +169,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		0663E8C00BC3805DB2F99BD9 /* [CP] Copy Pods Resources */ = {
+		31CCFF387D85F5E5281F9313 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -186,7 +186,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YoonitFacefyDemo/Pods-YoonitFacefyDemo-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D2A421A5473A8C965226611E /* [CP] Embed Pods Frameworks */ = {
+		38B93D990B7EF2BECF3998DF /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -203,7 +203,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YoonitFacefyDemo/Pods-YoonitFacefyDemo-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E5185F88A35F0D8BFFC5A5D4 /* [CP] Check Pods Manifest.lock */ = {
+		65156EFED71DDAF1F2C4E34E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -384,7 +384,7 @@
 		};
 		6176EFD3252E496F00F4D4DD /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 51782800D00239D214AC409C /* Pods-YoonitFacefyDemo.debug.xcconfig */;
+			baseConfigurationReference = B44241CE2ED25CA4B121E976 /* Pods-YoonitFacefyDemo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -400,11 +400,12 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/YoonitFacefy/YoonitFacefy.framework/Headers\"",
 				);
 				INFOPLIST_FILE = YoonitFacefyDemo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yoonit.facefydemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -414,7 +415,7 @@
 		};
 		6176EFD4252E496F00F4D4DD /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2B06598B5965589526FED76E /* Pods-YoonitFacefyDemo.release.xcconfig */;
+			baseConfigurationReference = 77670929FD4341019EEE7FB6 /* Pods-YoonitFacefyDemo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -430,11 +431,12 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/YoonitFacefy/YoonitFacefy.framework/Headers\"",
 				);
 				INFOPLIST_FILE = YoonitFacefyDemo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yoonit.facefydemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/Example/YoonitFacefyDemo/YoonitFacefyDemo/FacefyViewController.swift b/Example/YoonitFacefyDemo/YoonitFacefyDemo/FacefyViewController.swift
@@ -16,7 +16,7 @@ import YoonitFacefy
 class FacefyViewController:
     UIViewController,
     CameraEventListenerDelegate
-{    
+{
     var facefy: Facefy? = nil
     @IBOutlet var cameraView: CameraView!
     @IBOutlet var graphicView: GraphicView!
@@ -40,12 +40,15 @@ class FacefyViewController:
         self.cameraView.setTimeBetweenImages(300)
         self.cameraView.startCaptureType("frame")
     }
-            
+
     func onImageCaptured(
         _ type: String,
         _ count: Int,
         _ total: Int,
-        _ imagePath: String
+        _ imagePath: String,
+        _ darkness: NSNumber?,
+        _ lightness: NSNumber?,
+        _ sharpness: NSNumber?
     ) {
         let subpath = imagePath.substring(from: imagePath.index(imagePath.startIndex, offsetBy: 7))
         var image = UIImage(contentsOfFile: subpath)!
@@ -161,12 +164,18 @@ class FacefyViewController:
             label.text = value > 0.8 ? validText : invalidText
         }
     }
-
+            
     func onFaceDetected(
         _ x: Int,
         _ y: Int,
         _ width: Int,
-        _ height: Int
+        _ height: Int,
+        _ leftEyeOpenProbability: NSNumber?,
+        _ rightEyeOpenProbability: NSNumber?,
+        _ smilingProbability: NSNumber?,
+        _ headEulerAngleX: NSNumber?,
+        _ headEulerAngleY: NSNumber?,
+        _ headEulerAngleZ: NSNumber?
     ) {
 
     }

diff --git a/Example/YoonitFacefyDemo/YoonitFacefyDemo/Info.plist b/Example/YoonitFacefyDemo/YoonitFacefyDemo/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Yoonit Facefy</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

diff --git a/YoonitFacefy.podspec b/YoonitFacefy.podspec
@@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "YoonitFacefy"
-  spec.version      = "1.0.5"
+  spec.version      = "1.0.6"
   spec.summary      = "The face detection's module for iOS with a lot of awesome features"
 
   # This description is used to generate tags and improve search results.
@@ -54,7 +54,7 @@ Pod::Spec.new do |spec|
   #
 
   # spec.platform     = :ios
-  spec.platform     = :ios, "14.0"
+  spec.platform     = :ios, "12.1"
 
 
   # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #