Przeglądaj źródła

Create a new contract editing template for 2021 -- 创建2021新的合同编辑模版(issue50: #14717)
Improve the edit template modifier, increase direct input coordinates, width -- 完善编辑模板修改器,增加直接输入坐标,宽度(resolve: #14716)

Ray Zhang 4 lat temu
rodzic
commit
c3e1fd1d95

+ 124 - 111
Ants Contract/AntsContract/AntsContract/Base.lproj/Main.storyboard

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="UmP-Fl-ZUI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="UmP-Fl-ZUI">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -78,7 +79,7 @@
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QNm-bw-hPi">
-                                <rect key="frame" x="338" y="100" width="400" height="21"/>
+                                <rect key="frame" x="338" y="120" width="400" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="Yhd-Tk-Nc0"/>
                                     <constraint firstAttribute="width" constant="400" id="f6B-wT-xce"/>
@@ -87,7 +88,7 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bur-yb-Jpu">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bur-yb-Jpu">
                                 <rect key="frame" x="50" y="850" width="150" height="84"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="84" id="I7S-ew-qVQ"/>
@@ -115,7 +116,7 @@
                                 </constraints>
                             </view>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_bg_icon" translatesAutoresizingMaskIntoConstraints="NO" id="V9T-Cq-Gk2">
-                                <rect key="frame" x="42" y="110" width="188" height="77"/>
+                                <rect key="frame" x="42" y="130" width="188" height="77"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="188" id="fU0-Fz-xOM"/>
                                     <constraint firstAttribute="height" constant="77" id="wKF-T2-Fth"/>
@@ -131,13 +132,13 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2BU-Jv-Tw8">
-                                <rect key="frame" x="689" y="129" width="51" height="31"/>
+                                <rect key="frame" x="689" y="149" width="51" height="31"/>
                                 <connections>
                                     <action selector="onModeSwitch:" destination="BYZ-38-t0r" eventType="valueChanged" id="ve9-zT-d8E"/>
                                 </connections>
                             </switch>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CHe-xF-uwt">
-                                <rect key="frame" x="533" y="134" width="140" height="21"/>
+                                <rect key="frame" x="533" y="154" width="140" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="140" id="KVB-7J-8nm"/>
                                     <constraint firstAttribute="height" constant="21" id="eft-LK-Wlm"/>
@@ -146,7 +147,7 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="knI-LF-shp">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="knI-LF-shp">
                                 <rect key="frame" x="605" y="914" width="103" height="30"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                 <state key="normal" title="Privacy Policy"/>
@@ -155,6 +156,7 @@
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="lzJ-IH-Kef"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="V9T-Cq-Gk2" firstAttribute="leading" secondItem="lzJ-IH-Kef" secondAttribute="leading" constant="42" id="0R1-wi-auV"/>
@@ -183,7 +185,6 @@
                             <constraint firstItem="lzJ-IH-Kef" firstAttribute="bottom" secondItem="bur-yb-Jpu" secondAttribute="bottom" constant="40" id="zID-w7-tLj"/>
                             <constraint firstItem="lzJ-IH-Kef" firstAttribute="bottom" secondItem="knI-LF-shp" secondAttribute="bottom" constant="30" id="zNr-FV-D03"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="lzJ-IH-Kef"/>
                     </view>
                     <toolbarItems/>
                     <navigationItem key="navigationItem" id="jyF-zF-Kd8">
@@ -218,7 +219,7 @@
             <objects>
                 <navigationController id="UmP-Fl-ZUI" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="LkL-0D-hsA">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="50"/>
+                        <rect key="frame" x="0.0" y="20" width="768" height="50"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -264,8 +265,8 @@
                                 </connections>
                             </scrollView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                         <viewLayoutGuide key="safeArea" id="0n3-oJ-oam"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
                     <toolbarItems/>
                     <connections>
@@ -313,8 +314,8 @@
                                 </connections>
                             </scrollView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                         <viewLayoutGuide key="safeArea" id="Hq3-UL-fYw"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
                     <toolbarItems/>
                     <connections>
@@ -346,8 +347,8 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <viewLayoutGuide key="safeArea" id="oWp-Va-tHh"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Od8-0Y-umN" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -385,6 +386,7 @@ textAlignment</string>
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="N26-Eb-pMl"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="N26-Eb-pMl" firstAttribute="trailing" secondItem="GGe-bl-kzR" secondAttribute="trailing" constant="20" id="H3v-cr-Tnh"/>
@@ -392,7 +394,6 @@ textAlignment</string>
                             <constraint firstItem="GGe-bl-kzR" firstAttribute="centerY" secondItem="L77-lK-1UM" secondAttribute="centerY" id="RfZ-7x-ZiO"/>
                             <constraint firstItem="Tr0-iT-sQU" firstAttribute="centerY" secondItem="L77-lK-1UM" secondAttribute="centerY" id="oZL-R1-KYR"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="N26-Eb-pMl"/>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="ToF-qy-nGL">
                         <barButtonItem key="leftBarButtonItem" title="Cancel" id="hmm-vl-h47">
@@ -426,7 +427,7 @@ textAlignment</string>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="evD-af-aUy">
-                                <rect key="frame" x="60" y="103.5" width="360" height="34"/>
+                                <rect key="frame" x="60" y="123.5" width="360" height="34"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no"/>
@@ -435,13 +436,13 @@ textAlignment</string>
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="q63-cc-gUb">
-                                <rect key="frame" x="60" y="143.5" width="360" height="34"/>
+                                <rect key="frame" x="60" y="163.5" width="360" height="34"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="faF-MK-9Oe">
-                                <rect key="frame" x="60" y="193.5" width="142" height="22"/>
+                                <rect key="frame" x="60" y="213.5" width="141" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="AlR-lk-KIA"/>
                                 </constraints>
@@ -453,7 +454,7 @@ textAlignment</string>
                                 </state>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sign in" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gBB-fk-Phg">
-                                <rect key="frame" x="60" y="67" width="59" height="26"/>
+                                <rect key="frame" x="60" y="87" width="59" height="26"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="26" id="ocs-U4-yJ6"/>
                                 </constraints>
@@ -461,8 +462,8 @@ textAlignment</string>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ntl-Kh-GA0">
-                                <rect key="frame" x="294" y="65.5" width="126" height="30"/>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ntl-Kh-GA0">
+                                <rect key="frame" x="294" y="85.5" width="126" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="fQT-TT-YUD"/>
                                 </constraints>
@@ -474,7 +475,7 @@ textAlignment</string>
                                     <action selector="onRetrievePassword:" destination="WUP-k6-BVt" eventType="touchUpInside" id="FpW-TJ-jcK"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VtU-n8-h6p">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VtU-n8-h6p">
                                 <rect key="frame" x="391" y="270" width="59" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="YdW-5e-QV1"/>
@@ -493,18 +494,18 @@ textAlignment</string>
                                 </connections>
                             </button>
                             <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="atg-wv-FLz">
-                                <rect key="frame" x="60" y="137.5" width="360" height="124.5"/>
+                                <rect key="frame" x="60" y="157.5" width="360" height="104.5"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LoginListCell" textLabel="Ofv-pg-h2w" style="IBUITableViewCellStyleDefault" id="v4l-du-pTm">
-                                        <rect key="frame" x="0.0" y="28" width="360" height="44"/>
+                                        <rect key="frame" x="0.0" y="44.5" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="v4l-du-pTm" id="JkA-pY-NIV">
                                             <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ofv-pg-h2w">
-                                                    <rect key="frame" x="15" y="0.0" width="330" height="44"/>
+                                                    <rect key="frame" x="16" y="0.0" width="328" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -530,6 +531,7 @@ textAlignment</string>
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="9CD-h3-6uD"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="bPn-Og-hNE" firstAttribute="leading" secondItem="gBB-fk-Phg" secondAttribute="leading" id="1eb-St-6UI"/>
@@ -556,7 +558,6 @@ textAlignment</string>
                             <constraint firstItem="faF-MK-9Oe" firstAttribute="top" secondItem="q63-cc-gUb" secondAttribute="bottom" constant="16" id="vTB-ad-IOG"/>
                             <constraint firstItem="atg-wv-FLz" firstAttribute="top" secondItem="evD-af-aUy" secondAttribute="bottom" id="xXp-K4-QzC"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="9CD-h3-6uD"/>
                     </view>
                     <navigationItem key="navigationItem" title="NPD" id="mpw-4j-jbv">
                         <barButtonItem key="rightBarButtonItem" image="close" style="plain" id="pGR-8o-BHM">
@@ -596,8 +597,8 @@ textAlignment</string>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <viewLayoutGuide key="safeArea" id="LlL-Vf-6Qu"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="PxV-cV-qwl" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -613,7 +614,7 @@ textAlignment</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jsg-Ci-KBs">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="50"/>
+                                <rect key="frame" x="0.0" y="20" width="768" height="50"/>
                                 <items>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="9H2-6O-Ty3"/>
                                     <barButtonItem title="Add" id="Zbn-CL-t1c">
@@ -630,11 +631,11 @@ textAlignment</string>
                                 </items>
                             </toolbar>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="119" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="l0t-xj-j7L">
-                                <rect key="frame" x="0.0" y="50" width="768" height="974"/>
+                                <rect key="frame" x="0.0" y="70" width="768" height="954"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DocListTableViewCell" rowHeight="128" id="KmC-hR-Rfo" customClass="DocListTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="768" height="128"/>
+                                        <rect key="frame" x="0.0" y="44.5" width="768" height="128"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KmC-hR-Rfo" id="twt-7p-gUd">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="128"/>
@@ -810,12 +811,13 @@ textAlignment</string>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cannot get data from server.
Tap to try again." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S0J-Y4-ysB">
-                                <rect key="frame" x="262" y="489.5" width="244" height="45.5"/>
+                                <rect key="frame" x="263.5" y="489.5" width="241.5" height="45.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Z43-5J-MNN"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="l0t-xj-j7L" firstAttribute="bottom" secondItem="Z43-5J-MNN" secondAttribute="bottom" id="KnX-5O-lFD"/>
@@ -828,7 +830,6 @@ textAlignment</string>
                             <constraint firstItem="jsg-Ci-KBs" firstAttribute="trailing" secondItem="Z43-5J-MNN" secondAttribute="trailing" id="z3y-y2-LYs"/>
                             <constraint firstItem="l0t-xj-j7L" firstAttribute="trailing" secondItem="Z43-5J-MNN" secondAttribute="trailing" id="zW6-9h-qjk"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Z43-5J-MNN"/>
                     </view>
                     <connections>
                         <outlet property="label_net_err" destination="S0J-Y4-ysB" id="chc-pa-OFo"/>
@@ -849,7 +850,7 @@ textAlignment</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Doc#" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3FK-p8-lUc">
-                                <rect key="frame" x="20" y="30" width="42" height="21"/>
+                                <rect key="frame" x="20" y="50" width="42" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="WoC-sE-vrL"/>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="42" id="hg1-CP-IBL"/>
@@ -859,22 +860,22 @@ textAlignment</string>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mkL-b6-hfi">
-                                <rect key="frame" x="70" y="23.5" width="160" height="34"/>
+                                <rect key="frame" x="70" y="43.5" width="160" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="160" id="Duv-oC-vfY"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9fO-K4-8uI">
-                                <rect key="frame" x="240" y="25.5" width="35" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9fO-K4-8uI">
+                                <rect key="frame" x="240" y="45.5" width="35" height="30"/>
                                 <state key="normal" title="Scan"/>
                                 <connections>
                                     <action selector="onScanClicked:" destination="pYZ-6S-3OA" eventType="touchUpInside" id="5re-f2-soa"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wtk-Ar-V7i">
-                                <rect key="frame" x="295" y="25.5" width="80" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wtk-Ar-V7i">
+                                <rect key="frame" x="295" y="45.5" width="80" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="80" id="Mc4-ew-oo9"/>
                                 </constraints>
@@ -883,8 +884,8 @@ textAlignment</string>
                                     <action selector="onAddImageClicked:" destination="pYZ-6S-3OA" eventType="touchUpInside" id="P7H-9P-Otq"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KMY-bR-M7n">
-                                <rect key="frame" x="395" y="25.5" width="60" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KMY-bR-M7n">
+                                <rect key="frame" x="395" y="45.5" width="60" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="60" id="Vf0-Z6-hBh"/>
                                 </constraints>
@@ -893,8 +894,8 @@ textAlignment</string>
                                     <action selector="onAddFileClicked:" destination="pYZ-6S-3OA" eventType="touchUpInside" id="P2b-vX-xu5"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zip-G1-Y1F">
-                                <rect key="frame" x="475" y="25.5" width="50" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zip-G1-Y1F">
+                                <rect key="frame" x="475" y="45.5" width="50" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="Llc-1P-QOR"/>
                                 </constraints>
@@ -904,7 +905,7 @@ textAlignment</string>
                                 </connections>
                             </button>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Bp7-lh-LCu">
-                                <rect key="frame" x="0.0" y="71.5" width="540" height="565.5"/>
+                                <rect key="frame" x="0.0" y="91.5" width="540" height="545.5"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <connections>
                                     <outlet property="dataSource" destination="pYZ-6S-3OA" id="7QE-2C-FZO"/>
@@ -912,6 +913,7 @@ textAlignment</string>
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="rmM-CB-hr5"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="3FK-p8-lUc" firstAttribute="leading" secondItem="rmM-CB-hr5" secondAttribute="leading" constant="20" id="26T-yz-fzY"/>
@@ -932,7 +934,6 @@ textAlignment</string>
                             <constraint firstItem="3FK-p8-lUc" firstAttribute="top" secondItem="rmM-CB-hr5" secondAttribute="top" constant="30" id="qUO-hk-JDr"/>
                             <constraint firstItem="rmM-CB-hr5" firstAttribute="bottom" secondItem="Bp7-lh-LCu" secondAttribute="bottom" constant="43" id="yh4-ck-vRQ"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="rmM-CB-hr5"/>
                     </view>
                     <value key="contentSizeForViewInPopover" type="size" width="540" height="680"/>
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
@@ -956,13 +957,13 @@ textAlignment</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="d5F-eF-NZu">
-                                <rect key="frame" x="20" y="105" width="500" height="512"/>
+                                <rect key="frame" x="20" y="125" width="500" height="492"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sNv-f2-THF">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sNv-f2-THF">
                                 <rect key="frame" x="469" y="630" width="51" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="SVY-iO-AZC"/>
@@ -974,7 +975,7 @@ textAlignment</string>
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Notes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="acp-RN-WbK">
-                                <rect key="frame" x="20" y="64" width="60" height="21"/>
+                                <rect key="frame" x="20" y="84" width="60" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="TVf-7T-EQ0"/>
                                     <constraint firstAttribute="height" constant="21" id="qEs-hW-0KI"/>
@@ -984,7 +985,7 @@ textAlignment</string>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3Mu-rf-Ogh">
-                                <rect key="frame" x="70" y="23.5" width="180" height="34"/>
+                                <rect key="frame" x="70" y="43.5" width="180" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="180" id="wmF-Bx-mA1"/>
                                 </constraints>
@@ -992,7 +993,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Doc#" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YjC-uJ-fS1">
-                                <rect key="frame" x="20" y="30" width="42" height="21"/>
+                                <rect key="frame" x="20" y="50" width="42" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="42" id="H09-r6-yQZ"/>
                                     <constraint firstAttribute="height" constant="21" id="Ic9-p9-PNq"/>
@@ -1001,14 +1002,15 @@ textAlignment</string>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9aw-iq-yZQ">
-                                <rect key="frame" x="258" y="25.5" width="35" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9aw-iq-yZQ">
+                                <rect key="frame" x="258" y="45.5" width="35" height="30"/>
                                 <state key="normal" title="Scan"/>
                                 <connections>
                                     <action selector="onScanClick:" destination="lUg-hS-wd3" eventType="touchUpInside" id="CsX-ej-3jf"/>
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="9H4-7E-7wB"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="sNv-f2-THF" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="9H4-7E-7wB" secondAttribute="leading" symbolic="YES" id="0Wu-dD-Sar"/>
@@ -1029,7 +1031,6 @@ textAlignment</string>
                             <constraint firstItem="9H4-7E-7wB" firstAttribute="trailing" secondItem="sNv-f2-THF" secondAttribute="trailing" constant="20" id="nRJ-09-cYY"/>
                             <constraint firstItem="d5F-eF-NZu" firstAttribute="top" secondItem="acp-RN-WbK" secondAttribute="bottom" constant="20" id="plh-nm-Ab5"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="9H4-7E-7wB"/>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="vzj-nb-Xfa"/>
                     <value key="contentSizeForViewInPopover" type="size" width="540" height="680"/>
@@ -1055,25 +1056,25 @@ textAlignment</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="pEf-xk-Nic">
-                                <rect key="frame" x="0.0" y="68.5" width="540" height="611.5"/>
+                                <rect key="frame" x="0.0" y="88.5" width="540" height="591.5"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ADTableViewCell" textLabel="93T-5h-JKV" detailTextLabel="mtf-OD-AFL" style="IBUITableViewCellStyleSubtitle" id="K5M-kB-Cox">
-                                        <rect key="frame" x="0.0" y="28" width="540" height="44"/>
+                                        <rect key="frame" x="0.0" y="44.5" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="K5M-kB-Cox" id="8bB-hy-1xQ">
                                             <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="93T-5h-JKV">
-                                                    <rect key="frame" x="15" y="5" width="33.5" height="20.5"/>
+                                                    <rect key="frame" x="16" y="5" width="33" height="20.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mtf-OD-AFL">
-                                                    <rect key="frame" x="15" y="25.5" width="44" height="14.5"/>
+                                                    <rect key="frame" x="16" y="25.5" width="44" height="14.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <nil key="textColor"/>
@@ -1089,7 +1090,7 @@ textAlignment</string>
                                 </connections>
                             </tableView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Doc#" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ANz-40-2Sf">
-                                <rect key="frame" x="13" y="35" width="200" height="21"/>
+                                <rect key="frame" x="13" y="55" width="200" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="QTs-3G-bKa"/>
                                     <constraint firstAttribute="height" constant="21" id="rpK-4M-DTY"/>
@@ -1098,14 +1099,15 @@ textAlignment</string>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hfl-sD-ikK">
-                                <rect key="frame" x="490" y="30.5" width="30" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hfl-sD-ikK">
+                                <rect key="frame" x="490" y="50.5" width="30" height="30"/>
                                 <state key="normal" title="Add"/>
                                 <connections>
                                     <action selector="onAddClick:" destination="D86-Uz-4tc" eventType="touchUpInside" id="mmf-W1-gVE"/>
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="X37-rl-LuN"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="pEf-xk-Nic" firstAttribute="leading" secondItem="X37-rl-LuN" secondAttribute="leading" id="0ZB-FA-vrv"/>
@@ -1118,7 +1120,6 @@ textAlignment</string>
                             <constraint firstItem="ANz-40-2Sf" firstAttribute="top" secondItem="X37-rl-LuN" secondAttribute="top" constant="35" id="xlh-aP-Zf8"/>
                             <constraint firstItem="X37-rl-LuN" firstAttribute="trailing" secondItem="hfl-sD-ikK" secondAttribute="trailing" constant="20" id="y4f-sZ-eGI"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="X37-rl-LuN"/>
                     </view>
                     <navigationItem key="navigationItem" title="Additional Documents" id="vRK-Q0-MI7"/>
                     <value key="contentSizeForViewInPopover" type="size" width="540" height="680"/>
@@ -1153,14 +1154,14 @@ textAlignment</string>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jWr-7U-jNX">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jWr-7U-jNX">
                                 <rect key="frame" x="367" y="544.5" width="97" height="30"/>
                                 <state key="normal" title="Click to select"/>
                                 <connections>
                                     <action selector="onSelectSignDate:" destination="x0b-wx-C76" eventType="touchUpInside" id="aWi-lx-uE6"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ihN-HE-TIt">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ihN-HE-TIt">
                                 <rect key="frame" x="20" y="630" width="48" height="30"/>
                                 <state key="normal" title="Cancel"/>
                                 <userDefinedRuntimeAttributes>
@@ -1172,7 +1173,7 @@ textAlignment</string>
                                     <action selector="onCancelClick:" destination="x0b-wx-C76" eventType="touchUpInside" id="SfF-rA-rUG"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pcF-wi-5dI">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pcF-wi-5dI">
                                 <rect key="frame" x="472" y="630" width="48" height="30"/>
                                 <state key="normal" title="Search"/>
                                 <userDefinedRuntimeAttributes>
@@ -1184,7 +1185,7 @@ textAlignment</string>
                                     <action selector="onSearchClick:" destination="x0b-wx-C76" eventType="touchUpInside" id="Syz-4g-D6P"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UIv-Zm-PIF">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UIv-Zm-PIF">
                                 <rect key="frame" x="250.5" y="630" width="39" height="30"/>
                                 <state key="normal" title="Reset"/>
                                 <userDefinedRuntimeAttributes>
@@ -1197,25 +1198,25 @@ textAlignment</string>
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Document #:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kht-GK-wPH">
-                                <rect key="frame" x="20" y="74" width="168" height="21"/>
+                                <rect key="frame" x="20" y="94" width="168" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customer name:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pBP-LQ-9jo">
-                                <rect key="frame" x="20" y="120" width="168" height="21"/>
+                                <rect key="frame" x="20" y="140" width="168" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Job Address:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UBl-CC-QHh">
-                                <rect key="frame" x="20" y="166" width="168" height="21"/>
+                                <rect key="frame" x="20" y="186" width="168" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="sSQ-ma-KwS">
-                                <rect key="frame" x="208" y="67.5" width="312" height="34"/>
+                                <rect key="frame" x="208" y="87.5" width="312" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="312" id="LX8-ha-Lh7"/>
                                 </constraints>
@@ -1223,7 +1224,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="an6-5b-5fM">
-                                <rect key="frame" x="208" y="113.5" width="312" height="34"/>
+                                <rect key="frame" x="208" y="133.5" width="312" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="312" id="TaE-4N-b2T"/>
                                 </constraints>
@@ -1231,7 +1232,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Sx1-Qq-ryu">
-                                <rect key="frame" x="208" y="159.5" width="312" height="34"/>
+                                <rect key="frame" x="208" y="179.5" width="312" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="312" id="c89-vJ-Taf"/>
                                 </constraints>
@@ -1239,7 +1240,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Pc2-cS-gyA">
-                                <rect key="frame" x="208" y="205.5" width="312" height="34"/>
+                                <rect key="frame" x="208" y="225.5" width="312" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="312" id="WvN-1C-g0u"/>
                                 </constraints>
@@ -1247,7 +1248,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Mcr-GH-91S">
-                                <rect key="frame" x="208" y="251.5" width="312" height="34"/>
+                                <rect key="frame" x="208" y="271.5" width="312" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="312" id="Jle-rg-fEU"/>
                                 </constraints>
@@ -1255,7 +1256,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4pL-o7-SOu">
-                                <rect key="frame" x="208" y="297.5" width="312" height="34"/>
+                                <rect key="frame" x="208" y="317.5" width="312" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="312" id="LBG-hL-NNs"/>
                                 </constraints>
@@ -1263,7 +1264,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="eDM-3u-3UV">
-                                <rect key="frame" x="208" y="343.5" width="312" height="34"/>
+                                <rect key="frame" x="208" y="363.5" width="312" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="312" id="MIr-0c-UpL"/>
                                 </constraints>
@@ -1271,7 +1272,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits" keyboardType="phonePad"/>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Bo0-ij-VQG">
-                                <rect key="frame" x="208" y="389.5" width="312" height="34"/>
+                                <rect key="frame" x="208" y="409.5" width="312" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="312" id="qMi-NR-Yw3"/>
                                 </constraints>
@@ -1279,36 +1280,36 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits" keyboardType="phonePad"/>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Job city:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rdM-cA-yTJ">
-                                <rect key="frame" x="20" y="212" width="168" height="21"/>
+                                <rect key="frame" x="20" y="232" width="168" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Job state:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IFY-jP-if0">
-                                <rect key="frame" x="20" y="258" width="168" height="21"/>
+                                <rect key="frame" x="20" y="278" width="168" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Job zip:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eai-1j-Sie">
-                                <rect key="frame" x="20" y="304" width="168" height="21"/>
+                                <rect key="frame" x="20" y="324" width="168" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customer telephone:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QQ1-6V-rPY">
-                                <rect key="frame" x="20" y="350" width="168" height="21"/>
+                                <rect key="frame" x="20" y="370" width="168" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Agent name:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LPL-LS-flL">
-                                <rect key="frame" x="20" y="396" width="168" height="21"/>
+                                <rect key="frame" x="20" y="416" width="168" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VCg-d6-wsc">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VCg-d6-wsc">
                                 <rect key="frame" x="367" y="498.5" width="97" height="30"/>
                                 <state key="normal" title="Click to select"/>
                                 <connections>
@@ -1327,14 +1328,14 @@ textAlignment</string>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tQv-ZX-ShO">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tQv-ZX-ShO">
                                 <rect key="frame" x="484" y="498.5" width="36" height="30"/>
                                 <state key="normal" title="Clear"/>
                                 <connections>
                                     <action selector="OnClearJDClick:" destination="x0b-wx-C76" eventType="touchUpInside" id="Hoe-4N-E5Z"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b6Z-kl-iod">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b6Z-kl-iod">
                                 <rect key="frame" x="484" y="544.5" width="36" height="30"/>
                                 <state key="normal" title="Clear"/>
                                 <connections>
@@ -1342,6 +1343,7 @@ textAlignment</string>
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="XaT-qu-5yN"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="VCg-d6-wsc" firstAttribute="leading" secondItem="cDk-wo-pqZ" secondAttribute="trailing" constant="10" id="3MS-HU-NKV"/>
@@ -1413,7 +1415,6 @@ textAlignment</string>
                             <constraint firstItem="tQv-ZX-ShO" firstAttribute="firstBaseline" secondItem="M0G-RR-4Aj" secondAttribute="firstBaseline" id="xaH-BI-pt2"/>
                             <constraint firstItem="b6Z-kl-iod" firstAttribute="firstBaseline" secondItem="AKJ-DV-8In" secondAttribute="firstBaseline" id="yUz-t2-nXr"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="XaT-qu-5yN"/>
                     </view>
                     <value key="contentSizeForViewInPopover" type="size" width="540" height="680"/>
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
@@ -1446,11 +1447,11 @@ textAlignment</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Flg-41-AM4">
-                                <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                                <rect key="frame" x="0.0" y="40" width="768" height="984"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="PendingDocumentsTableViewCell" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="PendingDocumentsTableViewCell" id="bC4-0A-Qjh" customClass="PendingDocumentsTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="44.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bC4-0A-Qjh" id="rna-0d-wd1">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
@@ -1535,6 +1536,7 @@ textAlignment</string>
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="jqy-KW-k28"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="Flg-41-AM4" firstAttribute="trailing" secondItem="jqy-KW-k28" secondAttribute="trailing" id="K1h-iW-ZKj"/>
@@ -1542,7 +1544,6 @@ textAlignment</string>
                             <constraint firstItem="Flg-41-AM4" firstAttribute="leading" secondItem="jqy-KW-k28" secondAttribute="leading" id="XH7-aW-62e"/>
                             <constraint firstItem="Flg-41-AM4" firstAttribute="top" secondItem="jqy-KW-k28" secondAttribute="top" constant="20" id="xit-Uj-G7V"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="jqy-KW-k28"/>
                     </view>
                     <connections>
                         <outlet property="tableView" destination="Flg-41-AM4" id="zGy-IK-tDu"/>
@@ -1586,14 +1587,14 @@ textAlignment</string>
                                 <rect key="frame" x="26" y="667" width="717" height="337"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w4q-z3-jFI">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w4q-z3-jFI">
                                         <rect key="frame" x="328.5" y="45" width="60" height="30"/>
                                         <state key="normal" title="Top"/>
                                         <connections>
                                             <action selector="topBtnClick:" destination="IrJ-nO-Jqx" eventType="touchUpInside" id="YrK-Jq-inA"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="clc-xQ-3KH">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="clc-xQ-3KH">
                                         <rect key="frame" x="328.5" y="153.5" width="60" height="30"/>
                                         <state key="normal" title="OK"/>
                                         <connections>
@@ -1608,7 +1609,7 @@ textAlignment</string>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 <prototypes>
                                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="textfield_cell_identifier" rowHeight="40" id="9Ik-wx-I7e" customClass="AttributeTextFieldCell">
-                                                        <rect key="frame" x="0.0" y="28" width="300.5" height="40"/>
+                                                        <rect key="frame" x="0.0" y="44.5" width="300.5" height="40"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9Ik-wx-I7e" id="ZJs-5D-8bY">
                                                             <rect key="frame" x="0.0" y="0.0" width="300.5" height="40"/>
@@ -1646,7 +1647,7 @@ textAlignment</string>
                                                         </connections>
                                                     </tableViewCell>
                                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="label_cell_identifier" rowHeight="40" id="ES2-nV-P7X" customClass="AttributeLabelCell">
-                                                        <rect key="frame" x="0.0" y="68" width="300.5" height="40"/>
+                                                        <rect key="frame" x="0.0" y="84.5" width="300.5" height="40"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ES2-nV-P7X" id="5cN-ns-rLy">
                                                             <rect key="frame" x="0.0" y="0.0" width="300.5" height="40"/>
@@ -1686,7 +1687,7 @@ textAlignment</string>
                                                         </connections>
                                                     </tableViewCell>
                                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="switch_cell_identifier" rowHeight="40" id="Hfp-lV-yMb" customClass="AttributeSwitchCell">
-                                                        <rect key="frame" x="0.0" y="108" width="300.5" height="40"/>
+                                                        <rect key="frame" x="0.0" y="124.5" width="300.5" height="40"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Hfp-lV-yMb" id="A8G-jm-GXE">
                                                             <rect key="frame" x="0.0" y="0.0" width="300.5" height="40"/>
@@ -1741,7 +1742,7 @@ textAlignment</string>
                                                 </connections>
                                             </stepper>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="X:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="36D-hz-mdm">
-                                                <rect key="frame" x="4" y="32" width="50.5" height="21"/>
+                                                <rect key="frame" x="4" y="32" width="50" height="21"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="21" id="fzo-Ez-LBU"/>
                                                 </constraints>
@@ -1750,9 +1751,12 @@ textAlignment</string>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="tGg-qJ-1DB">
-                                                <rect key="frame" x="64.5" y="25.5" width="138" height="34"/>
+                                                <rect key="frame" x="64" y="25.5" width="138.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
+                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" returnKeyType="done"/>
+                                                <connections>
+                                                    <action selector="xFieldDone:" destination="IrJ-nO-Jqx" eventType="editingDidEnd" id="Vk6-uA-QMN"/>
+                                                </connections>
                                             </textField>
                                             <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100000" translatesAutoresizingMaskIntoConstraints="NO" id="iko-Xx-Khd">
                                                 <rect key="frame" x="212.5" y="63.5" width="94" height="32"/>
@@ -1761,12 +1765,15 @@ textAlignment</string>
                                                 </connections>
                                             </stepper>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PFg-fR-Jk8">
-                                                <rect key="frame" x="64.5" y="62.5" width="138" height="34"/>
+                                                <rect key="frame" x="64" y="62.5" width="138.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
+                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" returnKeyType="done"/>
+                                                <connections>
+                                                    <action selector="yFieldDone:" destination="IrJ-nO-Jqx" eventType="editingDidEnd" id="tsr-0o-ejG"/>
+                                                </connections>
                                             </textField>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Y:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2bv-uD-Gfj">
-                                                <rect key="frame" x="4" y="69" width="50.5" height="21"/>
+                                                <rect key="frame" x="4" y="69" width="50" height="21"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
@@ -1778,18 +1785,21 @@ textAlignment</string>
                                                 </connections>
                                             </stepper>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="M9N-a4-XH5">
-                                                <rect key="frame" x="64.5" y="136.5" width="138" height="34"/>
+                                                <rect key="frame" x="64" y="136.5" width="138.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
+                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" returnKeyType="done"/>
+                                                <connections>
+                                                    <action selector="hFieldDone:" destination="IrJ-nO-Jqx" eventType="editingDidEnd" id="pS4-XB-yCZ"/>
+                                                </connections>
                                             </textField>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hight:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eK8-TQ-bhT">
-                                                <rect key="frame" x="4" y="143" width="50.5" height="21"/>
+                                                <rect key="frame" x="4" y="143" width="50" height="21"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Width:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1lA-wP-7Wy">
-                                                <rect key="frame" x="4" y="106" width="50.5" height="21"/>
+                                                <rect key="frame" x="4" y="106" width="50" height="21"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
@@ -1801,9 +1811,12 @@ textAlignment</string>
                                                 </connections>
                                             </stepper>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KEu-MW-Ik7">
-                                                <rect key="frame" x="64.5" y="99.5" width="138" height="34"/>
+                                                <rect key="frame" x="64" y="99.5" width="138.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
+                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" returnKeyType="done"/>
+                                                <connections>
+                                                    <action selector="wFieldDone:" destination="IrJ-nO-Jqx" eventType="editingDidEnd" id="Don-Ai-pMr"/>
+                                                </connections>
                                             </textField>
                                         </subviews>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -1853,7 +1866,7 @@ textAlignment</string>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <prototypes>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="item_cell" rowHeight="40" id="Sis-8R-Rqy" customClass="PageItemCell">
-                                                <rect key="frame" x="0.0" y="28" width="310.5" height="40"/>
+                                                <rect key="frame" x="0.0" y="44.5" width="310.5" height="40"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Sis-8R-Rqy" id="iqu-NN-xx0">
                                                     <rect key="frame" x="0.0" y="0.0" width="310.5" height="40"/>
@@ -1865,13 +1878,13 @@ textAlignment</string>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WQo-9f-1k4">
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WQo-9f-1k4">
                                                             <rect key="frame" x="0.0" y="0.0" width="275.5" height="40"/>
                                                             <connections>
                                                                 <action selector="itemClicked:" destination="Sis-8R-Rqy" eventType="touchUpInside" id="mMd-0Z-cRP"/>
                                                             </connections>
                                                         </button>
-                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="alp-xq-Jp8">
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="alp-xq-Jp8">
                                                             <rect key="frame" x="280.5" y="5" width="30" height="30"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" secondItem="alp-xq-Jp8" secondAttribute="height" multiplier="1:1" id="heY-cT-RYn"/>
@@ -1904,7 +1917,7 @@ textAlignment</string>
                                                 </connections>
                                             </tableViewCell>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="subitem_cell" rowHeight="40" id="sg5-Io-RFc" customClass="PageSubItemCell">
-                                                <rect key="frame" x="0.0" y="68" width="310.5" height="40"/>
+                                                <rect key="frame" x="0.0" y="84.5" width="310.5" height="40"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="sg5-Io-RFc" id="XEY-QN-oaW">
                                                     <rect key="frame" x="0.0" y="0.0" width="310.5" height="40"/>
@@ -1930,21 +1943,21 @@ textAlignment</string>
                                             </tableViewCell>
                                         </prototypes>
                                     </tableView>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xPF-6R-x3J">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xPF-6R-x3J">
                                         <rect key="frame" x="328.5" y="267" width="60" height="30"/>
                                         <state key="normal" title="Bottom"/>
                                         <connections>
                                             <action selector="bottomBtnClick:" destination="IrJ-nO-Jqx" eventType="touchUpInside" id="NWZ-LQ-YIg"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rDo-Ii-pob">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rDo-Ii-pob">
                                         <rect key="frame" x="8" y="8" width="82" height="30"/>
                                         <state key="normal" title="Add Control"/>
                                         <connections>
                                             <action selector="addControlBtnClick:" destination="IrJ-nO-Jqx" eventType="touchUpInside" id="D64-qy-ZcN"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GZQ-fB-eTn">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GZQ-fB-eTn">
                                         <rect key="frame" x="219.5" y="8" width="99" height="30"/>
                                         <state key="normal" title="Delete Control"/>
                                         <connections>
@@ -1979,6 +1992,7 @@ textAlignment</string>
                                 </constraints>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="SPx-WF-an0"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="SPx-WF-an0" firstAttribute="trailing" secondItem="tuM-sI-7IN" secondAttribute="trailing" constant="20" id="3My-Fz-uJ0"/>
@@ -1988,7 +2002,6 @@ textAlignment</string>
                             <constraint firstItem="tuM-sI-7IN" firstAttribute="centerY" secondItem="YRy-cf-b04" secondAttribute="centerY" id="oU9-Gh-mSD"/>
                             <constraint firstItem="w7G-eF-IRC" firstAttribute="leading" secondItem="SPx-WF-an0" secondAttribute="leading" constant="26" id="yDg-oR-tJf"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="SPx-WF-an0"/>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="TOR-BH-g4o">
                         <barButtonItem key="leftBarButtonItem" title="Cancel" id="G4j-IK-wnq">

+ 1112 - 0
Ants Contract/Granite Expo eSign/2021 GECI - Home Improvement Contract.json

@@ -0,0 +1,1112 @@
+{
+  "page_0": {
+    "control_20": {
+      "pos_x": 617.474609375,
+      "width": 29.999996185302734,
+      "pos_y": 829.6358642578125,
+      "aname": "Initial",
+      "linewidth": 8,
+      "type": "Signature",
+      "value": "",
+      "dirty": false,
+      "height": 14.999998092651367,
+      "can_fill": true,
+      "name": "Customer Initial",
+      "required": true
+    },
+    "control_1": {
+      "dirty": false,
+      "width": 181.99998474121094,
+      "aname": "Job Date",
+      "pos_y": 182.8986053466797,
+      "size": "12",
+      "type": "DatePicker",
+      "field": "job_date",
+      "value": "",
+      "height": 29.999996185302734,
+      "margin_left": "4",
+      "pos_x": 461.9999694824219,
+      "required": false
+    },
+    "control_3": {
+      "width": 136.99998474121094,
+      "tv_vmargin": 0,
+      "aname": "Jobsite City",
+      "type": "TextView",
+      "size": "12",
+      "pos_y": 256.74652099609375,
+      "field": "job_city",
+      "value": "",
+      "dirty": false,
+      "height": 26.999996185302734,
+      "margin_left": "1",
+      "margin_top": "-1",
+      "required": true,
+      "pos_x": 242.83868408203125
+    },
+    "control_5": {
+      "width": 74,
+      "tv_vmargin": 0,
+      "aname": "Jobsite Zipcode",
+      "type": "TextView",
+      "size": "12",
+      "pos_y": 257.74652099609375,
+      "field": "job_zip",
+      "value": "",
+      "dirty": false,
+      "height": 26.999996185302734,
+      "margin_left": "1",
+      "margin_top": "-1",
+      "required": true,
+      "pos_x": 521.1289672851562
+    },
+    "control_7": {
+      "dirty": false,
+      "width": 179.99996948242188,
+      "aname": "Today's Date",
+      "pos_y": 286.74652099609375,
+      "size": "12",
+      "type": "DatePicker",
+      "field": "today_date",
+      "value": "",
+      "height": 29.999996185302734,
+      "margin_left": "4",
+      "pos_x": 462.9999694824219,
+      "required": true
+    },
+    "control_9": {
+      "pos_x": 462.9999694824219,
+      "disable": false,
+      "dirty": false,
+      "width": 180.99996948242188,
+      "pos_y": 318.2718811035156,
+      "aname": "Labor Deposit",
+      "value": "",
+      "action": {
+        "set_val": {
+          "condition": "true",
+          "count": 1,
+          "item_0": {
+            "control": "control_12",
+            "value": "control_6-control_7"
+          }
+        }
+      },
+      "value_type": "float",
+      "type": "TextView",
+      "size": "10",
+      "format": "price",
+      "keyboard": "number",
+      "height": 29.999996185302734,
+      "prefix_str": "$ ",
+      "margin_left": "4",
+      "field": "labor_deposit",
+      "required": true
+    },
+    "count": 22,
+    "control_22": {
+      "disable": true,
+      "textAlignment": "center",
+      "width": 100,
+      "pos_y": 0,
+      "aname": "new add Button",
+      "type": "Button",
+      "field": "new add Button",
+      "value": "NA",
+      "dirty": false,
+      "height": 30,
+      "margin_left": "4",
+      "margin_top": "1",
+      "required": true,
+      "pos_x": 0
+    },
+    "control_21": {
+      "disable": true,
+      "textAlignment": "center",
+      "width": 99.99996948242188,
+      "pos_y": 628.9400634765625,
+      "aname": "new add Button",
+      "type": "Button",
+      "field": "new add Button",
+      "value": "NA",
+      "dirty": false,
+      "height": 29.99999237060547,
+      "margin_left": "4",
+      "margin_top": "1",
+      "required": true,
+      "pos_x": 649.4376831054688
+    },
+    "control_10": {
+      "disable": true,
+      "width": 169.99996948242188,
+      "pos_y": 352.74652099609375,
+      "aname": "Balance on Account",
+      "type": "TextView",
+      "size": "12",
+      "field": "balance",
+      "value_type": "float",
+      "value": "",
+      "dirty": false,
+      "prefix_str": "$ ",
+      "margin_left": "4",
+      "height": 40,
+      "required": true,
+      "pos_x": 214.99996948242188
+    },
+    "control_11": {
+      "width": 522,
+      "pos_y": 506.53448486328125,
+      "aname": "Service",
+      "type": "Check",
+      "field": "service",
+      "title": "service button",
+      "single_select": false,
+      "show_detail": false,
+      "value": [],
+      "height": 70,
+      "dirty": false,
+      "marker_size": 6,
+      "cadedate": [
+        [
+          [
+            "Installation of Cabinetry.",
+            ""
+          ],
+          [
+            132.73728942871094,
+            512.5345458984375
+          ]
+        ],
+        [
+          [
+            "Installation of Plywood.",
+            ""
+          ],
+          [
+            132.73728942871094,
+            526.4838256835938
+          ]
+        ],
+        [
+          [
+            "Installation of Granite, Marble or Quartz Countertop(s).",
+            ""
+          ],
+          [
+            132.73728942871094,
+            537.009033203125,
+            0,
+            0
+          ]
+        ],
+        [
+          [
+            "Demolition Work.",
+            ""
+          ],
+          [
+            132.73728942871094,
+            549.7465209960938,
+            0,
+            0
+          ],
+          {
+            "memo": "action",
+            "conditional_constraint": {
+              "true": {
+                "item_1": {
+                  "control": "control_1",
+                  "set_val": "",
+                  "disable": "false",
+                  "page": "3"
+                },
+                "item_2": {
+                  "control": "control_2",
+                  "set_val": "",
+                  "disable": "false",
+                  "page": "3"
+                },
+                "count": 5,
+                "item_3": {
+                  "control": "control_3",
+                  "set_val": "",
+                  "disable": "false",
+                  "page": "3"
+                },
+                "item_0": {
+                  "control": "control_0",
+                  "set_val": "",
+                  "disable": "false",
+                  "page": "3"
+                },
+                "item_4": {
+                  "control": "control_4",
+                  "set_val": "",
+                  "disable": "false",
+                  "page": "3"
+                }
+              },
+              "false": {
+                "item_1": {
+                  "control": "control_1",
+                  "set_val": "",
+                  "disable": "true",
+                  "page": "3"
+                },
+                "item_2": {
+                  "control": "control_2",
+                  "set_val": "",
+                  "disable": "true",
+                  "page": "3"
+                },
+                "count": 5,
+                "item_3": {
+                  "control": "control_3",
+                  "set_val": "",
+                  "disable": "true",
+                  "page": "3"
+                },
+                "item_0": {
+                  "control": "control_0",
+                  "set_val": "",
+                  "disable": "true",
+                  "page": "3"
+                },
+                "item_4": {
+                  "control": "control_4",
+                  "set_val": "",
+                  "disable": "true",
+                  "page": "3"
+                }
+              }
+            }
+          }
+        ],
+        [
+          [
+            "Other / Include Description:",
+            ""
+          ],
+          [
+            132.73728942871094,
+            561.0090942382812,
+            0,
+            0
+          ]
+        ]
+      ],
+      "required": true,
+      "pos_x": 123.47463989257812
+    },
+    "control_19": {
+      "height": 10.999999046325684,
+      "textAlignment": "center",
+      "pos_x": 523,
+      "width": 103.99999237060547,
+      "size": "8",
+      "field": "doc_number",
+      "pos_y": 924.3732299804688,
+      "type": "Label",
+      "required": true,
+      "value": "",
+      "dirty": false
+    },
+    "control_12": {
+      "required": true,
+      "width": 30.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 640.8986206054688,
+      "type": "Signature",
+      "height": 14.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 617.474609375
+    },
+    "control_13": {
+      "required": true,
+      "width": 29.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 683.7971801757812,
+      "type": "Signature",
+      "height": 14.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 617.474609375
+    },
+    "control_14": {
+      "required": true,
+      "width": 29.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 732.0598754882812,
+      "type": "Signature",
+      "height": 14.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 617.474609375
+    },
+    "control_0": {
+      "width": 168.99998474121094,
+      "tv_vmargin": 0,
+      "aname": "Customer Name",
+      "type": "TextView",
+      "size": "12",
+      "pos_y": 182.16127014160156,
+      "field": "customer_name",
+      "value": "",
+      "dirty": false,
+      "height": 29.999996185302734,
+      "margin_left": "4",
+      "margin_top": "1",
+      "required": true,
+      "pos_x": 215.99998474121094
+    },
+    "control_15": {
+      "required": true,
+      "width": 29.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 749.5344848632812,
+      "type": "Signature",
+      "height": 14.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 617.474609375
+    },
+    "control_2": {
+      "width": 395.9999694824219,
+      "tv_vmargin": 0,
+      "aname": "Jobsite Address",
+      "type": "TextView",
+      "size": "12",
+      "pos_y": 214.8986053466797,
+      "field": "job_addr",
+      "value": "",
+      "dirty": false,
+      "height": 29.999996185302734,
+      "margin_left": "1",
+      "margin_top": "-1",
+      "required": true,
+      "pos_x": 247.99998474121094
+    },
+    "control_16": {
+      "required": true,
+      "width": 29.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 797.5344848632812,
+      "type": "Signature",
+      "field": "",
+      "height": 14.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 617.474609375
+    },
+    "control_4": {
+      "width": 37,
+      "tv_vmargin": 0,
+      "aname": "Jobsite State",
+      "type": "TextView",
+      "size": "12",
+      "capital": "charater",
+      "pos_y": 257.0091857910156,
+      "field": "job_state",
+      "value": "CA",
+      "height": 26.999996185302734,
+      "margin_left": "1",
+      "dirty": false,
+      "margin_top": "-1",
+      "required": true,
+      "pos_x": 423.99993896484375
+    },
+    "control_17": {
+      "required": true,
+      "width": 29.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 881.2625732421875,
+      "type": "Signature",
+      "height": 14.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_6": {
+      "keyboard": "tel",
+      "pos_y": 286.74652099609375,
+      "aname": "Telephone",
+      "type": "TextView",
+      "size": "12",
+      "width": 169.99996948242188,
+      "field": "tel",
+      "value": "",
+      "format": "us_tel",
+      "height": 29.999996185302734,
+      "margin_left": "4",
+      "dirty": false,
+      "required": true,
+      "pos_x": 214.99996948242188
+    },
+    "control_18": {
+      "height": 21.999998092651367,
+      "pos_x": 499.9999694824219,
+      "pos_y": 905.3732299804688,
+      "width": 150,
+      "value": "",
+      "dirty": false,
+      "required": true,
+      "type": "Image",
+      "name": "BarCode"
+    },
+    "control_8": {
+      "dirty": false,
+      "width": 169.99996948242188,
+      "pos_y": 318.2718811035156,
+      "aname": "Contract Price",
+      "value": "",
+      "type": "TextView",
+      "size": "12",
+      "keyboard": "number",
+      "value_type": "float",
+      "height": 29.999996185302734,
+      "prefix_str": "$ ",
+      "margin_left": "4",
+      "field": "contract_price",
+      "format": "price",
+      "required": true,
+      "pos_x": 214.99996948242188
+    }
+  },
+  "page_1": {
+    "control_1": {
+      "pos_x": 230,
+      "width": 200,
+      "tv_vmargin": 0.6,
+      "aname": "Decision Maker",
+      "type": "ignor",
+      "size": "12",
+      "pos_y": 125,
+      "field": "decision_maker",
+      "value": "",
+      "dirty": false,
+      "height": 20,
+      "margin_left": "4",
+      "margin_top": "1",
+      "name": "Decision Maker",
+      "required": true
+    },
+    "control_3": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 167.36404418945312,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_5": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 253.8386688232422,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_7": {
+      "required": true,
+      "width": 29,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 346,
+      "type": "Signature",
+      "height": 14,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_9": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 456.0091857910156,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "count": 19,
+    "control_10": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 493.2718200683594,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_11": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 531.0091552734375,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_12": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 589.5344848632812,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_0": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 111.36405181884766,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_2": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 142.1013641357422,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_4": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 205.36404418945312,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_6": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 301.364013671875,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_8": {
+      "width": 464,
+      "pos_y": 384,
+      "aname": "Joint Seams Option",
+      "type": "Check",
+      "field": "joint_seams",
+      "title": "joint seams",
+      "single_select": true,
+      "show_detail": true,
+      "value": [],
+      "height": 37,
+      "dirty": false,
+      "marker_size": 6,
+      "cadedate": [
+        [
+          [
+            "OPTION A:",
+            "Unpolished joint seams, which the Undersigned understands may not be smooth."
+          ],
+          [
+            149.2119598388672,
+            384.7879638671875,
+            0,
+            0
+          ]
+        ],
+        [
+          [
+            "OPTION B",
+            "Polished joint seams, which the Undersigned understands that color dullness or shade variation may occur."
+          ],
+          [
+            149.2119598388672,
+            396.78802490234375,
+            0,
+            0
+          ]
+        ],
+        [
+          [
+            "OPTION C",
+            "The Decision Maker will determine on-site with the assistance of the Contractor."
+          ],
+          [
+            149.2119598388672,
+            407.7879638671875,
+            0,
+            0
+          ]
+        ]
+      ],
+      "pos_x": 146,
+      "required": true
+    },
+    "control_13": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 606.2717895507812,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_14": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 624.7465209960938,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_15": {
+      "height": 21.999998092651367,
+      "pos_x": 499.9999694824219,
+      "pos_y": 905.3732299804688,
+      "width": 150,
+      "value": "",
+      "dirty": false,
+      "required": true,
+      "type": "Image",
+      "name": "BarCode"
+    },
+    "control_18": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 63.36405563354492,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_17": {
+      "required": true,
+      "width": 28.999996185302734,
+      "dirty": false,
+      "aname": "Initial",
+      "linewidth": 8,
+      "value": "",
+      "pos_y": 418.2718200683594,
+      "type": "Signature",
+      "height": 13.999998092651367,
+      "can_fill": "true",
+      "name": "Customer Initial",
+      "pos_x": 616
+    },
+    "control_16": {
+      "height": 10.999999046325684,
+      "textAlignment": "center",
+      "pos_x": 523,
+      "width": 103.99999237060547,
+      "size": "8",
+      "field": "doc_number",
+      "pos_y": 924.3732299804688,
+      "type": "Label",
+      "required": true,
+      "value": "",
+      "dirty": false
+    }
+  },
+  "signature_name": [
+    "Customer Initial",
+    "Decision Maker",
+    "Agent Of Contractor",
+    "Homeowner",
+    "Homeowner Print Name",
+    "Date"
+  ],
+  "page_2": {
+    "control_7": {
+      "height": 11,
+      "textAlignment": "center",
+      "pos_x": 523,
+      "width": 104,
+      "size": "8",
+      "field": "doc_number",
+      "pos_y": 917,
+      "type": "Label",
+      "required": true,
+      "value": "",
+      "dirty": false
+    },
+    "control_5": {
+      "height": 11,
+      "textAlignment": "center",
+      "pos_x": 523,
+      "width": 104,
+      "size": "8",
+      "field": "doc_number",
+      "pos_y": 917,
+      "type": "Label",
+      "required": true,
+      "value": "",
+      "dirty": false
+    },
+    "control_3": {
+      "height": 21.999998092651367,
+      "pos_x": 499.9999694824219,
+      "pos_y": 905.3732299804688,
+      "width": 150,
+      "value": "",
+      "dirty": false,
+      "required": true,
+      "type": "Image",
+      "name": "BarCode"
+    },
+    "control_1": {
+      "textAlignment": "center",
+      "width": 215.61289978027344,
+      "tv_vmargin": 0.3,
+      "aname": "Print Name",
+      "type": "TextView",
+      "size": "10",
+      "pos_y": 663.1473999023438,
+      "field": "customer_name_1",
+      "value": "",
+      "dirty": false,
+      "height": 13.999998092651367,
+      "margin_top": "2",
+      "required": true,
+      "pos_x": 422.3870544433594
+    },
+    "count": 5,
+    "control_6": {
+      "height": 11,
+      "textAlignment": "center",
+      "pos_x": 523,
+      "width": 104,
+      "size": "8",
+      "field": "doc_number",
+      "pos_y": 917,
+      "type": "Label",
+      "required": true,
+      "value": "",
+      "dirty": false
+    },
+    "control_4": {
+      "height": 10.999999046325684,
+      "textAlignment": "center",
+      "pos_x": 523,
+      "width": 103.99999237060547,
+      "size": "8",
+      "field": "doc_number",
+      "pos_y": 924.3732299804688,
+      "type": "Label",
+      "required": true,
+      "value": "",
+      "dirty": false
+    },
+    "control_2": {
+      "height": 14,
+      "pos_x": 194,
+      "width": 160,
+      "field": "signor_name",
+      "pos_y": 854,
+      "type": "Ignor",
+      "required": false,
+      "value": "",
+      "dirty": false
+    },
+    "control_0": {
+      "height": 25.211978912353516,
+      "pos_x": 403.5252990722656,
+      "pos_y": 611.7234497070312,
+      "linewidth": 8,
+      "aname": "Homeowner Signature",
+      "width": 145,
+      "value": "",
+      "dirty": false,
+      "required": true,
+      "type": "Signature",
+      "name": "Homeowner"
+    }
+  },
+  "page_3": {
+    "control_5": {
+      "textAlignment": "center",
+      "width": 392.626708984375,
+      "tv_vmargin": 0.3,
+      "aname": "New Add TextView",
+      "type": "TextView",
+      "size": "10",
+      "pos_y": 566.2672729492188,
+      "field": "c_name",
+      "value": "",
+      "dirty": false,
+      "height": 11.15207290649414,
+      "margin_top": "2",
+      "required": true,
+      "pos_x": 263.0783386230469
+    },
+    "control_3": {
+      "disable": true,
+      "textAlignment": "center",
+      "width": 392.7188415527344,
+      "pos_y": 538.9861450195312,
+      "aname": "new add DatePicker",
+      "type": "DatePicker",
+      "field": "new add DatePicker",
+      "value": "NA",
+      "dirty": false,
+      "height": 25.576030731201172,
+      "margin_left": "4",
+      "margin_top": "1",
+      "required": false,
+      "pos_x": 263.0783386230469
+    },
+    "control_1": {
+      "height": 10.999999046325684,
+      "textAlignment": "center",
+      "pos_x": 523,
+      "width": 103.99999237060547,
+      "size": "8",
+      "field": "doc_number",
+      "pos_y": 924.3732299804688,
+      "type": "Label",
+      "required": true,
+      "value": "",
+      "dirty": false
+    },
+    "count": 6,
+    "control_6": {
+      "width": 100,
+      "pos_y": 0,
+      "aname": "new add Check",
+      "type": "Check",
+      "field": "new add check",
+      "title": "new add check",
+      "single_select": false,
+      "show_detail": false,
+      "value": [],
+      "height": 70,
+      "dirty": false,
+      "marker_size": 6,
+      "cadedate": [
+        [
+          [
+            "New Add Check Option",
+            "New Add Check Option"
+          ],
+          [
+            0,
+            0
+          ]
+        ]
+      ],
+      "required": true,
+      "pos_x": 0
+    },
+    "control_4": {
+      "required_validation": true,
+      "validation_code": "1111",
+      "name": "new Add Signature",
+      "width": 183.31796264648438,
+      "pos_y": 823.5944213867188,
+      "aname": "new add Signature",
+      "linewidth": 8,
+      "type": "Signature",
+      "value": "",
+      "dirty": false,
+      "height": 29.999996185302734,
+      "required": true,
+      "pos_x": 190.0829315185547
+    },
+    "control_2": {
+      "width": 540.921630859375,
+      "pos_y": 368.6636047363281,
+      "aname": "contractors\n",
+      "type": "Check",
+      "field": "contractors\n",
+      "title": "new add check",
+      "single_select": true,
+      "show_detail": false,
+      "value": [],
+      "height": 102.44239807128906,
+      "dirty": false,
+      "marker_size": 6,
+      "cadedate": [
+        [
+          [
+            "New Add Check Option",
+            "New Add Check Option"
+          ],
+          [
+            124.46080780029297,
+            376.0367736816406,
+            0,
+            0
+          ]
+        ],
+        [
+          [
+            "New Add Check Option",
+            "New Add Check Option"
+          ],
+          [
+            124.46082305908203,
+            401.1059875488281,
+            0,
+            0
+          ]
+        ],
+        [
+          [
+            "New Add Check Option",
+            "New Add Check Option"
+          ],
+          [
+            124.46082305908203,
+            427.6497802734375,
+            0,
+            0
+          ]
+        ],
+        [
+          [
+            "New Add Check Option",
+            "New Add Check Option"
+          ],
+          [
+            124.46082305908203,
+            453.4562072753906,
+            0,
+            0
+          ]
+        ]
+      ],
+      "required": true,
+      "pos_x": 114.87556457519531
+    },
+    "control_0": {
+      "height": 21.999998092651367,
+      "pos_x": 499.9999694824219,
+      "pos_y": 905.3732299804688,
+      "width": 150,
+      "value": "",
+      "dirty": false,
+      "required": true,
+      "type": "Image",
+      "name": "BarCode"
+    }
+  },
+  "count": 5,
+  "page_4": {
+    "control_1": {
+      "height": 10.999999046325684,
+      "textAlignment": "center",
+      "pos_x": 523,
+      "width": 103.99999237060547,
+      "size": "8",
+      "field": "doc_number",
+      "pos_y": 924.3732299804688,
+      "type": "Label",
+      "required": true,
+      "value": "",
+      "dirty": false
+    },
+    "count": 2,
+    "control_0": {
+      "height": 21.999998092651367,
+      "pos_x": 499.9999694824219,
+      "pos_y": 905.3732299804688,
+      "width": 150,
+      "value": "",
+      "dirty": false,
+      "required": true,
+      "type": "Image",
+      "name": "BarCode"
+    }
+  }
+}

BIN
Ants Contract/Granite Expo eSign/GECI - Home Improvement Contract - Fong Huang.pdf


BIN
Ants Contract/Granite Expo eSign/GECI - Home Improvement Contract - Jim Xu.pdf


BIN
Ants Contract/Granite Expo eSign/GECI - Home Improvement Contract - Tan.pdf


BIN
Ants Contract/Granite Expo eSign/GECI - Home Improvement Contract - Wilson Ma.pdf


+ 46 - 22
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -11,6 +11,16 @@
 		3C69617C23C70ECF0075172A /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C69617B23C70ECF0075172A /* WebViewController.m */; };
 		3C69618E23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C69618D23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf */; };
 		3C69619023C81A500075172A /* 2020 GECI - Home Improvement Contract.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C69618F23C81A500075172A /* 2020 GECI - Home Improvement Contract.json */; };
