#58 Camera flow started

Kimlic · Jul 24, 2018 · cb7fa43 · cb7fa43
1 parent 7cdddd5
commit cb7fa43
Show file tree

Hide file tree

Showing 19 changed files with 289 additions and 194 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -69,31 +69,6 @@ DEPENDENCIES:
   - TextFieldEffects (~> 1.4)
   - web3swift (from `https://github.com/Kimlic/web3swift`, branch `master`)
 
-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - Alamofire
-    - Alamofire-Synchronous
-    - AlamofireImage
-    - BigInt
-    - Crashlytics
-    - CryptoSwift
-    - DynamicBlurView
-    - Fabric
-    - FSPagerView
-    - IQKeyboardManagerSwift
-    - libsodium
-    - NVActivityIndicatorView
-    - ObjectMapper
-    - PhoneNumberKit
-    - PopupDialog
-    - Result
-    - secp256k1_ios
-    - SipHash
-    - SmileLock
-    - SwiftyJSON
-    - SwiftyUserDefaults
-    - TextFieldEffects
-
 EXTERNAL SOURCES:
   Quorum:
     :git: https://github.com/Kimlic/Quorum-iOS
@@ -137,4 +112,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 982e6ca758cf0410819fcdae31319a30045f3c7d
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.4.0
diff --git a/kimlic.xcodeproj/project.pbxproj b/kimlic.xcodeproj/project.pbxproj
@@ -414,7 +414,6 @@
 				7C48384F1FB5F62400FC864A /* Products */,
 				130904B38EF0A17D7598EFE3 /* Pods */,
 				819710C74CB57B34F052FD71 /* Frameworks */,
-				17D8B2AF20FFD08C00CEE289 /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -676,6 +675,7 @@
 				7C48384C1FB5F62400FC864A /* Resources */,
 				DB2BEA7B75DD495A223EDDA9 /* [CP] Embed Pods Frameworks */,
 				1795117020EFEBEA0071772D /* Fabric */,
+				FE55E7852B153CD165533DEA /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -853,6 +853,21 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-kimlic/Pods-kimlic-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		FE55E7852B153CD165533DEA /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-kimlic/Pods-kimlic-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1098,7 +1113,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = V768S46E57;
+				DEVELOPMENT_TEAM = Z9WP434U24;
 				INFOPLIST_FILE = kimlic/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1118,7 +1133,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = V768S46E57;
+				DEVELOPMENT_TEAM = Z9WP434U24;
 				INFOPLIST_FILE = kimlic/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

diff --git a/...gn/camera_verification/Card_masked_cam_background.imageset/Card_masked_cam_background.pdf b/...gn/camera_verification/Card_masked_cam_background.imageset/Card_masked_cam_background.pdf
diff --git a/...xcassets/New_Design/camera_verification/Card_masked_cam_background.imageset/Contents.json b/...xcassets/New_Design/camera_verification/Card_masked_cam_background.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Card_masked_cam_background.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/kimlic/Assets.xcassets/New_Design/camera_verification/Contents.json b/kimlic/Assets.xcassets/New_Design/camera_verification/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...xcassets/New_Design/camera_verification/Face_masked_cam_background.imageset/Contents.json b/...xcassets/New_Design/camera_verification/Face_masked_cam_background.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Face_masked_cam_background.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...gn/camera_verification/Face_masked_cam_background.imageset/Face_masked_cam_background.pdf b/...gn/camera_verification/Face_masked_cam_background.imageset/Face_masked_cam_background.pdf
diff --git a/...ets.xcassets/New_Design/camera_verification/QR_code_cam_background.imageset/Contents.json b/...ets.xcassets/New_Design/camera_verification/QR_code_cam_background.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "QR_code_cam_background.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...New_Design/camera_verification/QR_code_cam_background.imageset/QR_code_cam_background.pdf b/...New_Design/camera_verification/QR_code_cam_background.imageset/QR_code_cam_background.pdf
diff --git a/kimlic/Assets.xcassets/New_Design/camera_verification/cam_background.imageset/Contents.json b/kimlic/Assets.xcassets/New_Design/camera_verification/cam_background.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "cam_background.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...Assets.xcassets/New_Design/camera_verification/cam_background.imageset/cam_background.pdf b/...Assets.xcassets/New_Design/camera_verification/cam_background.imageset/cam_background.pdf
diff --git a/kimlic/Assets.xcassets/New_Design/camera_verification/shutter_button.imageset/Contents.json b/kimlic/Assets.xcassets/New_Design/camera_verification/shutter_button.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "shutter_button.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...Assets.xcassets/New_Design/camera_verification/shutter_button.imageset/shutter_button.pdf b/...Assets.xcassets/New_Design/camera_verification/shutter_button.imageset/shutter_button.pdf
diff --git a/kimlic/Utils/Extension/Primitive/UserDefaultsExt.swift b/kimlic/Utils/Extension/Primitive/UserDefaultsExt.swift
@@ -28,6 +28,7 @@ extension DefaultsKeys {
     static let passcode = DefaultsKey<String?>("passcode")
     static let recovery = DefaultsKey<String?>("recovery")
 
+    static let userPhoto = DefaultsKey<Data?>("userPhoto")
 
     static let deviceId = DefaultsKey<String?>("deviceId")
 }