+		3C6B627E27102F6800E74CF9 /* CommonEditor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B627D27102F6800E74CF9 /* CommonEditor.storyboard */; };
+		3C6B628127102F7C00E74CF9 /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B628027102F7B00E74CF9 /* DatePickerViewController.m */; };
+		3C6B62842710324B00E74CF9 /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B62822710324B00E74CF9 /* TouchImageView.m */; };
+		3C6B62872710325500E74CF9 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */; };
+		3C6B628927181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628827181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf */; };
+		3C6B6290272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628C272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf */; };
+		3C6B6291272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628D272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf */; };
+		3C6B6292272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628E272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf */; };
+		3C6B6293272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B628F272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf */; };
+		3C6B629F2722A9B500E74CF9 /* 2021 GECI - Home Improvement Contract.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B629E2722A9B500E74CF9 /* 2021 GECI - Home Improvement Contract.json */; };
 		3CBB92F2248A26EB0099E429 /* NetworkUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CBB92F1248A26EB0099E429 /* NetworkUtils.m */; };
 		3CC7E73423BEDE9700BE5561 /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E73323BEDE9700BE5561 /* RAPDFViewController.m */; };
 		3CC7E73623BEDEA000BE5561 /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CC7E73523BEDEA000BE5561 /* wkweb.storyboard */; };