diff --git a/kimlic/Utils/Extension/UI/UIImageExt.swift b/kimlic/Utils/Extension/UI/UIImageExt.swift
@@ -41,7 +41,9 @@ public extension UIImage {
         let dataImage = imageData.base64EncodedString(options: .endLineWithLineFeed)
         return dataImage.trimmingCharacters(in: .whitespacesAndNewlines)
     }
-    public func resizeImage(size: CGSize) -> UIImage {
+
+    // MARK: Resize Image
+    func resizeImage(size: CGSize) -> UIImage {
         var returnImage: UIImage?
 
         var scaleFactor: CGFloat = 1.0

diff --git a/kimlic/View/ProfileCamera/ProfileCamera.storyboard b/kimlic/View/ProfileCamera/ProfileCamera.storyboard
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="vVE-Wi-QPL">
-    <device id="retina4_7" orientation="portrait">
+    <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -9,48 +9,66 @@
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Muli-Regular.ttf">
+            <string>Muli-Regular</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--Profile CameraVC-->
         <scene sceneID="bRS-Oe-JsE">
             <objects>
                 <viewController storyboardIdentifier="ProfileCameraVC" id="vVE-Wi-QPL" customClass="ProfileCameraVC" customModule="kimlic" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="T0c-Ab-NmZ">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ogp-hu-0Yc">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="adV-Ye-msJ">
-                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HTc-TI-P43">
-                                        <rect key="frame" x="69" y="411" width="237" height="218"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Button" image="ID_badge_black"/>
-                                        <connections>
-                                            <action selector="TakePhoto:" destination="vVE-Wi-QPL" eventType="touchUpInside" id="cyy-Qi-tG5"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                            </view>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Face_masked_cam_background" translatesAutoresizingMaskIntoConstraints="NO" id="BQz-5e-k26">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                            </imageView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YyF-0s-iZN">
+                                <rect key="frame" x="20" y="28" width="25" height="25"/>
+                                <state key="normal" image="white_close_button"/>
+                                <connections>
+                                    <action selector="closeButtonPressed:" destination="vVE-Wi-QPL" eventType="touchUpInside" id="frf-9h-diH"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y2T-40-KlF">
+                                <rect key="frame" x="175" y="652" width="64" height="64"/>
+                                <state key="normal" image="shutter_button"/>
+                                <connections>
+                                    <action selector="takePhotoButtonPressed:" destination="vVE-Wi-QPL" eventType="touchUpInside" id="brt-uz-qAT"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Take Your Portrait Photo" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ua6-i1-xK0">
+                                <rect key="frame" x="117.33333333333333" y="623.66666666666663" width="179.66666666666669" height="20.333333333333371"/>
+                                <fontDescription key="fontDescription" name="Muli-Regular" family="Muli" pointSize="16"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="camera_Screen_portrait_photo_icon" translatesAutoresizingMaskIntoConstraints="NO" id="jwi-RT-tlb">
+                                <rect key="frame" x="189.66666666666666" y="551.66666666666663" width="35" height="64"/>
+                            </imageView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="zOu-MB-RQa" firstAttribute="bottom" secondItem="ogp-hu-0Yc" secondAttribute="bottom" id="0Dy-1J-42l"/>
-                            <constraint firstItem="ogp-hu-0Yc" firstAttribute="leading" secondItem="zOu-MB-RQa" secondAttribute="leading" id="Fxq-RC-ayu"/>
-                            <constraint firstItem="zOu-MB-RQa" firstAttribute="bottom" secondItem="adV-Ye-msJ" secondAttribute="bottom" id="L3X-hW-DgV"/>
-                            <constraint firstItem="zOu-MB-RQa" firstAttribute="trailing" secondItem="adV-Ye-msJ" secondAttribute="trailing" id="PYx-A9-5z3"/>
-                            <constraint firstItem="adV-Ye-msJ" firstAttribute="top" secondItem="zOu-MB-RQa" secondAttribute="top" id="Xph-11-pwh"/>
-                            <constraint firstItem="ogp-hu-0Yc" firstAttribute="top" secondItem="T0c-Ab-NmZ" secondAttribute="top" id="ieD-wU-eNE"/>
-                            <constraint firstItem="adV-Ye-msJ" firstAttribute="leading" secondItem="zOu-MB-RQa" secondAttribute="leading" id="zg4-sl-3Ku"/>
-                            <constraint firstItem="ogp-hu-0Yc" firstAttribute="trailing" secondItem="zOu-MB-RQa" secondAttribute="trailing" id="zpK-c8-5J1"/>
+                            <constraint firstItem="zOu-MB-RQa" firstAttribute="bottom" secondItem="Y2T-40-KlF" secondAttribute="bottom" constant="20" id="1HW-GA-2BY"/>
+                            <constraint firstAttribute="trailing" secondItem="BQz-5e-k26" secondAttribute="trailing" id="4Sh-v5-nDN"/>
+                            <constraint firstItem="Ua6-i1-xK0" firstAttribute="centerX" secondItem="Y2T-40-KlF" secondAttribute="centerX" id="Mqf-Hj-Woh"/>
+                            <constraint firstItem="Y2T-40-KlF" firstAttribute="top" secondItem="Ua6-i1-xK0" secondAttribute="bottom" constant="8" id="Tvj-AA-iQt"/>
+                            <constraint firstItem="YyF-0s-iZN" firstAttribute="leading" secondItem="zOu-MB-RQa" secondAttribute="leading" constant="20" id="Wir-sa-jFc"/>
+                            <constraint firstItem="jwi-RT-tlb" firstAttribute="centerX" secondItem="Ua6-i1-xK0" secondAttribute="centerX" id="Xpk-jP-R0u"/>
+                            <constraint firstItem="BQz-5e-k26" firstAttribute="top" secondItem="T0c-Ab-NmZ" secondAttribute="top" id="gd3-4T-2wS"/>
+                            <constraint firstItem="Ua6-i1-xK0" firstAttribute="top" secondItem="jwi-RT-tlb" secondAttribute="bottom" constant="8" id="k9h-RS-Ert"/>
+                            <constraint firstItem="Y2T-40-KlF" firstAttribute="centerX" secondItem="T0c-Ab-NmZ" secondAttribute="centerX" id="mfx-o8-oC9"/>
+                            <constraint firstItem="YyF-0s-iZN" firstAttribute="top" secondItem="zOu-MB-RQa" secondAttribute="top" constant="8" id="niv-5v-xup"/>
+                            <constraint firstAttribute="bottom" secondItem="BQz-5e-k26" secondAttribute="bottom" id="rEh-yo-pFC"/>
+                            <constraint firstItem="BQz-5e-k26" firstAttribute="leading" secondItem="T0c-Ab-NmZ" secondAttribute="leading" id="sRA-KE-0H7"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="zOu-MB-RQa"/>
                     </view>
                     <connections>
-                        <outlet property="cameraView" destination="ogp-hu-0Yc" id="aql-Nh-ggJ"/>
+                        <outlet property="backgroundImage" destination="BQz-5e-k26" id="qi4-tZ-yb6"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="BLg-kt-F5v" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -59,6 +77,9 @@
         </scene>
     </scenes>
     <resources>
-        <image name="ID_badge_black" width="237" height="218"/>
+        <image name="Face_masked_cam_background" width="376" height="669"/>
+        <image name="camera_Screen_portrait_photo_icon" width="35" height="64"/>
+        <image name="shutter_button" width="64" height="64"/>
+        <image name="white_close_button" width="25" height="25"/>
     </resources>
 </document>