@@ -34,15 +44,12 @@
 		7115D4271E13B70C00EF4E4C /* DocumentListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4261E13B70C00EF4E4C /* DocumentListViewController.m */; };
 		7115D42A1E14DE0A00EF4E4C /* DocListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4291E14DE0A00EF4E4C /* DocListTableViewCell.m */; };
 		7115D4561E1606F700EF4E4C /* GEContractFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4551E1606F700EF4E4C /* GEContractFilterViewController.m */; };
-		7115D4591E162BA800EF4E4C /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4581E162BA800EF4E4C /* DatePickerViewController.m */; };
-		7115D45F1E16326C00EF4E4C /* CommonEditor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7115D45E1E16326C00EF4E4C /* CommonEditor.storyboard */; };
 		7128C2401E124F4500FF635B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C23F1E124F4500FF635B /* main.m */; };
 		7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7128C24A1E124F4500FF635B /* Assets.xcassets */; };
 		7128C26F1E124FF200FF635B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7128C2671E124FF200FF635B /* Main.storyboard */; };
 		7128C27B1E12500B00FF635B /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2731E12500B00FF635B /* SignatureView.m */; };
 		7128C27C1E12500B00FF635B /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2751E12500B00FF635B /* SignatureViewController.m */; };
 		7128C27D1E12500B00FF635B /* signature.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7128C2761E12500B00FF635B /* signature.storyboard */; };
-		7128C28E1E12501B00FF635B /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2811E12501B00FF635B /* TouchImageView.m */; };
 		7128C2AF1E1250CA00FF635B /* TableDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C29C1E1250CA00FF635B /* TableDrawable.m */; };
 		7128C2B01E1250CA00FF635B /* TextDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C29E1E1250CA00FF635B /* TextDrawable.m */; };
 		7128C2B11E1250CA00FF635B /* PDFDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2A01E1250CA00FF635B /* PDFDrawable.m */; };
@@ -85,7 +92,6 @@
 		714B37061E70F2BF00E99B90 /* SCShapeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 714B37031E70F2BF00E99B90 /* SCShapeView.m */; };
 		714B37081E70FCFE00E99B90 /* cam_scan.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 714B37071E70FCFE00E99B90 /* cam_scan.storyboard */; };
 		714B870B1E24CAE300A40D18 /* debug.json in Resources */ = {isa = PBXBuildFile; fileRef = 714B870A1E24CAE200A40D18 /* debug.json */; };
-		717243441E1CCCEC00800678 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 717243431E1CCCEC00800678 /* CustomIOSAlertView.m */; };
 		718697592113F40D00CE31EC /* RAConvertor.m in Sources */ = {isa = PBXBuildFile; fileRef = 718697582113F40D00CE31EC /* RAConvertor.m */; };
 		71B152EF1E66C87F00D2E5EC /* AddExtDocumentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */; };
 		71BBFC371E6419D4008668A7 /* ExtDocumentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */; };
@@ -103,6 +109,19 @@
 		3C69617B23C70ECF0075172A /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
 		3C69618D23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "2020 GECI - Home Improvement Contract.pdf"; sourceTree = "<group>"; };
 		3C69618F23C81A500075172A /* 2020 GECI - Home Improvement Contract.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "2020 GECI - Home Improvement Contract.json"; sourceTree = "<group>"; };
+		3C6B627D27102F6800E74CF9 /* CommonEditor.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CommonEditor.storyboard; path = ../../../common/customUI/commoneditor/CommonEditor.storyboard; sourceTree = "<group>"; };
+		3C6B627F27102F7B00E74CF9 /* DatePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatePickerViewController.h; path = ../../../common/customUI/commoneditor/DatePickerViewController.h; sourceTree = "<group>"; };
+		3C6B628027102F7B00E74CF9 /* DatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DatePickerViewController.m; path = ../../../common/customUI/commoneditor/DatePickerViewController.m; sourceTree = "<group>"; };
+		3C6B62822710324B00E74CF9 /* TouchImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TouchImageView.m; path = ../../../common/customUI/TouchImageView.m; sourceTree = "<group>"; };
+		3C6B62832710324B00E74CF9 /* TouchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchImageView.h; path = ../../../common/customUI/TouchImageView.h; sourceTree = "<group>"; };
+		3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = ../../../common/customUI/CustomIOSAlertView.m; sourceTree = "<group>"; };
+		3C6B62862710325500E74CF9 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = ../../../common/customUI/CustomIOSAlertView.h; sourceTree = "<group>"; };
+		3C6B628827181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "ZINC_3D_Printing_Guide[1.2].pdf"; sourceTree = "<group>"; };
+		3C6B628C272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Fong Huang.pdf"; sourceTree = "<group>"; };
+		3C6B628D272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Wilson Ma.pdf"; sourceTree = "<group>"; };
+		3C6B628E272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Jim Xu.pdf"; sourceTree = "<group>"; };
+		3C6B628F272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Tan.pdf"; sourceTree = "<group>"; };
+		3C6B629E2722A9B500E74CF9 /* 2021 GECI - Home Improvement Contract.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "2021 GECI - Home Improvement Contract.json"; sourceTree = "<group>"; };
 		3CBB92F0248A26EB0099E429 /* NetworkUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkUtils.h; path = ../../../common/NetworkUtils.h; sourceTree = "<group>"; };
 		3CBB92F1248A26EB0099E429 /* NetworkUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetworkUtils.m; path = ../../../common/NetworkUtils.m; sourceTree = "<group>"; };
 		3CC7E73223BEDE9700BE5561 /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
@@ -141,9 +160,6 @@
 		7115D4291E14DE0A00EF4E4C /* DocListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DocListTableViewCell.m; path = ../../common/DocListTableViewCell.m; sourceTree = "<group>"; };
 		7115D4541E1606F700EF4E4C /* GEContractFilterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GEContractFilterViewController.h; sourceTree = "<group>"; };
 		7115D4551E1606F700EF4E4C /* GEContractFilterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GEContractFilterViewController.m; sourceTree = "<group>"; };
-		7115D4571E162BA800EF4E4C /* DatePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatePickerViewController.h; path = "../../../RedAnt ERP Mobile/common/CommonEditor/DatePickerViewController.h"; sourceTree = "<group>"; };
-		7115D4581E162BA800EF4E4C /* DatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DatePickerViewController.m; path = "../../../RedAnt ERP Mobile/common/CommonEditor/DatePickerViewController.m"; sourceTree = "<group>"; };
-		7115D45E1E16326C00EF4E4C /* CommonEditor.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CommonEditor.storyboard; path = "../../../RedAnt ERP Mobile/common/CommonEditor/CommonEditor.storyboard"; sourceTree = "<group>"; };
 		7128C23B1E124F4500FF635B /* Granite Expo eSign.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Granite Expo eSign.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7128C23F1E124F4500FF635B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		7128C24A1E124F4500FF635B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -154,8 +170,6 @@
 		7128C2741E12500B00FF635B /* SignatureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureViewController.h; path = "../../../RedAnt ERP Mobile/common/Functions/signature/SignatureViewController.h"; sourceTree = "<group>"; };
 		7128C2751E12500B00FF635B /* SignatureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureViewController.m; path = "../../../RedAnt ERP Mobile/common/Functions/signature/SignatureViewController.m"; sourceTree = "<group>"; };
 		7128C2761E12500B00FF635B /* signature.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = signature.storyboard; path = "../../../RedAnt ERP Mobile/common/Functions/signature/signature.storyboard"; sourceTree = "<group>"; };
-		7128C2801E12501B00FF635B /* TouchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchImageView.h; path = "../../../RedAnt ERP Mobile/common/customUI/TouchImageView.h"; sourceTree = "<group>"; };
-		7128C2811E12501B00FF635B /* TouchImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TouchImageView.m; path = "../../../RedAnt ERP Mobile/common/customUI/TouchImageView.m"; sourceTree = "<group>"; };
 		7128C29B1E1250CA00FF635B /* TableDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/TableDrawable.h"; sourceTree = "<group>"; };
 		7128C29C1E1250CA00FF635B /* TableDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TableDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/TableDrawable.m"; sourceTree = "<group>"; };
 		7128C29D1E1250CA00FF635B /* TextDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.h"; sourceTree = "<group>"; };
@@ -239,8 +253,6 @@
 		714B37031E70F2BF00E99B90 /* SCShapeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SCShapeView.m; path = ../../../common/SCShapeView.m; sourceTree = "<group>"; };
 		714B37071E70FCFE00E99B90 /* cam_scan.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = cam_scan.storyboard; path = ../../../common/cam_scan.storyboard; sourceTree = "<group>"; };
 		714B870A1E24CAE200A40D18 /* debug.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = debug.json; sourceTree = "<group>"; };
-		717243421E1CCCEC00800678 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.h"; sourceTree = "<group>"; };
-		717243431E1CCCEC00800678 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.m"; sourceTree = "<group>"; };
 		718697572113F40D00CE31EC /* RAConvertor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAConvertor.h; path = ../../../common/RAConvertor.h; sourceTree = "<group>"; };
 		718697582113F40D00CE31EC /* RAConvertor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAConvertor.m; path = ../../../common/RAConvertor.m; sourceTree = "<group>"; };
 		71B152ED1E66C87F00D2E5EC /* AddExtDocumentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddExtDocumentViewController.h; path = ../../common/AddExtDocumentViewController.h; sourceTree = "<group>"; };
@@ -323,10 +335,10 @@
 		7115D4241E13B32800EF4E4C /* customerUI */ = {
 			isa = PBXGroup;
 			children = (
-				7128C2801E12501B00FF635B /* TouchImageView.h */,
-				7128C2811E12501B00FF635B /* TouchImageView.m */,
-				717243421E1CCCEC00800678 /* CustomIOSAlertView.h */,
-				717243431E1CCCEC00800678 /* CustomIOSAlertView.m */,
+				3C6B62832710324B00E74CF9 /* TouchImageView.h */,
+				3C6B62822710324B00E74CF9 /* TouchImageView.m */,
+				3C6B62862710325500E74CF9 /* CustomIOSAlertView.h */,
+				3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */,
 			);
 			name = customerUI;
 			sourceTree = "<group>";
@@ -373,11 +385,11 @@
 				7128C33D1E12541800FF635B /* RootViewController.m */,
 				7128C33F1E12542000FF635B /* LoginViewController.h */,
 				7128C3401E12542000FF635B /* LoginViewController.m */,
+				3C6B627F27102F7B00E74CF9 /* DatePickerViewController.h */,
+				3C6B628027102F7B00E74CF9 /* DatePickerViewController.m */,
 				7115D4541E1606F700EF4E4C /* GEContractFilterViewController.h */,
 				7115D4551E1606F700EF4E4C /* GEContractFilterViewController.m */,
-				7115D45E1E16326C00EF4E4C /* CommonEditor.storyboard */,
-				7115D4571E162BA800EF4E4C /* DatePickerViewController.h */,
-				7115D4581E162BA800EF4E4C /* DatePickerViewController.m */,
+				3C6B627D27102F6800E74CF9 /* CommonEditor.storyboard */,
 				7115D4281E14DE0A00EF4E4C /* DocListTableViewCell.h */,
 				7115D4291E14DE0A00EF4E4C /* DocListTableViewCell.m */,
 				7115D4251E13B70C00EF4E4C /* DocumentListViewController.h */,
@@ -546,8 +558,14 @@
 		7128C3261E1251DE00FF635B /* pdf resource */ = {
 			isa = PBXGroup;
 			children = (
+				3C6B629E2722A9B500E74CF9 /* 2021 GECI - Home Improvement Contract.json */,
+				3C6B628C272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf */,
+				3C6B628E272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf */,
+				3C6B628F272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf */,
+				3C6B628D272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf */,
 				3C69618F23C81A500075172A /* 2020 GECI - Home Improvement Contract.json */,
 				3C69618D23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf */,
+				3C6B628827181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf */,
 				714B870A1E24CAE200A40D18 /* debug.json */,
 				425A00F31F8F0EC200286D6F /* attribute_template.json */,
 				42DDB87B1F91E351002CCE22 /* template_type.json */,
@@ -641,17 +659,23 @@
 				3CC7E7B723C5CB7800BE5561 /* Launch Screen.storyboard in Resources */,
 				42DDB87C1F91E367002CCE22 /* template_type.json in Resources */,
 				425A00F41F8F196900286D6F /* attribute_template.json in Resources */,
+				3C6B629F2722A9B500E74CF9 /* 2021 GECI - Home Improvement Contract.json in Resources */,
 				7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */,
 				7128C26F1E124FF200FF635B /* Main.storyboard in Resources */,
 				3CC7E73623BEDEA000BE5561 /* wkweb.storyboard in Resources */,
 				3C69618E23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf in Resources */,
 				42DDB87A1F91DCE8002CCE22 /* ControlTemplateCell.xib in Resources */,
-				7115D45F1E16326C00EF4E4C /* CommonEditor.storyboard in Resources */,
 				7128C27D1E12500B00FF635B /* signature.storyboard in Resources */,
 				3C69619023C81A500075172A /* 2020 GECI - Home Improvement Contract.json in Resources */,
 				7128C2E81E12511B00FF635B /* LICENSE in Resources */,
+				3C6B628927181DE800E74CF9 /* ZINC_3D_Printing_Guide[1.2].pdf in Resources */,
+				3C6B6293272149D400E74CF9 /* GECI - Home Improvement Contract - Tan.pdf in Resources */,
+				3C6B6291272149D400E74CF9 /* GECI - Home Improvement Contract - Wilson Ma.pdf in Resources */,
 				42DDB8751F91C081002CCE22 /* ControlTemplateVC.xib in Resources */,
 				714B870B1E24CAE300A40D18 /* debug.json in Resources */,
+				3C6B6290272149D400E74CF9 /* GECI - Home Improvement Contract - Fong Huang.pdf in Resources */,
+				3C6B6292272149D400E74CF9 /* GECI - Home Improvement Contract - Jim Xu.pdf in Resources */,
+				3C6B627E27102F6800E74CF9 /* CommonEditor.storyboard in Resources */,
 				714B37081E70FCFE00E99B90 /* cam_scan.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -667,6 +691,7 @@
 				7115D42A1E14DE0A00EF4E4C /* DocListTableViewCell.m in Sources */,
 				7128C2B11E1250CA00FF635B /* PDFDrawable.m in Sources */,
 				7128C2E71E12511B00FF635B /* AESCrypt.m in Sources */,
+				3C6B628127102F7C00E74CF9 /* DatePickerViewController.m in Sources */,
 				713B97B31F79E649002B86BF /* RAPDFPage.m in Sources */,
 				71F8D0341EC057A2002003DB /* RANetworkTaskDelegate.m in Sources */,
 				7115D4271E13B70C00EF4E4C /* DocumentListViewController.m in Sources */,
@@ -681,7 +706,6 @@
 				7128C2EB1E12511B00FF635B /* NSString+Base64.m in Sources */,
 				7128C2B31E1250CA00FF635B /* BasicDrawable.m in Sources */,
 				7128C2C71E1250FC00FF635B /* PDFUtils.m in Sources */,
-				717243441E1CCCEC00800678 /* CustomIOSAlertView.m in Sources */,
 				42D49E6C1F8DFF2D00AE39D5 /* ItemTableDataSourceAndDelegate.m in Sources */,
 				3C69617C23C70ECF0075172A /* WebViewController.m in Sources */,
 				7128C3541E12548C00FF635B /* RAPDFScrollView.m in Sources */,
@@ -698,9 +722,10 @@
 				71B152EF1E66C87F00D2E5EC /* AddExtDocumentViewController.m in Sources */,
 				7128C2DC1E12510900FF635B /* ZipArchive.mm in Sources */,
 				7128C3561E12548C00FF635B /* SignatureTableViewCell.m in Sources */,
+				3C6B62842710324B00E74CF9 /* TouchImageView.m in Sources */,
 				7128C2B51E1250CA00FF635B /* GroupDrawable.m in Sources */,
 				714A9AEC1E9CA92000371995 /* PendingDocumentsViewController.m in Sources */,
-				7128C28E1E12501B00FF635B /* TouchImageView.m in Sources */,
+				3C6B62872710325500E74CF9 /* CustomIOSAlertView.m in Sources */,
 				42D49E5C1F8DF16B00AE39D5 /* AttributeSwitchCell.m in Sources */,
 				718697592113F40D00CE31EC /* RAConvertor.m in Sources */,
 				7128C2B41E1250CA00FF635B /* GridDrawable.m in Sources */,
@@ -716,7 +741,6 @@
 				7128C27B1E12500B00FF635B /* SignatureView.m in Sources */,
 				7128C2B61E1250CA00FF635B /* ImageDrawable.m in Sources */,
 				7128C2AF1E1250CA00FF635B /* TableDrawable.m in Sources */,
-				7115D4591E162BA800EF4E4C /* DatePickerViewController.m in Sources */,
 				7128C2401E124F4500FF635B /* main.m in Sources */,
 				7128C3551E12548C00FF635B /* SignatureListViewController.m in Sources */,
 				3CBB92F2248A26EB0099E429 /* NetworkUtils.m in Sources */,

+ 48 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign/DocumentTemplateViewController.m

@@ -1171,6 +1171,54 @@
     
     [self savePageControl];
 }
+- (IBAction)xFieldDone:(id)sender {
+    if (!self.focusView) {
+        return;
+    }
+    NSDecimalNumber *decNumber = [NSDecimalNumber decimalNumberWithString:self.xTextField.text];
+    self.xStepper.value = decNumber.doubleValue;
+    
+    CGRect frame = self.focusView.frame;
+    frame.origin.x = self.xStepper.value;
+    self.focusView.frame = frame;
+    [self savePageControl];
+}
+- (IBAction)yFieldDone:(id)sender {
+    if (!self.focusView) {
+        return;
+    }
+    NSDecimalNumber *decNumber = [NSDecimalNumber decimalNumberWithString:self.yTextField.text];
+    self.yStepper.value = decNumber.doubleValue;
+    
+    CGRect frame = self.focusView.frame;
+    frame.origin.y = self.yStepper.value;
+    self.focusView.frame = frame;
+    [self savePageControl];
+}
+- (IBAction)hFieldDone:(id)sender {
+    if (!self.focusView) {
+        return;
+    }
+    NSDecimalNumber *decNumber = [NSDecimalNumber decimalNumberWithString:self.hTextField.text];
+    self.hStepper.value = decNumber.doubleValue;
+    
+    CGRect frame = self.focusView.frame;
+    frame.size.height = self.hStepper.value;
+    self.focusView.frame = frame;
+    [self savePageControl];
+}
+- (IBAction)wFieldDone:(id)sender {
+    if (!self.focusView) {
+        return;
+    }
+    NSDecimalNumber *decNumber = [NSDecimalNumber decimalNumberWithString:self.wTextField.text];
+    self.wStepper.value = decNumber.doubleValue;
+    
+    CGRect frame = self.focusView.frame;
+    frame.size.width = self.wStepper.value;
+    self.focusView.frame = frame;
+    [self savePageControl];
+}
 
 - (IBAction)yStepperClick:(UIStepper *)sender {
     if (!self.focusView) {

+ 4 - 1
Ants Contract/Granite Expo eSign/Granite Expo eSign/TemplateViewController.m

@@ -2298,12 +2298,15 @@ typedef enum {
                     
                     double marker_x = marker_frame.origin.x;
                     double marker_y = marker_frame.origin.y;
+       
+                    ;
                     //                int marker_w = marker_frame.size.width;
                     //                int marker_h = marker_frame.size.height;
                     
                     [checkmarker replaceObjectAtIndex:0 withObject:@(marker_x)];
                     [checkmarker replaceObjectAtIndex:1 withObject:@(marker_y)];
-                    
+//                    [checkmarker replaceObjectAtIndex:2 withObject:@(marker_w)];
+//                    [checkmarker replaceObjectAtIndex:3 withObject:@(marker_h)];
                     [item replaceObjectAtIndex:1 withObject:checkmarker];
                     
                     [cadedate replaceObjectAtIndex:k withObject:item];

BIN
Ants Contract/Granite Expo eSign/ZINC_3D_Printing_Guide[1.2].pdf


+ 2 - 0
Ants Contract/Granite Expo eSign/template_example.json

@@ -129,6 +129,8 @@
                        "New Add Check Option"
                        ],
                       [
+                       0,
+                       0,
                        0,
                        0
                        ]

+ 43 - 9
Ants Contract/common/DocumentPageViewController.m

@@ -45,6 +45,18 @@
 
 - (IBAction)onLeftButtonClick:(id)sender {
     
+    if(true)
+    {
+        self.pdfPath = [[NSBundle mainBundle] pathForResource:@"ZINC_3D_Printing_Guide[1.2].pdf" ofType:nil];
+//        [self indexOfViewController:(PageViewController *)viewController]
+        [self setupDocument];
+        PageViewController* pvc=  self.pageViewController.viewControllers[0] ;
+        NSUInteger index=[self indexOfViewController:pvc];
+        pvc.pageRef =  CGPDFDocumentGetPage (self.document , index+1);
+        [pvc refreshPage];
+         return;
+
+    }
     
 //    - (NSUInteger) indexOfViewController:(PageViewController *)viewController
     
@@ -176,6 +188,27 @@
 -(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
 {
 
+}
+-(void) setupDocument
+{
+    self.signatureData= [[NSMutableDictionary alloc] init];
+ 
+    
+    if(self.document!=nil)
+    {
+        CFRelease(self.document);
+    }
+    self.document = [PDFUtils OpenPDF:self.pdfPath];
+    self.total_page = CGPDFDocumentGetNumberOfPages (self.document);
+    if(self.action==PDFEditActionNew)
+        self.controlTemplate = [self templateInit:[PDFUtils loadControl:self.templatePath]];
+    else
+        self.controlTemplate =[PDFUtils loadControl:self.templatePath];
+    
+    
+
+    
+//    self.pageViewController rel
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -195,15 +228,16 @@
     UIView *v = [[UIView alloc] init];
     [self.view insertSubview:v atIndex:0];
     
-    self.signatureData= [[NSMutableDictionary alloc] init];
-    
-    
-    self.document = [PDFUtils OpenPDF:self.pdfPath];
-    self.total_page = CGPDFDocumentGetNumberOfPages (self.document);
-    if(self.action==PDFEditActionNew)
-        self.controlTemplate = [self templateInit:[PDFUtils loadControl:self.templatePath]];
-    else
-        self.controlTemplate =[PDFUtils loadControl:self.templatePath];
+    [self setupDocument];
+//    self.signatureData= [[NSMutableDictionary alloc] init];
+//
+//
+//    self.document = [PDFUtils OpenPDF:self.pdfPath];
+//    self.total_page = CGPDFDocumentGetNumberOfPages (self.document);
+//    if(self.action==PDFEditActionNew)
+//        self.controlTemplate = [self templateInit:[PDFUtils loadControl:self.templatePath]];
+//    else
+//        self.controlTemplate =[PDFUtils loadControl:self.templatePath];
     
     
 //    self.title = [NSString stringWithFormat:@"%@ [%d/%ld]", self.docment_id,1, self.total_page ];

+ 1 - 1
Ants Contract/common/PageViewController.h

@@ -33,5 +33,5 @@
 @property (assign, nonatomic) bool  hide_control;
 
 - (void)rotateView;
-
+-(void) refreshPage;
 @end

+ 7 - 0
Ants Contract/common/PageViewController.m

@@ -228,6 +228,13 @@ typedef enum {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     self.orientation = self.currentAppOrientation;
 
+}
+-(void) refreshPage
+{
+    [self viewDidLoad];
+    [self.pdfPageView setNeedsDisplay];
+
+//    [self viewDidAppear:YES];
 }
 -(void) dealloc
 {

+ 8 - 8
Ants Contract/common/RootViewController.m

@@ -282,8 +282,8 @@
         DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
         
         //                dvc.templateName = @"debug.json";
-        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.json" ofType:nil];
-        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.pdf" ofType:nil];
+        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2021 GECI - Home Improvement Contract.json" ofType:nil];
+        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract - Tan.pdf" ofType:nil];
 
         dvc.docment_id =  offline_docnumber;
         dvc.OnSave=^(NSString* file, NSString* subject)
@@ -323,8 +323,8 @@
                         DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
                         
                         //                dvc.templateName = @"debug.json";
-                        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.json" ofType:nil];
-                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.pdf" ofType:nil];
+                        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2021 GECI - Home Improvement Contract.json" ofType:nil];
+                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract - Tan.pdf" ofType:nil];
                         dvc.docment_id = json[@"doc_number"];
                         dvc.OnSave=^(NSString* file, NSString* subject)
                         {
@@ -352,8 +352,8 @@
                             DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
                             
                             //                dvc.templateName = @"debug.json";
-                            dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.json" ofType:nil];
-                            dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.pdf" ofType:nil];
+                            dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2021 GECI - Home Improvement Contract.json" ofType:nil];
+                            dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract - Tan.pdf" ofType:nil];
 
                             dvc.docment_id =  offline_docnumber;
                             dvc.OnSave=^(NSString* file, NSString* subject)
@@ -740,8 +740,8 @@
     
     DocumentTemplateViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentTemplateViewController" ];
     
-    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.json" ofType:nil];
-    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.pdf" ofType:nil];
+    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2021 GECI - Home Improvement Contract.json" ofType:nil];
+    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract - Tan.pdf" ofType:nil];
     
     dvc.docment_id =  @"debug_template";
     dvc.OnSave=^(NSString* file, NSString* subject)

BIN
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate